Merge branch 'dev/1.10.1' into enterprise

package.json

@@ -19,8 +19,8 @@
   },
   "dependencies": {
     "@element-plus/icons-vue": "^1.1.0",
-    "@emqx/shared-ui-i18n": "~0.0.12",
-    "@emqx/shared-ui-utils": "~0.0.11",
+    "@emqx/shared-ui-i18n": "~0.0.25",
+    "@emqx/shared-ui-utils": "^0.0.14",
     "@highlightjs/vue-plugin": "^2.1.0",
     "@vue-flow/core": "^1.20.1",
     "ajv": "^8.12.0",
@@ -37,7 +37,6 @@
     "highlight.js": "10.7.3",
     "hocon-parser": "^1.0.1",
     "js-base64": "^3.7.2",
-    "json-bigint": "^1.0.0",
     "json-to-avro": "^1.1.1",
     "lodash": "^4.17.21",
     "marked": "^4.0.9",

src/shims-vue.d.ts

@@ -12,6 +12,5 @@ declare module '@/common/highlight/sql'
 declare module 'js-sql-parser'
 declare module 'highlight.js/lib/core'
 declare module 'highlight.js/lib/languages/sql'
-declare module 'json-bigint'
 declare module 'hocon-parser'
 declare module 'to-json-schema'

src/views/RuleEngine/components/SQLTest.vue

@@ -115,7 +115,7 @@ import { PropType, defineExpose, defineProps, onUnmounted, ref, watch } from 'vu
 import FromSelect from '../components/FromSelect.vue'
 import RuleTest from './RuleTest.vue'
 import TestSQLContextForm from './TestSQLContextForm.vue'
-import { jsonParse, jsonStringify } from '@/common/jsonUtils'
+import { jsonBigIntParse, jsonBigIntStringify } from '@emqx/shared-ui-utils'
 
 const { tl, t } = useI18nTl('RuleEngine')
 
@@ -157,7 +157,7 @@ const submitTestSQL = async () => {
   try {
     res = await testsql({ context: getMockContext(), sql: ruleSql.value })
     if (res) {
-      resultData.value = jsonStringify(jsonParse(res))
+      resultData.value = jsonBigIntStringify(jsonBigIntParse(res))
       ElMessage.success(tl('testPassed'))
     }
   } catch (error) {

yarn.lock

@@ -1195,12 +1195,12 @@
   resolved "https://registry.yarnpkg.com/@element-plus/icons-vue/-/icons-vue-2.0.9.tgz#b7777c57534522e387303d194451d50ff549d49a"
   integrity sha512-okdrwiVeKBmW41Hkl0eMrXDjzJwhQMuKiBOu17rOszqM+LS/yBYpNQNV5Jvoh06Wc+89fMmb/uhzf8NZuDuUaQ==
 
-"@emqx/shared-ui-i18n@~0.0.12":
-  version "0.0.26"
-  resolved "https://registry.yarnpkg.com/@emqx/shared-ui-i18n/-/shared-ui-i18n-0.0.26.tgz#6d5b772eed84486675af141fff76cf4ebdabd3b6"
-  integrity sha512-P7IiyEd7upLIPu4rO/AJrPwF3zYcQlvFmW99zWzn9j6RHry0PcMBxbiFfw0+NoTtFGf7t3drTYCS4gEZSUGhGw==
+"@emqx/shared-ui-i18n@~0.0.25":
+  version "0.0.25"
+  resolved "https://registry.yarnpkg.com/@emqx/shared-ui-i18n/-/shared-ui-i18n-0.0.25.tgz#bf5dc58fa8adc85489f60bc8c70df0f9741c780e"
+  integrity sha512-oVfaVglfHSq5aUmMB0BrwMaqE+7cJgBaL9aZdSbLhSwRci6yEmuF+TGreLtOGFeTb1n8aTj8BpG/sClJtm5kTQ==
 
-"@emqx/shared-ui-utils@~0.0.11":
+"@emqx/shared-ui-utils@^0.0.14":
   version "0.0.14"
   resolved "https://registry.yarnpkg.com/@emqx/shared-ui-utils/-/shared-ui-utils-0.0.14.tgz#1778dfb0d22fac40c8d159c03d5db800f644e983"
   integrity sha512-65TsDNoEyb6obdupU4zuFSxjTa7hXxS8n+BdJ5CvpBuZCPne4zMNV3djuSEVS3LqlwV8RrIzKzN7QZar1G+0bQ==
@@ -1299,13 +1299,13 @@
     cssnano-preset-default "^4.0.0"
     postcss "^7.0.0"
 
-"@intlify/[email protected].0":
-  version "9.14.0"
-  resolved "https://registry.yarnpkg.com/@intlify/core-base/-/core-base-9.14.0.tgz#63ce687a6560c0af6a16cb567d9d8a1ea1a5a65e"
-  integrity sha512-zJn0imh9HIsZZUtt9v8T16PeVstPv6bP2YzlrYJwoF8F30gs4brZBwW2KK6EI5WYKFi3NeqX6+UU4gniz5TkGg==
+"@intlify/[email protected].1":
+  version "9.14.1"
+  resolved "https://registry.yarnpkg.com/@intlify/core-base/-/core-base-9.14.1.tgz#405b43dca3a38ab70dbb06a818d0a5b8a835fcc9"
+  integrity sha512-rG5/hlNW6Qfve41go37szEf0mVLcfhYuOu83JcY0jZKasnwsrcZYYWDzebCcuO5I/6Sy1JFWo9p+nvkQS1Dy+w==
   dependencies:
-    "@intlify/message-compiler" "9.14.0"
-    "@intlify/shared" "9.14.0"
+    "@intlify/message-compiler" "9.14.1"
+    "@intlify/shared" "9.14.1"
 
 "@intlify/[email protected]":
   version "9.2.0-beta.22"
@@ -1324,12 +1324,12 @@
   dependencies:
     "@intlify/shared" "9.2.0-beta.22"
 
-"@intlify/[email protected].0":
-  version "9.14.0"
-  resolved "https://registry.yarnpkg.com/@intlify/message-compiler/-/message-compiler-9.14.0.tgz#e767141dd12862b3c1bf02ab5fc4852792812381"
-  integrity sha512-sXNsoMI0YsipSXW8SR75drmVK56tnJHoYbPXUv2Cf9lz6FzvwsosFm6JtC1oQZI/kU+n7qx0qRrEWkeYFTgETA==
+"@intlify/[email protected].1":
+  version "9.14.1"
+  resolved "https://registry.yarnpkg.com/@intlify/message-compiler/-/message-compiler-9.14.1.tgz#e361133e2849453c55cb3feb856898ff563e70d1"
+  integrity sha512-MY8hwukJBnXvGAncVKlHsqKDQ5ZcQx4peqEmI8wBUTXn4pezrtTGYXNoz81cLyEEHB+L/zlKWVBSh5TiX4gYoQ==
   dependencies:
-    "@intlify/shared" "9.14.0"
+    "@intlify/shared" "9.14.1"
     source-map-js "^1.0.2"
 
 "@intlify/[email protected]":
@@ -1340,10 +1340,10 @@
     "@intlify/shared" "9.2.0-beta.22"
     source-map "0.6.1"
 
-"@intlify/[email protected].0":
-  version "9.14.0"
-  resolved "https://registry.yarnpkg.com/@intlify/shared/-/shared-9.14.0.tgz#e8fb3693ad4171442cbe6cb8922a9b5a22ffb4ef"
-  integrity sha512-r+N8KRQL7LgN1TMTs1A2svfuAU0J94Wu9wWdJVJqYsoMMLIeJxrPjazihfHpmJqfgZq0ah3Y9Q4pgWV2O90Fyg==
+"@intlify/[email protected].1":
+  version "9.14.1"
+  resolved "https://registry.yarnpkg.com/@intlify/shared/-/shared-9.14.1.tgz#11c3d6103615d8b0203224826d2955987c058b72"
+  integrity sha512-XjHu6PEQup9MnP1x0W9y0nXXfq9jFftAYSfV11hryjtH4XqXP8HrzMvXI+ZVifF+jZLszaTzIhvukllplxTQTg==
 
 "@intlify/[email protected]":
   version "9.2.0-beta.22"
@@ -12817,12 +12817,12 @@ vue-hot-reload-api@^2.3.0:
   integrity sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog==
 
 vue-i18n@^9.10.2:
-  version "9.14.0"
-  resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-9.14.0.tgz#d6f1b3d95bfc4f40e630ff9456c78ab5becfd933"
-  integrity sha512-LxmpRuCt2rI8gqU+kxeflRZMQn4D5+4M3oP3PWZdowW/ePJraHqhF7p4CuaME52mUxdw3Mmy2yAUKgfZYgCRjA==
+  version "9.14.1"
+  resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-9.14.1.tgz#5bd2d7659e1a1dcda28df66e78aa786d1792ef31"
+  integrity sha512-xjxV0LYc1xQ8TbAVfIyZiOSS8qoU1R0YwV7V5I8I6Fd64+zvsTsdPgtylPsie3Vdt9wekeYhr+smKDeaK6RBuA==
   dependencies:
-    "@intlify/core-base" "9.14.0"
-    "@intlify/shared" "9.14.0"
+    "@intlify/core-base" "9.14.1"
+    "@intlify/shared" "9.14.1"
     "@vue/devtools-api" "^6.5.0"
 
 vue-i18n@^9.2.0-beta.19: