Browse Source

[Style][UI] Format code. (#10314)

3.1.0-release
songjianet 3 years ago committed by GitHub
parent
commit
8584aad490
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      dolphinscheduler-ui/src/locales/en_US/crontab.ts
  2. 2
      dolphinscheduler-ui/src/locales/en_US/data-quality.ts
  3. 2
      dolphinscheduler-ui/src/locales/en_US/datasource.ts
  4. 2
      dolphinscheduler-ui/src/locales/en_US/home.ts
  5. 2
      dolphinscheduler-ui/src/locales/en_US/login.ts
  6. 2
      dolphinscheduler-ui/src/locales/en_US/menu.ts
  7. 2
      dolphinscheduler-ui/src/locales/en_US/modal.ts
  8. 2
      dolphinscheduler-ui/src/locales/en_US/monitor.ts
  9. 2
      dolphinscheduler-ui/src/locales/en_US/password.ts
  10. 2
      dolphinscheduler-ui/src/locales/en_US/profile.ts
  11. 8
      dolphinscheduler-ui/src/locales/en_US/project.ts
  12. 2
      dolphinscheduler-ui/src/locales/en_US/resource.ts
  13. 2
      dolphinscheduler-ui/src/locales/en_US/security.ts
  14. 2
      dolphinscheduler-ui/src/locales/en_US/theme.ts
  15. 2
      dolphinscheduler-ui/src/locales/en_US/user-dropdown.ts
  16. 2
      dolphinscheduler-ui/src/locales/zh_CN/crontab.ts
  17. 2
      dolphinscheduler-ui/src/locales/zh_CN/data-quality.ts
  18. 2
      dolphinscheduler-ui/src/locales/zh_CN/datasource.ts
  19. 2
      dolphinscheduler-ui/src/locales/zh_CN/home.ts
  20. 2
      dolphinscheduler-ui/src/locales/zh_CN/login.ts
  21. 2
      dolphinscheduler-ui/src/locales/zh_CN/menu.ts
  22. 2
      dolphinscheduler-ui/src/locales/zh_CN/modal.ts
  23. 5
      dolphinscheduler-ui/src/locales/zh_CN/monitor.ts
  24. 2
      dolphinscheduler-ui/src/locales/zh_CN/password.ts
  25. 2
      dolphinscheduler-ui/src/locales/zh_CN/profile.ts
  26. 5
      dolphinscheduler-ui/src/locales/zh_CN/project.ts
  27. 2
      dolphinscheduler-ui/src/locales/zh_CN/resource.ts
  28. 2
      dolphinscheduler-ui/src/locales/zh_CN/security.ts
  29. 2
      dolphinscheduler-ui/src/locales/zh_CN/theme.ts
  30. 2
      dolphinscheduler-ui/src/locales/zh_CN/user-dropdown.ts
  31. 4
      dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-http.ts
  32. 108
      dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-jupyter.ts
  33. 108
      dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-openmldb.ts
  34. 2
      dolphinscheduler-ui/src/views/resource/task-group/option/components/form-modal.tsx

2
dolphinscheduler-ui/src/locales/en_US/crontab.ts

@ -75,4 +75,4 @@ export default {
specific_year_tip: 'Please enter a year', specific_year_tip: 'Please enter a year',
one_hour: 'hour', one_hour: 'hour',
one_day: 'day' one_day: 'day'
} }

2
dolphinscheduler-ui/src/locales/en_US/data-quality.ts

@ -109,4 +109,4 @@ export default {
SrcTableTotalRows: 'SrcTableTotalRows', SrcTableTotalRows: 'SrcTableTotalRows',
TargetTableTotalRows: 'TargetTableTotalRows' TargetTableTotalRows: 'TargetTableTotalRows'
} }
} }

2
dolphinscheduler-ui/src/locales/en_US/datasource.ts

@ -63,4 +63,4 @@ export default {
user_password: 'Password', user_password: 'Password',
user_password_tips: 'Please enter your password', user_password_tips: 'Please enter your password',
jdbc_format_tips: 'jdbc connection parameters is not a correct JSON format' jdbc_format_tips: 'jdbc connection parameters is not a correct JSON format'
} }

2
dolphinscheduler-ui/src/locales/en_US/home.ts

@ -39,4 +39,4 @@ export default {
dispatch: 'DISPATCH', dispatch: 'DISPATCH',
ready_block: 'READY_BLOCK', ready_block: 'READY_BLOCK',
block: 'BLOCK' block: 'BLOCK'
} }

