();
@@ -83,16 +85,28 @@
},
message: t('表名不能为空'),
},
+ {
+ validator: (value: string[]) => _.every(value, (item) => /^[-_a-zA-Z0-9*?%]{0,35}$/.test(item)),
+ message: t('库表名支持数字、字母、中划线、下划线,最大35字符'),
+ },
+ {
+ validator: (value: string[]) => {
+ if (props.allowAsterisk) {
+ return true;
+ }
+
+ return _.every(value, (item) => item !== '*');
+ },
+ message: t('不允许为 *'),
+ },
{
validator: (value: string[]) =>
!_.some(value, (item) => (/\*/.test(item) && item.length > 1) || (value.length > 1 && item === '*')),
message: t('* 只能独立使用'),
- trigger: 'change',
},
{
- validator: (value: string[]) => _.every(value, (item) => !/^%$/.test(item)),
- message: t('% 不允许单独使用'),
- trigger: 'change',
+ validator: (value: string[]) => _.every(value, (item) => !/^[%?]$/.test(item)),
+ message: t('% 或 ? 不允许单独使用'),
},
{
validator: (value: string[]) => {
@@ -102,7 +116,6 @@
return true;
},
message: t('含通配符的单元格仅支持输入单个对象'),
- trigger: 'change',
},
// TODO: 表不存在
];
diff --git a/dbm-ui/frontend/src/views/mysql/db-clear/pages/page1/components/RenderData/Index.vue b/dbm-ui/frontend/src/views/mysql/db-clear/pages/page1/components/RenderData/Index.vue
index 0acad4fdaf..ad4c4e66ca 100644
--- a/dbm-ui/frontend/src/views/mysql/db-clear/pages/page1/components/RenderData/Index.vue
+++ b/dbm-ui/frontend/src/views/mysql/db-clear/pages/page1/components/RenderData/Index.vue
@@ -49,14 +49,14 @@
- {{ t('目标表名') }}
+ {{ t('忽略DB名') }}
- {{ t('忽略DB名') }}
+ {{ t('目标表名') }}
-
-
- |
|
+
+
+ |
- {{ t('备份表名') }}
+ {{ t('忽略DB名') }}
- {{ t('忽略DB名') }}
+ {{ t('备份表名') }}
|
-
-
- |
|
+
+
+ |
diff --git a/dbm-ui/frontend/src/views/mysql/dumper/components/create-rule/components/receiver-data/components/batch-edit-common/Index.vue b/dbm-ui/frontend/src/views/mysql/dumper/components/create-rule/components/receiver-data/components/batch-edit-common/Index.vue
index fd84479e13..ed50ebcba4 100644
--- a/dbm-ui/frontend/src/views/mysql/dumper/components/create-rule/components/receiver-data/components/batch-edit-common/Index.vue
+++ b/dbm-ui/frontend/src/views/mysql/dumper/components/create-rule/components/receiver-data/components/batch-edit-common/Index.vue
@@ -2,6 +2,7 @@
@@ -16,6 +17,7 @@
();
@@ -52,6 +54,7 @@
const { t } = useI18n();
+ const inputRef = ref();
const multipleInputRef = ref();
const localValue = ref('');
@@ -68,6 +71,17 @@
}
localValue.value = '';
};
+
+ const handleAfterShow = () => {
+ nextTick(() => {
+ if (isShowInput.value) {
+ inputRef.value?.focus();
+ return;
+ }
+
+ multipleInputRef.value?.focus();
+ });
+ };
diff --git a/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/TargetCluster.vue b/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/TargetCluster.vue
deleted file mode 100644
index 3927942188..0000000000
--- a/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/TargetCluster.vue
+++ /dev/null
@@ -1,215 +0,0 @@
-
-
-
-
-
-
-
- {{ t('添加目标集群') }}
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/TaskTips.vue b/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/TaskTips.vue
deleted file mode 100644
index 8a54a0cec8..0000000000
--- a/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/TaskTips.vue
+++ /dev/null
@@ -1,150 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
- {{ t('目前已有') }}
-
- {{ taskCount }}
-
- {{ t('个模拟执行任务待确认_可点击查看最新动态') }}
-
-
-
-
-
-
-
-
-
-
-
- {{ item.created_at }}
-
-
-
-
-
-
-
-
-
diff --git a/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/backup/Index.vue b/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/backup/Index.vue
deleted file mode 100644
index ce81cc7577..0000000000
--- a/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/backup/Index.vue
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
-
-
-
-
-
-
- handleAppend(value, index)"
- @change="(data: IDataRow) => handleChange(data, index)"
- @remove="handleRemove(index)" />
-
-
-
-
diff --git a/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/backup/RenderData/Index.vue b/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/backup/RenderData/Index.vue
deleted file mode 100644
index d6933ace98..0000000000
--- a/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/backup/RenderData/Index.vue
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
-
-
- {{ t('备份DB') }}
-
-
- {{ t('备份源') }}
-
-
- {{ t('备份表名') }}
-
-
- {{ t('操作') }}
-
-
-
-
-
-
-
diff --git a/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/backup/RenderData/RenderBackupSource.vue b/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/backup/RenderData/RenderBackupSource.vue
deleted file mode 100644
index 0f51b3ce24..0000000000
--- a/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/backup/RenderData/RenderBackupSource.vue
+++ /dev/null
@@ -1,74 +0,0 @@
-
-
-
- handleChange(value as string)" />
-
-
diff --git a/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/backup/RenderData/Row.vue b/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/backup/RenderData/Row.vue
deleted file mode 100644
index 4ded730019..0000000000
--- a/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/backup/RenderData/Row.vue
+++ /dev/null
@@ -1,137 +0,0 @@
-
-
-
-
-
-
- |
-
-
- |
-
-
- |
-
-
-
-
-
diff --git a/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/sql-file/Index.vue b/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/sql-file/Index.vue
deleted file mode 100644
index 5ef7cb135b..0000000000
--- a/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/sql-file/Index.vue
+++ /dev/null
@@ -1,111 +0,0 @@
-
-
-
-
-
-
- {{ t('手动输入') }}
-
-
- {{ t('SQL文件') }}
-
-
-
-
-
-
-
-
-
diff --git a/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/sql-file/editor/Index.vue b/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/sql-file/editor/Index.vue
deleted file mode 100644
index c5d64a695f..0000000000
--- a/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/sql-file/editor/Index.vue
+++ /dev/null
@@ -1,235 +0,0 @@
-
-
-
-
-
-
-
diff --git a/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/sql-file/editor/MessageList.vue b/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/sql-file/editor/MessageList.vue
deleted file mode 100644
index b35f03c07e..0000000000
--- a/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/sql-file/editor/MessageList.vue
+++ /dev/null
@@ -1,181 +0,0 @@
-
-
-
-
-
-
-
- {{ totalMap.errorNum }}
-
-
- ,
-
- {{ totalMap.warningNum }}
-
-
-
-
-
-
-
-
-
-
- {{ item.message }}
- [{{ item.line }}]
-
-
-
-
-
-
-
-
-
-
-
diff --git a/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/sql-file/local-file/Index.vue b/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/sql-file/local-file/Index.vue
deleted file mode 100644
index 22a87a0b99..0000000000
--- a/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/sql-file/local-file/Index.vue
+++ /dev/null
@@ -1,410 +0,0 @@
-
-
-
-
-
-
- ({{ t('最终执行结果以SQL文件内容为准') }})
-
-
-
-
-
-
- {{ t('添加文件') }}
-
-
- {{
- t(
- '仅支持_sql文件_文件名不能包含空格_上传后_SQL执行顺序默认为从上至下_可拖动文件位置_变换文件的执行顺序文件',
- )
- }}
-
-
-
-
-
-
-
-
-
diff --git a/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/sql-file/local-file/SqlFileList.vue b/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/sql-file/local-file/SqlFileList.vue
deleted file mode 100644
index a60f40590d..0000000000
--- a/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/sql-file/local-file/SqlFileList.vue
+++ /dev/null
@@ -1,164 +0,0 @@
-
-
-
-
-
- {{ t('文件列表') }}
-
- {{ t('按顺序执行') }}
-
-
-
-
-
-
- {{ fileItemData.name }}
-
-
-
-
-
-
-
-
-
diff --git a/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/sql-file/local-file/components/CheckError.vue b/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/sql-file/local-file/components/CheckError.vue
deleted file mode 100644
index ac706601d8..0000000000
--- a/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/sql-file/local-file/components/CheckError.vue
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-
-
- {{ t('SQL语法错误') }}
- {{ data.uploadErrorMessage }}
- {{ t('文件上传失败') }}
-
-
-
-
diff --git a/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/sql-file/local-file/components/CheckSuccess.vue b/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/sql-file/local-file/components/CheckSuccess.vue
deleted file mode 100644
index ef5aca9e34..0000000000
--- a/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/sql-file/local-file/components/CheckSuccess.vue
+++ /dev/null
@@ -1,40 +0,0 @@
-
-
-
-
-
- {{ t('检测通过') }}
-
-
-
-
diff --git a/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/sql-file/local-file/components/FileList.vue b/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/sql-file/local-file/components/FileList.vue
deleted file mode 100644
index 0320d11bce..0000000000
--- a/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/sql-file/local-file/components/FileList.vue
+++ /dev/null
@@ -1,288 +0,0 @@
-
-
-
-
-
- {{ t('文件列表') }}
-
- {{ t('按顺序执行') }}
-
-
-
-
-
-
-
- {{ fileItemData.name }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/sql-file/manual-input/Index.vue b/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/sql-file/manual-input/Index.vue
deleted file mode 100644
index b563bf8eb4..0000000000
--- a/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/sql-file/manual-input/Index.vue
+++ /dev/null
@@ -1,227 +0,0 @@
-
-
-
-
-
-
- ({{ t('最终执行结果以 SQL 内容为准') }})
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/sql-file/manual-input/components/SyntaxChecking.vue b/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/sql-file/manual-input/components/SyntaxChecking.vue
deleted file mode 100644
index c876b9c371..0000000000
--- a/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/sql-file/manual-input/components/SyntaxChecking.vue
+++ /dev/null
@@ -1,38 +0,0 @@
-
-
-
-
-
- {{ t('语法校验进行中') }}
-
-
-
-
diff --git a/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/sql-file/manual-input/components/SyntaxError.vue b/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/sql-file/manual-input/components/SyntaxError.vue
deleted file mode 100644
index 5b93e3f356..0000000000
--- a/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/sql-file/manual-input/components/SyntaxError.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
-
- {{ t('语法检测服务异常_请联系管理员') }}
-
-
-
-
diff --git a/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/sql-file/manual-input/components/SyntaxSuccess.vue b/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/sql-file/manual-input/components/SyntaxSuccess.vue
deleted file mode 100644
index e89a19ed11..0000000000
--- a/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/sql-file/manual-input/components/SyntaxSuccess.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-
-
-
-
-
- {{ t('检测通过') }}
-
-
-
-
diff --git a/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/sql-file/utils.ts b/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/sql-file/utils.ts
deleted file mode 100644
index 3424a70e98..0000000000
--- a/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/sql-file/utils.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * TencentBlueKing is pleased to support the open source community by making 蓝鲸智云-DB管理系统(BlueKing-BK-DBM) available.
- *
- * Copyright (C) 2017-2023 THL A29 Limited, a Tencent company. All rights reserved.
- *
- * Licensed under the MIT License (the "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at https://opensource.org/licenses/MIT
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License is distributed
- * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for
- * the specific language governing permissions and limitations under the License.
- */
-
-export const getFileNameFromFilePath = (filePath: string) => filePath.replace(/[^_]+_/, '');
diff --git a/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/target-db/Index.vue b/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/target-db/Index.vue
deleted file mode 100644
index dd23f5bf64..0000000000
--- a/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/target-db/Index.vue
+++ /dev/null
@@ -1,96 +0,0 @@
-
-
-
-
-
- handleAppend(value, index)"
- @change="(data: IDataRow) => handleChange(data, index)"
- @remove="handleRemove(index)" />
-
-
-
-
diff --git a/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/target-db/RenderData/Index.vue b/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/target-db/RenderData/Index.vue
deleted file mode 100644
index 0086bf6e74..0000000000
--- a/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/target-db/RenderData/Index.vue
+++ /dev/null
@@ -1,42 +0,0 @@
-
-
-
-
-
- {{ t('变更的DB') }}
-
- ({{ t('如果变更 SQL 是“create database ...”,这个请填写 test') }})
-
-
-
- {{ t('忽略的DB') }}
-
-
- {{ t('操作') }}
-
-
-
-
-
-
-
diff --git a/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/target-db/RenderData/RenderDbName.vue b/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/target-db/RenderData/RenderDbName.vue
deleted file mode 100644
index 5731fa95b5..0000000000
--- a/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/target-db/RenderData/RenderDbName.vue
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-
-
-
-
diff --git a/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/target-db/RenderData/Row.vue b/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/target-db/RenderData/Row.vue
deleted file mode 100644
index 003c1c8a19..0000000000
--- a/dbm-ui/frontend/src/views/spider-manage/sql-execute/steps/step1/components/target-db/RenderData/Row.vue
+++ /dev/null
@@ -1,118 +0,0 @@
-
-
-
-
-
-
- |
-
-
- |
-
-
-
-
-
diff --git a/dbm-ui/frontend/src/views/staff-manage/components/MemberSelector.vue b/dbm-ui/frontend/src/views/staff-manage/components/MemberSelector.vue
index 3539568a0c..c7c0cf693f 100644
--- a/dbm-ui/frontend/src/views/staff-manage/components/MemberSelector.vue
+++ b/dbm-ui/frontend/src/views/staff-manage/components/MemberSelector.vue
@@ -60,7 +60,7 @@
const exactSearchMethod = () =>
getUserList({
- fuzzy_lookups: modelValue.value.join(','),
+ exact_lookups: modelValue.value.join(','),
}).then((result) => result.results);
const pasteValidator = (values: string[]) => values;
diff --git a/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/mysql/Flashback.vue b/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/mysql/Flashback.vue
index 23c3969fa9..8f1e56d665 100644
--- a/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/mysql/Flashback.vue
+++ b/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/mysql/Flashback.vue
@@ -57,48 +57,48 @@
field: 'databases',
showOverflowTooltip: false,
render: ({ cell }: { cell: string[] }) => (
-
- {cell.map(item => {item})}
-
- ),
+
+ {cell.map(item => {item})}
+
+ ),
},
{
- label: t('目标表'),
- field: 'tables',
+ label: t('忽略库'),
+ field: 'databases_ignore',
showOverflowTooltip: false,
render: ({ cell }: { cell: string[] }) => (
-
- {cell.map(item => {item})}
-
- ),
+
+ {cell.length > 0 ? cell.map(item => {item}) : '--'}
+
+ ),
},
{
- label: t('忽略库'),
- field: 'databases_ignore',
+ label: t('目标表'),
+ field: 'tables',
showOverflowTooltip: false,
render: ({ cell }: { cell: string[] }) => (
-
- {cell.length > 0 ? cell.map(item => {item}) : '--'}
-
- ),
+
+ {cell.map(item => {item})}
+
+ ),
},
{
label: t('忽略表'),
field: 'tables_ignore',
showOverflowTooltip: false,
render: ({ cell }: { cell: string[] }) => (
-
- {cell.length > 0 ? cell.map(item => {item}) : '--'}
-
- ),
+
+ {cell.length > 0 ? cell.map(item => {item}) : '--'}
+
+ ),
},
];
diff --git a/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/mysql/HATruncate.vue b/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/mysql/HATruncate.vue
index 934fc74139..b214736846 100644
--- a/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/mysql/HATruncate.vue
+++ b/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/mysql/HATruncate.vue
@@ -103,48 +103,48 @@
field: 'db_patterns',
showOverflowTooltip: false,
render: ({ cell }: { cell: string[] }) => (
-
- {cell.map(item => {item})}
-
- ),
+
+ {cell.map(item => {item})}
+
+ ),
},
{
- label: t('目标表名'),
- field: 'table_patterns',
+ label: t('忽略DB名'),
+ field: 'ignore_dbs',
showOverflowTooltip: false,
render: ({ cell }: { cell: string[] }) => (
-
- {cell.map(item => {item})}
-
- ),
+
+ {cell.length > 0 ? cell.map(item => {item}) : '--'}
+
+ ),
},
{
- label: t('忽略DB名'),
- field: 'ignore_dbs',
+ label: t('目标表名'),
+ field: 'table_patterns',
showOverflowTooltip: false,
render: ({ cell }: { cell: string[] }) => (
-
- {cell.length > 0 ? cell.map(item => {item}) : '--'}
-
- ),
+
+ {cell.map(item => {item})}
+
+ ),
},
{
label: t('忽略表名'),
field: 'ignore_tables',
showOverflowTooltip: false,
render: ({ cell }: { cell: string[] }) => (
-
- {cell.length > 0 ? cell.map(item => {item}) : '--'}
-
- ),
+
+ {cell.length > 0 ? cell.map(item => {item}) : '--'}
+
+ ),
},
];
diff --git a/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/mysql/TableBackup.vue b/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/mysql/TableBackup.vue
index 90c2e10ed5..851169a6e5 100644
--- a/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/mysql/TableBackup.vue
+++ b/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/mysql/TableBackup.vue
@@ -44,19 +44,17 @@
name: string,
}
- /**
- * mysql 库表备份
- */
-
- const columns: any = [{
- label: t('集群ID'),
- field: 'cluster_id',
- render: ({ cell }: { cell: number }) => {cell || '--'},
- }, {
- label: t('集群名称'),
- field: 'immute_domain',
- showOverflowTooltip: false,
- render: ({ data }: { data: any }) => (
+ const columns = [
+ {
+ label: t('集群ID'),
+ field: 'cluster_id',
+ render: ({ cell }: { cell: number }) => {cell || '--'},
+ },
+ {
+ label: t('集群名称'),
+ field: 'immute_domain',
+ showOverflowTooltip: false,
+ render: ({ data }: { data: backupItem }) => (
{data.name}
),
- }, {
- label: t('备份源'),
- field: 'backup_on',
- render: ({ cell }: { cell: string }) => {cell || '--'},
- }, {
- label: t('备份DB名'),
- field: 'db_patterns',
- showOverflowTooltip: false,
- render: ({ cell }: { cell: string[] }) => (
+ },
+ {
+ label: t('备份源'),
+ field: 'backup_on',
+ render: ({ cell }: { cell: string }) => {cell || '--'},
+ },
+ {
+ label: t('备份DB名'),
+ field: 'db_patterns',
+ showOverflowTooltip: false,
+ render: ({ cell }: { cell: string[] }) => (
{cell.map(item => {item})}
),
- }, {
- label: t('忽略DB名'),
- field: 'ignore_dbs',
- showOverflowTooltip: false,
- render: ({ cell }: { cell: string[] }) => (
+ },
+ {
+ label: t('忽略DB名'),
+ field: 'ignore_dbs',
+ showOverflowTooltip: false,
+ render: ({ cell }: { cell: string[] }) => (
{cell.length > 0 ? cell.map(item => {item}) : '--'}
),
- }, {
- label: t('备份表名'),
- field: 'table_patterns',
- showOverflowTooltip: false,
- render: ({ cell }: { cell: string[] }) => (
+ },
+ {
+ label: t('备份表名'),
+ field: 'table_patterns',
+ showOverflowTooltip: false,
+ render: ({ cell }: { cell: string[] }) => (
{cell.map(item => {item})}
),
- }, {
- label: t('忽略表名'),
- field: 'ignore_tables',
- showOverflowTooltip: false,
- render: ({ cell }: { cell: string[] }) => (
+ },
+ {
+ label: t('忽略表名'),
+ field: 'ignore_tables',
+ showOverflowTooltip: false,
+ render: ({ cell }: { cell: string[] }) => (
{cell.length > 0 ? cell.map(item => {item}) : '--'}
),
- }];
+ }
+ ];
const dataList = computed(() => {
const list: backupItem[] = [];
diff --git a/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/Flashback.vue b/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/Flashback.vue
index 40ad4a3111..afdb49ed31 100644
--- a/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/Flashback.vue
+++ b/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/Flashback.vue
@@ -70,13 +70,13 @@
showOverflowTooltip: true,
},
{
- label: t('目标表'),
- field: 'tableName',
+ label: t('忽略库'),
+ field: 'ignoreDbName',
showOverflowTooltip: true,
},
{
- label: t('忽略库'),
- field: 'ignoreDbName',
+ label: t('目标表'),
+ field: 'tableName',
showOverflowTooltip: true,
},
{
diff --git a/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/TableBackup.vue b/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/TableBackup.vue
index 916ebe5351..702f4468a7 100644
--- a/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/TableBackup.vue
+++ b/dbm-ui/frontend/src/views/tickets/common/components/demand-factory/spider/TableBackup.vue
@@ -63,13 +63,13 @@
showOverflowTooltip: true,
},
{
- label: t('备份表名'),
- field: 'tableName',
+ label: t('忽略DB名'),
+ field: 'ignoreDbName',
showOverflowTooltip: true,
},
{
- label: t('忽略DB名'),
- field: 'ignoreDbName',
+ label: t('备份表名'),
+ field: 'tableName',
showOverflowTooltip: true,
},
{
|