Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
5738b3d
refactor(@dag): extract Chinese language text
StormKennen Feb 2, 2023
c1a9b19
style(monitor/LineChart): add align-items-center class
StormKennen Feb 4, 2023
288924e
Merge remote-tracking branch 'origin/feature-dag_language' into dfs-v…
StormKennen Feb 7, 2023
19d4fe0
refactor(monitor): set startTime in startLoopTask function
StormKennen Feb 7, 2023
7d7eb49
style(workbench): adjust style #133987
FannieGirl Feb 8, 2023
9e3d133
feat(alarmSetting): add alarm notice
FannieGirl Feb 9, 2023
7450653
feat(agentName): set agent status
FannieGirl Feb 10, 2023
6f15464
Merge remote-tracking branch 'origin/feature-agent-name-64-1' into df…
FannieGirl Feb 13, 2023
e29b588
feat(setting notice): add alarm notice
FannieGirl Feb 13, 2023
0b474c0
feat(setting notice): add alarm notice
FannieGirl Feb 13, 2023
5908818
fix(setting notice): add alarm notice for task
FannieGirl Feb 13, 2023
eb0ac83
Merge remote-tracking branch 'origin/dfs-v3.1.7' into feature-notice-…
FannieGirl Feb 13, 2023
fc50b8c
fix(notice): add SYSTEM_FLOW_EGINGE_UP item
FannieGirl Feb 14, 2023
65f8af8
fix(notice): fix alarm setting save # 135042
FannieGirl Feb 15, 2023
3c9dac0
fix(notice): no-WeChat disabled notice # 135050
FannieGirl Feb 15, 2023
dfe27c4
refactor: pingTime relative time with Time.now
FannieGirl Feb 15, 2023
2663216
fix(@business/connection/form): add label in schemaUpdateHour #134880
StormKennen Feb 15, 2023
bd339f7
Merge remote-tracking branch 'origin/dfs-v3.1.7' into dfs-v3.1.7
StormKennen Feb 15, 2023
6137bfc
fix(@business/connection/form): add label in schemaUpdateHour #134880
StormKennen Feb 15, 2023
9a86a24
feat(alarm): Adjust alarm rlues #135067
FannieGirl Feb 15, 2023
5cf2248
Merge branch 'dfs-v3.1.7' of github.com:tapdata/tapdata-enterprise-we…
FannieGirl Feb 15, 2023
5b31ba6
refactor: dfs add custom node
cn-xufei Feb 16, 2023
a5d51ee
Merge remote-tracking branch 'origin/dfs-v3.1.7' into dfs-v3.1.7
cn-xufei Feb 16, 2023
b8a9b8b
fix(alarm): ws data #135067
FannieGirl Feb 16, 2023
c0af523
fix(alarm): remote alarm item #13508
FannieGirl Feb 16, 2023
d8db914
fix(@tap/dag): fix LeftSidebar repeated load table
cn-xufei Feb 16, 2023
35e7500
Merge remote-tracking branch 'origin/dfs-v3.1.7' into dfs-v3.1.7
cn-xufei Feb 16, 2023
87272b6
fix(alarm): remote alarm item #13508
FannieGirl Feb 16, 2023
aaa354a
Merge branch 'dfs-v3.1.7' of github.com:tapdata/tapdata-enterprise-we…
FannieGirl Feb 16, 2023
3dcb685
fix(alarm): Adjust text #135044
FannieGirl Feb 16, 2023
e6e05dd
fix(alarm): Open control time interval input #135095
FannieGirl Feb 16, 2023
0edd443
fix(@tap/dag): fix alarm settings show as null #135046
cn-xufei Feb 16, 2023
edb5c0a
style: dashboard style
FannieGirl Feb 16, 2023
02112e7
Merge remote-tracking branch 'origin/dfs-v3.1.7' into dfs-v3.1.7
cn-xufei Feb 16, 2023
4cbc626
refactor: mv custom node to @tap/business
cn-xufei Feb 16, 2023
a8ee549
fix(setting):stateIsReadonly accessNodeType disabled #134948
FannieGirl Feb 16, 2023
bc60e20
Merge branch 'dfs-v3.1.7' of github.com:tapdata/tapdata-enterprise-we…
FannieGirl Feb 16, 2023
0236cb9
fix(setting): update alarm setting
FannieGirl Feb 16, 2023
f4a42a3
fix(setting): notice alarm setting
FannieGirl Feb 16, 2023
b120608
fix(setting): adjust internationalized text
FannieGirl Feb 17, 2023
4b24f14
fix(taskStatus): renewing no delete #135118
FannieGirl Feb 17, 2023
1e2b379
style: menu add background color
FannieGirl Feb 17, 2023
948b5d8
fix(alarm): save alarm data
FannieGirl Feb 17, 2023
8685ece
style: Reduce the minimum width of the message bar
cn-xufei Feb 20, 2023
ce210e9
fix: fix MigrationMonitorViewer page return
cn-xufei Feb 20, 2023
4298091
fix(dashboard): add announcement
FannieGirl Feb 20, 2023
0c039b5
Merge branch 'dfs-v3.1.7' of github.com:tapdata/tapdata-enterprise-we…
FannieGirl Feb 20, 2023
0416e88
fix(@tap/dag): remove TASK_INSPECT_ERROR
FannieGirl Feb 21, 2023
ef4df2c
fix(@tap/dag): SMS no disabled
FannieGirl Feb 21, 2023
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
14 changes: 11 additions & 3 deletions apps/daas/src/router/routes.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -89,6 +93,11 @@ const VerificationResult = async () => {
return VerificationResult
}

