From d62c98e3ddf83e928d3ff9cedd8a26b2bf6fb2c7 Mon Sep 17 00:00:00 2001 From: BoYiZhang Date: Tue, 30 Jun 2020 00:11:41 +0800 Subject: [PATCH 01/30] fix bug Delete invalid field: executorcores Modify verification prompt --- .../dag/_source/formModel/tasks/flink.vue | 33 ++++--------------- .../src/js/module/i18n/locale/en_US.js | 16 +++++---- .../src/js/module/i18n/locale/zh_CN.js | 14 ++++---- 3 files changed, 24 insertions(+), 39 deletions(-) diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/flink.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/flink.vue index 2e87721341..4e3aac82fe 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/flink.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/flink.vue @@ -86,7 +86,7 @@ :disabled="isDetails" type="input" v-model="jobManagerMemory" - :placeholder="$t('Please enter the number of Executor')" + :placeholder="$t('Please enter jobManager memory')" style="width: 200px;" autocomplete="off"> @@ -97,7 +97,7 @@ :disabled="isDetails" type="input" v-model="taskManagerMemory" - :placeholder="$t('Please enter the Executor memory')" + :placeholder="$t('Please enter the taskManager memory')" style="width: 186px;" autocomplete="off"> @@ -210,12 +210,10 @@ slot: 1, // Driver Number of memory taskManager: '2', - // Executor Number + // jobManager Memory jobManagerMemory: '1G', - // Executor Number of memory + // taskManager Memory taskManagerMemory: '2G', - // Executor Number of cores - executorCores: 2, // Command line argument mainArgs: '', // Other parameters @@ -290,22 +288,17 @@ } if (!this.jobManagerMemory) { - this.$message.warning(`${i18n.$t('Please enter the number of Executor')}`) + this.$message.warning(`${i18n.$t('Please enter jobManager memory')}`) return false } if (!Number.isInteger(parseInt(this.jobManagerMemory))) { - this.$message.warning(`${i18n.$t('The number of Executors should be a positive integer')}`) - return false - } - - if (!this.taskManagerMemory) { - this.$message.warning(`${i18n.$t('Please enter the Executor memory')}`) + this.$message.warning(`${i18n.$t('Memory should be a positive integer')}`) return false } if (!this.taskManagerMemory) { - this.$message.warning(`${i18n.$t('Please enter the Executor memory')}`) + this.$message.warning(`${i18n.$t('Please enter the taskManager memory')}`) return false } @@ -314,16 +307,6 @@ return false } - if (!this.executorCores) { - this.$message.warning(`${i18n.$t('Please enter ExecutorPlease enter Executor core number')}`) - return false - } - - if (!Number.isInteger(parseInt(this.executorCores))) { - this.$message.warning(`${i18n.$t('Core number should be positive integer')}`) - return false - } - // noRes if (this.noRes.length>0) { this.$message.warning(`${i18n.$t('Please delete all non-existent resources')}`) @@ -351,7 +334,6 @@ taskManager: this.taskManager, jobManagerMemory: this.jobManagerMemory, taskManagerMemory: this.taskManagerMemory, - executorCores: this.executorCores, mainArgs: this.mainArgs, others: this.others, programType: this.programType @@ -482,7 +464,6 @@ taskManager: this.taskManager, jobManagerMemory: this.jobManagerMemory, taskManagerMemory: this.taskManagerMemory, - executorCores: this.executorCores, mainArgs: this.mainArgs, others: this.others, programType: this.programType diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js index cec9859bb9..968eecb54a 100755 --- a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js +++ b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js @@ -98,7 +98,7 @@ export default { Script: 'Script', 'Please enter script(required)': 'Please enter script(required)', 'Deploy Mode': 'Deploy Mode', - 'Flink Version':'Flink Version', + 'Flink Version': 'Flink Version', 'Driver core number': 'Driver core number', 'Please enter driver core number': 'Please enter driver core number', 'Driver memory use': 'Driver memory use', @@ -113,6 +113,8 @@ export default { 'Memory should be a positive integer': 'Memory should be a positive integer', 'Please enter ExecutorPlease enter Executor core number': 'Please enter ExecutorPlease enter Executor core number', 'Core number should be positive integer': 'Core number should be positive integer', + 'Please enter jobManager memory': '请输入JobManager内存数', + 'Please enter the taskManager memory': '请输入TaskManager内存数', 'SQL Type': 'SQL Type', Title: 'Title', 'Please enter the title of email': 'Please enter the title of email', @@ -181,7 +183,7 @@ export default { Tenant: 'Tenant', Email: 'Email', Phone: 'Phone', - 'User Type':'User Type', + 'User Type': 'User Type', 'Please enter phone number': 'Please enter phone number', 'Please enter main class': 'Please enter main class', 'Please enter email': 'Please enter email', @@ -600,12 +602,12 @@ export default { 'Successful branch flow and failed branch flow are required': 'Successful branch flow and failed branch flow are required', 'Unauthorized or deleted resources': 'Unauthorized or deleted resources', 'Please delete all non-existent resources': 'Please delete all non-existent resources', - 'Enable': 'Enable', - 'Disable': 'Disable', + Enable: 'Enable', + Disable: 'Disable', 'Timeout Settings': 'Timeout Settings', - 'Connect Timeout':'Connect Timeout', - 'Socket Timeout':'Socket Timeout', + 'Connect Timeout': 'Connect Timeout', + 'Socket Timeout': 'Socket Timeout', 'Connect timeout be a positive integer': 'Connect timeout be a positive integer', 'Socket Timeout be a positive integer': 'Socket Timeout be a positive integer', - 'ms':'ms' + ms: 'ms' } diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js index 540452efe4..b854ed45f5 100755 --- a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js +++ b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js @@ -114,6 +114,8 @@ export default { 'Memory should be a positive integer': '内存数为数字', 'Please enter ExecutorPlease enter Executor core number': '请填写Executor内核数', 'Core number should be positive integer': '内核数为正整数', + 'Please enter jobManager memory': '请输入JobManager内存数', + 'Please enter the taskManager memory': '请输入TaskManager内存数', 'SQL Type': 'sql类型', Title: '主题', 'Please enter the title of email': '请输入邮件主题', @@ -184,7 +186,7 @@ export default { Tenant: '租户', Email: '邮件', Phone: '手机', - 'User Type':'用户类型', + 'User Type': '用户类型', 'Please enter phone number': '请输入手机', 'Please enter email': '请输入邮箱', 'Please enter the correct email format': '请输入正确的邮箱格式', @@ -600,12 +602,12 @@ export default { 'Successful branch flow and failed branch flow are required': '成功分支流转和失败分支流转必填', 'Unauthorized or deleted resources': '未授权或已删除资源', 'Please delete all non-existent resources': '请删除所有未授权或已删除资源', - 'Enable': '启用', - 'Disable': '停用', + Enable: '启用', + Disable: '停用', 'Timeout Settings': '超时设置', - 'Connect Timeout':'连接超时', - 'Socket Timeout':'Socket超时', + 'Connect Timeout': '连接超时', + 'Socket Timeout': 'Socket超时', 'Connect timeout be a positive integer': '连接超时必须为数字', 'Socket Timeout be a positive integer': 'Socket超时必须为数字', - 'ms':'毫秒' + ms: '毫秒' } From 2c059f98881c3e508398725b03b000c0c43d64c2 Mon Sep 17 00:00:00 2001 From: BoYiZhang Date: Tue, 30 Jun 2020 00:23:09 +0800 Subject: [PATCH 02/30] fix bug Delete invalid field: executorcores Modify verification prompt --- .../conf/home/pages/dag/_source/formModel/tasks/flink.vue | 4 ++-- dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js | 6 ++++-- dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js | 2 ++ 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/flink.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/flink.vue index 4e3aac82fe..d1488df6d0 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/flink.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/flink.vue @@ -110,7 +110,7 @@ :disabled="isDetails" type="input" v-model="slot" - :placeholder="$t('Please enter driver core number')" + :placeholder="$t('Please enter solt number')" style="width: 200px;" autocomplete="off"> @@ -122,7 +122,7 @@ :disabled="isDetails" type="input" v-model="taskManager" - :placeholder="$t('Please enter driver memory use')" + :placeholder="$t('Please enter taskManager number')" style="width: 186px;" autocomplete="off"> diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js index 968eecb54a..337c6ac6f9 100755 --- a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js +++ b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js @@ -113,8 +113,10 @@ export default { 'Memory should be a positive integer': 'Memory should be a positive integer', 'Please enter ExecutorPlease enter Executor core number': 'Please enter ExecutorPlease enter Executor core number', 'Core number should be positive integer': 'Core number should be positive integer', - 'Please enter jobManager memory': '请输入JobManager内存数', - 'Please enter the taskManager memory': '请输入TaskManager内存数', + 'Please enter jobManager memory': 'Please enter jobManager memory', + 'Please enter the taskManager memory': 'Please enter the taskManager memory', + 'Please enter solt number': 'Please enter solt number', + 'Please enter taskManager number': 'Please enter taskManager number', 'SQL Type': 'SQL Type', Title: 'Title', 'Please enter the title of email': 'Please enter the title of email', diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js index b854ed45f5..a1a2221ffc 100755 --- a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js +++ b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js @@ -116,6 +116,8 @@ export default { 'Core number should be positive integer': '内核数为正整数', 'Please enter jobManager memory': '请输入JobManager内存数', 'Please enter the taskManager memory': '请输入TaskManager内存数', + 'Please enter solt number': '请输入solt数量', + 'Please enter taskManager number': '请输入taskManager数量', 'SQL Type': 'sql类型', Title: '主题', 'Please enter the title of email': '请输入邮件主题', From bc98ab525f32e522b288763afaa482ac2a180d7d Mon Sep 17 00:00:00 2001 From: BoYiZhang Date: Tue, 30 Jun 2020 18:02:04 +0800 Subject: [PATCH 03/30] fix bug Delete invalid field: executorcores Modify verification prompt --- .../src/js/module/i18n/locale/en_US.js | 21 ++++++++++++------- .../src/js/module/i18n/locale/zh_CN.js | 21 ++++++++++++------- 2 files changed, 26 insertions(+), 16 deletions(-) diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js index 337c6ac6f9..3e0ed54eb2 100755 --- a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js +++ b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js @@ -98,7 +98,7 @@ export default { Script: 'Script', 'Please enter script(required)': 'Please enter script(required)', 'Deploy Mode': 'Deploy Mode', - 'Flink Version': 'Flink Version', + 'Flink Version':'Flink Version', 'Driver core number': 'Driver core number', 'Please enter driver core number': 'Please enter driver core number', 'Driver memory use': 'Driver memory use', @@ -185,7 +185,7 @@ export default { Tenant: 'Tenant', Email: 'Email', Phone: 'Phone', - 'User Type': 'User Type', + 'User Type':'User Type', 'Please enter phone number': 'Please enter phone number', 'Please enter main class': 'Please enter main class', 'Please enter email': 'Please enter email', @@ -432,9 +432,11 @@ export default { Running: 'Running', 'Waiting for dependency to complete': 'Waiting for dependency to complete', Selected: 'Selected', + CurrentHour: 'CurrentHour', Last1Hour: 'Last1Hour', Last2Hours: 'Last2Hours', Last3Hours: 'Last3Hours', + Last24Hours: 'Last24Hours', today: 'today', Last1Days: 'Last1Days', Last2Days: 'Last2Days', @@ -601,15 +603,18 @@ export default { 'Custom Job': 'Custom Job', 'Custom Script': 'Custom Script', 'Cannot select the same node for successful branch flow and failed branch flow': 'Cannot select the same node for successful branch flow and failed branch flow', - 'Successful branch flow and failed branch flow are required': 'Successful branch flow and failed branch flow are required', + 'Successful branch flow and failed branch flow are required': 'conditions node Successful and failed branch flow are required', 'Unauthorized or deleted resources': 'Unauthorized or deleted resources', 'Please delete all non-existent resources': 'Please delete all non-existent resources', - Enable: 'Enable', - Disable: 'Disable', + 'Enable': 'Enable', 'Timeout Settings': 'Timeout Settings', - 'Connect Timeout': 'Connect Timeout', - 'Socket Timeout': 'Socket Timeout', + 'Connect Timeout':'Connect Timeout', + 'Socket Timeout':'Socket Timeout', 'Connect timeout be a positive integer': 'Connect timeout be a positive integer', 'Socket Timeout be a positive integer': 'Socket Timeout be a positive integer', - ms: 'ms' + 'ms':'ms', + 'Disable': 'Disable', + 'The Worker group no longer exists, please select the correct Worker group!': 'The Worker group no longer exists, please select the correct Worker group!', + 'Please confirm whether the workflow has been saved before downloading': 'Please confirm whether the workflow has been saved before downloading', + 'User name length is between 3 and 39': 'User name length is between 3 and 39' } diff --git a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js index a1a2221ffc..a610d8b03c 100755 --- a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js +++ b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js @@ -173,7 +173,7 @@ export default { 'Project Name': '项目名称', 'Please enter name': '请输入名称', 'Owned Users': '所属用户', - 'Process Pid': '进程pid', + 'Process Pid': '进程Pid', 'Zk registration directory': 'zk注册目录', cpuUsage: 'cpuUsage', memoryUsage: 'memoryUsage', @@ -188,7 +188,7 @@ export default { Tenant: '租户', Email: '邮件', Phone: '手机', - 'User Type': '用户类型', + 'User Type':'用户类型', 'Please enter phone number': '请输入手机', 'Please enter email': '请输入邮箱', 'Please enter the correct email format': '请输入正确的邮箱格式', @@ -427,9 +427,11 @@ export default { Running: '正在运行', 'Waiting for dependency to complete': '等待依赖完成', Selected: '已选', + CurrentHour: '当前小时', Last1Hour: '前1小时', Last2Hours: '前2小时', Last3Hours: '前3小时', + Last24Hours: '前24小时', today: '今天', Last1Days: '昨天', Last2Days: '前两天', @@ -601,15 +603,18 @@ export default { 'Custom Job': '自定义任务', 'Custom Script': '自定义脚本', 'Cannot select the same node for successful branch flow and failed branch flow': '成功分支流转和失败分支流转不能选择同一个节点', - 'Successful branch flow and failed branch flow are required': '成功分支流转和失败分支流转必填', + 'Successful branch flow and failed branch flow are required': 'conditions节点成功和失败分支流转必填', 'Unauthorized or deleted resources': '未授权或已删除资源', 'Please delete all non-existent resources': '请删除所有未授权或已删除资源', - Enable: '启用', - Disable: '停用', + 'Enable': '启用', + 'Disable': '停用', + 'The Worker group no longer exists, please select the correct Worker group!': '该Worker分组已经不存在，请选择正确的Worker分组！', + 'Please confirm whether the workflow has been saved before downloading': '下载前请确定工作流是否已保存', + 'User name length is between 3 and 39': '用户名长度在3～39之间', 'Timeout Settings': '超时设置', - 'Connect Timeout': '连接超时', - 'Socket Timeout': 'Socket超时', + 'Connect Timeout':'连接超时', + 'Socket Timeout':'Socket超时', 'Connect timeout be a positive integer': '连接超时必须为数字', 'Socket Timeout be a positive integer': 'Socket超时必须为数字', - ms: '毫秒' + 'ms':'毫秒' } From 038beff923be127d7272c56d8999b3568ce9b89c Mon Sep 17 00:00:00 2001 From: BoYiZhang Date: Thu, 9 Jul 2020 14:28:07 +0800 Subject: [PATCH 04/30] dag add close button --- .../js/conf/home/pages/dag/_source/dag.vue | 24 +++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue index eb58da46f6..b5c1788d6d 100755 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue @@ -101,6 +101,17 @@ @click="_rtNodesDag" > {{$t('Return_1')}} + + {{$t('Close')}} + Date: Thu, 9 Jul 2020 14:34:21 +0800 Subject: [PATCH 05/30] reset last version --- .../js/conf/home/pages/dag/_source/dag.vue | 170 ++++++++---------- 1 file changed, 75 insertions(+), 95 deletions(-) diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue index b5c1788d6d..c6cc3a60c9 100755 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue @@ -1,19 +1,19 @@ /* - * 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. - */ +* 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. +*/