Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions apps/daas/src/utils/settings.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
let settings = {}

const normalizeSetting = (setting) => {
return {
...setting,
value:
setting.isArray && typeof setting.value === 'string'
? setting.value.split(',')
: setting.value,
}
}

export const getSettings = () => {
return Object.values(settings)
}
Expand All @@ -8,8 +18,7 @@ export const setSettings = (data = []) => {
settings = {}

data.forEach((setting) => {
setting.value = setting.isArray ? setting.value.split(',') : setting.value
settings[setting.key] = setting
settings[setting.key] = normalizeSetting(setting)
})
}

Expand Down
8 changes: 6 additions & 2 deletions apps/daas/src/views/setting/Setting.vue
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import { AdminOutlined } from '@tap/component/src/icon'
import { TextFileReader } from '@tap/form/src/components/text-file-reader'
import { getCurrentLanguage } from '@tap/i18n/src/shared/util'
import Cookie from '@tap/shared/src/cookie'
import { setSettings } from '@tap/shared/src/settings'
import Time from '@tap/shared/src/time'
import { find, uniq } from 'lodash-es'
import i18n from '@/i18n'
Expand Down Expand Up @@ -299,12 +300,15 @@ export default {
// 保存
save() {
const settingData = []
this.formData.items.filter((item) => {
this.formData.items.forEach((item) => {
item.items.forEach((childItem) => {
settingData.push(childItem)
})
})
saveSettings(settingData).then(() => {
saveSettings(settingData).then(async () => {
const settings = await fetchSettings()
setSettings(settings)
localStorage.setItem('TAPDATA_SETTINGS', JSON.stringify(settings))
this.$message.success(this.$t('public_message_save_ok'))

if (this.appearanceForm && Object.keys(this.appearanceForm).length) {
Expand Down
13 changes: 4 additions & 9 deletions apps/daas/src/views/user/List.vue
Original file line number Diff line number Diff line change
Expand Up @@ -385,15 +385,10 @@ export default {
fetchRoles(filter).then((data) => {
const items = data?.items || []
this.roleList = items
const options = []
items.forEach((db) => {
if (db.name !== 'admin') {
options.push({
label: db.name,
value: db.id,
})
}
})
const options = items.map((db) => ({
label: db.name,
value: db.id,
}))
this.createFormConfig.items[3].options = options
})
},
Expand Down
9 changes: 9 additions & 0 deletions packages/api/src/core/alarm.ts
Original file line number Diff line number Diff line change
Expand Up @@ -105,3 +105,12 @@ export function updateTaskAlarm(params: {
}) {
return requestClient.post(`${BASE_URL}/updateTaskAlarm`, params)
}

export function batchUpdateTaskAlarm(params: {
taskIds: string[]
alarmRules?: AlarmRuleVO[] | null
alarmSettings?: AlarmSettingVO[] | null
emailReceivers?: string[] | null
}) {
return requestClient.post('/api/task/alarm/batch-update', params)
}
23 changes: 19 additions & 4 deletions packages/business/src/locale/lang/en.js
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,17 @@ export default {
packages_business_dataFlow_bulkScheuled: 'Batch Start',
packages_business_dataFlow_bulkStopping: 'Batch Stop',
packages_business_dataFlow_taskBulkOperation: 'Batch Operation',
packages_business_task_batch_alarm_email_action: 'Batch Set Alert Receivers',
packages_business_task_batch_alarm_email_title: 'Batch Set Alert Receivers',
packages_business_task_batch_alarm_email_label: 'Email Receivers',
packages_business_task_batch_alarm_email_placeholder:
'Select email receivers',
packages_business_task_batch_alarm_email_overwrite_tip:
"After saving, the selected tasks' existing alert receiver settings will be overwritten.",
packages_business_task_batch_alarm_email_empty:
'No email receivers available. Save directly to clear alert receivers from the selected tasks.',
packages_business_task_batch_alarm_email_no_edit_permission_tip:
'{count} tasks do not have edit permission and will be skipped.',
packages_business_dataFlow_addTag: 'Add Tag',
packages_business_dataVerify_dataVerify: 'Data Verify',
packages_business_dataFlow_selectAll: 'Select All',
Expand Down Expand Up @@ -752,8 +763,10 @@ export default {
'When the task encounters an error',
packages_business_setting_alarmnotification_dangrenwustop:
'When the Agent service stops',
packages_business_setting_alarmnotification_dangyinqinglixian: 'When the engine stops',
packages_business_setting_alarmnotification_dangyinqinghuifu: 'When the engine starts',
packages_business_setting_alarmnotification_dangyinqinglixian:
'When the engine stops',
packages_business_setting_alarmnotification_dangyinqinghuifu:
'When the engine starts',
packages_business_setting_alarmnotification_api_server_worker_delay_p50_warn:
'When APIServer worker P50 per minute exceeding threshold',
packages_business_setting_alarmnotification_api_server_worker_delay_p95_warn:
Expand Down Expand Up @@ -1770,6 +1783,8 @@ export default {
'Under active development. Some features may still be incomplete.',
packages_business_column_setting: 'Display Settings',
packages_business_column_reset: 'Reset',
packages_business_api_server_connection_pool_deficiency_warn: 'When any API Server connection pool resource is tight and triggers the alarm threshold',
packages_business_api_server_connection_pool_idle_warn: 'When the number of connections in the connection pool of any API Server falls below the alarm threshold',
packages_business_api_server_connection_pool_deficiency_warn:
'When any API Server connection pool resource is tight and triggers the alarm threshold',
packages_business_api_server_connection_pool_idle_warn:
'When the number of connections in the connection pool of any API Server falls below the alarm threshold',
}
10 changes: 10 additions & 0 deletions packages/business/src/locale/lang/zh-CN.js
Original file line number Diff line number Diff line change
Expand Up @@ -232,6 +232,16 @@ export default {
packages_business_dataFlow_bulkScheuled: '批量启动',
packages_business_dataFlow_bulkStopping: '批量停止',
packages_business_dataFlow_taskBulkOperation: '任务操作',
packages_business_task_batch_alarm_email_action: '批量设置告警接收人',
packages_business_task_batch_alarm_email_title: '批量设置告警接收人',
packages_business_task_batch_alarm_email_label: '邮件接收人',
packages_business_task_batch_alarm_email_placeholder: '请选择邮件接收人',
packages_business_task_batch_alarm_email_overwrite_tip:
'保存后,将覆盖所选任务原有的告警接收人设置',
packages_business_task_batch_alarm_email_empty:
'暂无可选邮件接收人,可直接保存以清空所选任务的告警接收人',
packages_business_task_batch_alarm_email_no_edit_permission_tip:
'以下 {count} 个任务没有编辑权限,保存时将自动跳过',
packages_business_dataFlow_addTag: '添加标签',
packages_business_dataVerify_dataVerify: '数据校验',
packages_business_dataFlow_selectAll: '全选',
Expand Down
10 changes: 10 additions & 0 deletions packages/business/src/locale/lang/zh-TW.js
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,16 @@ export default {
packages_business_dataFlow_bulkScheuled: '批量啟動',
packages_business_dataFlow_bulkStopping: '批量停止',
packages_business_dataFlow_taskBulkOperation: '任務操作',
packages_business_task_batch_alarm_email_action: '批量設置告警接收人',
packages_business_task_batch_alarm_email_title: '批量設置告警接收人',
packages_business_task_batch_alarm_email_label: '郵件接收人',
packages_business_task_batch_alarm_email_placeholder: '請選擇郵件接收人',
packages_business_task_batch_alarm_email_overwrite_tip:
'保存後,將覆蓋所選任務原有的告警接收人設置',
packages_business_task_batch_alarm_email_empty:
'暫無可選郵件接收人,可直接保存以清空所選任務的告警接收人',
packages_business_task_batch_alarm_email_no_edit_permission_tip:
'以下 {count} 個任務沒有編輯權限,保存時將自動跳過',
packages_business_dataFlow_addTag: '添加標籤',
packages_business_dataVerify_dataVerify: '數據校驗',
packages_business_dataFlow_selectAll: '全選',
Expand Down
Loading
Loading