//告警设置
const AlarmSetting = async () => {
const { AlarmSetting } = await import('@tap/business')
return AlarmSetting
}
export default [
{
path: '/login',
Expand Down Expand Up @@ -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'
Expand Down Expand Up @@ -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',
Expand Down
6 changes: 4 additions & 2 deletions apps/daas/src/views/Layout.vue
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,8 @@
'migrateList',
'dataflowList',
'connectionsList',
'users'
'users',
'customNodeList'
].includes($route.name)
},
{
Expand All @@ -128,7 +129,8 @@
'migrateList',
'dataflowList',
'connectionsList',
'users'
'users',
'customNodeList'
].includes($route.name)
}
]"
Expand Down
2 changes: 1 addition & 1 deletion apps/daas/src/views/notification/Center.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions apps/dfs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions apps/dfs/src/assets/icons/svg/custom.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
9 changes: 7 additions & 2 deletions apps/dfs/src/i18n/langs/en.js
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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'
}
9 changes: 7 additions & 2 deletions apps/dfs/src/i18n/langs/zh-CN.js
Original file line number Diff line number Diff line change
Expand Up @@ -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: '【重要】版本升级和服务切换重要公告',
Expand Down Expand Up @@ -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: '保存成功'
}
9 changes: 7 additions & 2 deletions apps/dfs/src/i18n/langs/zh-TW.js
Original file line number Diff line number Diff line change
Expand Up @@ -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: '【重要】版本升級和服務切換重要公告',
Expand Down Expand Up @@ -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: '保存成功'
}
28 changes: 28 additions & 0 deletions apps/dfs/src/router/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -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: '/',
Expand Down Expand Up @@ -244,6 +253,15 @@ const routes = [
hideTitle: true,
icon: 'data-server'
}
},
/* ---------- 自定义节点 ----------*/
{
path: '/custom-node',
name: 'customNodeList',
component: CustomNodeList,
meta: {
title: 'page_title_custom_node'
}
}
]
},
Expand Down Expand Up @@ -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') {
Expand Down
9 changes: 9 additions & 0 deletions apps/dfs/src/views/Layout.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
Expand Down Expand Up @@ -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);
Expand Down
Loading