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 efd5d5a39e..008c327b5a 100644 --- a/bcs-services/bcs-bscp/ui/src/i18n/en-us.ts +++ b/bcs-services/bcs-bscp/ui/src/i18n/en-us.ts @@ -522,6 +522,7 @@ export default { 是否可见: 'visibility', 密钥类型: 'secret_type', '请输入配置文件的完整路径和文件名,例如:/etc/nginx/nginx.conf': 'Please enter the complete path and file name of the configuration file, for example: /etc/nginx/nginx.conf', + '对于Windows客户端,以上文件权限、用户及用户组设置不生效,可在后置脚本中处理文件权限': 'For Windows clients, the above file permission, user and user group settings do not take effect, and file permissions can be handled in the post-script', // 分组管理 新增分组: 'New group', 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 f84e89bd28..8123888219 100644 --- a/bcs-services/bcs-bscp/ui/src/i18n/zh-cn.ts +++ b/bcs-services/bcs-bscp/ui/src/i18n/zh-cn.ts @@ -521,6 +521,7 @@ export default { 密钥类型: '密钥类型', '请输入配置文件的完整路径和文件名,例如:/etc/nginx/nginx.conf': '请输入配置文件的完整路径和文件名,例如:/etc/nginx/nginx.conf', 只看冲突配置项: '只看冲突配置项', + '对于Windows客户端,以上文件权限、用户及用户组设置不生效,可在后置脚本中处理文件权限': '对于Windows客户端,以上文件权限、用户及用户组设置不生效,可在后置脚本中处理文件权限', // 分组管理 新增分组: '新增分组', diff --git a/bcs-services/bcs-bscp/ui/src/views/space/service/detail/components/modify-group-publish.vue b/bcs-services/bcs-bscp/ui/src/views/space/service/detail/components/modify-group-publish.vue index 2b7c778c93..ae0a207216 100644 --- a/bcs-services/bcs-bscp/ui/src/views/space/service/detail/components/modify-group-publish.vue +++ b/bcs-services/bcs-bscp/ui/src/views/space/service/detail/components/modify-group-publish.vue @@ -294,12 +294,12 @@ }; // 上线确认 - const handleConfirm = (haveCredentials: boolean) => { + const handleConfirm = (havePull: boolean) => { isDiffSliderShow.value = false; publishedVersionId.value = versionData.value.id; handlePanelClose(); emit('confirm'); - if (haveCredentials) { + if (havePull) { InfoBox({ infoType: 'success', 'ext-cls': 'info-box-style', diff --git a/bcs-services/bcs-bscp/ui/src/views/space/service/detail/components/publish-version/index.vue b/bcs-services/bcs-bscp/ui/src/views/space/service/detail/components/publish-version/index.vue index 5bc8f257b1..65a006aaf4 100644 --- a/bcs-services/bcs-bscp/ui/src/views/space/service/detail/components/publish-version/index.vue +++ b/bcs-services/bcs-bscp/ui/src/views/space/service/detail/components/publish-version/index.vue @@ -238,12 +238,12 @@ }; // 版本上线成功 - const handleConfirm = (haveCredentials: boolean) => { + const handleConfirm = (havePull: boolean) => { isDiffSliderShow.value = false; publishedVersionId.value = versionData.value.id; handlePanelClose(); emit('confirm'); - if (haveCredentials) { + if (havePull) { InfoBox({ infoType: 'success', 'ext-cls': 'info-box-style', @@ -258,7 +258,7 @@ confirmText: t('配置客户端'), cancelText: t('稍后再说'), onConfirm: () => { - router.push({ name: 'credentials-management' }); + router.push({ name: 'configuration-example' }); }, }); } diff --git a/bcs-services/bcs-bscp/ui/src/views/space/service/detail/config/config-list/config-table-list/config-form.vue b/bcs-services/bcs-bscp/ui/src/views/space/service/detail/config/config-list/config-table-list/config-form.vue index a3a9e14db4..7cac0cd4c9 100644 --- a/bcs-services/bcs-bscp/ui/src/views/space/service/detail/config/config-list/config-table-list/config-form.vue +++ b/bcs-services/bcs-bscp/ui/src/views/space/service/detail/config/config-list/config-table-list/config-form.vue @@ -24,58 +24,64 @@
- -
- - - - - -
- -
- +
+
+
+ + + + + + +
+
+ + {{ t('对于Windows客户端,以上文件权限、用户及用户组设置不生效,可在后置脚本中处理文件权限') }} +
(); + const isWindowsAgent = ref(false); // 是否为windows用户 const rules = { // 配置文件名校验规则,path+filename fileAP: [ @@ -324,6 +331,7 @@ } else { stringContent.value = props.content as string; } + isWindowsAgent.value = navigator.userAgent.indexOf('Windows') !== -1; }); // 权限输入框失焦后,校验输入是否合法,如不合法回退到上次输入 @@ -563,9 +571,26 @@