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 bdfca20bff..e039cf5b3b 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 @@ -228,33 +228,7 @@ // 配置文件绝对路径校验规则,path+filename fileAP: [ { - validator: (val: string) => { - // 必须为绝对路径, 且不能以/结尾 - if (!val.startsWith('/') || val.endsWith('/')) { - return false; - } - - const parts = val.split('/').slice(1); - const fileName = parts.pop() as string; - - // 文件名称校验 - // 文件名和路径不能全由.组成 - if (!/^((?!\.{1,}$)[\u4e00-\u9fa5A-Za-z0-9.\-_#%,:?!@$^+=\\[\]{}]+)$/.test(fileName)) { - return false; - } - - let isValid = true; - // 文件路径校验 - parts.some((part) => { - if (!/^((?!\.{1,}$)[\u4e00-\u9fa5A-Za-z0-9.\-_#%,:?!@$^+=\\[\]{}]+)$/.test(part)) { - isValid = false; - return true; - } - return false; - }); - - return isValid; - }, + validator: (val: string) => /^\/(?:[^/]+\/)*[^/]+$/.test(val), message: t('无效的路径,路径不符合Unix文件路径格式规范'), trigger: 'change', }, diff --git a/bcs-services/bcs-bscp/ui/src/views/space/service/detail/config/config-list/config-table-list/tables/table-with-templates.vue b/bcs-services/bcs-bscp/ui/src/views/space/service/detail/config/config-list/config-table-list/tables/table-with-templates.vue index b9c67084b5..9f7737647b 100644 --- a/bcs-services/bcs-bscp/ui/src/views/space/service/detail/config/config-list/config-table-list/tables/table-with-templates.vue +++ b/bcs-services/bcs-bscp/ui/src/views/space/service/detail/config/config-list/config-table-list/tables/table-with-templates.vue @@ -582,6 +582,11 @@ }); configsCount.value = res.count; conflictCount.value = res.conflict_number || 0; + if (conflictCount.value === 0) { + configStore.$patch((state) => { + state.onlyViewConflict = false; + }); + } } catch (e) { console.error(e); } finally {