2
dolphinscheduler-ui/src/locales/en_US/login.ts

@ -22,4 +22,4 @@ export default {
userPassword: 'Password', userPassword: 'Password',
userPassword_tips: 'Please enter your password', userPassword_tips: 'Please enter your password',
login: 'Login' login: 'Login'
} }

2
dolphinscheduler-ui/src/locales/en_US/menu.ts

@ -56,4 +56,4 @@ export default {
data_quality: 'Data Quality', data_quality: 'Data Quality',
task_result: 'Task Result', task_result: 'Task Result',
rule: 'Rule management' rule: 'Rule management'
} }

2
dolphinscheduler-ui/src/locales/en_US/modal.ts

@ -18,4 +18,4 @@
export default { export default {
cancel: 'Cancel', cancel: 'Cancel',
confirm: 'Confirm' confirm: 'Confirm'
} }

2
dolphinscheduler-ui/src/locales/en_US/monitor.ts

@ -71,4 +71,4 @@ export default {
delete: 'Delete', delete: 'Delete',
read: 'Read' read: 'Read'
} }
} }

2
dolphinscheduler-ui/src/locales/en_US/password.ts

@ -24,4 +24,4 @@ export default {
two_password_entries_are_inconsistent: two_password_entries_are_inconsistent:
'Two password entries are inconsistent', 'Two password entries are inconsistent',
submit: 'Submit' submit: 'Submit'
} }

2
dolphinscheduler-ui/src/locales/en_US/profile.ts

@ -37,4 +37,4 @@ export default {
disable: 'Disable', disable: 'Disable',
timezone_success: 'Time zone updated successful', timezone_success: 'Time zone updated successful',
please_select_timezone: 'Choose timeZone' please_select_timezone: 'Choose timeZone'
} }

8
dolphinscheduler-ui/src/locales/en_US/project.ts

@ -686,8 +686,10 @@ export default {
please_select_source_datasource_id: 'Please select source datasource id', please_select_source_datasource_id: 'Please select source datasource id',
please_enter_source_table_name: 'Please select source table name', please_enter_source_table_name: 'Please select source table name',
please_enter_filter_expression: 'Please enter filter expression', please_enter_filter_expression: 'Please enter filter expression',
please_enter_column_only_single_column_is_supported: 'Please select column, only single column is supported', please_enter_column_only_single_column_is_supported:
please_enter_threshold_number_is_needed: 'Please enter threshold number is needed', 'Please select column, only single column is supported',
please_enter_threshold_number_is_needed:
'Please enter threshold number is needed',
please_enter_comparison_title: 'please select comparison title' please_enter_comparison_title: 'please select comparison title'
} }
} }

2
dolphinscheduler-ui/src/locales/en_US/resource.ts

@ -167,4 +167,4 @@ export default {
update_time: 'Update time', update_time: 'Update time',
edit_priority: 'Edit the task priority' edit_priority: 'Edit the task priority'
} }
} }

2
dolphinscheduler-ui/src/locales/en_US/security.ts

@ -262,4 +262,4 @@ export default {
delete: 'Delete', delete: 'Delete',
delete_confirm: 'Delete?' delete_confirm: 'Delete?'
} }
} }

2
dolphinscheduler-ui/src/locales/en_US/theme.ts

@ -18,4 +18,4 @@
export default { export default {
light: 'Light', light: 'Light',
dark: 'Dark' dark: 'Dark'
} }

2
dolphinscheduler-ui/src/locales/en_US/user-dropdown.ts

@ -19,4 +19,4 @@ export default {
profile: 'Profile', profile: 'Profile',
password: 'Password', password: 'Password',
logout: 'Logout' logout: 'Logout'
} }

2
dolphinscheduler-ui/src/locales/zh_CN/crontab.ts

@ -74,4 +74,4 @@ export default {
specific_year_tip: '请选择具体年数', specific_year_tip: '请选择具体年数',
one_hour: '小时', one_hour: '小时',
one_day: '日' one_day: '日'
} }

2
dolphinscheduler-ui/src/locales/zh_CN/data-quality.ts

@ -108,4 +108,4 @@ export default {
SrcTableTotalRows: '源表总行数', SrcTableTotalRows: '源表总行数',
TargetTableTotalRows: '目标表总行数' TargetTableTotalRows: '目标表总行数'
} }
} }

2
dolphinscheduler-ui/src/locales/zh_CN/datasource.ts

