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. 6
      dolphinscheduler-ui/src/locales/en_US/project.ts
  2. 3
      dolphinscheduler-ui/src/locales/zh_CN/monitor.ts
  3. 3
      dolphinscheduler-ui/src/locales/zh_CN/project.ts
  4. 4
      dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-http.ts
  5. 108
      dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-jupyter.ts
  6. 2
      dolphinscheduler-ui/src/views/resource/task-group/option/components/form-modal.tsx

6
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'
} }
} }

3
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: '待执行的命令数',

3
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',

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 })
] ]

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