fix(frontend): 新建开区取消授权IP必填限制 #3488

TencentBlueKing · Mar 7, 2024 · acaa9b1 · acaa9b1
1 parent f431bec
commit acaa9b1
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 26 deletions.
diff --git a/dbm-ui/frontend/src/components/add-permission-rule-dialog/Index.vue b/dbm-ui/frontend/src/components/add-permission-rule-dialog/Index.vue
@@ -13,6 +13,7 @@
         :columns="columns"
         :container-height="600"
         :data-source="getPermissionRules"
+        :remote-pagination="false"
         :settings="settings" />
     </div>
     <template #footer>

diff --git a/dbm-ui/frontend/src/services/model/es/es.ts b/dbm-ui/frontend/src/services/model/es/es.ts
@@ -216,7 +216,7 @@ export default class Es {
   }
 
   get domainDisplayName() {
-    const port = this.es_datanode_hot[0]?.port;
+    const { port } = this.es_master[0];
     const displayName = port ? `${this.domain}:${port}` : this.domain;
     return displayName;
   }

diff --git a/...ntend/src/views/mysql/openarea/create/components/target-cluster/components/ColumnHost.vue b/...ntend/src/views/mysql/openarea/create/components/target-cluster/components/ColumnHost.vue
@@ -86,7 +86,7 @@
   import IpSelector from '@components/ip-selector/IpSelector.vue';
 
   import type { IDataRow } from './Row.vue';
-  import useValidtor from './useValidtor';
+  import useValidtor, { type Rules } from './useValidtor';
 
   interface Props {
     clusterData?: IDataRow['clusterData']
@@ -112,11 +112,11 @@
   const isShowOverflowTip = computed(() => isOverflow.value && showEditIcon.value);
 
   const rules = [
-    {
-      validator: (value: string[]) => value.length > 0,
-      message: t('授权 IP 不能为空'),
-    },
-  ];
+    // {
+    //   validator: (value: string[]) => value.length > 0,
+    //   message: t('授权 IP 不能为空'),
+    // },
+  ] as Rules;
 
   const {
     message: errorMessage,

diff --git a/...tend/src/views/mysql/openarea/create/components/target-cluster/components/RenderTable.vue b/...tend/src/views/mysql/openarea/create/components/target-cluster/components/RenderTable.vue
@@ -36,6 +36,7 @@
         </RenderTableHeadColumn>
         <RenderTableHeadColumn
           :min-width="100"
+          :required="false"
           :width="190">
           {{ t('授权 IP') }}
         </RenderTableHeadColumn>

diff --git a/.../src/views/mysql/openarea/create/components/template-detail/components/PrivRuleDetail.vue b/.../src/views/mysql/openarea/create/components/template-detail/components/PrivRuleDetail.vue
@@ -110,6 +110,9 @@
   };
 
   onMounted(() => {
+    if (props.ruleIdList.length === 0) {
+      return;
+    }
     tableRef.value.fetchData({
       cluster_id: props.clusterId,
       rule_ids: props.ruleIdList.join(','),

diff --git a/dbm-ui/frontend/src/views/mysql/toolbox/components/toolbox-side/Index.vue b/dbm-ui/frontend/src/views/mysql/toolbox/components/toolbox-side/Index.vue
@@ -32,7 +32,8 @@
         <BkCollapse v-model="activeCollapses">
           <Vuedraggable
             v-model="allRenderMenuGroupList"
-            item-key="id">
+            item-key="id"
+            @end="handleDragEnd">
             <template #item="{element}">
               <RenderMenuGroup
                 :id="element.id"
@@ -102,13 +103,12 @@
     immediate: true,
   });
 
-  // 拖动排序
-  watch(allRenderMenuGroupList, () => {
+  const handleDragEnd = () => {
     userProfileStore.updateProfile({
       label: UserPersonalSettings.MYSQL_TOOLBOX_MENUS,
       values: allRenderMenuGroupList.value.map(item => item.id),
     });
-  });
+  };
 
 </script>
 

diff --git a/dbm-ui/frontend/src/views/redis/toolbox/components/toolbox-side/Index.vue b/dbm-ui/frontend/src/views/redis/toolbox/components/toolbox-side/Index.vue
@@ -33,7 +33,8 @@
         <BkCollapse v-model="activeCollapses">
           <Vuedraggable
             v-model="allRenderMenuGroupList"
-            item-key="id">
+            item-key="id"
+            @end="handleDragEnd">
             <template #item="{element}">
               <RenderMenuGroup
                 :id="element.id"
@@ -103,13 +104,12 @@
     immediate: true,
   });
 