@ -60,4 +60,4 @@ export default {
user_password: '密码', user_password: '密码',
user_password_tips: '请输入密码', user_password_tips: '请输入密码',
jdbc_format_tips: 'jdbc连接参数不是一个正确的JSON格式' jdbc_format_tips: 'jdbc连接参数不是一个正确的JSON格式'
} }

2
dolphinscheduler-ui/src/locales/zh_CN/home.ts

@ -39,4 +39,4 @@ export default {
dispatch: '派发', dispatch: '派发',
ready_block: '准备阻断', ready_block: '准备阻断',
block: '阻断' block: '阻断'
} }

2
dolphinscheduler-ui/src/locales/zh_CN/login.ts

@ -22,4 +22,4 @@ export default {
userPassword: '密码', userPassword: '密码',
userPassword_tips: '请输入密码', userPassword_tips: '请输入密码',
login: '登录' login: '登录'
} }

2
dolphinscheduler-ui/src/locales/zh_CN/menu.ts

@ -56,4 +56,4 @@ export default {
data_quality: '数据质量', data_quality: '数据质量',
task_result: '任务结果', task_result: '任务结果',
rule: '规则管理' rule: '规则管理'
} }

2
dolphinscheduler-ui/src/locales/zh_CN/modal.ts

@ -18,4 +18,4 @@
export default { export default {
cancel: '取消', cancel: '取消',
confirm: '确定' confirm: '确定'
} }

5
dolphinscheduler-ui/src/locales/zh_CN/monitor.ts

@ -48,8 +48,7 @@ export default {
threads_connections: '当前连接数', threads_connections: '当前连接数',
threads_running_connections: '数据库当前活跃连接数', threads_running_connections: '数据库当前活跃连接数',
db_no_data_result_title: 'DB节点不存在', db_no_data_result_title: 'DB节点不存在',
db_no_data_result_desc: db_no_data_result_desc: '目前没有任何DB节点,请先创建DB节点,再访问该页面'
'目前没有任何DB节点,请先创建DB节点,再访问该页面'
}, },
statistics: { statistics: {
command_number_of_waiting_for_running: '待执行的命令数', command_number_of_waiting_for_running: '待执行的命令数',
@ -70,4 +69,4 @@ export default {
delete: '删除', delete: '删除',
read: '读取' read: '读取'
} }
} }

2
dolphinscheduler-ui/src/locales/zh_CN/password.ts

@ -23,4 +23,4 @@ export default {
confirm_password_tips: '请输入确认密码', confirm_password_tips: '请输入确认密码',
two_password_entries_are_inconsistent: '两次密码输入不一致', two_password_entries_are_inconsistent: '两次密码输入不一致',
submit: '提交' submit: '提交'
} }

2
dolphinscheduler-ui/src/locales/zh_CN/profile.ts

@ -37,4 +37,4 @@ export default {
disable: '禁用', disable: '禁用',
timezone_success: '时区更新成功', timezone_success: '时区更新成功',
please_select_timezone: '请选择时区' please_select_timezone: '请选择时区'
} }

5
dolphinscheduler-ui/src/locales/zh_CN/project.ts

@ -600,8 +600,7 @@ export default {
zeppelin_paragraph_id: 'zeppelin_paragraph_id', zeppelin_paragraph_id: 'zeppelin_paragraph_id',
zeppelin_paragraph_id_tips: '请输入zeppelin paragraph id', zeppelin_paragraph_id_tips: '请输入zeppelin paragraph id',
zeppelin_parameters: 'parameters', zeppelin_parameters: 'parameters',
zeppelin_parameters_tips: zeppelin_parameters_tips: '请输入zeppelin dynamic form参数',
'请输入zeppelin dynamic form参数',
jupyter_conda_env_name: 'condaEnvName', jupyter_conda_env_name: 'condaEnvName',
jupyter_conda_env_name_tips: '请输入papermill所在的conda环境名', jupyter_conda_env_name_tips: '请输入papermill所在的conda环境名',
jupyter_input_note_path: 'inputNotePath', jupyter_input_note_path: 'inputNotePath',
@ -677,4 +676,4 @@ export default {
please_enter_threshold_number_is_needed: '请输入阈值', please_enter_threshold_number_is_needed: '请输入阈值',
please_enter_comparison_title: '请选择期望值类型' please_enter_comparison_title: '请选择期望值类型'
} }
} }

2
dolphinscheduler-ui/src/locales/zh_CN/resource.ts

