From ee7a05afc9890d54c6179923875388153088f751 Mon Sep 17 00:00:00 2001 From: break60 <790061044@qq.com> Date: Sat, 12 Oct 2019 15:25:11 +0800 Subject: [PATCH] =?UTF-8?q?=201.update=20logo=202.Workflow=20Definition=20?= =?UTF-8?q?Page=20Timing=20Component=20Replaced=20with=20Source=20Code3.Re?= =?UTF-8?q?pair=20bug=20#901=EF=BC=8C#909=EF=BC=8C#935=20(#998)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 1.repair [BUG]#884;2.Add Scheduling Time Fields to Workflow Instance List;3.Add a reminder for empty data 4.Delete the'babel-plugin-transform-remove-console'dependency package * 1.update logo 2.Workflow Definition Page Timing Component Replaced with Source Code * Repair bug #901,#909,#935 --- .../pages/dag/_source/formModel/tasks/sql.vue | 6 +- .../pages/list/_source/createDataSource.vue | 10 +- .../datasource/pages/list/_source/list.vue | 2 +- .../pages/servers/_source/zookeeperList.vue | 2 +- .../definition/pages/list/_source/timing.vue | 3 +- .../pages/taskInstance/_source/list.vue | 2 +- .../security/pages/queue/_source/list.vue | 8 +- .../security/pages/tenement/_source/list.vue | 8 +- .../security/pages/users/_source/list.vue | 2 +- .../pages/warningGroups/_source/list.vue | 2 +- .../pages/workerGroups/_source/list.vue | 2 +- .../pages/user/pages/token/_source/list.vue | 2 +- dolphinscheduler-ui/src/js/conf/login/App.vue | 2 +- .../src/js/conf/login/img/login-logo.png | Bin 8007 -> 0 bytes .../src/js/conf/login/img/login-logo.svg | 99 ++++ .../src/js/module/components/crontab/index.js | 22 + .../crontab/source/_source/i18n/config.js | 39 ++ .../crontab/source/_source/i18n/index.js | 28 + .../source/_source/i18n/locale/en_US.js | 76 +++ .../source/_source/i18n/locale/zh_CN.js | 76 +++ .../crontab/source/_source/i18n/util.js | 50 ++ .../crontab/source/_source/input-number.vue | 122 ++++ .../components/crontab/source/_times/day.vue | 521 ++++++++++++++++++ .../components/crontab/source/_times/hour.vue | 255 +++++++++ .../crontab/source/_times/minute.vue | 261 +++++++++ .../crontab/source/_times/month.vue | 260 +++++++++ .../crontab/source/_times/second.vue | 268 +++++++++ .../components/crontab/source/_times/year.vue | 259 +++++++++ .../module/components/crontab/source/app.vue | 206 +++++++ .../components/crontab/source/index.scss | 46 ++ .../components/crontab/source/util/index.js | 215 ++++++++ .../src/js/module/components/nav/logo.png | Bin 5888 -> 0 bytes .../src/js/module/components/nav/logo.svg | 99 ++++ .../src/js/module/components/nav/nav.vue | 2 +- .../src/lib/@vue/crontab/README.md | 30 - .../src/lib/@vue/crontab/build/config.js | 65 --- .../@vue/crontab/build/webpack.config.prod.js | 106 ---- .../src/lib/@vue/crontab/dist/index.css | 1 - .../src/lib/@vue/crontab/dist/index.js | 2 - .../src/lib/@vue/crontab/dist/index.js.map | 1 - .../src/lib/@vue/crontab/example/app.vue | 47 -- .../src/lib/@vue/crontab/example/index.html | 14 - .../src/lib/@vue/crontab/example/index.js | 14 - .../src/lib/@vue/crontab/package.json | 63 --- .../src/lib/@vue/crontab/postcss.config.js | 7 - 45 files changed, 2929 insertions(+), 376 deletions(-) delete mode 100644 dolphinscheduler-ui/src/js/conf/login/img/login-logo.png create mode 100755 dolphinscheduler-ui/src/js/conf/login/img/login-logo.svg create mode 100755 dolphinscheduler-ui/src/js/module/components/crontab/index.js create mode 100755 dolphinscheduler-ui/src/js/module/components/crontab/source/_source/i18n/config.js create mode 100755 dolphinscheduler-ui/src/js/module/components/crontab/source/_source/i18n/index.js create mode 100755 dolphinscheduler-ui/src/js/module/components/crontab/source/_source/i18n/locale/en_US.js create mode 100755 dolphinscheduler-ui/src/js/module/components/crontab/source/_source/i18n/locale/zh_CN.js create mode 100755 dolphinscheduler-ui/src/js/module/components/crontab/source/_source/i18n/util.js create mode 100755 dolphinscheduler-ui/src/js/module/components/crontab/source/_source/input-number.vue create mode 100755 dolphinscheduler-ui/src/js/module/components/crontab/source/_times/day.vue create mode 100755 dolphinscheduler-ui/src/js/module/components/crontab/source/_times/hour.vue create mode 100755 dolphinscheduler-ui/src/js/module/components/crontab/source/_times/minute.vue create mode 100755 dolphinscheduler-ui/src/js/module/components/crontab/source/_times/month.vue create mode 100755 dolphinscheduler-ui/src/js/module/components/crontab/source/_times/second.vue create mode 100755 dolphinscheduler-ui/src/js/module/components/crontab/source/_times/year.vue create mode 100755 dolphinscheduler-ui/src/js/module/components/crontab/source/app.vue create mode 100755 dolphinscheduler-ui/src/js/module/components/crontab/source/index.scss create mode 100755 dolphinscheduler-ui/src/js/module/components/crontab/source/util/index.js delete mode 100644 dolphinscheduler-ui/src/js/module/components/nav/logo.png create mode 100755 dolphinscheduler-ui/src/js/module/components/nav/logo.svg delete mode 100644 dolphinscheduler-ui/src/lib/@vue/crontab/README.md delete mode 100644 dolphinscheduler-ui/src/lib/@vue/crontab/build/config.js delete mode 100644 dolphinscheduler-ui/src/lib/@vue/crontab/build/webpack.config.prod.js delete mode 100644 dolphinscheduler-ui/src/lib/@vue/crontab/dist/index.css delete mode 100644 dolphinscheduler-ui/src/lib/@vue/crontab/dist/index.js delete mode 100644 dolphinscheduler-ui/src/lib/@vue/crontab/dist/index.js.map delete mode 100644 dolphinscheduler-ui/src/lib/@vue/crontab/example/app.vue delete mode 100644 dolphinscheduler-ui/src/lib/@vue/crontab/example/index.html delete mode 100644 dolphinscheduler-ui/src/lib/@vue/crontab/example/index.js delete mode 100644 dolphinscheduler-ui/src/lib/@vue/crontab/package.json delete mode 100644 dolphinscheduler-ui/src/lib/@vue/crontab/postcss.config.js diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue index 6be4b5c2d6..4362d1f0f1 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sql.vue @@ -355,7 +355,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/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/createDataSource.vue b/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/createDataSource.vue index cc6d25e7de..7e0b310052 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/createDataSource.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/createDataSource.vue @@ -97,7 +97,7 @@ - +