diff --git a/.eslintrc.js b/.eslintrc.js index 34bb583..d5e347c 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,38 +1,36 @@ module.exports = { - root: true, - env: { - node: true, - }, - extends: [ - 'plugin:vue/essential', - '@vue/airbnb', - ], - plugins: [ - 'html', - 'vue' - ], - - rules: { - "semi": "off", //去掉分号检查 - 'linebreak-style':'off', - 'no-param-reassign': 0, //允许改变形参 - 'no-plusplus':0, // ++ --允许使用 - 'no-underscore-dangle':0 ,//允许类似 const _this=this 下划线命名 - 'import/no-unresolved':'off', //允许alias import - 'import/no-duplicates':'off', //允许alias import - 'no-restricted-syntax': 0, // 允许for-of, - 'vue/require-prop-types':0, //props允许不指定type - 'consistent-return':'off', // - 'max-len':'off', - 'import/extensions':'off', - 'vue/require-valid-default-prop':'off', - 'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off', - 'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off' - }, - parserOptions: { - parser: 'babel-eslint', - }, - + root: true, + env: { + node: true, + }, + extends: [ + 'plugin:vue/essential', + '@vue/airbnb', + ], + plugins: [ + 'vue' + ], -} + rules: { + "semi": "off", //去掉分号检查 + 'linebreak-style': 'off', + 'no-param-reassign': 0, //允许改变形参 + 'no-plusplus': 0, // ++ --允许使用 + 'no-underscore-dangle': 0, //允许类似 const _this=this 下划线命名 + 'import/no-unresolved': 'off', //允许alias import + 'import/no-duplicates': 'off', //允许alias import + 'no-restricted-syntax': 0, // 允许for-of, + 'vue/require-prop-types': 0, //props允许不指定type + 'consistent-return': 'off', // + 'max-len': 'off', + 'import/extensions': 'off', + 'vue/require-valid-default-prop': 'off', + 'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off', + 'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off' + }, + parserOptions: { + parser: 'babel-eslint', + }, + +} \ No newline at end of file diff --git a/package.json b/package.json index bdc3747..3362fca 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "nprogress": "^0.2.0", "screenfull": "3.3.3", "svg-sprite-loader": "^4.1.3", - "vue": "2.6.6", + "vue": "^2.5.21", "vue-awesome": "^3.2.0", "vue-chartjs": "^3.4.0", "vue-router": "^3.0.1", @@ -42,11 +42,9 @@ "babel-eslint": "^10.0.1", "chai": "^4.1.2", "vuetify-loader": "1.2.1", - "eslint": "5.14.1", - "eslint-plugin-vue": "5.2.2", - "eslint-friendly-formatter": "^4.0.1", - "eslint-loader": "2.1.2", - "eslint-plugin-html": "5.0.3", + "eslint": "^5.12.0", + "eslint-plugin-vue": "^5.1.0", + "lint-staged": "^7.2.2", "node-sass": "^4.9.2", "sass-loader": "^7.0.3", @@ -56,6 +54,6 @@ "vue-cli-plugin-element": "^1.0.0", "vue-cli-plugin-vuetify": "0.4.6", - "vue-template-compiler": "2.6.6" + "vue-template-compiler": "^2.5.21" } } diff --git a/src/components/Breadcrumb/index.vue b/src/components/Breadcrumb/index.vue index 2be5f31..99d1b6e 100644 --- a/src/components/Breadcrumb/index.vue +++ b/src/components/Breadcrumb/index.vue @@ -4,11 +4,10 @@ separator="/"> {{ item.meta.title }} - + @@ -65,38 +60,39 @@ diff --git a/src/components/FormDesigner/GenerateForm.vue b/src/components/FormDesigner/GenerateForm.vue index 7f907ac..d99517f 100644 --- a/src/components/FormDesigner/GenerateForm.vue +++ b/src/components/FormDesigner/GenerateForm.vue @@ -9,7 +9,7 @@ :label-width="data.config.labelWidth + 'px'">