From 49b8f63e277913538772cfca3ab96c39e41865e0 Mon Sep 17 00:00:00 2001 From: break60 <790061044@qq.com> Date: Fri, 20 Sep 2019 16:23:50 +0800 Subject: [PATCH] Daily optimization (#837) 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 --- escheduler-ui/build/webpack.config.prod.js | 4 +++- escheduler-ui/package.json | 2 +- .../js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js | 2 -- .../projects/pages/definition/pages/list/_source/email.vue | 2 -- .../home/pages/security/pages/users/_source/createUser.vue | 1 - escheduler-ui/src/lib/@vue/crontab/example/app.vue | 1 - 6 files changed, 4 insertions(+), 8 deletions(-) diff --git a/escheduler-ui/build/webpack.config.prod.js b/escheduler-ui/build/webpack.config.prod.js index 595de11076..4a287feb8e 100644 --- a/escheduler-ui/build/webpack.config.prod.js +++ b/escheduler-ui/build/webpack.config.prod.js @@ -100,8 +100,10 @@ const config = merge.smart(baseConfig, { sourceMap: true, uglifyOptions: { compress: { + warnings: false, + drop_debugger: true, drop_console: true, - drop_debugger: true + pure_funcs: ['console.log']//移除console }, comments: function (n, c) { /*! IMPORTANT: Please preserve 3rd-party library license info, inspired from @allex/amd-build-worker/config/jsplumb.js */ diff --git a/escheduler-ui/package.json b/escheduler-ui/package.json index c6a2a92e40..014205ba16 100644 --- a/escheduler-ui/package.json +++ b/escheduler-ui/package.json @@ -1,5 +1,5 @@ { - "name": "escheduler", + "name": "dolphinscheduler", "version": "1.0.0", "description": "调度平台前端项目", "author": "gongzijian ", diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js b/escheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js index 440deb48fb..807c70bfd5 100644 --- a/escheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js +++ b/escheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/jsPlumbHandle.js @@ -645,7 +645,6 @@ JSP.prototype.saveStore = function () { }) }) - console.log(tasksAll()) _.map(tasksAll(), v => { locations[v.id] = { @@ -656,7 +655,6 @@ JSP.prototype.saveStore = function () { } }) - console.log(locations) // Storage node store.commit('dag/setTasks', tasks) diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/email.vue b/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/email.vue index f5c38f9a12..ec34c78648 100644 --- a/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/email.vue +++ b/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/email.vue @@ -271,13 +271,11 @@ $(this).prop('comStart', true) // Check mailbox index initialization this.activeIndex = null - // console.log('中文输入：开始'); this.isCn = true }).on('compositionend', () => { $(this).prop('comStart', false) // Check mailbox index initialization this.activeIndex = null - // console.log('中文输入：结束'); this.isCn = false }) } diff --git a/escheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue b/escheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue index 378f410d38..b45e6555ab 100644 --- a/escheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue +++ b/escheduler-ui/src/js/conf/home/pages/security/pages/users/_source/createUser.vue @@ -203,7 +203,6 @@ }, _submit () { this.$refs['popup'].spinnerLoading = true - console.log(this.tenantId.id) let param = { userName: this.userName, userPassword: this.userPassword, diff --git a/escheduler-ui/src/lib/@vue/crontab/example/app.vue b/escheduler-ui/src/lib/@vue/crontab/example/app.vue index c691638a64..7328886801 100644 --- a/escheduler-ui/src/lib/@vue/crontab/example/app.vue +++ b/escheduler-ui/src/lib/@vue/crontab/example/app.vue @@ -36,7 +36,6 @@ _lang (type) { this.is = false this.lang = type - console.log(this.lang) setTimeout(() => { this.is = true }, 1)