@ -165,4 +165,4 @@ export default {
update_time: '更新时间', update_time: '更新时间',
edit_priority: '修改优先级' edit_priority: '修改优先级'
} }
} }

2
dolphinscheduler-ui/src/locales/zh_CN/security.ts

@ -262,4 +262,4 @@ export default {
delete: '删除', delete: '删除',
delete_confirm: '确定删除吗?' delete_confirm: '确定删除吗?'
} }
} }

2
dolphinscheduler-ui/src/locales/zh_CN/theme.ts

@ -18,4 +18,4 @@
export default { export default {
light: '浅色', light: '浅色',
dark: '深色' dark: '深色'
} }

2
dolphinscheduler-ui/src/locales/zh_CN/user-dropdown.ts

@ -19,4 +19,4 @@ export default {
profile: '用户信息', profile: '用户信息',
password: '密码管理', password: '密码管理',
logout: '退出登录' logout: '退出登录'
} }

4
dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-http.ts

@ -55,9 +55,7 @@ export function useHttp(model: { [field: string]: any }): IJsonItem[] {
if (!value) { if (!value) {
return new Error(t('project.node.http_url_tips')) return new Error(t('project.node.http_url_tips'))
} }
if ( if (value.search(new RegExp(/http[s]{0,1}:\/\/\S*/, 'i'))) {
value.search(new RegExp(/http[s]{0,1}:\/\/\S*/, 'i'))
) {
return new Error(t('project.node.http_url_validator')) return new Error(t('project.node.http_url_validator'))
} }
} }

108
dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-jupyter.ts

