diff --git a/bcs-services/bcs-bscp/ui/src/api/template.ts b/bcs-services/bcs-bscp/ui/src/api/template.ts index 9b69d5ff28..b2098c6191 100644 --- a/bcs-services/bcs-bscp/ui/src/api/template.ts +++ b/bcs-services/bcs-bscp/ui/src/api/template.ts @@ -658,3 +658,24 @@ export const batchEditTemplatePermission = (biz_id: string, query: any) => */ export const getTemplateConfigMeta = (biz_id: string, template_id: number, revision_name?: string) => http.get(`/config/biz/${biz_id}/templates/${template_id}/template_revisions`, { params: { revision_name } }); + +/** + * 编辑模板配置文件 + * @param biz_id 业务ID + * @param template_space_id 空间ID + * @param template_id 模板ID + * @param params 模板配置参数 + * @returns + */ +export const updateTemplateConfig = ( + biz_id: string, + template_space_id: number, + template_id: number, + params: ITemplateVersionEditingData, +) => + http + .put( + `/config/biz/${biz_id}/template_spaces/${template_space_id}/templates/${template_id}/template_revisions`, + params, + ) + .then((res) => res.data); diff --git a/bcs-services/bcs-bscp/ui/src/utils/config.ts b/bcs-services/bcs-bscp/ui/src/utils/config.ts index 1c92a46a0b..78950322a7 100644 --- a/bcs-services/bcs-bscp/ui/src/utils/config.ts +++ b/bcs-services/bcs-bscp/ui/src/utils/config.ts @@ -1,5 +1,4 @@ import { CONFIG_FILE_TYPE } from '../constants/config'; -import dayjs from 'dayjs'; // 查询配置文件类型名称 export const getConfigTypeName = (type: string) => { @@ -73,7 +72,6 @@ export function getConfigEditParams() { user: 'root', user_group: 'root', privilege: '644', - revision_name: `v${dayjs().format('YYYYMMDDHHmmss')}`, }; } diff --git a/bcs-services/bcs-bscp/ui/src/utils/index.ts b/bcs-services/bcs-bscp/ui/src/utils/index.ts index 82167c6c25..fe52dd9e8c 100644 --- a/bcs-services/bcs-bscp/ui/src/utils/index.ts +++ b/bcs-services/bcs-bscp/ui/src/utils/index.ts @@ -75,3 +75,14 @@ export const getTimeRange = (n: number) => { end.setSeconds(59); return [dayjs(start).format('YYYY-MM-DD HH:mm:ss'), dayjs(end).format('YYYY-MM-DD HH:mm:ss')]; }; + +export const sortObjectKeysByAscii = (obj: any) => { + // 获取对象的所有键,并按ASCII码排序 + const sortedKeys = Object.keys(obj).sort((a, b) => a.localeCompare(b, 'en')); + const sortedObj: any = {}; + sortedKeys.forEach((key) => { + sortedObj[key] = obj[key]; + }); + + return sortedObj; +}; 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 f96d09dd36..d4741c01e1 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 @@ -77,9 +77,6 @@ - - - { return importTemplateConfigList.value.some( - (config) => !config.template_space_exist || !config.template_set_exist || config.template_revisions.length === 0, + (config) => !config.template_space_exist || !config.template_set_exist || config.template_set_is_empty, ); }); diff --git a/bcs-services/bcs-bscp/ui/src/views/space/service/detail/config/config-list/config-table-list/create-config/import-file/template-config-table.vue b/bcs-services/bcs-bscp/ui/src/views/space/service/detail/config/config-list/config-table-list/create-config/import-file/template-config-table.vue index d4ed6fca9a..6e10c61705 100644 --- a/bcs-services/bcs-bscp/ui/src/views/space/service/detail/config/config-list/config-table-list/create-config/import-file/template-config-table.vue +++ b/bcs-services/bcs-bscp/ui/src/views/space/service/detail/config/config-list/config-table-list/create-config/import-file/template-config-table.vue @@ -21,11 +21,11 @@