diff --git a/dbm-ui/frontend/src/components/editable-info/index.vue b/dbm-ui/frontend/src/components/editable-info/index.vue index 408a20cfc5..2adb56f1ce 100644 --- a/dbm-ui/frontend/src/components/editable-info/index.vue +++ b/dbm-ui/frontend/src/components/editable-info/index.vue @@ -64,7 +64,7 @@ v-overflow-tips class="base-info__value text-overflow"> @@ -100,7 +100,7 @@ isEdit?: boolean; isCopy?: boolean; isRequired?: boolean; - render?: () => VNode | string | null; + render?: (data: Record) => VNode | string | null; }; export type EditEmitData = { diff --git a/dbm-ui/frontend/src/locales/zh-cn.json b/dbm-ui/frontend/src/locales/zh-cn.json index 6ede19b15e..5ece828998 100644 --- a/dbm-ui/frontend/src/locales/zh-cn.json +++ b/dbm-ui/frontend/src/locales/zh-cn.json @@ -3680,5 +3680,6 @@ "错误日志": "错误日志", "点击上传": "点击上传", "请选择本地 SQL 文件": "请选择本地 SQL 文件", + "实际内存分配比率": "实际内存分配比率", "这行勿动!新增翻译请在上一行添加!": "" } diff --git a/dbm-ui/frontend/src/views/db-configure/business/list/components/hooks/useBaseDetails.ts b/dbm-ui/frontend/src/views/db-configure/business/list/components/hooks/useBaseDetails.ts index 28981b0253..c215dc5b36 100644 --- a/dbm-ui/frontend/src/views/db-configure/business/list/components/hooks/useBaseDetails.ts +++ b/dbm-ui/frontend/src/views/db-configure/business/list/components/hooks/useBaseDetails.ts @@ -27,6 +27,7 @@ interface State { isEmpty: boolean; version: string; data: ServiceReturnType & { charset?: string }; + deployInfo: ServiceReturnType & { charset?: string }; } /** * 获取参数管理基本信息 @@ -77,6 +78,13 @@ export const useBaseDetails = (immediateFetch = true, confName = 'db_version') = description: '', charset: '', }, + deployInfo: { + conf_items: [], + version: '', + name: '', + description: '', + charset: '', + }, }); const fetchParams = computed(() => getFetchParams('version')); @@ -113,8 +121,9 @@ export const useBaseDetails = (immediateFetch = true, confName = 'db_version') = state.loading = true; getLevelConfig(params) - .then((res) => { - res.conf_items.forEach((item) => { + .then((result) => { + state.deployInfo = result; + result.conf_items.forEach((item) => { if (item.conf_name === confName) { state.version = item.conf_value ?? ''; } else if (item.conf_name === 'charset') { diff --git a/dbm-ui/frontend/src/views/db-configure/business/list/components/module/ConfigDetails.vue b/dbm-ui/frontend/src/views/db-configure/business/list/components/module/ConfigDetails.vue index a941fcf639..7d7b5bf2ba 100644 --- a/dbm-ui/frontend/src/views/db-configure/business/list/components/module/ConfigDetails.vue +++ b/dbm-ui/frontend/src/views/db-configure/business/list/components/module/ConfigDetails.vue @@ -20,6 +20,7 @@ ; + type DetailData = ServiceReturnType; interface Props { - data?: ServiceReturnType; + data?: Partial; + deployInfo?: Partial; loading?: boolean; fetchParams?: PlatConfDetailsParams | ServiceParameters; } const props = withDefaults(defineProps(), { - data: () => - ({ - conf_items: [] as NonNullable['conf_items'], - }) as NonNullable, + data: () => ({ + conf_items: [] as DetailData['conf_items'], + }), loading: false, fetchParams: () => ({}) as PlatConfDetailsParams, + deployInfo: () => ({ + conf_items: [] as DetailData['conf_items'], + }), }); const route = useRoute(); diff --git a/dbm-ui/frontend/src/views/db-configure/business/list/components/module/Index.vue b/dbm-ui/frontend/src/views/db-configure/business/list/components/module/Index.vue index 9e2c708247..dd30440122 100644 --- a/dbm-ui/frontend/src/views/db-configure/business/list/components/module/Index.vue +++ b/dbm-ui/frontend/src/views/db-configure/business/list/components/module/Index.vue @@ -33,6 +33,7 @@ diff --git a/dbm-ui/frontend/src/views/db-configure/components/DetailsBase.vue b/dbm-ui/frontend/src/views/db-configure/components/DetailsBase.vue index 78fb3645d3..e3034ac034 100644 --- a/dbm-ui/frontend/src/views/db-configure/components/DetailsBase.vue +++ b/dbm-ui/frontend/src/views/db-configure/components/DetailsBase.vue @@ -23,7 +23,7 @@ :title="$t('基础信息')"> -