@ -80,15 +80,15 @@ export function useJupyter(model: { [field: string]: any }): IJsonItem[] {
props: { props: {
placeholder: t('project.node.jupyter_parameters_tips') placeholder: t('project.node.jupyter_parameters_tips')
} }
// validate: { // validate: {
// trigger: ['input', 'blur'], // trigger: ['input', 'blur'],
// required: false, // required: false,
// validator(validate: any, value: string) { // validator(validate: any, value: string) {
// if (!value) { // if (!value) {
// return new Error(t('project.node.jupyter_parameters_tips')) // return new Error(t('project.node.jupyter_parameters_tips'))
// } // }
// } // }
// } // }
}, },
{ {
type: 'input', type: 'input',
@ -97,15 +97,15 @@ export function useJupyter(model: { [field: string]: any }): IJsonItem[] {
props: { props: {
placeholder: t('project.node.jupyter_kernel_tips') placeholder: t('project.node.jupyter_kernel_tips')
} }
// validate: { // validate: {
// trigger: ['input', 'blur'], // trigger: ['input', 'blur'],
// required: false, // required: false,
// validator(validate: any, value: string) { // validator(validate: any, value: string) {
// if (!value) { // if (!value) {
// return new Error(t('project.node.jupyter_kernel_tips')) // return new Error(t('project.node.jupyter_kernel_tips'))
// } // }
// } // }
// } // }
}, },
{ {
type: 'input', type: 'input',
@ -114,15 +114,15 @@ export function useJupyter(model: { [field: string]: any }): IJsonItem[] {
props: { props: {
placeholder: t('project.node.jupyter_engine_tips') placeholder: t('project.node.jupyter_engine_tips')
} }
// validate: { // validate: {
// trigger: ['input', 'blur'], // trigger: ['input', 'blur'],
// required: false, // required: false,
// validator(validate: any, value: string) { // validator(validate: any, value: string) {
// if (!value) { // if (!value) {
// return new Error(t('project.node.jupyter_engine_tips')) // return new Error(t('project.node.jupyter_engine_tips'))
// } // }
// } // }
// } // }
}, },
{ {
type: 'input', type: 'input',
@ -131,15 +131,15 @@ export function useJupyter(model: { [field: string]: any }): IJsonItem[] {
props: { props: {
placeholder: t('project.node.jupyter_execution_timeout_tips') placeholder: t('project.node.jupyter_execution_timeout_tips')
} }
// validate: { // validate: {
// trigger: ['input', 'blur'], // trigger: ['input', 'blur'],
// required: false, // required: false,
// validator(validate: any, value: string) { // validator(validate: any, value: string) {
// if (!value) { // if (!value) {
// return new Error(t('project.node.jupyter_execution_timeout_tips')) // return new Error(t('project.node.jupyter_execution_timeout_tips'))
// } // }
// } // }
// } // }
}, },
{ {
type: 'input', type: 'input',
@ -148,15 +148,15 @@ export function useJupyter(model: { [field: string]: any }): IJsonItem[] {
props: { props: {
placeholder: t('project.node.zeppelin_note_id_tips') placeholder: t('project.node.zeppelin_note_id_tips')
} }
// validate: { // validate: {
// trigger: ['input', 'blur'], // trigger: ['input', 'blur'],
// required: false, // required: false,
// validator(validate: any, value: string) { // validator(validate: any, value: string) {
// if (!value) { // if (!value) {
// return new Error(t('project.node.jupyter_start_timeout_tips')) // return new Error(t('project.node.jupyter_start_timeout_tips'))
// } // }
// } // }
// } // }
}, },
{ {
type: 'input', type: 'input',
@ -165,15 +165,15 @@ export function useJupyter(model: { [field: string]: any }): IJsonItem[] {
props: { props: {
placeholder: t('project.node.jupyter_others_tips') placeholder: t('project.node.jupyter_others_tips')
} }
// validate: { // validate: {
// trigger: ['input', 'blur'], // trigger: ['input', 'blur'],
// required: false, // required: false,
// validator(validate: any, value: string) { // validator(validate: any, value: string) {
// if (!value) { // if (!value) {
// return new Error(t('project.node.jupyter_others_tips')) // return new Error(t('project.node.jupyter_others_tips'))
// } // }
// } // }
// } // }
}, },
...useCustomParams({ model, field: 'localParams', isSimple: false }) ...useCustomParams({ model, field: 'localParams', isSimple: false })
] ]

108
dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-openmldb.ts

@ -30,58 +30,58 @@ export function useOpenmldb(model: { [field: string]: any }): IJsonItem[] {
value: 'online' value: 'online'
} }
] ]
return [ return [
{ {
type: 'input', type: 'input',
field: 'zk', field: 'zk',
name: t('project.node.openmldb_zk_address'), name: t('project.node.openmldb_zk_address'),
props: { props: {
placeholder: t('project.node.openmldb_zk_address_tips') placeholder: t('project.node.openmldb_zk_address_tips')
}, },
validate: { validate: {
trigger: ['input', 'blur'], trigger: ['input', 'blur'],
required: true, required: true,
validator(validate: any, value: string) { validator(validate: any, value: string) {
if (!value) { if (!value) {
return new Error(t('project.node.openmldb_zk_address_tips')) return new Error(t('project.node.openmldb_zk_address_tips'))
} }
} }
} }
}, },
{ {
type: 'input', type: 'input',
field: 'zkPath', field: 'zkPath',
name: t('project.node.openmldb_zk_path'), name: t('project.node.openmldb_zk_path'),
props: { props: {
placeholder: t('project.node.openmldb_zk_path_tips') placeholder: t('project.node.openmldb_zk_path_tips')
}, },
validate: { validate: {
trigger: ['input', 'blur'], trigger: ['input', 'blur'],
required: true, required: true,
validator(validate: any, value: string) { validator(validate: any, value: string) {
if (!value) { if (!value) {
return new Error(t('project.node.openmldb_zk_path_tips')) return new Error(t('project.node.openmldb_zk_path_tips'))
} }
} }
} }
}, },
{ {
type: 'radio', type: 'radio',
field: 'executeMode', field: 'executeMode',
name: t('project.node.openmldb_execute_mode'), name: t('project.node.openmldb_execute_mode'),
options: options options: options
}, },
{ {
type: 'editor', type: 'editor',
field: 'sql', field: 'sql',
name: t('project.node.sql_statement'), name: t('project.node.sql_statement'),
validate: { validate: {
trigger: ['input', 'trigger'], trigger: ['input', 'trigger'],
required: true, required: true,
message: t('project.node.sql_empty_tips') message: t('project.node.sql_empty_tips')
} }
}, },
useResources(), useResources(),
...useCustomParams({ model, field: 'localParams', isSimple: false }) ...useCustomParams({ model, field: 'localParams', isSimple: false })
] ]
} }

2
dolphinscheduler-ui/src/views/resource/task-group/option/components/form-modal.tsx

@ -135,7 +135,7 @@ const FormModal = defineComponent({
> >
<NInputNumber <NInputNumber
v-model:value={this.formData.groupSize} v-model:value={this.formData.groupSize}
style={{width: '100%'}} style={{ width: '100%' }}
min={1} min={1}
placeholder={t( placeholder={t(
'resource.task_group_option.please_enter_resource_pool_size' 'resource.task_group_option.please_enter_resource_pool_size'

Loading…
Cancel
Save