diff --git a/apps/daas/src/i18n/langs/en.js b/apps/daas/src/i18n/langs/en.js index cf5843c72a..26e2e8c805 100644 --- a/apps/daas/src/i18n/langs/en.js +++ b/apps/daas/src/i18n/langs/en.js @@ -793,6 +793,8 @@ export default { setting_lagTime: 'incremental lag decision time (seconds)', setting_Task_CPU_and_Memory_Metrics_Statistics: 'Task CPU and Memory Metrics Statistics', + setting_Monitoring_task_upper_limit: + 'Monitoring task upper limit for Task CPU and Memory Metrics Statistics', setting_connection_schema_update_hour: 'Data source schema update time', setting_connection_schema_update_interval: 'Data source schema update interval (days)', diff --git a/apps/daas/src/i18n/langs/zh-CN.js b/apps/daas/src/i18n/langs/zh-CN.js index 44b934a861..9ae1e4a9a2 100644 --- a/apps/daas/src/i18n/langs/zh-CN.js +++ b/apps/daas/src/i18n/langs/zh-CN.js @@ -753,6 +753,7 @@ export default { setting_job_cdc_record_ttl_doc: ' 增量事件保存时长(天)', setting_lagTime: '增量滞后判定时间(秒)', setting_Task_CPU_and_Memory_Metrics_Statistics: '任务CPU&内存指标统计', + setting_Monitoring_task_upper_limit: '任务CPU&内存指标的监控任务上限', setting_connection_schema_update_hour: '数据源schema更新时间', setting_connection_schema_update_interval: '数据源schema更新周期(天)', setting_creatDuplicateSource: ' 允许创建重复数据源', diff --git a/apps/daas/src/i18n/langs/zh-TW.js b/apps/daas/src/i18n/langs/zh-TW.js index e725ce2b3b..c526c4d74d 100644 --- a/apps/daas/src/i18n/langs/zh-TW.js +++ b/apps/daas/src/i18n/langs/zh-TW.js @@ -750,6 +750,7 @@ export default { setting_job_cdc_record_ttl_doc: ' 增量事件保存時長(天)', setting_lagTime: '增量滯後判定時間(秒)', setting_Task_CPU_and_Memory_Metrics_Statistics: '任務CPU&記憶體名額統計', + setting_Monitoring_task_upper_limit: '任務CPU&記憶體名額統計的監控任務上限', setting_connection_schema_update_hour: '數據源schema更新時間', setting_connection_schema_update_interval: '數據源schema更新周期(天)', setting_creatDuplicateSource: ' 允許創建重複數據源', diff --git a/apps/daas/src/utils/setting-dependency.ts b/apps/daas/src/utils/setting-dependency.ts new file mode 100644 index 0000000000..b63b2da54f --- /dev/null +++ b/apps/daas/src/utils/setting-dependency.ts @@ -0,0 +1,81 @@ +export interface DependentSetting { + key?: string + value?: unknown + default_value?: unknown + open?: unknown + parent_key?: string + parent_value?: unknown +} + +function getSettingValue(setting: DependentSetting) { + const value = Object.prototype.hasOwnProperty.call(setting, 'open') + ? setting.open + : setting.value + + return value === undefined || value === null || value === '' + ? setting.default_value + : value +} + +export function isSettingDependencyVisible( + setting: DependentSetting, + settingsByKey: Record, +) { + if (!setting.parent_key) { + return true + } + + const parent = settingsByKey[setting.parent_key] + if (!parent) { + return false + } + + const expectedValue = setting.parent_value ?? 'true' + return String(getSettingValue(parent)) === String(expectedValue) +} + +export function orderSettingsByDependency( + settings: T[], +) { + const settingsByKey = new Map() + const childrenByParent = new Map() + const orderedSettings: T[] = [] + const visited = new Set() + + settings.forEach((setting) => { + if (setting.key) { + settingsByKey.set(setting.key, setting) + } + }) + + settings.forEach((setting) => { + if (!setting.parent_key || !settingsByKey.has(setting.parent_key)) { + return + } + + const children = childrenByParent.get(setting.parent_key) || [] + children.push(setting) + childrenByParent.set(setting.parent_key, children) + }) + + const appendSettingAndChildren = (setting: T) => { + if (visited.has(setting)) { + return + } + + visited.add(setting) + orderedSettings.push(setting) + ;(childrenByParent.get(setting.key || '') || []).forEach( + appendSettingAndChildren, + ) + } + + settings.forEach((setting) => { + if (!setting.parent_key || !settingsByKey.has(setting.parent_key)) { + appendSettingAndChildren(setting) + } + }) + + settings.forEach(appendSettingAndChildren) + return orderedSettings +} diff --git a/apps/daas/src/views/setting/Setting.vue b/apps/daas/src/views/setting/Setting.vue index a07b582e90..11e487e31d 100644 --- a/apps/daas/src/views/setting/Setting.vue +++ b/apps/daas/src/views/setting/Setting.vue @@ -24,6 +24,10 @@ import { setSettings } from '@tap/shared/src/settings' import { downloadJson } from '@tap/shared/src/util' import { find, uniq } from 'lodash-es' import i18n from '@/i18n' +import { + isSettingDependencyVisible, + orderSettingsByDependency, +} from '@/utils/setting-dependency' export default { name: 'Setting', @@ -41,6 +45,7 @@ export default { formData: { items: [], }, + allSettings: [], activeTab: 0, activePanel: 'Log', lang: getCurrentLanguage(), @@ -142,6 +147,15 @@ export default { } return result }, + + settingsByKey() { + return this.allSettings.reduce((result, item) => { + if (item.key) { + result[item.key] = item + } + return result + }, {}) + }, }, watch: { formData: { @@ -185,6 +199,9 @@ export default { this.activePanel = item.category this.formItems = item.items || [] }, + isSettingVisible(setting) { + return isSettingDependencyVisible(setting, this.settingsByKey) + }, // 获取设置数据 getData() { let auth_data = [] @@ -196,6 +213,7 @@ export default { const itemsCategories = [] const cat = [] data = data || [] + this.allSettings = data items = data.map((item) => { if (item.documentation) { item.documentationKey = item.documentation @@ -238,8 +256,9 @@ export default { values.sort((a, b) => { return a.sort < b.sort ? -1 : 1 }) + const orderedValues = orderSettingsByDependency(values) if (values.length > 0) { - itemsCategories.push({ category: item, items: values }) + itemsCategories.push({ category: item, items: orderedValues }) cat.push(item) } }) @@ -694,8 +713,9 @@ export default {