diff --git a/.eslintrc.js b/.eslintrc.js index 6f55c5a1..53481808 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -21,6 +21,20 @@ module.exports = { "allowFirstLine": false } }], + "vue/html-closing-bracket-newline": ["error", { + "singleline": "never", + "multiline": "never" + }], + "vue/singleline-html-element-content-newline": ["error", { + "ignoreWhenNoAttributes": true, + "ignoreWhenEmpty": true, + "ignores": ["a", "abbr", "audio", "b", "bdi", "bdo", "canvas", "cite", "code", "data", "del", "dfn", "em", "i", "iframe", "ins", "kbd", "label", "map", "mark", "noscript", "object", "output", "picture", "q", "ruby", "s", "samp", "small", "span", "strong", "sub", "sup", "svg", "time", "u", "var", "video", "div"] + }], + "vue/multiline-html-element-content-newline": ["error", { + "ignoreWhenEmpty": true, + "ignores": ["a", "abbr", "audio", "b", "bdi", "bdo", "canvas", "cite", "code", "data", "del", "dfn", "em", "i", "iframe", "ins", "kbd", "label", "map", "mark", "noscript", "object", "output", "picture", "q", "ruby", "s", "samp", "small", "span", "strong", "sub", "sup", "svg", "time", "u", "var", "video"], + "allowEmptyLines": true + }], "vue/name-property-casing": ["error", "PascalCase"], 'accessor-pairs': 2, 'arrow-spacing': [2, { diff --git a/package.json b/package.json index aef30525..0f759467 100644 --- a/package.json +++ b/package.json @@ -80,10 +80,10 @@ "copy-webpack-plugin": "4.5.2", "cross-env": "5.2.0", "css-loader": "1.0.0", - "eslint": "4.19.1", - "eslint-friendly-formatter": "4.0.1", - "eslint-loader": "2.0.0", - "eslint-plugin-vue": "4.7.1", + "eslint": "^5.15.1", + "eslint-friendly-formatter": "^4.0.1", + "eslint-loader": "^2.1.2", + "eslint-plugin-vue": "^5.2.2", "file-loader": "1.1.11", "friendly-errors-webpack-plugin": "1.7.0", "hash-sum": "1.0.2", diff --git a/src/App.vue b/src/App.vue index ab408f3e..ec9032c1 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,11 +1,11 @@ diff --git a/src/components/BackToTop/index.vue b/src/components/BackToTop/index.vue index 39977178..0c1ff792 100644 --- a/src/components/BackToTop/index.vue +++ b/src/components/BackToTop/index.vue @@ -4,7 +4,7 @@ diff --git a/src/components/Breadcrumb/index.vue b/src/components/Breadcrumb/index.vue index 5f4d054f..9e78b1ec 100644 --- a/src/components/Breadcrumb/index.vue +++ b/src/components/Breadcrumb/index.vue @@ -2,8 +2,9 @@ - {{ - generateTitle(item.meta.title) }} + + {{ generateTitle(item.meta.title) }} + {{ generateTitle(item.meta.title) }} diff --git a/src/components/Charts/keyboard.vue b/src/components/Charts/keyboard.vue index 857b26ae..3f061bd0 100644 --- a/src/components/Charts/keyboard.vue +++ b/src/components/Charts/keyboard.vue @@ -1,5 +1,5 @@