-  // 拖动排序
-  watch(allRenderMenuGroupList, () => {
+  const handleDragEnd = () => {
     userProfileStore.updateProfile({
       label: UserPersonalSettings.REDIS_TOOLBOX_MENUS,
       values: allRenderMenuGroupList.value.map(item => item.id),
     });
-  });
+  };
 
 </script>
 

diff --git a/...c/views/spider-manage/openarea-create/components/target-cluster/components/ColumnHost.vue b/...c/views/spider-manage/openarea-create/components/target-cluster/components/ColumnHost.vue
@@ -86,7 +86,7 @@
   import IpSelector from '@components/ip-selector/IpSelector.vue';
 
   import type { IDataRow } from './Row.vue';
-  import useValidtor from './useValidtor';
+  import useValidtor, { type Rules } from './useValidtor';
 
   interface Props {
     clusterData?: IDataRow['clusterData']
@@ -111,11 +111,11 @@
   const isShowOverflowTip = computed(() => isOverflow.value && showEditIcon.value);
 
   const rules = [
-    {
-      validator: (value: string[]) => value.length > 0,
-      message: t('授权 IP 不能为空'),
-    },
-  ];
+    // {
+    //   validator: (value: string[]) => value.length > 0,
+    //   message: t('授权 IP 不能为空'),
+    // },
+  ] as Rules;
 
   const {
     message: errorMessage,

diff --git a/.../views/spider-manage/openarea-create/components/target-cluster/components/RenderTable.vue b/.../views/spider-manage/openarea-create/components/target-cluster/components/RenderTable.vue
@@ -36,6 +36,7 @@
         </RenderTableHeadColumn>
         <RenderTableHeadColumn
           :min-width="100"
+          :required="false"
           :width="190">
           {{ t('授权 IP') }}
         </RenderTableHeadColumn>

diff --git a/...ws/spider-manage/openarea-create/components/template-detail/components/PrivRuleDetail.vue b/...ws/spider-manage/openarea-create/components/template-detail/components/PrivRuleDetail.vue
@@ -114,6 +114,9 @@
   };
 
   onMounted(() => {
+    if (props.ruleIdList.length === 0) {
+      return;
+    }
     tableRef.value.fetchData({
       cluster_id: props.clusterId,
       rule_ids: props.ruleIdList.join(','),

diff --git a/dbm-ui/frontend/src/views/spider-manage/toolbox/components/toolbox-side/Index.vue b/dbm-ui/frontend/src/views/spider-manage/toolbox/components/toolbox-side/Index.vue
@@ -33,7 +33,8 @@
         <BkCollapse v-model="activeCollapses">
           <Vuedraggable
             v-model="allRenderMenuGroupList"
-            item-key="id">
+            item-key="id"
+            @end="handleDragEnd">
             <template #item="{element}">
               <RenderMenuGroup
                 :id="element.id"
@@ -103,14 +104,12 @@
     immediate: true,
   });
 
-  // 拖动排序
-  watch(allRenderMenuGroupList, () => {
+  const handleDragEnd = () => {
     userProfileStore.updateProfile({
       label: UserPersonalSettings.SPIDER_TOOLBOX_MENUS,
       values: allRenderMenuGroupList.value.map(item => item.id),
     });
-  });
-
+  };
 </script>
 
 <style lang="less">