From 2ad19f7b49785a4d2c114f982294aa36e1bc3262 Mon Sep 17 00:00:00 2001
From: Yuikill <105910874+Yuikill@users.noreply.github.com>
Date: Wed, 25 Sep 2024 16:09:37 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=96=87=E4=BB=B6=E6=81=A2=E5=A4=8D?=
=?UTF-8?q?=E5=90=8E=E6=9B=B4=E6=96=B0=E7=94=9F=E6=88=90=E7=89=88=E6=9C=AC?=
=?UTF-8?q?=E6=8C=89=E9=92=AE=E7=8A=B6=E6=80=81--bug=3D131345207=20=20(#35?=
=?UTF-8?q?38)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* fix: 文件恢复后更新生成版本按钮状态
* fix: 客户端查询表格展示设置添加最后一次拉取时间
* fix: 客户端查询表格横向滚动展示问题
* fix: 选择载入版本文案调整
---
bcs-services/bcs-bscp/ui/src/i18n/en-us.ts | 1 -
bcs-services/bcs-bscp/ui/src/i18n/zh-cn.ts | 1 -
.../src/views/space/client/search/index.vue | 19 ++++++++++++++++---
.../scripts/version-manage/create-version.vue | 2 +-
.../tables/table-with-templates.vue | 8 ++++++++
5 files changed, 25 insertions(+), 6 deletions(-)
diff --git a/bcs-services/bcs-bscp/ui/src/i18n/en-us.ts b/bcs-services/bcs-bscp/ui/src/i18n/en-us.ts
index 9289abe0af..2f3e2a1462 100644
--- a/bcs-services/bcs-bscp/ui/src/i18n/en-us.ts
+++ b/bcs-services/bcs-bscp/ui/src/i18n/en-us.ts
@@ -706,7 +706,6 @@ export default {
'当前已有「未上线」版本': 'There is currently a "not online" version',
前往编辑: 'Go to edit',
创建版本: 'Create version',
- 选择载入脚本: 'Select load script',
'无效名称，只允许包含中文、英文、数字、下划线()、连字符(-)、空格，且必须以中文、英文、数字开头和结尾': 'Invalid name, only allowed to contain Chinese, English, numbers, underscores (), hyphens (-), spaces, and must start and end with Chinese, English, numbers',
编辑版本: 'Edited version',
脚本内容不能为空: 'Script content cannot be empty',
diff --git a/bcs-services/bcs-bscp/ui/src/i18n/zh-cn.ts b/bcs-services/bcs-bscp/ui/src/i18n/zh-cn.ts
index 152081acd4..05e6b679a4 100644
--- a/bcs-services/bcs-bscp/ui/src/i18n/zh-cn.ts
+++ b/bcs-services/bcs-bscp/ui/src/i18n/zh-cn.ts
@@ -705,7 +705,6 @@ export default {
'当前已有「未上线」版本': '当前已有「未上线」版本',
前往编辑: '前往编辑',
创建版本: '创建版本',
- 选择载入脚本: '选择载入脚本',
'无效名称，只允许包含中文、英文、数字、下划线()、连字符(-)、空格，且必须以中文、英文、数字开头和结尾': '无效名称，只允许包含中文、英文、数字、下划线()、连字符(-)、空格，且必须以中文、英文、数字开头和结尾',
编辑版本: '编辑版本',
脚本内容不能为空: '脚本内容不能为空',
diff --git a/bcs-services/bcs-bscp/ui/src/views/space/client/search/index.vue b/bcs-services/bcs-bscp/ui/src/views/space/client/search/index.vue
index 056f31ec4c..82d29549ba 100644
--- a/bcs-services/bcs-bscp/ui/src/views/space/client/search/index.vue
+++ b/bcs-services/bcs-bscp/ui/src/views/space/client/search/index.vue
@@ -29,7 +29,12 @@
-
+
@@ -428,7 +433,8 @@
settings.value.size = 'medium';
if (tableSet) {
const { checked, size } = JSON.parse(tableSet);
- selectedShowColumn.value = checked;
+ const requiredChecked = settings.value.fields.filter((item) => item.disabled).map((item) => item.id);
+ selectedShowColumn.value = [...requiredChecked, ...checked];
settings.value.checked = checked;
settings.value.size = size;
}
@@ -479,6 +485,11 @@
id: 'pull-status',
disabled: true,
},
+ {
+ name: t('最后一次拉取配置耗时'),
+ id: 'pull-time',
+ disabled: true,
+ },
{
name: t('在线状态'),
id: 'online-status',
@@ -515,6 +526,7 @@
'label',
'current-version',
'pull-status',
+ 'pull-time',
'online-status',
'first-connect-time',
'last-heartbeat-time',
@@ -532,6 +544,7 @@
'label',
'current-version',
'pull-status',
+ 'pull-time',
'online-status',
'first-connect-time',
'last-heartbeat-time',
diff --git a/bcs-services/bcs-bscp/ui/src/views/space/scripts/version-manage/create-version.vue b/bcs-services/bcs-bscp/ui/src/views/space/scripts/version-manage/create-version.vue
index 6206ef64b3..991aa218ec 100644
--- a/bcs-services/bcs-bscp/ui/src/views/space/scripts/version-manage/create-version.vue
+++ b/bcs-services/bcs-bscp/ui/src/views/space/scripts/version-manage/create-version.vue
@@ -32,7 +32,7 @@
@confirm="handleLoadScript"
@closed="dialogShow = false">
-
+
group.id === 0)!.configs.splice(oldConfigIndex.value, 1);
}
+
+ // 更新配置项数量
+ const existConfigCount = configList.value.filter((item) => item.file_state !== 'DELETE').length;
+ configStore.$patch((state) => {
+ state.conflictFileCount = conflictCount.value;
+ state.allConfigCount = configsCount.value + templatesCount.value;
+ state.allExistConfigCount = existConfigCount + templatesCount.value;
+ });
};
// 批量操作配置项后刷新配置项列表