From 6f72deff5752409534d7cacbb4461ba3edbccfa0 Mon Sep 17 00:00:00 2001 From: Shiwen Cheng Date: Thu, 17 Dec 2020 09:52:30 +0800 Subject: [PATCH] [Improvement][UI] Add no-var rule for eslint and add 'npm run lint:fix' command (#4225) Add no-var rule for eslint, and fix related files Add npm run lint:fix command, which distinguished from the default command npm run lint The behavior of command npm run lint and command npm run lint:fix should be distinguished The first command is used to lint only, and the second one is used to lint and fix problems automatically --- dolphinscheduler-ui/.eslintrc.yml | 1 + dolphinscheduler-ui/package.json | 3 ++- .../pages/dag/_source/formModel/formModel.vue | 4 ++-- .../dag/_source/formModel/tasks/flink.vue | 4 ++-- .../pages/dag/_source/formModel/tasks/mr.vue | 4 ++-- .../dag/_source/formModel/tasks/python.vue | 4 ++-- .../dag/_source/formModel/tasks/shell.vue | 4 ++-- .../dag/_source/formModel/tasks/spark.vue | 4 ++-- .../dag/_source/formModel/tasks/sqoop.vue | 4 ++-- .../dag/_source/formModel/tasks/waterdrop.vue | 4 ++-- .../pages/list/_source/createDataSource.vue | 2 +- .../src/js/module/axios/jsonp.js | 20 +++++++++---------- .../src/js/module/axios/querystring.js | 14 ++++++------- .../module/components/transfer/resource.vue | 4 ++-- .../src/js/module/util/localStorage.js | 6 +++--- 15 files changed, 42 insertions(+), 40 deletions(-) diff --git a/dolphinscheduler-ui/.eslintrc.yml b/dolphinscheduler-ui/.eslintrc.yml index a72507d2f2..64c83e6ac0 100644 --- a/dolphinscheduler-ui/.eslintrc.yml +++ b/dolphinscheduler-ui/.eslintrc.yml @@ -39,5 +39,6 @@ rules: no-mixed-operators: 'off' no-extend-native: 'off' prefer-const: 'off' + no-var: 'error' overrides: - { 'files': ['*.vue'], 'rules': { 'indent': 'off' }} diff --git a/dolphinscheduler-ui/package.json b/dolphinscheduler-ui/package.json index a2cd72c7f1..eb1c7e15d7 100644 --- a/dolphinscheduler-ui/package.json +++ b/dolphinscheduler-ui/package.json @@ -8,7 +8,8 @@ "dev": "cross-env NODE_ENV=development webpack-dev-server --config ./build/webpack.config.dev.js", "clean": "rimraf dist", "start": "npm run dev", - "lint": "eslint ./src --ext .js,.vue --fix", + "lint": "eslint --ext .js,.vue ./src", + "lint:fix": "eslint --ext .js,.vue --fix ./src", "build:release": "npm run clean && cross-env NODE_ENV=production PUBLIC_PATH=/dolphinscheduler/ui webpack --config ./build/webpack.config.release.js" }, "dependencies": { diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue index 6b028f08c9..46cdbff8fd 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue @@ -578,7 +578,7 @@ // Update JSP connections let plumbIns = JSP.JspInstance - var targetId = this.nodeData.id + let targetId = this.nodeData.id // Update new connections this.preTasksToAdd.map(sourceId => { @@ -719,7 +719,7 @@ } // If the workergroup has been deleted, set the default workergroup for (let i = 0; i < this.store.state.security.workerGroupsListAll.length; i++) { - var workerGroup = this.store.state.security.workerGroupsListAll[i].id + let workerGroup = this.store.state.security.workerGroupsListAll[i].id if (o.workerGroup === workerGroup) { break } 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 93d914c4e9..a982dff7c8 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 @@ -358,8 +358,8 @@ if (element.id === id) { return element } else if (element.children !== null) { - var i - var result = null + let i + let result = null for (i = 0; result === null && i < element.children.length; i++) { result = this.searchTree(element.children[i], id) } diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/mr.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/mr.vue index 41f0bfd6ad..a88f33b071 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/mr.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/mr.vue @@ -192,8 +192,8 @@ if (element.id === id) { return element } else if (element.children !== null) { - var i - var result = null + let i + let result = null for (i = 0; result === null && i < element.children.length; i++) { result = this.searchTree(element.children[i], id) } diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/python.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/python.vue index b74e2510e0..c633ef2375 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/python.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/python.vue @@ -197,8 +197,8 @@ if (element.id === id) { return element } else if (element.children !== null) { - var i - var result = null + let i + let result = null for (i = 0; result === null && i < element.children.length; i++) { result = this.searchTree(element.children[i], id) } diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/shell.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/shell.vue index 4fb955e21b..71b33e3064 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/shell.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/shell.vue @@ -206,8 +206,8 @@ if (element.id === id) { return element } else if (element.children !== null) { - var i - var result = null + let i + let result = null for (i = 0; result === null && i < element.children.length; i++) { result = this.searchTree(element.children[i], id) } diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/spark.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/spark.vue index 50447e5131..88ef02ec63 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/spark.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/spark.vue @@ -303,8 +303,8 @@ if (element.id === id) { return element } else if (element.children !== null) { - var i - var result = null + let i + let result = null for (i = 0; result === null && i < element.children.length; i++) { result = this.searchTree(element.children[i], id) } diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sqoop.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sqoop.vue index 0c8e220205..dc3af78ec5 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sqoop.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/sqoop.vue @@ -854,7 +854,7 @@ * stringify the source params */ _handleSourceParams () { - var params = null + let params = null switch (this.sourceType) { case 'MYSQL': this.sourceMysqlParams.srcQuerySql = this.sourceMysqlParams.srcQueryType === '1' && editor @@ -881,7 +881,7 @@ * stringify the target params */ _handleTargetParams () { - var params = null + let params = null switch (this.targetType) { case 'HIVE': params = JSON.stringify(this.targetHiveParams) diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/waterdrop.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/waterdrop.vue index 1dec899242..f730d59bc4 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/waterdrop.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/tasks/waterdrop.vue @@ -247,8 +247,8 @@ if (element.id === id) { return element } else if (element.children !== null) { - var i - var result = null + let i + let result = null for (i = 0; result === null && i < element.children.length; i++) { result = this.searchTree(element.children[i], id) } 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 dce24e766a..b329831269 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 @@ -404,7 +404,7 @@ * Get default port by type */ _getDefaultPort (type) { - var defaultPort = '' + let defaultPort = '' switch (type) { case 'MYSQL': defaultPort = '3306' diff --git a/dolphinscheduler-ui/src/js/module/axios/jsonp.js b/dolphinscheduler-ui/src/js/module/axios/jsonp.js index 900338c6df..7bc2fe328b 100755 --- a/dolphinscheduler-ui/src/js/module/axios/jsonp.js +++ b/dolphinscheduler-ui/src/js/module/axios/jsonp.js @@ -20,7 +20,7 @@ module.exports = jsonp * Callback index. */ -var count = 0 +let count = 0 /** * Noop function. @@ -51,19 +51,19 @@ function jsonp (url, opts, fn) { } if (!opts) opts = {} - var prefix = opts.prefix || '__jp' + let prefix = opts.prefix || '__jp' // use the callback name that was passed if one was provided. // otherwise generate a unique name by incrementing our counter. - var id = opts.name || (prefix + (count++)) + let id = opts.name || (prefix + (count++)) - var param = opts.param || 'callback' - var timeout = opts.timeout !== null ? opts.timeout : 60000 - var enc = encodeURIComponent + let param = opts.param || 'callback' + let timeout = opts.timeout !== null ? opts.timeout : 60000 + let enc = encodeURIComponent /* istanbul ignore next */ - var target = document.getElementsByTagName('script')[0] || document.head - var script - var timer + let target = document.getElementsByTagName('script')[0] || document.head + let script + let timer /* istanbul ignore else */ if (timeout) { timer = setTimeout( @@ -102,7 +102,7 @@ function jsonp (url, opts, fn) { url = url.replace('?&', '?') // debug('jsonp req "%s"', url); - var handler = ({ type }) => { + let handler = ({ type }) => { /* istanbul ignore else */ if (type === 'error') { cleanup() diff --git a/dolphinscheduler-ui/src/js/module/axios/querystring.js b/dolphinscheduler-ui/src/js/module/axios/querystring.js index 7ac580c4df..87a236d8cb 100755 --- a/dolphinscheduler-ui/src/js/module/axios/querystring.js +++ b/dolphinscheduler-ui/src/js/module/axios/querystring.js @@ -15,18 +15,18 @@ * limitations under the License. */ /* istanbul ignore next */ -var param = function (a) { - var s = [] - var rbracket = /\[\]$/ - var isArray = function (obj) { +let param = function (a) { + let s = [] + let rbracket = /\[\]$/ + let isArray = function (obj) { return Object.prototype.toString.call(obj) === '[object Array]' } - var add = function (k, v) { + let add = function (k, v) { v = typeof v === 'function' ? v() : v === null ? '' : v === undefined ? '' : v s[s.length] = encodeURIComponent(k) + '=' + encodeURIComponent(v) } - var buildParams = function (prefix, obj) { - var i, len, key + let buildParams = function (prefix, obj) { + let i, len, key if (prefix) { if (isArray(obj)) { diff --git a/dolphinscheduler-ui/src/js/module/components/transfer/resource.vue b/dolphinscheduler-ui/src/js/module/components/transfer/resource.vue index 5115a98964..339e5b4780 100644 --- a/dolphinscheduler-ui/src/js/module/components/transfer/resource.vue +++ b/dolphinscheduler-ui/src/js/module/components/transfer/resource.vue @@ -88,7 +88,7 @@ getParent */ getParent (data2, nodeId2) { - var arrRes = [] + let arrRes = [] if (data2.length === 0) { if (nodeId2) { arrRes.unshift(data2) @@ -96,7 +96,7 @@ return arrRes } let rev = (data, nodeId) => { - for (var i = 0, length = data.length; i < length; i++) { + for (let i = 0, length = data.length; i < length; i++) { let node = data[i] if (node.id === nodeId) { arrRes.unshift(node) diff --git a/dolphinscheduler-ui/src/js/module/util/localStorage.js b/dolphinscheduler-ui/src/js/module/util/localStorage.js index 561e09dc0e..4ad9fd7eb0 100644 --- a/dolphinscheduler-ui/src/js/module/util/localStorage.js +++ b/dolphinscheduler-ui/src/js/module/util/localStorage.js @@ -48,7 +48,7 @@ const localStorage = { }, getJSON: function (skey, p) { try { - var d = storage.getItem(skey) + let d = storage.getItem(skey) if (d) { d = JSON.parse(d) return d[p] @@ -59,7 +59,7 @@ const localStorage = { }, setJSON: function (skey, p, val) { try { - var f = storage.getItem(skey) + let f = storage.getItem(skey) f = f ? JSON.parse(f) : {} f[p] = val storage.setItem(skey, JSON.stringify(f)) @@ -69,7 +69,7 @@ const localStorage = { }, removeJSON: function (skey, p) { try { - var d = storage.getItem(skey) + let d = storage.getItem(skey) if (d) { d = JSON.parse(d) delete d[p]