diff --git a/dolphinscheduler-ui/src/js/module/components/crontab/source/index.scss b/dolphinscheduler-ui/src/js/module/components/crontab/source/index.scss
index 6b215a1cf3..bd8346ba17 100755
--- a/dolphinscheduler-ui/src/js/module/components/crontab/source/index.scss
+++ b/dolphinscheduler-ui/src/js/module/components/crontab/source/index.scss
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-.v-crontab-from-model {
+.v-crontab-form-model {
.list-box {
//padding: 6px 0;
diff --git a/dolphinscheduler-ui/src/js/module/components/nav/nav.vue b/dolphinscheduler-ui/src/js/module/components/nav/nav.vue
index aff6b1b9ef..b72d259f05 100644
--- a/dolphinscheduler-ui/src/js/module/components/nav/nav.vue
+++ b/dolphinscheduler-ui/src/js/module/components/nav/nav.vue
@@ -139,28 +139,28 @@
+ width="auto">
+ width="auto">
+ width="auto">
+ width="auto">
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 13dbc7e068..46c51e8f33 100755
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
@@ -35,6 +35,7 @@ export default {
'Force success': 'Force success',
'Enter this child node': 'Enter this child node',
'Node name': 'Node name',
+ 'Please enter name (required)': 'Please enter name (required)',
'Run flag': 'Run flag',
Normal: 'Normal',
'Prohibition execution': 'Prohibition execution',
@@ -45,11 +46,11 @@ export default {
Minute: 'Minute',
'Delay execution time': 'Delay execution time',
'Delay execution': 'Delay execution',
+ 'Forced success': 'Forced success',
Cancel: 'Cancel',
'Confirm add': 'Confirm add',
'The newly created sub-Process has not yet been executed and cannot enter the sub-Process': 'The newly created sub-Process has not yet been executed and cannot enter the sub-Process',
'The task has not been executed and cannot enter the sub-Process': 'The task has not been executed and cannot enter the sub-Process',
- 'Please enter name (required)': 'Please enter name (required)',
'Name already exists': 'Name already exists',
'Download Log': 'Download Log',
'Refresh Log': 'Refresh Log',
@@ -87,8 +88,7 @@ export default {
'Main class': 'Main class',
'Main jar package': 'Main jar package',
'Please enter main jar package': 'Please enter main jar package',
- 'Main package': 'Main package',
- 'Please enter main package': 'Please enter main package',
+ 'Please enter main class': 'Please enter main class',
'Command-line parameters': 'Command-line parameters',
'Please enter Command-line parameters': 'Please enter Command-line parameters',
'Other parameters': 'Other parameters',
@@ -102,26 +102,24 @@ export default {
Script: 'Script',
'Please enter script(required)': 'Please enter script(required)',
'Deploy Mode': 'Deploy Mode',
- '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',
- 'Please enter driver memory use': 'Please enter driver memory use',
- 'Number of Executors': 'Number of Executors',
- 'Please enter the job name of Flink(optional)': 'Please enter the job name of Flink(optional)',
- 'Please enter the number of Executor': 'Please enter the number of Executor',
+ 'Driver cores': 'Driver cores',
+ 'Please enter Driver cores': 'Please enter Driver cores',
+ 'Driver memory': 'Driver memory',
+ 'Please enter Driver memory': 'Please enter Driver memory',
+ 'Executor Number': 'Executor Number',
+ 'Please enter Executor number': 'Please enter Executor number',
'Executor memory': 'Executor memory',
- 'Please enter the Executor memory': 'Please enter the Executor memory',
- 'Executor core number': 'Executor core number',
- 'Please enter Executor core number': 'Please enter Executor core number',
- 'The number of Executors should be a positive integer': 'The number of Executors should be a positive integer',
+ 'Please enter Executor memory': 'Please enter Executor memory',
+ 'Executor cores': 'Executor cores',
+ 'Please enter Executor cores': 'Please enter Executor cores',
+ 'The Executor Number should be a positive integer': 'The Executor Number should be a positive integer',
'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': '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',
+ 'Please enter JobManager memory': 'Please enter JobManager memory',
+ 'Please enter TaskManager memory': 'Please enter TaskManager memory',
+ 'Please enter Slot number': 'Please enter Slot number',
+ 'Please enter TaskManager number': 'Please enter TaskManager number',
+ 'Please enter app name(optional)': 'Please enter app name(optional)',
'SQL Type': 'SQL Type',
Title: 'Title',
'Please enter the title of email': 'Please enter the title of email',
@@ -193,14 +191,12 @@ export default {
'Please enter tenant code': 'Please enter tenant code',
'Please enter tenant Name': 'Please enter tenant Name',
'The tenant code. Only letters or a combination of letters and numbers are allowed': 'The tenant code. Only letters or a combination of letters and numbers are allowed',
- 'The tenant code cannot be all numbers': 'The tenant code cannot be all numbers',
'Edit User': 'Edit User',
Tenant: 'Tenant',
Email: 'Email',
Phone: 'Phone',
'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',
'Please enter the correct email format': 'Please enter the correct email format',
'Please enter the correct mobile phone format': 'Please enter the correct mobile phone format',
@@ -208,9 +204,8 @@ export default {
Authorize: 'Authorize',
'File resources': 'File resources',
'UDF resources': 'UDF resources',
- 'Please select UDF resources directory': 'Please select UDF resources directory',
'UDF resources directory': 'UDF resources directory',
- 'Upload File Size': 'Upload File size cannot exceed 1g',
+ 'Please select UDF resources directory': 'Please select UDF resources directory',
'Edit alarm group': 'Edit alarm group',
'Create alarm group': 'Create alarm group',
'Group Name': 'Group Name',
@@ -261,6 +256,7 @@ export default {
'File Format': 'File Format',
'Folder Format': 'Folder Format',
'File Content': 'File Content',
+ 'Upload File Size': 'Upload File size cannot exceed 1g',
Create: 'Create',
'Please enter the resource content': 'Please enter the resource content',
'Resource content cannot exceed 3000 lines': 'Resource content cannot exceed 3000 lines',
@@ -338,11 +334,6 @@ export default {
'Resume the suspension process': 'Resume the suspension process',
'Execute from the failed nodes': 'Execute from the failed nodes',
'Complement Data': 'Complement Data',
- slot: 'slot',
- taskManager: 'taskManager',
- appName: 'Flink job name',
- jobManagerMemory: 'jobManagerMemory',
- taskManagerMemory: 'taskManagerMemory',
'Scheduling execution': 'Scheduling execution',
'Recovery waiting thread': 'Recovery waiting thread',
'Submitted successfully': 'Submitted successfully',
@@ -359,7 +350,6 @@ export default {
Delete: 'Delete',
'Please enter keyword': 'Please enter keyword',
'File Upload': 'File Upload',
- 'File ReUpload': 'File ReUpload',
'Drag the file into the current upload window': 'Drag the file into the current upload window',
'Drag area upload': 'Drag area upload',
Upload: 'Upload',
@@ -445,7 +435,6 @@ export default {
'Timeout must be longer than check interval': 'Timeout must be longer than check interval',
'Timeout strategy must be selected': 'Timeout strategy must be selected',
'Timeout must be a positive integer': 'Timeout must be a positive integer',
- 'Forced success': 'Forced success',
'Add dependency': 'Add dependency',
and: 'and',
or: 'or',
@@ -546,6 +535,12 @@ export default {
'Next five execution times': 'Next five execution times',
'Execute time': 'Execute time',
'Complement range': 'Complement range',
+ 'Flink Version': 'Flink Version',
+ 'Slot Number': 'Slot Number',
+ 'TaskManager Number': 'TaskManager Number',
+ 'JobManager Memory': 'JobManager Memory',
+ 'TaskManager Memory': 'TaskManager Memory',
+ 'App Name': 'App Name',
'Http Url': 'Http Url',
'Http Method': 'Http Method',
'Http Parameters': 'Http Parameters',
@@ -629,6 +624,8 @@ export default {
'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': 'conditions node Successful and failed branch flow are required',
+ 'No resources exist': 'No resources exist',
+ 'Please delete all non-existing resources': 'Please delete all non-existing resources',
'Unauthorized or deleted resources': 'Unauthorized or deleted resources',
'Please delete all non-existent resources': 'Please delete all non-existent resources',
Kinship: 'Workflow relationship',
@@ -639,18 +636,16 @@ export default {
KinshipState10: 'Scheduling is not online',
'Dag label display control': 'Dag label display control',
Enable: 'Enable',
+ 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',
'Timeout Settings': 'Timeout Settings',
'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',
- Disable: 'Disable',
- 'No resources exist': 'No resources exist',
- 'Please delete all non-existing resources': 'Please delete all non-existing resources',
- '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',
'Please Enter Url': 'Please Enter Url eg. 127.0.0.1:7077',
Master: 'Master',
'Please select the waterdrop resources': 'Please select the waterdrop resources',
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 c45afda8a5..b4f146d35b 100755
--- a/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
+++ b/dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
@@ -45,6 +45,8 @@ export default {
'Failed retry interval': '失败重试间隔',
Minute: '分',
'Delay execution time': '延时执行时间',
+ 'Delay execution': '延时执行',
+ 'Forced success': '强制成功过',
Cancel: '取消',
'Confirm add': '确认添加',
'The newly created sub-Process has not yet been executed and cannot enter the sub-Process': '新创建子工作流还未执行，不能进入子工作流',
@@ -86,6 +88,7 @@ export default {
'Main class': '主函数的class',
'Main jar package': '主jar包',
'Please enter main jar package': '请选择主jar包',
+ 'Please enter main class': '请填写主函数的class',
'Command-line parameters': '命令行参数',
'Please enter Command-line parameters': '请输入命令行参数',
'Other parameters': '其他参数',
@@ -93,33 +96,30 @@ export default {
Resources: '资源',
'Custom Parameters': '自定义参数',
'Custom template': '自定义模版',
- 'Please enter main class': '请填写主函数的class',
Datasource: '数据源',
methods: '方法',
'Please enter method(optional)': '请输入方法(选填)',
Script: '脚本',
'Please enter script(required)': '请输入脚本(必填)',
'Deploy Mode': '部署方式',
- 'Flink Version': 'Flink版本',
- 'Driver core number': 'Driver内核数',
- 'Please enter driver core number': '请输入Driver内核数',
- 'Driver memory use': 'Driver内存数',
- 'Please enter driver memory use': '请输入Driver内存数',
- 'Number of Executors': 'Executor数量',
- 'Please enter the job name of Flink(optional)': '请输入Flink任务名称(选填)',
- 'Please enter the number of Executor': '请输入Executor数量',
+ 'Driver cores': 'Driver内核数',
+ 'Please enter Driver cores': '请输入Driver内核数',
+ 'Driver memory': 'Driver内存数',
+ 'Please enter Driver memory': '请输入Driver内存数',
+ 'Executor Number': 'Executor数量',
+ 'Please enter Executor number': '请输入Executor数量',
'Executor memory': 'Executor内存数',
- 'Please enter the Executor memory': '请输入Executor内存数',
- 'Executor core number': 'Executor内核数',
- 'Please enter Executor core number': '请输入Executor内核数',
- 'The number of Executors should be a positive integer': 'Executor数量为正整数',
+ 'Please enter Executor memory': '请输入Executor内存数',
+ 'Executor cores': 'Executor内核数',
+ 'Please enter Executor cores': '请输入Executor内核数',
+ 'The Executor Number should be a positive integer': 'Executor数量为正整数',
'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内存数',
- 'Please enter solt number': '请输入solt数量',
- 'Please enter taskManager number': '请输入taskManager数量',
+ 'Please enter JobManager memory': '请输入JobManager内存数',
+ 'Please enter TaskManager memory': '请输入TaskManager内存数',
+ 'Please enter Slot number': '请输入Slot数量',
+ 'Please enter TaskManager number': '请输入TaskManager数量',
+ 'Please enter app name(optional)': '请输入任务名称(选填)',
'SQL Type': 'sql类型',
Title: '主题',
'Please enter the title of email': '请输入邮件主题',
@@ -129,9 +129,6 @@ export default {
'SQL Parameter': 'sql参数',
'SQL Statement': 'sql语句',
'UDF Function': 'UDF函数',
- FILE: '文件',
- UDF: 'UDF',
- 'File Subdirectory': '文件子目录',
'Please enter a SQL Statement(required)': '请输入sql语句(必填)',
'Please enter a JSON Statement(required)': '请输入json语句(必填)',
'One form or attachment must be selected': '表格、附件必须勾选一个',
@@ -188,6 +185,7 @@ export default {
'Tenant Code': '租户编码',
'Tenant Name': '租户名称',
Queue: '队列',
+ 'Please select a queue': '默认为租户关联队列',
'Please enter the tenant code in English': '请输入租户编码只允许英文',
'Please enter tenant code in English': '请输入英文租户编码',
'Please enter tenant code': '请输入租户编码',
@@ -305,6 +303,9 @@ export default {
'Edit UDF Function': '编辑UDF函数',
type: '类型',
'UDF Function Name': 'UDF函数名称',
+ FILE: '文件',
+ UDF: 'UDF',
+ 'File Subdirectory': '文件子目录',
'Please enter a function name': '请输入函数名',
'Package Name': '包名类名',
'Please enter a Package name': '请输入包名类名',
@@ -431,9 +432,9 @@ export default {
'Waiting Dependent complete': '等待依赖完成',
'Waiting Dependent start': '等待依赖启动',
'Check interval': '检查间隔',
+ 'Timeout must be longer than check interval': '超时时间必须比检查间隔长',
'Timeout strategy must be selected': '超时策略必须选一个',
'Timeout must be a positive integer': '超时时长必须为正整数',
- 'Timeout must be longer than check interval': '超时时间必须比检查间隔长',
'Add dependency': '添加依赖',
and: '且',
or: '或',
@@ -443,8 +444,6 @@ export default {
hour: '时',
Running: '正在运行',
'Waiting for dependency to complete': '等待依赖完成',
- 'Delay execution': '延时执行',
- 'Forced success': '强制成功过',
Selected: '已选',
CurrentHour: '当前小时',
Last1Hour: '前1小时',
@@ -521,7 +520,6 @@ export default {
'Statement cannot be empty': '语句不能为空',
'Process Define Count': '工作流定义数',
'Process Instance Running Count': '正在运行的流程数',
- 'Please select a queue': '默认为租户关联队列',
'command number of waiting for running': '待执行的命令数',
'failure command number': '执行失败的命令数',
'tasks number of waiting running': '待运行任务数',
@@ -537,11 +535,12 @@ export default {
'Next five execution times': '接下来五次执行时间',
'Execute time': '执行时间',
'Complement range': '补数范围',
- slot: 'slot数量',
- taskManager: 'taskManager数量',
- appName: 'Flink任务名称',
- jobManagerMemory: 'jobManager内存数',
- taskManagerMemory: 'taskManager内存数',
+ 'Flink Version': 'Flink版本',
+ 'Slot Number': 'Slot数量',
+ 'TaskManager Number': 'TaskManager数量',
+ 'JobManager Memory': 'JobManager内存数',
+ 'TaskManager Memory': 'TaskManager内存数',
+ 'App Name': '任务名称',
'Http Url': '请求地址',
'Http Method': '请求类型',
'Http Parameters': '请求参数',
diff --git a/dolphinscheduler-ui/src/sass/common/index.scss b/dolphinscheduler-ui/src/sass/common/index.scss
index 02f8d6bcb1..28c146c662 100644
--- a/dolphinscheduler-ui/src/sass/common/index.scss
+++ b/dolphinscheduler-ui/src/sass/common/index.scss
@@ -206,7 +206,10 @@ button[disabled='disabled'] {
border-radius: 3px;
}
-
+.el-dialog__wrapper .el-dialog {
+ display: table;
+ width: auto;
+}
article,aside,blockquote,body,button,code,dd,details,div,dl,dt,fieldset,figcaption,figure,footer,form,h1,h2,h3,h4,h5,h6,header,hgroup,hr,input,legend,li,menu,nav,ol,p,pre,section,td,textarea,th,ul {
diff --git a/dolphinscheduler-ui/src/sass/conf/login/index.scss b/dolphinscheduler-ui/src/sass/conf/login/index.scss
index aef779ac30..9081c247e4 100644
--- a/dolphinscheduler-ui/src/sass/conf/login/index.scss
+++ b/dolphinscheduler-ui/src/sass/conf/login/index.scss
@@ -57,7 +57,7 @@ body {
font-size: 50px;
}
}
- .from-model {
+ .form-model {
padding: 30px 40px 0 40px;
.list {
margin-bottom: 32px;