Browse Source

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

(cherry picked from commit 8584aad490)
3.0.0/version-upgrade
songjianet 3 years ago committed by devosend
parent
commit
30589121c4
  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. 6
      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. 57
      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. 180
      dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-jupyter.ts
  33. 87
      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',
one_hour: 'hour',
one_day: 'day'
}
}

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

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

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

@ -63,4 +63,4 @@ export default {
user_password: 'Password',
user_password_tips: 'Please enter your password',
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',
ready_block: 'READY_BLOCK',
block: 'BLOCK'
}
}

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

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

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

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

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

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

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

@ -71,4 +71,4 @@ export default {
delete: 'Delete',
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',
submit: 'Submit'
}
}

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

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

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

@ -614,8 +614,10 @@ export default {
please_select_source_datasource_id: 'Please select source datasource id',
please_enter_source_table_name: 'Please select source table name',
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_threshold_number_is_needed: 'Please enter threshold number is needed',
please_enter_column_only_single_column_is_supported:
'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'
}
}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -591,6 +591,63 @@ export default {
zeppelin_note_id_tips: '请输入zeppelin note id',
zeppelin_paragraph_id: 'zeppelin_paragraph_id',
zeppelin_paragraph_id_tips: '请输入zeppelin paragraph id',
zeppelin_parameters: 'parameters',
zeppelin_parameters_tips: '请输入zeppelin dynamic form参数',
jupyter_conda_env_name: 'condaEnvName',
jupyter_conda_env_name_tips: '请输入papermill所在的conda环境名',
jupyter_input_note_path: 'inputNotePath',
jupyter_input_note_path_tips: '请输入jupyter note的输入路径',
jupyter_output_note_path: 'outputNotePath',
jupyter_output_note_path_tips: '请输入jupyter note的输出路径',
jupyter_parameters: 'parameters',
jupyter_parameters_tips: '请输入jupyter parameterization参数',
jupyter_kernel: 'kernel',
jupyter_kernel_tips: '请输入jupyter kernel名',
jupyter_engine: 'engine',
jupyter_engine_tips: '请输入引擎名称',
jupyter_execution_timeout: 'executionTimeout',
jupyter_execution_timeout_tips: '请输入jupyter note cell的执行最长时间',
jupyter_start_timeout: 'startTimeout',
jupyter_start_timeout_tips: '请输入jupyter kernel的启动最长时间',
jupyter_others: 'others',
jupyter_others_tips: '请输入papermill的其他参数',
mlflow_algorithm: '算法',
mlflow_algorithm_tips: 'svm',
mlflow_params: '参数',
mlflow_params_tips: ' ',
mlflow_searchParams: '参数搜索空间',
mlflow_searchParams_tips: ' ',
mlflow_isSearchParams: '是否搜索参数',
mlflow_dataPath: '数据路径',
mlflow_dataPath_tips:
' 文件/文件夹的绝对路径, 若文件需以.csv结尾, 文件夹需包含train.csv和test.csv ',
mlflow_dataPath_error_tips: ' 数据路径不能为空 ',
mlflow_experimentName: '实验名称',
mlflow_experimentName_tips: 'experiment_001',
mlflow_registerModel: '注册模型',
mlflow_modelName: '注册的模型名称',
mlflow_modelName_tips: 'model_001',
mlflow_mlflowTrackingUri: 'mlflow server tracking uri',
mlflow_mlflowTrackingUri_tips: 'http://127.0.0.1:5000',
mlflow_mlflowTrackingUri_error_tips: ' mlflow server tracking uri 不能为空',
mlflow_jobType: '任务类型',
mlflow_automlTool: 'AutoML工具',
mlflow_taskType: 'MLflow 任务类型',
mlflow_deployType: '部署类型',
mlflow_deployModelKey: '部署的模型uri',
mlflow_deployPort: '监听端口',
mlflowProjectRepository: '运行仓库',
mlflowProjectRepository_tips: '可以为github仓库或worker上的路径',
mlflowProjectVersion: '项目版本',
mlflowProjectVersion_tips: '项目git版本',
openmldb_zk_address: 'zookeeper地址',
openmldb_zk_address_tips: '请输入zookeeper地址',
openmldb_zk_path: 'zookeeper路径',
openmldb_zk_path_tips: '请输入zookeeper路径',
openmldb_execute_mode: '执行模式',
openmldb_execute_mode_tips: '请选择执行模式',
openmldb_execute_mode_offline: '离线',
openmldb_execute_mode_online: '在线',
send_email: '发送邮件',
log_display: '日志显示',
rows_of_result: '行查询结果',

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

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

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

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

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

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

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

@ -19,4 +19,4 @@ export default {
profile: '用户信息',
password: '密码管理',
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) {
return new Error(t('project.node.http_url_tips'))
}
if (
value.search(new RegExp(/http[s]{0,1}:\/\/\S*/, 'i'))
) {
if (value.search(new RegExp(/http[s]{0,1}:\/\/\S*/, 'i'))) {
return new Error(t('project.node.http_url_validator'))
}
}

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

@ -0,0 +1,180 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { useI18n } from 'vue-i18n'
import { useCustomParams } from '.'
import type { IJsonItem } from '../types'
export function useJupyter(model: { [field: string]: any }): IJsonItem[] {
const { t } = useI18n()
return [
{
type: 'input',
field: 'condaEnvName',
name: t('project.node.jupyter_conda_env_name'),
props: {
placeholder: t('project.node.jupyter_conda_env_name_tips')
},
validate: {
trigger: ['input', 'blur'],
required: true,
validator(validate: any, value: string) {
if (!value) {
return new Error(t('project.node.jupyter_conda_env_name_tips'))
}
}
}
},
{
type: 'input',
field: 'inputNotePath',
name: t('project.node.jupyter_input_note_path'),
props: {
placeholder: t('project.node.jupyter_input_note_path_tips')
},
validate: {
trigger: ['input', 'blur'],
required: true,
validator(validate: any, value: string) {
if (!value) {
return new Error(t('project.node.jupyter_input_note_path_tips'))
}
}
}
},
{
type: 'input',
field: 'outputNotePath',
name: t('project.node.jupyter_output_note_path'),
props: {
placeholder: t('project.node.jupyter_output_note_path_tips')
},
validate: {
trigger: ['input', 'blur'],
required: true,
validator(validate: any, value: string) {
if (!value) {
return new Error(t('project.node.jupyter_output_note_path_tips'))
}
}
}
},
{
type: 'input',
field: 'parameters',
name: t('project.node.jupyter_parameters'),
props: {
placeholder: t('project.node.jupyter_parameters_tips')
}
// validate: {
// trigger: ['input', 'blur'],
// required: false,
// validator(validate: any, value: string) {
// if (!value) {
// return new Error(t('project.node.jupyter_parameters_tips'))
// }
// }
// }
},
{
type: 'input',
field: 'kernel',
name: t('project.node.jupyter_kernel'),
props: {
placeholder: t('project.node.jupyter_kernel_tips')
}
// validate: {
// trigger: ['input', 'blur'],
// required: false,
// validator(validate: any, value: string) {
// if (!value) {
// return new Error(t('project.node.jupyter_kernel_tips'))
// }
// }
// }
},
{
type: 'input',
field: 'engine',
name: t('project.node.jupyter_engine'),
props: {
placeholder: t('project.node.jupyter_engine_tips')
}
// validate: {
// trigger: ['input', 'blur'],
// required: false,
// validator(validate: any, value: string) {
// if (!value) {
// return new Error(t('project.node.jupyter_engine_tips'))
// }
// }
// }
},
{
type: 'input',
field: 'executionTimeout',
name: t('project.node.jupyter_execution_timeout'),
props: {
placeholder: t('project.node.jupyter_execution_timeout_tips')
}
// validate: {
// trigger: ['input', 'blur'],
// required: false,
// validator(validate: any, value: string) {
// if (!value) {
// return new Error(t('project.node.jupyter_execution_timeout_tips'))
// }
// }
// }
},
{
type: 'input',
field: 'startTimeout',
name: t('project.node.jupyter_start_timeout'),
props: {
placeholder: t('project.node.zeppelin_note_id_tips')
}
// validate: {
// trigger: ['input', 'blur'],
// required: false,
// validator(validate: any, value: string) {
// if (!value) {
// return new Error(t('project.node.jupyter_start_timeout_tips'))
// }
// }
// }
},
{
type: 'input',
field: 'others',
name: t('project.node.jupyter_others'),
props: {
placeholder: t('project.node.jupyter_others_tips')
}
// validate: {
// trigger: ['input', 'blur'],
// required: false,
// validator(validate: any, value: string) {
// if (!value) {
// return new Error(t('project.node.jupyter_others_tips'))
// }
// }
// }
},
...useCustomParams({ model, field: 'localParams', isSimple: false })
]
}

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

@ -0,0 +1,87 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { useI18n } from 'vue-i18n'
import { useCustomParams, useResources } from '.'
import type { IJsonItem } from '../types'
export function useOpenmldb(model: { [field: string]: any }): IJsonItem[] {
const { t } = useI18n()
const options = [
{
label: t('project.node.openmldb_execute_mode_offline'),
value: 'offline'
},
{
label: t('project.node.openmldb_execute_mode_online'),
value: 'online'
}
]
return [
{
type: 'input',
field: 'zk',
name: t('project.node.openmldb_zk_address'),
props: {
placeholder: t('project.node.openmldb_zk_address_tips')
},
validate: {
trigger: ['input', 'blur'],
required: true,
validator(validate: any, value: string) {
if (!value) {
return new Error(t('project.node.openmldb_zk_address_tips'))
}
}
}
},
{
type: 'input',
field: 'zkPath',
name: t('project.node.openmldb_zk_path'),
props: {
placeholder: t('project.node.openmldb_zk_path_tips')
},
validate: {
trigger: ['input', 'blur'],
required: true,
validator(validate: any, value: string) {
if (!value) {
return new Error(t('project.node.openmldb_zk_path_tips'))
}
}
}
},
{
type: 'radio',
field: 'executeMode',
name: t('project.node.openmldb_execute_mode'),
options: options
},
{
type: 'editor',
field: 'sql',
name: t('project.node.sql_statement'),
validate: {
trigger: ['input', 'trigger'],
required: true,
message: t('project.node.sql_empty_tips')
}
},
useResources(),
...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
v-model:value={this.formData.groupSize}
style={{width: '100%'}}
style={{ width: '100%' }}
min={1}
placeholder={t(
'resource.task_group_option.please_enter_resource_pool_size'

Loading…
Cancel
Save