diff --git a/dbm-ui/frontend/package.json b/dbm-ui/frontend/package.json index 9701780677..182055be70 100644 --- a/dbm-ui/frontend/package.json +++ b/dbm-ui/frontend/package.json @@ -24,9 +24,7 @@ "@blueking/login-modal": "^1.0.5", "@blueking/notice-component": "2.0.5", "@blueking/sub-saas": "0.0.0-beta.6", - "@blueking/table": "^0.0.1-beta.19", - "@blueking/vxe-table": "^4.8.0-beta.7.8", - "@icon-cool/bk-icon-bk-biz-components": "0.0.4", + "@blueking/table": "^0.0.1-beta.20", "@vueuse/core": "^12.0.0", "axios": "^1.7.9", "bkui-vue": "2.0.1-beta.78", @@ -56,7 +54,6 @@ }, "devDependencies": { "@commitlint/config-conventional": "^19.6.0", - "@jridgewell/gen-mapping":"0.3.5", "@trivago/prettier-plugin-sort-imports": "^5.1.0", "@tsconfig/node20": "20.1.4", "@types/lodash": "^4.17.13", @@ -111,9 +108,6 @@ "prettier --write" ] }, - "overrides":{ - "@jridgewell/gen-mapping":"0.3.5" - }, "engines": { "node": ">=16.0.1" } diff --git a/dbm-ui/frontend/src/components/cluster-selector/Index.vue b/dbm-ui/frontend/src/components/cluster-selector/Index.vue index f6dbe5ca12..afecd1dfc1 100644 --- a/dbm-ui/frontend/src/components/cluster-selector/Index.vue +++ b/dbm-ui/frontend/src/components/cluster-selector/Index.vue @@ -497,6 +497,7 @@ [tabKey]: tabSelectMap, }; }, {} as SelectMapValueType); + showTabTips.value = true; } }); diff --git a/dbm-ui/frontend/src/components/render-table/columns/spec-display/Index.vue b/dbm-ui/frontend/src/components/render-table/columns/spec-display/Index.vue index 2293b66434..0c5ce4383a 100644 --- a/dbm-ui/frontend/src/components/render-table/columns/spec-display/Index.vue +++ b/dbm-ui/frontend/src/components/render-table/columns/spec-display/Index.vue @@ -91,9 +91,9 @@ white-space: nowrap; .content { + color: #313238; // padding-bottom: 2px; cursor: pointer; - color: #313238; // border-bottom: 1px dotted #979ba5; } } @@ -104,8 +104,8 @@ } .visible-icon { + font-size: 16px; color: #3a84ff; cursor: pointer; - font-size: 16px; } diff --git a/dbm-ui/frontend/src/components/tag-block/Index.vue b/dbm-ui/frontend/src/components/tag-block/Index.vue new file mode 100644 index 0000000000..c3313b2e9e --- /dev/null +++ b/dbm-ui/frontend/src/components/tag-block/Index.vue @@ -0,0 +1,231 @@ + + + diff --git a/dbm-ui/frontend/src/locales/zh-cn.json b/dbm-ui/frontend/src/locales/zh-cn.json index 7db6e06c35..505c2d3c8a 100644 --- a/dbm-ui/frontend/src/locales/zh-cn.json +++ b/dbm-ui/frontend/src/locales/zh-cn.json @@ -3820,5 +3820,6 @@ "容灾要求:": "容灾要求:", "Proxy起始端口:": "Proxy起始端口:", "数量:": "数量:", + "源 DB 名": "源 DB 名", "这行勿动!新增翻译请在上一行添加!": "" } diff --git a/dbm-ui/frontend/src/views/db-manage/common/sql-execute/cluster-ids/Index.vue b/dbm-ui/frontend/src/views/db-manage/common/sql-execute/cluster-ids/Index.vue index 481c9a4095..030c302527 100644 --- a/dbm-ui/frontend/src/views/db-manage/common/sql-execute/cluster-ids/Index.vue +++ b/dbm-ui/frontend/src/views/db-manage/common/sql-execute/cluster-ids/Index.vue @@ -58,6 +58,8 @@ import ClusterSelector from '@components/cluster-selector/Index.vue'; import RenderClusterStatus from '@components/cluster-status/Index.vue'; + + interface IClusterData { id: number; cluster_name: string; @@ -158,7 +160,7 @@ const fetchClusterData = (clusterIds: number[]) => { isLoading.value = true; - filterClusters({ + filterClusters({ cluster_ids: clusterIds.join(','), bk_biz_id: window.PROJECT_CONFIG.BIZ_ID, }) @@ -167,14 +169,21 @@ clusterVersionList.value = _.uniq(data.map(item => item.major_version)); clusterSelectorValue.value = data.reduce((result, item) => { if (item.cluster_type === ClusterTypes.TENDBHA) { - result[ClusterTypes.TENDBHA].push(item); - } else { - result[ClusterTypes.TENDBSINGLE].push(item); + result[ClusterTypes.TENDBHA].push(item as TendbhaModel); + } else if (item.cluster_type === ClusterTypes.TENDBSINGLE) { + result[ClusterTypes.TENDBSINGLE].push(item as TendbsingleModel); + } else if (item.cluster_type === ClusterTypes.TENDBCLUSTER) { + result[ClusterTypes.TENDBCLUSTER].push(item as TendbclusterModel); + } else if (item.cluster_type === ClusterTypes.SQLSERVER_HA) { + result[ClusterTypes.SQLSERVER_HA].push(item as SqlServerHaClusterModel); + } else if (item.cluster_type === ClusterTypes.SQLSERVER_SINGLE) { + result[ClusterTypes.SQLSERVER_SINGLE].push(item as SqlServerSingleClusterModel); } return result; }, { [ClusterTypes.TENDBHA]: [] as TendbhaModel[], [ClusterTypes.TENDBSINGLE]: [] as TendbsingleModel[], + [ClusterTypes.TENDBCLUSTER]: [] as TendbclusterModel[], [ClusterTypes.SQLSERVER_HA]: [] as SqlServerHaClusterModel[], [ClusterTypes.SQLSERVER_SINGLE]: [] as SqlServerSingleClusterModel[], }) diff --git a/dbm-ui/frontend/src/views/db-manage/common/sql-execute/common/RenderSql/components/sql-content/components/RenderFileList.vue b/dbm-ui/frontend/src/views/db-manage/common/sql-execute/common/RenderSql/components/sql-content/components/RenderFileList.vue index a8260f8e60..e9d520371d 100644 --- a/dbm-ui/frontend/src/views/db-manage/common/sql-execute/common/RenderSql/components/sql-content/components/RenderFileList.vue +++ b/dbm-ui/frontend/src/views/db-manage/common/sql-execute/common/RenderSql/components/sql-content/components/RenderFileList.vue @@ -163,12 +163,10 @@ watch( filenameList, () => { - if (filenameList.value.length) { - localList.value = filenameList.value.map((fileName) => ({ - id: fileName, - name: fileName, - })); - } + localList.value = filenameList.value.map((fileName) => ({ + id: fileName, + name: fileName, + })); }, { immediate: true, diff --git a/dbm-ui/frontend/src/views/db-manage/common/sql-execute/common/RenderSql/components/sql-content/components/manual-input/Index.vue b/dbm-ui/frontend/src/views/db-manage/common/sql-execute/common/RenderSql/components/sql-content/components/manual-input/Index.vue index 04e24dd921..ac028c8bf8 100644 --- a/dbm-ui/frontend/src/views/db-manage/common/sql-execute/common/RenderSql/components/sql-content/components/manual-input/Index.vue +++ b/dbm-ui/frontend/src/views/db-manage/common/sql-execute/common/RenderSql/components/sql-content/components/manual-input/Index.vue @@ -215,6 +215,7 @@ } else { selectFileName.value = ''; } + triggerGramarCheckChange(); triggerChange(); }; diff --git a/dbm-ui/frontend/src/views/ticket-center/common/CardModeList.vue b/dbm-ui/frontend/src/views/ticket-center/common/CardModeList.vue index bb628ff640..6f1d3b7577 100644 --- a/dbm-ui/frontend/src/views/ticket-center/common/CardModeList.vue +++ b/dbm-ui/frontend/src/views/ticket-center/common/CardModeList.vue @@ -235,10 +235,7 @@ .ticket-info-more { display: flex; - - & ~ .ticket-info-more { - margin-top: 8px; - } + margin-top: 8px; .ticket-info-label { flex-shrink: 0; diff --git a/dbm-ui/frontend/src/views/ticket-center/common/TableModeTable.vue b/dbm-ui/frontend/src/views/ticket-center/common/TableModeTable.vue index a67a5e8de7..d5758ae701 100644 --- a/dbm-ui/frontend/src/views/ticket-center/common/TableModeTable.vue +++ b/dbm-ui/frontend/src/views/ticket-center/common/TableModeTable.vue @@ -190,12 +190,9 @@ :label="t('当前处理人')" width="250"> (props.data.summary.status === 'TERMINATED' ? t('已关单') : t('已拒绝'))); + const statusText = computed(() => { + if (props.data.summary.status === 'REVOKED') { + return t('已撤销'); + } + if (props.data.summary.status === 'FINISHED') { + return t('已拒绝'); + } + + return t('已关单'); + }); diff --git a/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/task-info/Index.vue b/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/task-info/Index.vue index a74bd7125d..290e47290c 100644 --- a/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/task-info/Index.vue +++ b/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/task-info/Index.vue @@ -49,6 +49,7 @@ const { t } = useI18n(); const isTaskInfoCardCollapse = useStorage('ticketTaskInfo', false); + console.log('taskinof'); diff --git a/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/task-info/com-factory/components/import-sqlfile/components/render-sqlfile/Index.vue b/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/task-info/com-factory/components/import-sqlfile/components/render-sqlfile/Index.vue deleted file mode 100644 index 79c4f18f26..0000000000 --- a/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/task-info/com-factory/components/import-sqlfile/components/render-sqlfile/Index.vue +++ /dev/null @@ -1,146 +0,0 @@ - - - diff --git a/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/task-info/com-factory/components/import-sqlfile/components/render-sqlfile/components/RenderFileContent.vue b/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/task-info/com-factory/components/import-sqlfile/components/render-sqlfile/components/RenderFileContent.vue deleted file mode 100644 index b7b549edb1..0000000000 --- a/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/task-info/com-factory/components/import-sqlfile/components/render-sqlfile/components/RenderFileContent.vue +++ /dev/null @@ -1,196 +0,0 @@ - - - - - diff --git a/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/task-info/com-factory/components/import-sqlfile/components/render-sqlfile/components/RenderFileList.vue b/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/task-info/com-factory/components/import-sqlfile/components/render-sqlfile/components/RenderFileList.vue deleted file mode 100644 index 4ff22d31e6..0000000000 --- a/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/task-info/com-factory/components/import-sqlfile/components/render-sqlfile/components/RenderFileList.vue +++ /dev/null @@ -1,137 +0,0 @@ - - - - - diff --git a/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/task-info/com-factory/doris/Apply.vue b/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/task-info/com-factory/doris/Apply.vue index cc9fddf787..51ed353157 100644 --- a/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/task-info/com-factory/doris/Apply.vue +++ b/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/task-info/com-factory/doris/Apply.vue @@ -119,10 +119,6 @@ label: t('http端口'), key: 'details.http_port', }, - { - label: t('备注'), - key: 'remark', - }, ], }, ]; diff --git a/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/task-info/com-factory/elastic-search/Apply.vue b/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/task-info/com-factory/elastic-search/Apply.vue index 611aa66b6e..44fd5739f1 100644 --- a/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/task-info/com-factory/elastic-search/Apply.vue +++ b/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/task-info/com-factory/elastic-search/Apply.vue @@ -185,14 +185,6 @@ {{ $t('端口号') }}: {{ ticketDetails?.details?.http_port || '--' }} -
- {{ $t('备注') }}: - - {{ ticketDetails?.remark || '--' }} - -
-
- {{ $t('备注') }}: - - {{ ticketDetails?.remark || '--' }} - -
{{ $t('访问端口') }}: {{ ticketDetails?.details?.port || '--' }} -
- {{ $t('备注') }}: - {{ ticketDetails?.remark || '--' }} -
-
- {{ $t('备注') }}: - - {{ ticketDetails?.remark || '--' }} - -
{{ $t('访问端口') }}: {{ ticketDetails?.details?.port || '--' }} -
- {{ $t('备注') }}: - {{ ticketDetails?.remark || '--' }} -
diff --git a/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/task-info/com-factory/redis/ScaleUpdown.vue b/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/task-info/com-factory/redis/ScaleUpdown.vue index fb51c59210..334a7c666a 100644 --- a/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/task-info/com-factory/redis/ScaleUpdown.vue +++ b/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/task-info/com-factory/redis/ScaleUpdown.vue @@ -53,7 +53,9 @@ :columns="getTargetColunms(data)" />
- + @@ -176,55 +178,15 @@ }, { title: t('机器组数'), - render: () => { - if (_.isEmpty(data.display_info?.machine_pair_cnt)) { - return '--' - } - return ( - <> - {data.group_num} - - - ) - } + render: () => data.group_num }, { title: t('机器数量'), - render: () => { - if (_.isEmpty(data.display_info?.machine_pair_cnt)) { - return '--' - } - const targetValue = data.group_num * 2 - return ( - <> - {targetValue} - - - ) - } + render: () => data.group_num * 2 }, { title: t('分片数'), - render: () => { - if (_.isEmpty(data.display_info?.cluster_shard_num)) { - return '--' - } - return ( - <> - {data.shard_num} - - - ) - } + render: () => data.shard_num }, { title: t('变更方式'), diff --git a/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/task-info/com-factory/riak/Apply.vue b/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/task-info/com-factory/riak/Apply.vue index 6ac1265e28..dee079d013 100644 --- a/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/task-info/com-factory/riak/Apply.vue +++ b/dbm-ui/frontend/src/views/ticket-center/common/ticket-detail/components/task-info/com-factory/riak/Apply.vue @@ -59,10 +59,6 @@ {{ t('服务器选择方式') }}: {{ isFromResourcePool ? t('从资源池匹配') : t('手动选择') }} -
- {{ t('备注') }}: - {{ ticketDetails?.remark || '--' }} -