From 6135a6ad162f3793de5e7df5a98fb361a00e9927 Mon Sep 17 00:00:00 2001 From: break60 <790061044@qq.com> Date: Mon, 30 Sep 2019 17:42:34 +0800 Subject: [PATCH] =?UTF-8?q?Repair=20bug=20#901=EF=BC=8C#909=EF=BC=8C#935?= =?UTF-8?q?=20(#952)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * package * 修改工作流实例页面状态为运行时，禁止删除，删除package.json包里面的babel-runtime和jasmine-core * bugfix-user-specified queue takes precedence over tenant queue (#769) Solve the problem that the user queue setting does not take effect * update markdown docs which can not display images normally (#806) * issue#728 (#746) The mailSender in PasswordAuthentication() and setFrom() may not be the same in actual use, and it's best to set it up separately. please add a example about this. * install-escheduler-ui.sh,monitor_server.py and install.sh scripts comment change to english and install-escheduler-ui.sh use escheduler change to dolphinscheduler (#812) * service start exception modify * master，worker start modify * .env update * install-escheduler-ui.sh,monitor_server.py and install.sh scripts comment change to english and install-escheduler-ui.sh use escheduler change to dolphinscheduler * scripts name standardization (#813) * service start exception modify * master，worker start modify * .env update * install-escheduler-ui.sh,monitor_server.py and install.sh scripts comment change to english and install-escheduler-ui.sh use escheduler change to dolphinscheduler * scripts name standardization * [BUG][#731]repair swagger annotation，interface path:/escheduler/projects/{projectName}/process/batch-delete and /escheduler/projects/{projectName}/process/delete (#764) * 增加工作流导出导入功能，前端定时器表达式的秒和分钟的默认值从*修改成0 * 修改工作流导出导入功能由excel改为json减少依赖 * [BUG][#731]repair swagger annotation ,interface path:/escheduler/projects/{projectName}/process/batch-delete and /escheduler/projects/{projectName}/process/delete * [BUG][#771] The edit timer did not assign the original data * [FEATURE][#236] Cross-project dependency * [FEATURE][#236] Cross-project dependency(增加跨项目依赖) * misspell words (#817) * (Docs): Fixed some typo errors (#811) * Update EasyScheduler Proposal.md * Update frontend-deployment.md * Update frontend-development.md * Update 前端开发文档.md * Update system-manual.md * Update HttpClientTest.java * Update 系统使用手册.md * fix singleton with volatile (#818) * Replace StringBuffer with StringBuilder inside the method (#816) * flink task support(flink 任务支持) (#711) * flink任务支持 * flink任务支持 * Update zh_CN.js * Update FlinkArgsUtils.java * Update .escheduler_env.sh * 1.Delete the page section console.log; 2.Change project name； 3.Production configuration packaging clears console.log * Delete the'babel-plugin-transform-remove-console'dependency package * 1.repair [BUG]#884,2.Add Scheduling Time Fields to Workflow Instance List，3.Add a reminder for empty data * 1.update logo 2.Workflow Definition Page Timing Component Replaced with Source Code * epair bug #901，#909，#935 --- .../home/pages/dag/_source/formModel/tasks/sql.vue | 6 +++++- .../datasource/pages/list/_source/createDataSource.vue | 10 ++++++++-- .../home/pages/datasource/pages/list/_source/list.vue | 2 +- .../monitor/pages/servers/_source/zookeeperList.vue | 3 +-- .../home/pages/monitor/pages/servers/statistics.vue | 2 +- .../pages/projects/pages/taskInstance/_source/list.vue | 2 +- .../home/pages/security/pages/queue/_source/list.vue | 4 ---- .../pages/security/pages/tenement/_source/list.vue | 4 ---- .../home/pages/security/pages/users/_source/list.vue | 2 +- .../security/pages/warningGroups/_source/list.vue | 3 +-- .../pages/security/pages/workerGroups/_source/list.vue | 3 +-- .../conf/home/pages/user/pages/token/_source/list.vue | 3 +-- 12 files changed, 21 insertions(+), 23 deletions(-) diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue b/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue index f8d62ca04c..029dcacf56 100644 --- a/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue +++ b/escheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue @@ -371,7 +371,11 @@ this.sqlType = o.params.sqlType this.connParams = o.params.connParams || '' this.localParams = o.params.localParams || [] - this.showType = o.params.showType.split(',') || [] + if(o.params.showType == '') { + this.showType = [] + } else { + this.showType = o.params.showType.split(',') || [] + } this.preStatements = o.params.preStatements || [] this.postStatements = o.params.postStatements || [] this.title = o.params.title || '' diff --git a/escheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/createDataSource.vue b/escheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/createDataSource.vue index 45ab53c08c..619a3fadbb 100644 --- a/escheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/createDataSource.vue +++ b/escheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/createDataSource.vue @@ -113,7 +113,7 @@ - +