diff --git a/apps/daas/src/router/routes.js b/apps/daas/src/router/routes.js index 13ee1482a2..b51fa2535d 100644 --- a/apps/daas/src/router/routes.js +++ b/apps/daas/src/router/routes.js @@ -18,6 +18,10 @@ const MigrationMonitorViewer = async () => { const { MigrationMonitorViewer } = await import('@tap/dag') return MigrationMonitorViewer } +const CustomNodeList = async () => { + const { CustomNodeList } = await import('@tap/business') + return CustomNodeList +} const NodeEditor = async () => { const { Editor } = await import(/* webpackChunkName: "node-design" */ '@tap/node-design') return Editor @@ -89,6 +93,11 @@ const VerificationResult = async () => { return VerificationResult } +//告警设置 +const AlarmSetting = async () => { + const { AlarmSetting } = await import('@tap/business') + return AlarmSetting +} export default [ { path: '/login', @@ -624,8 +633,7 @@ export default [ { path: '', name: 'customNodeList', - component: () => - import(/* webpackChunkName: "custom-proccessor-node" */ '@/views/custom-proccessor-node/List'), + component: CustomNodeList, meta: { title: 'page_title_custom_node', code: 'v2_custom_node_menu' @@ -876,7 +884,7 @@ export default [ { path: 'alarmSetting', name: 'alarmSetting', - component: () => import(/* webpackChunkName: "system-setting" */ '@/views/setting/AlarmNotification'), + component: AlarmSetting, meta: { title: 'page_title_setting', code: 'v2_alarm_settings_menu', diff --git a/apps/daas/src/views/Layout.vue b/apps/daas/src/views/Layout.vue index c561b8e8c5..0bffc05c2e 100644 --- a/apps/daas/src/views/Layout.vue +++ b/apps/daas/src/views/Layout.vue @@ -117,7 +117,8 @@ 'migrateList', 'dataflowList', 'connectionsList', - 'users' + 'users', + 'customNodeList' ].includes($route.name) }, { @@ -128,7 +129,8 @@ 'migrateList', 'dataflowList', 'connectionsList', - 'users' + 'users', + 'customNodeList' ].includes($route.name) } ]" diff --git a/apps/daas/src/views/notification/Center.vue b/apps/daas/src/views/notification/Center.vue index c685dfb8a8..325c595907 100644 --- a/apps/daas/src/views/notification/Center.vue +++ b/apps/daas/src/views/notification/Center.vue @@ -35,8 +35,8 @@ import SystemNotification from './SystemNotification' import UserNotification from './UserNotification' import SystemAlarm from './SystemAlarm' -import AlarmNotification from './AlarmNotification' import { VIcon } from '@tap/component' +import { AlarmNotification } from '@tap/business' import { mapState } from 'vuex' export default { diff --git a/apps/dfs/package.json b/apps/dfs/package.json index 82b6e5ad9a..ceaac98d6c 100644 --- a/apps/dfs/package.json +++ b/apps/dfs/package.json @@ -29,6 +29,7 @@ "@tap/dag": "workspace:^1.0.0", "@tap/form": "workspace:^1.0.0", "@tap/i18n": "workspace:^1.0.0", + "@tap/node-design": "workspace:^1.0.0", "@tap/shared": "workspace:^1.0.0", "@vue/composition-api": "^1.2.4", "ali-oss": "^6.17.1", diff --git a/apps/dfs/src/assets/icons/svg/custom.svg b/apps/dfs/src/assets/icons/svg/custom.svg new file mode 100644 index 0000000000..066b38d898 --- /dev/null +++ b/apps/dfs/src/assets/icons/svg/custom.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/apps/dfs/src/i18n/langs/en.js b/apps/dfs/src/i18n/langs/en.js index aa26a664f0..394442ede7 100644 --- a/apps/dfs/src/i18n/langs/en.js +++ b/apps/dfs/src/i18n/langs/en.js @@ -1081,7 +1081,8 @@ export default { _workbench_workbench_yigoushishitong: 'Hetrogeneous Database Replication', _workbench_workbench_shujuruhucang: 'Ingestion into Data Lake', _workbench_workbench_jichengaliyun: 'Integrate Alibaba Cloud Computing Nest', - _workbench_workbench_jiangshujudaoru: 'Sync to AliCloud Tablestore', + _workbench_workbench_jiangshujudaoru: 'Sync to', + _workbench_workbench_jiangshujudaorusub: 'AliCloud Tablestore', _workbench_workbench_tansuoshili: 'Explore Use Cases', dfs_workbench_workbench_zhongyaobanbensheng: @@ -1285,5 +1286,9 @@ export default { dfs_data_server_apply_for_version: 'Offline deployment version', dfs_data_dashboard_Marquee: - 'The current demo environment is a read-only environment, which only supports viewing and experiencing product functions' + 'The current demo environment is a read-only environment, which only supports viewing and experiencing product functions', + + page_title_custom_node: 'Custom Nodes', + packages_nodeDesign_custom_node_name_required: 'Please enter the node name', + packages_nodeDesign_message_save_ok: 'Save successfully' } diff --git a/apps/dfs/src/i18n/langs/zh-CN.js b/apps/dfs/src/i18n/langs/zh-CN.js index 5b3f8dc95a..48efddfec0 100644 --- a/apps/dfs/src/i18n/langs/zh-CN.js +++ b/apps/dfs/src/i18n/langs/zh-CN.js @@ -1030,7 +1030,8 @@ export default { _workbench_workbench_yigoushishitong: '异构实时同步', _workbench_workbench_shujuruhucang: '数据入湖仓 ', _workbench_workbench_jichengaliyun: '集成阿里云计算巢', - _workbench_workbench_jiangshujudaoru: '将数据导入阿里云 Tablestore', + _workbench_workbench_jiangshujudaoru: '数据导入', + _workbench_workbench_jiangshujudaorusub: '阿里云 Tablestore', _workbench_workbench_tansuoshili: '探索示例', dfs_workbench_workbench_zhongyaobanbensheng: '【重要】版本升级和服务切换重要公告', @@ -1204,5 +1205,9 @@ export default { dfs_data_server_apply_for_trial: '申请试用', dfs_data_server_apply_for_version: '线下部署版', - dfs_data_dashboard_Marquee: '当前demo环境为只读环境，仅支持查看和体验产品功能' + dfs_data_dashboard_Marquee: '当前demo环境为只读环境，仅支持查看和体验产品功能', + + page_title_custom_node: '自定义节点', + packages_nodeDesign_custom_node_name_required: '请输入节点名称', + packages_nodeDesign_message_save_ok: '保存成功' } diff --git a/apps/dfs/src/i18n/langs/zh-TW.js b/apps/dfs/src/i18n/langs/zh-TW.js index 780ae9d28b..e703ca8506 100644 --- a/apps/dfs/src/i18n/langs/zh-TW.js +++ b/apps/dfs/src/i18n/langs/zh-TW.js @@ -998,7 +998,8 @@ export default { _workbench_workbench_yigoushishitong: '異構實時同步', _workbench_workbench_shujuruhucang: '數據入湖倉 ', _workbench_workbench_jichengaliyun: '集成阿里雲計算巢', - _workbench_workbench_jiangshujudaoru: '將數據導入阿里雲 Tablestore', + _workbench_workbench_jiangshujudaoru: '數據導入阿里雲 Tablestore', + _workbench_workbench_jiangshujudaorusub: '阿里雲 Tablestore', _workbench_workbench_tansuoshili: '探索示例', dfs_workbench_workbench_zhongyaobanbensheng: '【重要】版本升級和服務切換重要公告', @@ -1177,5 +1178,9 @@ export default { dfs_data_server_apply_for_trial: '申請試用', dfs_data_server_apply_for_version: '線下部署版', - dfs_data_dashboard_Marquee: '當前demo環境為只讀環境，僅支持查看和體驗產品功能' + dfs_data_dashboard_Marquee: '當前demo環境為只讀環境，僅支持查看和體驗產品功能', + + page_title_custom_node: '自定義節點', + packages_nodeDesign_custom_node_name_required: '請輸入節點名稱', + packages_nodeDesign_message_save_ok: '保存成功' } diff --git a/apps/dfs/src/router/index.js b/apps/dfs/src/router/index.js index f8e20a4477..f1393db513 100644 --- a/apps/dfs/src/router/index.js +++ b/apps/dfs/src/router/index.js @@ -44,6 +44,15 @@ const VerifyDetails = async () => { const { VerifyDetails } = await import('@tap/business') return VerifyDetails } +const CustomNodeList = async () => { + const { CustomNodeList } = await import('@tap/business') + return CustomNodeList +} +const NodeEditor = async () => { + const { Editor } = await import(/* webpackChunkName: "node-design" */ '@tap/node-design') + return Editor +} + const routes = [ { path: '/', @@ -244,6 +253,15 @@ const routes = [ hideTitle: true, icon: 'data-server' } + }, + /* ---------- 自定义节点 ----------*/ + { + path: '/custom-node', + name: 'customNodeList', + component: CustomNodeList, + meta: { + title: 'page_title_custom_node' + } } ] }, @@ -382,6 +400,16 @@ const routes = [ title: 'page_title_run_monitor', code: 'Data_SYNC_menu' } + }, + { + path: '/node/editor', + name: 'NodeNew', + component: NodeEditor + }, + { + path: '/node/editor/:id', + name: 'NodeEditor', + component: NodeEditor } ] if (process.env.NODE_ENV === 'development') { diff --git a/apps/dfs/src/views/Layout.vue b/apps/dfs/src/views/Layout.vue index f417b77ba6..0fbecd4386 100644 --- a/apps/dfs/src/views/Layout.vue +++ b/apps/dfs/src/views/Layout.vue @@ -108,6 +108,12 @@ export default { icon: 'task', beta: true }, + { + name: 'customNodeList', + title: $t('page_title_custom_node'), + icon: 'custom', + beta: true + }, { name: 'dataServerList', title: $t('dfs_data_server'), @@ -306,6 +312,9 @@ export default { ::v-deep .v-icon { color: map-get($iconFillColor, normal); } + &.is-active { + background-color: #eaf0ff; + } &.is-active { ::v-deep .v-icon { color: map-get($color, primary); diff --git a/apps/dfs/src/views/workbench/NotificationPopover.vue b/apps/dfs/src/views/workbench/NotificationPopover.vue index 4cdbe87516..7bdfc653e2 100644 --- a/apps/dfs/src/views/workbench/NotificationPopover.vue +++ b/apps/dfs/src/views/workbench/NotificationPopover.vue @@ -12,16 +12,21 @@ {{ $t('header_notification_content') }} @@ -307,53 +306,6 @@ export default { barData: [], lineDataX: [], lineDataY: [], - barOptions: { - barWidth: '50%', - grid: { - top: 20, - bottom: 0, - left: 0, - right: 0 - }, - xAxis: { - axisLabel: { - formatter: val => { - return this.formatTime(val, '', 'MM-DD') - } - }, - axisLine: { - onZero: false - } - }, - yAxis: { - show: true, - type: 'log', - min: 1, - logBase: 10, - axisLabel: { - formatter: val => { - let res = val === 1 ? 0 : val - if (res / 1000 >= 1) { - res = res / 1000 + 'K' - } - return res - } - } - }, - tooltip: { - trigger: 'item', - formatter: params => { - let item = params - let val = item.value - if (val === 1.1) { - val = 1 - } - val = numToThousands(val) - let html = item.marker + params.name + `
` + val - return html - } - } - }, colorList: ['rgba(44, 101, 255, 0.85)', 'rgba(44, 101, 255, 0.5)'], showUpgrade: false, //版本升级弹窗 //付费升级 @@ -364,6 +316,7 @@ export default { { type: 'all', title: i18n.t('_workbench_workbench_jiangshujudaoru'), + subTitle: i18n.t('_workbench_workbench_jiangshujudaorusub'), img: 'table-store', url: 'https://tapdata.net/how-to-import-data-into-tablestore-alibaba-cloud.html?fromColId=104' }, @@ -452,16 +405,32 @@ export default { }, loadNotices() { this.notices = [ + { + id: 5, + type: '', + name: 'Tapdata Cloud 3.1.6 Release Notes', + link: 'https://mp.weixin.qq.com/s/rG_ag8LY-WSte4VnIgThXA', + time: '2023-02-3 21:00' + }, + { + id: 4, + type: '', + name: 'Tapdata Cloud 3.1.5 Release Notes', + link: 'https://mp.weixin.qq.com/s/JYPt9aExnCL9tyOENe7QOA', + time: '2023-01-20 21:00' + }, { id: 3, type: '', name: 'Tapdata Cloud 3.1.4 Release Notes', + link: 'https://mp.weixin.qq.com/s/dUuqGQZGEI10cOLpbzqbHA', time: '2023-01-3 21:00' }, { id: 2, type: '', name: 'Tapdata Cloud 3.1.3 Release Notes', + link: 'https://mp.weixin.qq.com/s/mwMNTGsglm9rQi-k9zqRgg', time: '2022-12-15 21:00' }, { @@ -520,10 +489,8 @@ export default { if (item?.id === 1) { //当前页弹窗 this.showUpgrade = true - } else if (item?.id === 2) { - window.open('https://mp.weixin.qq.com/s/mwMNTGsglm9rQi-k9zqRgg') - } else if (item?.id === 3) { - window.open('https://mp.weixin.qq.com/s/dUuqGQZGEI10cOLpbzqbHA') + } else if (item?.link) { + window.open(item.link) } else { this.$router.push({ name: 'WorkbenchNotice', @@ -606,7 +573,7 @@ export default { grid: { top: 20, bottom: 20, - left: 20, + left: 55, right: 20 }, xAxis: { diff --git a/apps/dfs/src/views/workbench/components/Setting.vue b/apps/dfs/src/views/workbench/components/Setting.vue deleted file mode 100644 index 8cf9661f34..0000000000 --- a/apps/dfs/src/views/workbench/components/Setting.vue +++ /dev/null @@ -1,165 +0,0 @@ - - - diff --git a/apps/dfs/vue.config.js b/apps/dfs/vue.config.js index 226f6f75d0..ac17331b91 100644 --- a/apps/dfs/vue.config.js +++ b/apps/dfs/vue.config.js @@ -5,12 +5,12 @@ const crypto = require('crypto') const serveUrlMap = { mock: 'http://localhost:3000', dev: 'http://backend:3030', - test: 'https://test3.cloud.tapdata.net:7443', + test: 'https://dev.cloud.tapdata.net:8443', local: 'https://v3.test.cloud.tapdata.net', localTm: 'http://127.0.0.1:3030' } // const userId = '60b60af1147bce7705727188' // zed? -const userId = '60cc0c304e190a579cbe306c' // jason +const userId = '637b268fe377c481ae013dc2' // jason let origin const { argv } = process const { SERVE_ENV = 'mock' } = process.env diff --git a/packages/assets/styles/element-overrides.scss b/packages/assets/styles/element-overrides.scss index 24716dc05b..1de82f0dac 100644 --- a/packages/assets/styles/element-overrides.scss +++ b/packages/assets/styles/element-overrides.scss @@ -286,7 +286,7 @@ $--messagebox-content-color: map-get($fontColor, normal) !default; /* Message -------------------------- */ // $--message-shadow: $--box-shadow-base !default; -// $--message-min-width: 380px !default; + $--message-min-width: 184px !default; // $--message-background-color: #edf2fc !default; // $--message-padding: 15px 15px 15px 20px !default; // $--message-content-color: $--color-text-regular !default; diff --git a/packages/business/src/locale/lang/en.js b/packages/business/src/locale/lang/en.js index d2b1aee601..e567081871 100644 --- a/packages/business/src/locale/lang/en.js +++ b/packages/business/src/locale/lang/en.js @@ -4,6 +4,8 @@ export default { packages_business_connection_list_testing: 'Testing', packages_business_connection_column_name: 'Connection Name', + packages_business_agent_status_running: 'Running', + packages_business_agent_status_stopped: 'Stopped', packages_business_status_running: 'Running', packages_business_status_paused: 'Paused', @@ -37,11 +39,12 @@ export default { packages_business_task_status_not_running: 'Not running', packages_business_task_status_error: 'Error', - packages_business_task_info_ms: 'milliseconds', - packages_business_task_info_s: 'seconds', - packages_business_task_info_m: 'minutes', + packages_business_task_info_ms: 'Milliseconds', + packages_business_task_info_s: 'Seconds', + packages_business_task_info_m: 'Minutes', packages_business_task_info_h: 'Hour', - packages_business_task_info_d: 'day', + packages_business_task_info_d: 'Day', + packages_business_task_info_w: 'Week', packages_business_connection_form_data_source: 'Data source', packages_business_connection_selector_desc1: 'The trial version is not currently supported', @@ -737,5 +740,54 @@ export default { packages_business_connections_databaseform_shujuyuanzhongmo: 'When the number of models in the data source is greater than 10,000, the model will be refreshed according to this parameter setting', packages_business_connections_databaseform_moxingjiazaipin: 'Model Load Frequency', - packages_business_connections_list_biaojiegougengxin: 'Table structure update time' + packages_business_connections_list_biaojiegougengxin: 'Table structure update time', + + packages_business_notify_sms_notification: 'SMS Notification', + packages_business_notify_email_notification: 'Email Notification', + packages_business_notify_webchat_notification: 'WeChat Notification', + packages_business_notify_system_notice: 'System Notification', + packages_business_notify_alarm_title: 'Agent Alarm Setting', + packages_business_setting_alarm_notification_notify_noticeInterval: 'Send Interval', + packages_business_setting_alarm_notification_describtion: 'Description', + packages_business_setting_notification_alarm_notification_gaojingtongzhi: 'Alarm Notification', + packages_business_setting_alarmnotification_gaojingzhibiao: 'Alarm Indicator', + packages_business_setting_alarmnotification_dangjiediandeping: 'When the average processing time of the node', + packages_business_setting_alarmnotification_dangshujuyuanjie: + 'When the average processing time of the data source node', + packages_business_setting_alarmnotification_dangshujuyuanxie: 'When the data source protocol connection takes time', + packages_business_setting_alarmnotification_dangshujuyuanwang: 'When the data source network connection takes time', + packages_business_setting_alarmnotification_dangshujuwufa: + 'It takes time when the data cannot be connected to the network', + packages_business_setting_alarmnotification_dangrenwudezeng: 'When the incremental delay of the task', + packages_business_setting_alarmnotification_dangrenwutingzhi: 'When the task stops', + packages_business_setting_alarmnotification_dangrenwuzengliang: 'When the task increment start', + packages_business_setting_alarmnotification_dangrenwuquanliang: 'When the task is fully completed', + packages_business_setting_alarmnotification_dangrenwujiaoyan: 'When the task verification error occurs', + packages_business_setting_alarmnotification_dangrenwuyudao: 'When the task encounters an error', + packages_business_setting_alarmnotification_dangrenwustop: 'When the Agent service stops', + packages_business_setting_alarmnotification_dangrenwuuP: 'When the Agent service start', + packages_business_setting_alarmnotification_msshigaojing: 'Alarm when s', + packages_business_setting_alarmnotification_gedian: 'Minutes', + packages_business_setting_alarmnotification_lianxu: 'Continuous', + + packages_business_notify_user_all_notice: 'All', + packages_business_notify_unread_notice: 'Unread Message', + packages_business_notify_mask_read: 'Mark this page as read', + packages_business_notify_mask_read_all: 'Mark All Read', + packages_business_notify_no_notice: 'No Notice', + + packages_business_setting_alarmnotification_cichugaojinggui: + 'The alarm rule setting here is the system global alarm rule setting, and the priority of the alarm rule setting on the task running monitoring page is higher than the system global setting', + packages_business_setting_alarmnotification_renwumorengao: 'Task default alarm rule setting', + packages_business_setting_alarmnotification_morengaojinggui: 'Default Alarm Rule', + packages_business_setting_alarmnotification_renwugaojingshe: 'Task Alarm Setting', + packages_business_notify_no_webchat_notification: + 'Your account has not been bound to WeChat. If you want to receive notification information through WeChat, please log out and log in first and then scan the code to complete the binding through WeChat.', + packages_business_connections_databaseform_bujiazai: 'not loaded', + + packages_business_custom_node_name: 'Node Name', + packages_business_new: 'Add', + packages_business_desc: 'Description', + packages_business_last_updated: 'Update Time', + packages_business_custom_node_placeholder: 'Please enter the node name to search' } diff --git a/packages/business/src/locale/lang/zh-CN.js b/packages/business/src/locale/lang/zh-CN.js index aa21441b94..c52886c01e 100644 --- a/packages/business/src/locale/lang/zh-CN.js +++ b/packages/business/src/locale/lang/zh-CN.js @@ -5,6 +5,9 @@ export default { packages_business_connection_column_name: '连接名称', + packages_business_agent_status_running: '运行中', + packages_business_agent_status_stopped: '离线', + packages_business_status_running: '运行中', packages_business_status_paused: '待启动', packages_business_status_draft: '待启动', @@ -42,6 +45,7 @@ export default { packages_business_task_info_m: '分钟', packages_business_task_info_h: '小时', packages_business_task_info_d: '天', + packages_business_task_info_w: '周', packages_business_connection_form_data_source: '数据源', packages_business_connection_selector_desc1: '试用版暂不支持', @@ -713,5 +717,56 @@ export default { packages_business_relation_details_wajuexinxi: '挖掘信息', packages_business_connections_databaseform_shujuyuanzhongmo: '数据源中模型数量大于1万时，会按本参数设置进行模型刷新', packages_business_connections_databaseform_moxingjiazaipin: '模型加载频率', - packages_business_connections_list_biaojiegougengxin: '表结构更新时间' + packages_business_connections_list_biaojiegougengxin: '表结构更新时间', + + //告警设置 + packages_business_notify_sms_notification: '短信通知', + packages_business_notify_email_notification: '邮件通知', + packages_business_notify_webchat_notification: '微信通知', + packages_business_notify_alarm_title: 'Agent告警设置', + packages_business_notify_system_notice: '系统通知', + packages_business_setting_alarm_notification_notify_noticeInterval: '发送间隔', + packages_business_setting_alarm_notification_describtion: '描述', + packages_business_setting_notification_alarm_notification_gaojingtongzhi: '告警通知', + packages_business_setting_alarmnotification_gaojingzhibiao: '告警指标', + packages_business_setting_alarmnotification_dangjiediandeping: '当节点的平均处理耗时', + packages_business_setting_alarmnotification_dangshujuyuanjie: '当数据源节点的平均处理耗时', + packages_business_setting_alarmnotification_dangshujuyuanxie: '当数据源协议连接耗时', + packages_business_setting_alarmnotification_dangshujuyuanwang: '当数据源网络连接耗时', + packages_business_setting_alarmnotification_dangshujuwufa: '当数据源无法连接网络时', + packages_business_setting_alarmnotification_dangrenwudezeng: '当任务的增量延迟', + packages_business_setting_alarmnotification_dangrenwutingzhi: '当任务停止时', + packages_business_setting_alarmnotification_dangrenwuzengliang: '当任务增量开始时', + packages_business_setting_alarmnotification_dangrenwuquanliang: '当任务全量完成时', + packages_business_setting_alarmnotification_dangrenwujiaoyan: '当任务校验出错时', + packages_business_setting_alarmnotification_dangrenwuyudao: '当任务遇到错误时', + packages_business_setting_alarmnotification_dangrenwustop: 'Agent服务停止时', + packages_business_setting_alarmnotification_dangrenwuuP: 'Agent服务启动时', + packages_business_setting_alarmnotification_msshigaojing: 's 时告警', + packages_business_setting_alarmnotification_gedian: '分钟', + packages_business_setting_alarmnotification_lianxu: '连续', + packages_business_setting_alarmnotification_cichugaojinggui: + '此处告警规则设置为系统全局告警规则设置，任务运行监控页面的告警规则设置优先级高于系统全局设置', + packages_business_setting_alarmnotification_renwumorengao: '任务默认告警规则设置', + packages_business_setting_alarmnotification_morengaojinggui: '默认告警规则', + packages_business_setting_alarmnotification_renwugaojingshe: '任务告警设置', + + //消息通知 + packages_business_notify_user_all_notice: '全部通知', + packages_business_notify_unread_notice: '未读消息', + packages_business_notify_mask_read: '标记本页为已读', + packages_business_notify_mask_read_all: '标记全部为已读', + packages_business_notify_notice_type: '消息类型', + packages_business_notify_notice_level: '消息级别', + packages_business_notify_no_notice: '暂无通知', + + packages_business_notify_no_webchat_notification: + '您的账户还没有进行微信绑定，如需通过微信接收通知信息，请先退出登录后通过微信扫码完成绑定', + packages_business_connections_databaseform_bujiazai: '不加载', + + packages_business_custom_node_name: '节点名称', + packages_business_new: '新增', + packages_business_desc: '描述', + packages_business_last_updated: '更新时间', + packages_business_custom_node_placeholder: '请输入节点名称搜索' } diff --git a/packages/business/src/locale/lang/zh-TW.js b/packages/business/src/locale/lang/zh-TW.js index 6c487bebe6..38e7637049 100644 --- a/packages/business/src/locale/lang/zh-TW.js +++ b/packages/business/src/locale/lang/zh-TW.js @@ -5,6 +5,9 @@ export default { packages_business_connection_column_name: '連接名稱', + packages_business_agent_status_running: '运行中', + packages_business_agent_status_stopped: '离线', + packages_business_status_running: '運行中', packages_business_status_paused: '待啟動', packages_business_status_draft: '待啟動', @@ -42,6 +45,7 @@ export default { packages_business_task_info_m: '分鐘', packages_business_task_info_h: '小時', packages_business_task_info_d: '天', + packages_business_task_info_w: '周', packages_business_connection_form_data_source: '數據源', packages_business_connection_selector_desc1: '試用版暫不支持', @@ -715,5 +719,57 @@ export default { packages_business_relation_details_wajuexinxi: '挖掘信息', packages_business_connections_databaseform_shujuyuanzhongmo: '數據源中模型數量大於1萬時，會按本參數設置進行模型刷新', packages_business_connections_databaseform_moxingjiazaipin: '模型加載頻率', - packages_business_connections_list_biaojiegougengxin: '表結構更新時間' + packages_business_connections_list_biaojiegougengxin: '表結構更新時間', + + notify_webchat_notification: '微信通知', + notify_sms_notification: '簡訊通知', + notify_email_notification: '郵件通知', + notify_system_notice: '系统通知', + packages_business_notify_alarm_title: 'Agent告警设置', + + packages_business_setting_alarm_notification_notify_noticeInterval: '发送间隔', + packages_business_setting_alarm_notification_describtion: '描述', + packages_business_setting_notification_alarm_notification_gaojingtongzhi: '告警通知', + packages_business_setting_alarmnotification_gaojingzhibiao: '告警指標', + packages_business_setting_alarmnotification_dangjiediandeping: '當節點的平均處理耗時', + packages_business_setting_alarmnotification_dangshujuyuanjie: '當數據源節點的平均處理耗時', + packages_business_setting_alarmnotification_dangshujuyuanxie: '當數據源協議連接耗時', + packages_business_setting_alarmnotification_dangshujuyuanwang: '當數據源網络連接耗時', + packages_business_setting_alarmnotification_dangshujuwufa: '當數據無法網络連接耗時', + packages_business_setting_alarmnotification_dangrenwudezeng: '當任務的增量延遲', + packages_business_setting_alarmnotification_dangrenwutingzhi: '當任務停止時', + packages_business_setting_alarmnotification_dangrenwuzengliang: '當任務增量开始時', + packages_business_setting_alarmnotification_dangrenwuquanliang: '當任務全量完成時', + packages_business_setting_alarmnotification_dangrenwujiaoyan: '當任務校驗出錯時', + packages_business_setting_alarmnotification_dangrenwuyudao: '當任務遇到錯誤時', + packages_business_setting_alarmnotification_dangrenwustop: 'Agent服務停止時', + packages_business_setting_alarmnotification_dangrenwuuP: 'Agent服务啓動時', + packages_business_setting_alarmnotification_msshigaojing: 's 時告警', + packages_business_setting_alarmnotification_gedian: '分钟', + packages_business_setting_alarmnotification_lianxu: '連續', + packages_business_setting_alarmnotification_cichugaojinggui: + '此處告警規則設置為系統全局告警規則設置，任務運行監控頁面的告警規則設置優先級高於系統全局設置', + packages_business_setting_alarmnotification_renwumorengao: '任務默認告警規則設置', + packages_business_setting_alarmnotification_morengaojinggui: '默認告警規則', + packages_business_setting_alarmnotification_renwugaojingshe: '任務告警設置', + + //消息通知 + + packages_business_notify_user_all_notice: '全部通知', + packages_business_notify_unread_notice: '未讀消息', + packages_business_notify_mask_read: '標記本頁為已讀', + packages_business_notify_mask_read_all: '標記全部為已讀', + packages_business_notify_notice_type: '消息類型', + packages_business_notify_notice_level: '消息級別', + packages_business_notify_no_notice: '暫無通知', + + packages_business_notify_no_webchat_notification: + '您的賬戶還沒有進行微信綁定，如需通過微信接收通知信息，請先退出登錄後通過微信掃碼完成綁定', + packages_business_connections_databaseform_bujiazai: '不加載', + + packages_business_custom_node_name: '節點名稱', + packages_business_new: '新增', + packages_business_desc: '描述', + packages_business_last_updated: '更新時間', + packages_business_custom_node_placeholder: '請輸入節點名稱搜索' } diff --git a/packages/business/src/shared/task.js b/packages/business/src/shared/task.js index d5b211fe67..312210c069 100644 --- a/packages/business/src/shared/task.js +++ b/packages/business/src/shared/task.js @@ -131,10 +131,11 @@ export const STATUS_MERGE = Object.entries(STATUS_MAP).reduce((merge, [key, valu return merge }, {}) +//'renewing' 不可以删除 const BUTTON_WITH_STATUS = { start: ['wait_start', 'complete', 'error', 'stop'], edit: ['edit', 'wait_start', 'complete', 'error', 'stop', 'renew_failed'], - delete: ['edit', 'wait_start', 'complete', 'error', 'stop', 'renewing', 'renew_failed'], + delete: ['edit', 'wait_start', 'complete', 'error', 'stop', 'renew_failed'], stop: ['running'], forceStop: ['stopping'], reset: ['wait_start', 'complete', 'error', 'stop', 'renew_failed'], diff --git a/packages/business/src/views/connections/DatabaseForm.vue b/packages/business/src/views/connections/DatabaseForm.vue index f23b42afb6..10d95c2c4d 100644 --- a/packages/business/src/views/connections/DatabaseForm.vue +++ b/packages/business/src/views/connections/DatabaseForm.vue @@ -767,7 +767,10 @@ export default { }, default: '02:00', enum: [ - 'false', + { + label: i18n.t('packages_business_connections_databaseform_bujiazai'), + value: 'false' + }, '00:00', '01:00', '02:00', @@ -920,11 +923,17 @@ export default { }, loadAccessNode: async () => { const data = await clusterApi.findAccessNodeInfo() + return ( data?.map(item => { return { value: item.processId, - label: `${item.hostName}（${item.ip}）` + label: `${item.hostName}（${ + item.status === 'running' + ? i18n.t('packages_business_agent_status_running') + : i18n.t('packages_business_agent_status_stopped') + }）`, + disabled: item.status !== 'running' } }) || [] ) diff --git a/apps/daas/src/views/custom-proccessor-node/List.vue b/packages/business/src/views/custom-node/List.vue similarity index 85% rename from apps/daas/src/views/custom-proccessor-node/List.vue rename to packages/business/src/views/custom-node/List.vue index 09f16a5795..983ebc4448 100644 --- a/apps/daas/src/views/custom-proccessor-node/List.vue +++ b/packages/business/src/views/custom-node/List.vue @@ -1,25 +1,25 @@