Merge pull request #2903 from emqx/dev/1.10.0

Sync code from refs/heads/dev/1.10.0 to enterprise
emqx · Aug 21, 2024 · 09fcd0b · 09fcd0b
2 parents 7ad0f7b + 4794234
commit 09fcd0b
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 13 deletions.
diff --git a/src/components/ArrayEditor.vue b/src/components/ArrayEditor.vue
@@ -1,5 +1,9 @@
 <template>
+  <p class="value" v-if="readonly">
+    {{ Array.isArray(modelValue) ? modelValue.join(', ') : modelValue }}
+  </p>
   <el-select
+    v-else
     class="array-editor"
     v-model="selected"
     multiple
@@ -36,6 +40,10 @@ const props = defineProps({
     type: Boolean,
     default: false,
   },
+  readonly: {
+    type: Boolean,
+    default: false,
+  },
 })
 const emit = defineEmits(['update:modelValue'])
 

diff --git a/src/components/ListenerDrawer/ListenerDrawer.vue b/src/components/ListenerDrawer/ListenerDrawer.vue
@@ -123,7 +123,15 @@
       <el-row :gutter="20" v-if="!gatewayName">
         <el-col :span="24"><el-divider /></el-col>
         <el-col :span="12">
-          <el-form-item :label="tl('showLimiter')"> </el-form-item>
+          <el-form-item>
+            <template #label>
+              <form-item-label
+                :label="tl('showLimiter')"
+                :desc="tl('showLimiterDesc')"
+                desc-marked
+              />
+            </template>
+          </el-form-item>
         </el-col>
         <el-col :span="12" />
         <el-col v-if="!typesWithoutMaxConnectionRate.includes(listenerRecord.type)" :span="12">

diff --git a/src/components/SchemaForm.tsx b/src/components/SchemaForm.tsx
@@ -676,17 +676,28 @@ const SchemaForm = defineComponent({
           return ele
         }
         case 'oneof': {
-          const props = { modelValue, items: property.oneOf }
           if (isComplexOneof(property)) {
-            return (
-              <OneofRefs
-                {...props}
-                property={property}
-                colSpan={getColSpan(property)}
-                getText={getText}
-                readonly
-              />
-            )
+            const props = {
+              modelValue,
+              property,
+              getText,
+              items: property.oneOf,
+              readonly: true,
+              colSpan: getColSpan(property),
+            }
+            if (property.useNewCom) {
+              return (
+                <OneofRefsSelect
+                  {...props}
+                  key={property.path}
+                  fieldValue={modelValue}
+                  onChange={(selectedProperty: any) =>
+                    handleSelectOneof(property, selectedProperty)
+                  }
+                />
+              )
+            }
+            return <OneofRefs {...props} />
           }
           return <p class="value">{modelValue}</p>
         }

diff --git a/src/i18n/Gateway.js b/src/i18n/Gateway.js
@@ -365,8 +365,12 @@ export default {
     zh: '启用 CRL 检查',
   },
   showLimiter: {
-    zh: '速率限制（可选）',
-    en: 'Limiter (Optional)',
+    zh: '速率限制',
+    en: 'Limiter',
+  },
+  showLimiterDesc: {
+    zh: '速率限制为可选配置。默认空白值表示未开启限制。设置具体数值来启用限制，如需关闭已开启的限制，请将其值设为 `infinity。`',
+    en: 'Rate limiting is optional. Default empty values indicate that limits are not enabled. Set specific numeric values to enable limits, or set to `infinity` to disable enabled limits.',
   },
   customConfig: {
     zh: '自定义配置',