feat(frontend): mysql、spider库表校验规则调整 #6595

TencentBlueKing · Sep 10, 2024 · 3439562 · 3439562
1 parent a0f0ed8
commit 3439562
Show file tree

Hide file tree

Showing 7 changed files with 56 additions and 44 deletions.
diff --git a/...ontend/src/views/db-manage/common/sql-execute/execute-objects/RenderData/RenderDbName.vue b/...ontend/src/views/db-manage/common/sql-execute/execute-objects/RenderData/RenderDbName.vue
@@ -31,6 +31,7 @@
   import { makeMap, random } from '@utils';
 
   interface Props {
+    allowEmpty?: boolean;
     checkDuplicate?: boolean;
   }
 
@@ -39,6 +40,7 @@
   }
 
   const props = withDefaults(defineProps<Props>(), {
+    allowEmpty: false,
     checkDuplicate: false,
   });
 
@@ -57,7 +59,13 @@
 
   const rules = [
     {
-      validator: (value: string[]) => value && value.length > 0,
+      validator: (value: string[]) => {
+        if (props.allowEmpty) {
+          return true;
+        }
+
+        return value && value.length > 0;
+      },
       message: t('DB 名不能为空'),
     },
     {

diff --git a/dbm-ui/frontend/src/views/db-manage/common/sql-execute/execute-objects/RenderData/Row.vue b/dbm-ui/frontend/src/views/db-manage/common/sql-execute/execute-objects/RenderData/Row.vue
@@ -23,7 +23,8 @@
       <td style="padding: 0">
         <RenderDbName
           ref="ignoreDbnamesRef"
-          v-model="localIgnoreDbnames" />
+          v-model="localIgnoreDbnames"
+          allow-empty />
       </td>
       <td style="padding: 0">
         <RenderSql

diff --git a/dbm-ui/frontend/src/views/mysql/checksum/pages/page1/components/RenderData/Row.vue b/dbm-ui/frontend/src/views/mysql/checksum/pages/page1/components/RenderData/Row.vue
@@ -57,7 +57,8 @@
         ref="ignoreTablesRef"
         :allow-asterisk="false"
         :cluster-id="localClusterId"
-        :model-value="data.ignoreTables" />
+        :model-value="data.ignoreTables"
+        :required="false" />
     </td>
     <OperateColumn
       :removeable="removeable"

diff --git a/.../src/views/mysql/data-migrate/pages/page1/components/render-target-db/TargetDbPreview.vue b/.../src/views/mysql/data-migrate/pages/page1/components/render-target-db/TargetDbPreview.vue
@@ -53,6 +53,7 @@
       <div
         v-for="name in previewDataList"
         :key="name"
+        v-overflow-tips
         class="name-item">
         {{ name }}
       </div>
@@ -72,7 +73,7 @@
 
   import RenderDbName from '@views/mysql/common/edit-field/DbName.vue';
 
-  export type DbsType = Omit<Props['data'], 'sourceClusterId' | 'targetClusters'>
+  export type DbsType = Omit<Props['data'], 'sourceClusterId' | 'targetClusters'>;
 
   interface Props {
     data: {
@@ -147,38 +148,40 @@
   });
 </script>
 <style lang="less" scoped>
-.preview-main {
-  padding: 16px 24px;
-
-  .preview-header {
-    margin: 24px 0 16px;
-    display: flex;
-    .title {
-      font-weight: 700;
-      color: #313238;
+  .preview-main {
+    padding: 16px 24px;
+
+    .preview-header {
+      margin: 24px 0 16px;
+      display: flex;
+      .title {
+        font-weight: 700;
+        color: #313238;
+      }
     }
-  }
-
-  .preview-copy {
-    width: 100%;
-    display: flex;
-    justify-content: flex-end;
-    margin-bottom: 8px;
-    margin-top: -24px;
-  }
 
-  .preview-content {
-    display: flex;
-    flex-wrap: wrap;
-    padding: 16px;
-    background: #f5f7fa;
+    .preview-copy {
+      width: 100%;
+      display: flex;
+      justify-content: flex-end;
+      margin-bottom: 8px;
+      margin-top: -24px;
+    }
 
-    .name-item {
-      width: 260px;
-      line-height: 24px;
-      margin: 0 13px 0 0;
+    .preview-content {
+      display: flex;
+      flex-wrap: wrap;
+      padding: 16px;
+      background: #f5f7fa;
+
+      .name-item {
+        width: 260px;
+        line-height: 24px;
+        margin: 0 13px 0 0;
+        white-space: nowrap;
+        overflow: hidden;
+        text-overflow: ellipsis;
+      }
     }
   }
-}
-
 </style>
diff --git a/dbm-ui/frontend/src/views/mysql/db-clear/pages/page1/components/RenderData/Row.vue b/dbm-ui/frontend/src/views/mysql/db-clear/pages/page1/components/RenderData/Row.vue
@@ -163,11 +163,10 @@
   };
 
   const handleIgnoreDbsChange = (value: string[]) => {
-    if (isDropDatabase.value && value.length > 0) {
-      ignoreTables.value = ['*'];
-      return;
-    }
-
+    // if (isDropDatabase.value && value.length > 0) {
+    //   ignoreTables.value = ['*'];
+    //   return;
+    // }
     ignoreTables.value = [];
   };
 

diff --git a/dbm-ui/frontend/src/views/spider-manage/checksum/pages/page1/components/RenderData/Row.vue b/dbm-ui/frontend/src/views/spider-manage/checksum/pages/page1/components/RenderData/Row.vue
@@ -82,7 +82,8 @@
           ref="ignoreTablesRefs"
           :allow-asterisk="false"
           :cluster-id="localClusterId"
-          :model-value="backupInfoItem.ignoreTables" />
+          :model-value="backupInfoItem.ignoreTables"
+          :required="false" />
       </td>
       <OperateColumn
         :removeable="removeable"

diff --git a/dbm-ui/frontend/src/views/spider-manage/db-clear/pages/page1/components/RenderData/Row.vue b/dbm-ui/frontend/src/views/spider-manage/db-clear/pages/page1/components/RenderData/Row.vue
@@ -156,11 +156,10 @@
   };
 
   const handleIgnoreDbsChange = (value: string[]) => {
-    if (isDropDatabase.value && value.length > 0) {
-      ignoreTables.value = ['*'];
-      return;
-    }
-
+    // if (isDropDatabase.value && value.length > 0) {
+    //   ignoreTables.value = ['*'];
+    //   return;
+    // }
     ignoreTables.value = [];
   };