Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
160 commits
Select commit Hold shift + click to select a range
f841bed
feat(route): add user and roles
StormKennen Dec 7, 2022
30e9723
feat(daas/route): add RoleDetails
StormKennen Dec 12, 2022
df29390
fix(role): disabled create role button
FannieGirl Dec 14, 2022
9060427
fix(data-server): add role drawer
FannieGirl Dec 14, 2022
20e301b
fix(data-server): add acl
FannieGirl Dec 14, 2022
7cb55e0
fix(role): add permissions
FannieGirl Dec 14, 2022
a318711
fix(role): update role save function
FannieGirl Dec 15, 2022
08a3966
fix(role): Select all to save data
FannieGirl Dec 15, 2022
8080dda
fix(role): remove data
FannieGirl Dec 15, 2022
bd6fec4
fix(role): add filter parma
FannieGirl Dec 15, 2022
167fdaa
Merge remote-tracking branch 'origin/develop-v2.12' into feature-user…
FannieGirl Dec 15, 2022
3bdf743
fix(role): add data verify
FannieGirl Dec 19, 2022
3cb51d6
fix(application): open create button
FannieGirl Dec 19, 2022
a8ca4a4
Merge remote-tracking branch 'origin/develop-v2.12' into feature-user…
FannieGirl Dec 19, 2022
43e3c39
fix(role): primary role
FannieGirl Dec 20, 2022
81ec853
fix(user): update edit form value
FannieGirl Dec 20, 2022
a517119
Merge remote-tracking branch 'origin/develop-v2.12' into feature-user…
FannieGirl Jan 6, 2023
c1935ea
fix(singout): clear permissions cache
FannieGirl Jan 9, 2023
ece6e04
fix(singout): Solve the problem of no permission
FannieGirl Jan 9, 2023
fdbbeb0
feat(@tap/dag): add expression migrateTableSelectType
cn-xufei Jan 9, 2023
ad44027
feat(daas/shared-mining): add syncPoints #131963
StormKennen Jan 9, 2023
88551e4
refactor(daas/shared-mining): hide connectionName in syncPoints #131963
StormKennen Jan 9, 2023
4c4ccf6
Merge branch 'release-v2.12' into feature-user-manage
StormKennen Jan 10, 2023
5237ade
feat(relation/Detail): add logCollector info
StormKennen Jan 10, 2023
f647116
feat(daas/shared-mining): add pickerOptions to limit timeRange
StormKennen Jan 10, 2023
187f070
refactor(@tap/dag): TableReName node configuration adjustment #126712
cn-xufei Jan 10, 2023
38b2a97
refactor(@tap/dag): Database node tableExpression add default value '*'
cn-xufei Jan 10, 2023
46beff8
Merge branch 'feat-expression' into develop-v2.13
cn-xufei Jan 10, 2023
09f1acf
feat(@tap/dag): Node add readBatchSize、writeBatchSize #131960
cn-xufei Jan 10, 2023
d511b09
feat(@tap/dag): Add cdc log mode for table.js
FannieGirl Jan 10, 2023
3e3ebba
fix(@tap/dag): Adjust the value range for table.js
FannieGirl Jan 10, 2023
187d6a3
fix(@tap/dag): remove writeBatchWaitMs tooltip
cn-xufei Jan 10, 2023
cf61aaf
refactor(@shared/time): change getTime function name
StormKennen Jan 10, 2023
edba864
Merge remote-tracking branch 'origin/develop-v2.13' into develop-v2.13
StormKennen Jan 10, 2023
2534203
refactor: Date.now() or new Date().getTime() replace with Time.now() …
StormKennen Jan 10, 2023
2a6e33c
Create CODEOWNERS
xbsura Jan 10, 2023
192c9d2
Update CODEOWNERS
xbsura Jan 10, 2023
9dde745
Update CODEOWNERS
xbsura Jan 10, 2023
e8a7ee3
feat(dag/Editor): add handleStart function and watch status to run co…
StormKennen Jan 11, 2023
e359915
Merge remote-tracking branch 'origin/feature-change_date_now' into de…
StormKennen Jan 11, 2023
e82c6ce
feat(dag/Editor): add datetime pickerOptions in syncPoints properties…
StormKennen Jan 11, 2023
0d244c2
feat(monitor): show resetInfo when status is renewing or renew_failed
StormKennen Jan 11, 2023
ad9f1b0
Merge branch 'feature-info-output' into develop-v2.13
StormKennen Jan 11, 2023
8f62efa
feat(@tap/business): TaskStatus add cron tooltip
cn-xufei Jan 11, 2023
abcc501
feat(@tap/dag): add standard js node #125720
cn-xufei Jan 11, 2023
7dfe603
fix(data-server): api custom path
FannieGirl Jan 11, 2023
1b47b57
fix(data-server): update api custom path
FannieGirl Jan 11, 2023
688552d
fix(data-server): update rules
FannieGirl Jan 11, 2023
41ece66
fix(data-server): update rules
FannieGirl Jan 11, 2023
9d910d4
fix(data-server): Globalization
FannieGirl Jan 12, 2023
2445a4a
fix(data-server): update cdcPollingFields filed type
FannieGirl Jan 12, 2023
be16176
Merge branch 'dfs-v3.1.5' into develop-v2.13
cn-xufei Jan 12, 2023
e237cb6
fix(data-server): update cdcPollingFields data structure
FannieGirl Jan 12, 2023
2632e47
fix(data-server): update edit mode
FannieGirl Jan 12, 2023
9b7758d
fix(data-server): update edit path
FannieGirl Jan 12, 2023
5c2714d
fix(data-server): update edit path
FannieGirl Jan 12, 2023
9a23c2a
fix(data-server): update edit path
FannieGirl Jan 12, 2023
a19c65a
fix(data-server): hidden path in test
FannieGirl Jan 13, 2023
c30fa11
fix(data-server-audit): show user ip
FannieGirl Jan 13, 2023
b159ebc
fix(data-server-audit): update margin left
FannieGirl Jan 13, 2023
25e919a
Merge remote-tracking branch 'origin/master' into develop-v2.13
cn-xufei Jan 13, 2023
b87a8dc
feat: add StageButton
StormKennen Jan 13, 2023
1aa8fba
Merge remote-tracking branch 'origin/develop-v2.13-api-server' into d…
FannieGirl Jan 13, 2023
8251d93
fix(@tap/dag): fix PaperScroller offset caused by reset operation and…
cn-xufei Jan 13, 2023
c52a70f
Merge remote-tracking branch 'origin/develop-v2.13' into develop-v2.13
cn-xufei Jan 15, 2023
3aae12e
refactor(StageButton): add $emit complete
StormKennen Jan 16, 2023
63d2986
fix(@tap/dag): fix js editor fullscreen error
cn-xufei Jan 16, 2023
71b3f6a
style(@tap/dag): update js processor log line style
cn-xufei Jan 16, 2023
df7b9a7
feat(@dag): add StageButtonLaebl
StormKennen Jan 16, 2023
9cc9d54
Merge branch 'feature-shared_cache' into develop-v2.13
StormKennen Jan 16, 2023
2f53e36
refactor(@tap/dag): update Database node tableExpression
cn-xufei Jan 16, 2023
554a02f
Merge remote-tracking branch 'origin/develop-v2.13' into develop-v2.13
cn-xufei Jan 16, 2023
72116bc
feat(@tap/dag): JsProcessor Node show api docs
cn-xufei Jan 16, 2023
8c32648
Merge branch 'feat-v2.13-119950-udf' into develop-v2.13
cn-xufei Jan 16, 2023
59b5b8c
feat(targetNode): add writeStrategy
StormKennen Jan 16, 2023
2241080
feat(databaseForm): add tooltip in connectionSchemaUpdateHour
StormKennen Jan 16, 2023
04ae930
Merge branch 'feature-writeStrategy' into develop-v2.13
StormKennen Jan 16, 2023
aae145f
feat(targetNode): add writeStrategy
StormKennen Jan 16, 2023
cef9794
Merge remote-tracking branch 'origin/feature-table-rename' into devel…
cn-xufei Jan 16, 2023
0cef9dc
Merge remote-tracking branch 'origin/develop-v2.13' into develop-v2.13
cn-xufei Jan 16, 2023
df24095
style(@tap/dag): JS Node add beta icon
cn-xufei Jan 16, 2023
f41aa94
reformat(daas): Function list add category filter condition
cn-xufei Jan 16, 2023
d1ab008
refactor(StageButton): watch connectionId to run init function
StormKennen Jan 17, 2023
af4fc66
refactor(@tap/dag): update Database Node tableExpression description
cn-xufei Jan 17, 2023
8cd9edb
refactor(@tap/dag): Remove useless code
cn-xufei Jan 17, 2023
7e33444
fix(@tap/dag): Monitor page do not validate the form #132406
cn-xufei Jan 17, 2023
33a332d
refactor(RelationTask/Details): show info when detailData is not empty
StormKennen Jan 17, 2023
0185083
Merge remote-tracking branch 'origin/develop-v2.13' into develop-v2.13
StormKennen Jan 17, 2023
ffc0b43
refactor(databaseForm): extract language text
StormKennen Jan 17, 2023
402173e
fix(setting): Source node add nodeSchema
FannieGirl Jan 17, 2023
62ffa63
fix(@tap/dag): fix saving empty field names #132372
cn-xufei Jan 17, 2023
7d0f3f8
Merge remote-tracking branch 'origin/develop-v2.13-cdc-order-by-speci…
FannieGirl Jan 17, 2023
f8b2983
Merge remote-tracking branch 'origin/develop-v2.13' into develop-v2.13
cn-xufei Jan 17, 2023
974ce1f
feat(node/selectTable): add checkTableExist function
StormKennen Jan 17, 2023
e35c8c0
feat(node/selectTable): add checkTableExist function
StormKennen Jan 17, 2023
b333873
Merge branch 'feature-mode-reload' into develop-v2.13
StormKennen Jan 17, 2023
5f2f861
feat(connection/list): add loadSchemaTime columns
StormKennen Jan 17, 2023
8244ef1
refactor(migrate/editor/setting): change tooltip #132102
StormKennen Jan 17, 2023
10a13ce
refactor(StageButton): change setTimeout params
StormKennen Jan 18, 2023
95a4e0f
fix(setting): defaultValue required:true
FannieGirl Jan 18, 2023
aaa2ce4
revert: cancel hide item with count
cn-xufei Jan 28, 2023
ce0e783
refactor(@shared/util): add params in getPickerOptionsBeforeTime func…
StormKennen Jan 28, 2023
fa6d8e0
Merge remote-tracking branch 'origin/develop-v2.13' into develop-v2.13
StormKennen Jan 28, 2023
5ce3b09
fix: fix MigrationMonitorViewer js node config empty
cn-xufei Jan 29, 2023
416f379
fix(setting): fix syncPoints #13332 & #13331
FannieGirl Jan 29, 2023
1ad3252
Merge branch 'develop-v2.13' of github.com:tapdata/tapdata-enterprise…
FannieGirl Jan 29, 2023
5af9daf
Merge remote-tracking branch 'origin/feature-user-manage' into develo…
FannieGirl Jan 29, 2023
8b743fc
refactor(@business): add i18n language
StormKennen Jan 28, 2023
002b77b
fix(role): fix some bugs #132473 #132472 #132471
FannieGirl Jan 30, 2023
b9d7376
fix(role): add v2_data_discovery #132472
FannieGirl Jan 30, 2023
3642174
fix(setting): Update syncPoints #13331
FannieGirl Jan 30, 2023
c775c41
fix(taskSetting): change pickerOptions in dateTime field #133336
StormKennen Jan 30, 2023
25b8023
Merge remote-tracking branch 'origin/develop-v2.13' into develop-v2.13
StormKennen Jan 30, 2023
254cf4e
fix(shared-mining/List): format logTime when data is not empty
StormKennen Jan 31, 2023
56cac12
fix(shared-mining/List): show delayTime when data greater than 0
StormKennen Jan 31, 2023
d86f2ee
fix(@tap/dag): fix saving empty field names #132372
FannieGirl Jan 31, 2023
30e388e
fix(monitor/node): get inputTotal and outputTotal
StormKennen Jan 31, 2023
2dc135a
Merge remote-tracking branch 'origin/develop-v2.13' into develop-v2.13
StormKennen Jan 31, 2023
e686e75
refactor(dfs): remove modify file in i18n
StormKennen Jan 31, 2023
84fbe38
refactor(dfs/Lang): change local Language
StormKennen Jan 31, 2023
9672b2a
Merge branch 'develop-v2.13' into feature-cron-status
cn-xufei Jan 31, 2023
a3ce729
refactor: update task status cron tooltip; show lastStartDate
cn-xufei Jan 31, 2023
69f3ddf
style: update task list time column minWidth
cn-xufei Feb 1, 2023
31aec1c
fix(apiServer): Optimize the [Generate] function #3476 & Adjust style
FannieGirl Feb 1, 2023
64530a6
Merge branch 'develop-v2.13' of github.com:tapdata/tapdata-enterprise…
FannieGirl Feb 1, 2023
1ba0361
refactor: update task status agent tooltip #133557
cn-xufei Feb 1, 2023
35cd5a5
refactor: Added log query when the log is empty #132713
cn-xufei Feb 2, 2023
b6ea463
refactor: js editor prevent caption undefined
cn-xufei Feb 2, 2023
10ee865
fix(taskSetting): add popClass and add hide style #133558
StormKennen Feb 2, 2023
2630355
Merge remote-tracking branch 'origin/develop-v2.13' into develop-v2.13
StormKennen Feb 2, 2023
b22af56
fix(dag/dataflow): run logicSchema when progress is finished
StormKennen Feb 2, 2023
1b3555a
fix(dag/dataflow): run updateDag when progress is finished
StormKennen Feb 2, 2023
9e2787a
fix(dag/dataflow): emit complete when progress is finished
StormKennen Feb 2, 2023
677d29d
fix(objectList): change searchBox text #133620
StormKennen Feb 3, 2023
6519b7d
refactor(connectionList): hide progress when source is file
StormKennen Feb 3, 2023
810dc79
refactor(loadSchemaTree): check connection status and show loadFieldE…
StormKennen Feb 3, 2023
bf663c5
fix(apiServer): Hide generate button in new mode
FannieGirl Feb 3, 2023
41d2ca1
Merge branch 'develop-v2.13' of github.com:tapdata/tapdata-enterprise…
FannieGirl Feb 3, 2023
9b1ca5d
fix(sharedMining/List): hide current button #133558
StormKennen Feb 3, 2023
e5bc0bd
Merge remote-tracking branch 'origin/develop-v2.13' into develop-v2.13
StormKennen Feb 3, 2023
1041fe8
fix(sharedMining/List): hide current button #133558
StormKennen Feb 3, 2023
3486ac0
refactor: pingTime relative time with Time.now
cn-xufei Feb 3, 2023
ff8e12c
fix(apiServer): remove acl default value
FannieGirl Feb 3, 2023
a6fd9f8
fix: fix table rename table name repeat
cn-xufei Feb 3, 2023
935346e
refactor: table rename doModify prevent duplicate table names
cn-xufei Feb 3, 2023
11bf688
fix(apiServer): edit save acl #133660
FannieGirl Feb 4, 2023
4aace75
Merge branch 'develop-v2.13' of github.com:tapdata/tapdata-enterprise…
FannieGirl Feb 4, 2023
68f5856
fix(objectList): change searchBox text #133620
StormKennen Feb 6, 2023
54802a9
fix(DataDir): show userName in default dir #133657
StormKennen Feb 6, 2023
c154428
refactor: JsProcessor test run log show errorStack
cn-xufei Feb 6, 2023
67e1046
Merge remote-tracking branch 'origin/develop-v2.13' into develop-v2.13
cn-xufei Feb 6, 2023
266ccad
refactor: update JsProcessor log query
cn-xufei Feb 6, 2023
cd613ac
fix: fix TableReName hasDuplicateTableName can save #133642
cn-xufei Feb 6, 2023
ce4e2c9
refactor: Remove useless code
cn-xufei Feb 6, 2023
43fd7da
fix(setting): Non-admin shielding system settings
FannieGirl Feb 6, 2023
fa545f2
fix(@business/connection/form): echo schemaUpdateHour in getPdkData f…
StormKennen Feb 6, 2023
dbf0936
fix(setting): Non-admin shielding system settings
FannieGirl Feb 7, 2023
40fdf02
Merge branch 'develop-v2.13' of github.com:tapdata/tapdata-enterprise…
FannieGirl Feb 7, 2023
dc1a3cc
refactor: TableReName node tooltip show duplicate table name
cn-xufei Feb 7, 2023
c14c102
Merge remote-tracking branch 'origin/master' into release-v2.13-merge…
cn-xufei Feb 7, 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
1 change: 1 addition & 0 deletions .github/CODEOWNERS
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/apps/daas/src/i18n/langs/en.js @tjworks
10 changes: 10 additions & 0 deletions apps/daas/src/assets/icons/colorSvg/beta.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
41 changes: 28 additions & 13 deletions apps/daas/src/i18n/langs/en.js
Original file line number Diff line number Diff line change
Expand Up @@ -384,7 +384,8 @@ export default {
apiaudit_name: 'API name',
apiaudit_access_type: 'Access Type',
apiaudit_visitor: 'Visitor',
apiaudit_interview_time: 'Access time',
apiaudit_ip: 'Visitor IP',
apiaudit_interview_time: 'Access Time',
apiaudit_visit_result: 'Result',
apiaudit_reason_fail: 'Failure reason',
apiaudit_log_info: 'Log details',
Expand Down Expand Up @@ -509,6 +510,7 @@ export default {
share_list_status: 'Status',
share_list_time: 'Mining Delay',
share_list_edit_title: 'Mining Edit',
share_list_edit_title_start_time: 'Mining Start Time',
share_form_setting_table_name: 'Store MongoDB table name',
share_form_setting_log_time: 'Log save time',
share_form_edit_name: 'Mining name',
Expand Down Expand Up @@ -1080,7 +1082,7 @@ export default {
datadiscovery_catalogue_ziyuanbangding: 'Resource binding',
datadiscovery_catalogue_lianjieduixiangming: 'Connection object name',
datadiscovery_catalogue_ziyuanleixing: 'Resource Type',
datadiscovery_objectlist_duixiangminglaiyuan: 'Object name/Source information',
datadiscovery_objectlist_duixiangminglaiyuan: 'Object name/Data source',
datadiscovery_objectlist_laiyuanfenlei: 'Source classification',
datadiscovery_previewdrawer_shujuxiang: 'Data item',
datadiscovery_previewdrawer_yewumingcheng: 'Business name',
Expand Down Expand Up @@ -1996,21 +1998,23 @@ export default {
daas_data_server_drawer_qingxuanzeduixiang: 'Please select the object name',
daas_data_server_drawer_qingxuanzelianjie: 'Please Select connection type',
daas_data_server_drawer_qingshurufuwu: 'Please enter service name',
daas_data_server_drawer_shilidaima: 'Sample code',
daas_data_server_drawer_shilidaima2: 'Sample code',
daas_data_server_drawer_fanhuijieguo: 'Return result',
daas_data_server_drawer_quanxianfanwei: 'Authority Range',
daas_data_server_drawer_selectPermissions: 'Please select the scope of authority',
daas_data_server_drawer_shilidaima: 'Sample Code',
daas_data_server_drawer_shilidaima2: 'Sample Code',
daas_data_server_drawer_fanhuijieguo: 'Return Result',
daas_data_server_drawer_diaoyongfangshi: 'Call method',
daas_data_server_drawer_fuwufangwen: 'Service access',
daas_data_server_drawer_shuchujieguo: 'Output result',
daas_data_server_drawer_fuwufangwen: 'Service Access',
daas_data_server_drawer_shuchujieguo: 'Output Result',
daas_data_server_drawer_pailietiaojian: 'Order condition',
daas_data_server_drawer_shaixuantiaojian: 'Filter condition ',
daas_data_server_drawer_canshuzhi: 'parameter value',
daas_data_server_drawer_canshumingcheng: 'parameter name',
daas_data_server_drawer_shurucanshu: 'input parameter',
daas_data_server_drawer_lianjiemingcheng: 'connection name',
daas_data_server_drawer_jiekouleixing: 'interface type',
daas_data_server_drawer_fabujiedian: 'publishing node',
daas_data_server_drawer_caozuoleixing: 'operation type',
daas_data_server_drawer_canshumingcheng: 'Parameter Name',
daas_data_server_drawer_shurucanshu: 'Input Parameter',
daas_data_server_drawer_lianjiemingcheng: 'Connection Name',
daas_data_server_drawer_jiekouleixing: 'Interface Type',
daas_data_server_drawer_fabujiedian: 'Publishing Node',
daas_data_server_drawer_caozuoleixing: 'Operation Type',
daas_data_server_drawer_zanwumiaoshu: 'no description yet',
daas_data_server_drawer_tiaoshi: 'Debug',
daas_data_server_drawer_peizhi: 'Configuration',
Expand Down Expand Up @@ -2053,5 +2057,16 @@ export default {
daas_data_discovery_previewdrawer_shuchujiedian: 'Output node',
daas_router_routes_guanlianrenwuxiang: 'Associated task details',
daas_data_server_drawer_geshicuowu: 'Format error',

daas_data_server_drawer_validate:
'Only alphanumeric letters and underscores are allowed and must start with a letter.',
daas_data_server_drawer_aPI_path_Settings: 'API Path Settings',
daas_data_server_drawer_default_path: 'Default Path',
daas_data_server_drawer_custom_path: 'Custom Path',
daas_data_server_drawer_prefix: 'Prefix',
daas_data_server_drawer_base_path: 'Base Path',
daas_data_server_drawer_path: 'Path',
daas_data_server_drawer_confirm_tip: 'This will re-generate the API path, do you wish to continue?',

daas_notification_center_yonghucaozuo: 'User action'
}
15 changes: 14 additions & 1 deletion apps/daas/src/i18n/langs/zh-CN.js
Original file line number Diff line number Diff line change
Expand Up @@ -381,6 +381,7 @@ export default {
apiaudit_name: 'API名称',
apiaudit_access_type: '访问类型',
apiaudit_visitor: '访问人员',
apiaudit_ip: '访问人员IP',
apiaudit_interview_time: '访问时间',
apiaudit_visit_result: '访问结果',
apiaudit_reason_fail: '失败原因',
Expand Down Expand Up @@ -499,6 +500,7 @@ export default {
share_list_status: '状态',
share_list_time: '挖掘延迟',
share_list_edit_title: '挖掘编辑',
share_list_edit_title_start_time: '挖掘开始时间',
share_detail_title: '挖掘表详情',
share_form_setting_table_name: '存储MongoDB表名',
share_form_setting_log_time: '日志保存时长',
Expand Down Expand Up @@ -1058,7 +1060,7 @@ export default {
datadiscovery_catalogue_ziyuanbangding: '资源绑定',
datadiscovery_catalogue_lianjieduixiangming: '连接对象名',
datadiscovery_catalogue_ziyuanleixing: '资源类型',
datadiscovery_objectlist_duixiangminglaiyuan: '对象名称/来源信息',
datadiscovery_objectlist_duixiangminglaiyuan: '对象名称/数据源',
datadiscovery_objectlist_laiyuanfenlei: '来源分类',
datadiscovery_previewdrawer_shujuxiang: '数据项',
datadiscovery_previewdrawer_yewumingcheng: '业务名称',
Expand Down Expand Up @@ -1944,6 +1946,7 @@ export default {
daas_data_server_drawer_qingxuanzeduixiang: '请选择对象名称',
daas_data_server_drawer_qingxuanzelianjie: '请选择连接类型',
daas_data_server_drawer_qingshurufuwu: '请输入服务名称',
daas_data_server_drawer_selectPermissions: '请选择权限范围',
daas_data_server_drawer_shilidaima: '示例代码',
daas_data_server_drawer_shilidaima2: '示例代码',
daas_data_server_drawer_fanhuijieguo: '返回结果',
Expand All @@ -1956,6 +1959,7 @@ export default {
daas_data_server_drawer_canshumingcheng: '参数名称',
daas_data_server_drawer_shurucanshu: '输入参数',
daas_data_server_drawer_lianjiemingcheng: '连接名称',
daas_data_server_drawer_quanxianfanwei: '权限范围',
daas_data_server_drawer_jiekouleixing: '接口类型',
daas_data_server_drawer_fabujiedian: '发布节点',
daas_data_server_drawer_caozuoleixing: '操作类型',
Expand Down Expand Up @@ -2003,6 +2007,15 @@ export default {
daas_data_server_drawer_geshicuowu: '格式错误',
daas_notification_center_yonghucaozuo: '用户操作',

daas_data_server_drawer_validate: '只能包含中文、字母、数字、下划线和美元符号,并且数字不能开头',
daas_data_server_drawer_aPI_path_Settings: '访问路径设置',
daas_data_server_drawer_default_path: '默认访问路径',
daas_data_server_drawer_custom_path: '自定义访问路径',
daas_data_server_drawer_prefix: '前缀',
daas_data_server_drawer_base_path: '基础路径',
daas_data_server_drawer_path: '访问路径',
daas_data_server_drawer_confirm_tip: '重新生成会导致原API访问路径发生改变,是否确认重新生成?',

// 覆盖连接编辑、创建处的国际化文案
packages_business_connection_form_source_and_target_tip: `此数据连接在 ${process.env.VUE_APP_PAGE_TITLE} 中能同时作为源和目标使用`,
packages_business_connection_form_source_tip: `此数据连接在 ${process.env.VUE_APP_PAGE_TITLE} 中只能作为源使用,不能作用为目标`,
Expand Down
16 changes: 15 additions & 1 deletion apps/daas/src/i18n/langs/zh-TW.js
Original file line number Diff line number Diff line change
Expand Up @@ -380,6 +380,7 @@ export default {
apiaudit_name: 'API名稱',
apiaudit_access_type: '訪問類型',
apiaudit_visitor: '訪問人員',
apiaudit_ip: '訪問人員IP',
apiaudit_interview_time: '訪問時間',
apiaudit_visit_result: '訪問結果',
apiaudit_reason_fail: '失敗原因',
Expand Down Expand Up @@ -497,6 +498,7 @@ export default {
share_list_setting: '挖掘設置',
share_list_status: '狀態',
share_list_edit_title: '挖掘编辑',
share_list_edit_title_start_time: '挖掘開始時間',
share_form_setting_table_name: '存儲MongoDB表名',
share_form_setting_log_time: '日誌保存時長',
share_form_edit_name: '挖掘名稱',
Expand Down Expand Up @@ -1048,7 +1050,7 @@ export default {
datadiscovery_catalogue_ziyuanbangding: '資源綁定',
datadiscovery_catalogue_lianjieduixiangming: '連接對象名',
datadiscovery_catalogue_ziyuanleixing: '資源類型',
datadiscovery_objectlist_duixiangminglaiyuan: '對象名稱/來源信息',
datadiscovery_objectlist_duixiangminglaiyuan: '對象名稱/數據源',
datadiscovery_objectlist_laiyuanfenlei: '來源分類',
datadiscovery_previewdrawer_shujuxiang: '數據項',
datadiscovery_previewdrawer_yewumingcheng: '業務名稱',
Expand Down Expand Up @@ -1941,6 +1943,8 @@ export default {
daas_data_server_drawer_qingxuanzeduixiang: '請選擇對象名稱',
daas_data_server_drawer_qingxuanzelianjie: '請選擇連接類型',
daas_data_server_drawer_qingshurufuwu: '請輸入服務名稱',
daas_data_server_drawer_quanxianfanwei: '權限範圍',
daas_data_server_drawer_selectPermissions: '請選擇權限範圍',
daas_data_server_drawer_shilidaima: '示例代碼',
daas_data_server_drawer_shilidaima2: '示例代碼',
daas_data_server_drawer_fanhuijieguo: '返回結果',
Expand Down Expand Up @@ -1998,5 +2002,15 @@ export default {
daas_data_discovery_previewdrawer_shuchujiedian: '输出节点',
daas_router_routes_guanlianrenwuxiang: '關聯任務詳情',
daas_data_server_drawer_geshicuowu: '格式錯誤',

daas_data_server_drawer_validate: '只能包含中文、字母、數字、下劃線和美元符號,並且數字不能開頭',
daas_data_server_drawer_aPI_path_Settings: '訪問路徑設置',
daas_data_server_drawer_default_path: '默認訪問路徑',
daas_data_server_drawer_custom_path: '自定義訪問路徑',
daas_data_server_drawer_prefix: '前綴',
daas_data_server_drawer_base_path: '基礎路徑',
daas_data_server_drawer_path: '訪問路徑',
daas_data_server_drawer_confirm_tip: '重新生成會導致原API訪問路徑發生改變,是否確認重新生成? ',

daas_notification_center_yonghucaozuo: '用戶操作'
}
3 changes: 3 additions & 0 deletions apps/daas/src/router/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ export default i18n => {
} else {
next()
}
} else if (from.name === 'login') {
//from为login 上一次重定向无权限跳转到 控制台
next('/')
} else {
Message.error({
message: i18n.t('app_signIn_permission_denied')
Expand Down
Loading