diff --git a/.eslintrc.js b/.eslintrc.js index 00d60805..6f55c5a1 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,7 +1,7 @@ module.exports = { root: true, - parser: 'babel-eslint', parserOptions: { + parser: 'babel-eslint', sourceType: 'module' }, env: { @@ -9,22 +9,19 @@ module.exports = { node: true, es6: true, }, - extends: 'eslint:recommended', - // required to lint *.vue files - plugins: [ - 'html' - ], - // check if imports actually resolve - 'settings': { - 'import/resolver': { - 'webpack': { - 'config': 'build/webpack.base.conf.js' - } - } - }, + extends: ['plugin:vue/recommended', 'eslint:recommended'], + // add your custom rules here //it is base on https://github.com/vuejs/eslint-config-vue - 'rules': { + rules: { + "vue/max-attributes-per-line": [2, { + "singleline": 10, + "multiline": { + "max": 1, + "allowFirstLine": false + } + }], + "vue/name-property-casing": ["error", "PascalCase"], 'accessor-pairs': 2, 'arrow-spacing': [2, { 'before': true, @@ -196,4 +193,3 @@ module.exports = { 'array-bracket-spacing': [2, 'never'] } } - diff --git a/README.md b/README.md index d19bb898..27234ec7 100644 --- a/README.md +++ b/README.md @@ -4,10 +4,10 @@

- vue + vue - element-ui + element-ui Build Status diff --git a/README.zh-CN.md b/README.zh-CN.md index 4438bda8..b7ca3d7d 100644 --- a/README.zh-CN.md +++ b/README.zh-CN.md @@ -38,6 +38,9 @@ - [Gitee](https://panjiachen.gitee.io/vue-element-admin/) 国内用户可访问该地址在线预览 + +- [国内访问文档](https://panjiachen.gitee.io/vue-element-admin-site/zh/) 方便没翻墙的用户查看文档 + **本项目的定位是后台集成方案，不适合当基础模板来开发。** - 模板建议使用: [vue-admin-template](https://github.com/PanJiaChen/vue-admin-template) diff --git a/config/index.js b/config/index.js index 3033f9be..599e4a63 100644 --- a/config/index.js +++ b/config/index.js @@ -60,7 +60,7 @@ module.exports = { * then assetsPublicPath should be set to "/bar/". * In most cases please use '/' !!! */ - assetsPublicPath: '/vue-element-admin/', // If you are deployed on the root path, please use '/' + assetsPublicPath: '/', /** * Source Maps diff --git a/package.json b/package.json index 8f7847cf..48dfa91f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vue-element-admin", - "version": "3.8.0", + "version": "3.8.1", "description": "A magical vue admin. Typical templates for enterprise applications. Newest development stack of vue. Lots of awesome features", "author": "Pan ", "license": "MIT", @@ -82,10 +82,10 @@ "eslint": "4.19.1", "eslint-friendly-formatter": "4.0.1", "eslint-loader": "2.0.0", - "eslint-plugin-html": "4.0.5", + "eslint-plugin-vue": "4.7.1", "file-loader": "1.1.11", "friendly-errors-webpack-plugin": "1.7.0", - "hash-sum": "^1.0.2", + "hash-sum": "1.0.2", "html-webpack-plugin": "^4.0.0-alpha", "husky": "0.14.3", "lint-staged": "7.2.2", diff --git a/src/App.vue b/src/App.vue index 690cfc98..ab408f3e 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 de953821..39977178 100644 --- a/src/components/BackToTop/index.vue +++ b/src/components/BackToTop/index.vue @@ -1,10 +1,10 @@ @@ -41,7 +50,7 @@ import countTo from 'vue-count-to' export default { - name: 'countTo-demo', + name: 'CountToDemo', components: { countTo }, data() { return { @@ -202,4 +211,3 @@ input { } - diff --git a/src/views/components-demo/dndList.vue b/src/views/components-demo/dndList.vue index b9779a31..9c8847a9 100644 --- a/src/views/components-demo/dndList.vue +++ b/src/views/components-demo/dndList.vue @@ -4,7 +4,7 @@ Vue.Draggable

- +
@@ -14,7 +14,7 @@ import DndList from '@/components/DndList' import { fetchList } from '@/api/article' export default { - name: 'dndList-demo', + name: 'DndListDemo', components: { DndList }, data() { return { @@ -37,4 +37,3 @@ export default { } - diff --git a/src/views/components-demo/dragDialog.vue b/src/views/components-demo/dragDialog.vue index 454d6327..0a023f90 100644 --- a/src/views/components-demo/dragDialog.vue +++ b/src/views/components-demo/dragDialog.vue @@ -1,15 +1,14 @@ @@ -13,7 +13,7 @@ import JsonEditor from '@/components/JsonEditor' const jsonData = '[{"items":[{"market_type":"forexdata","symbol":"XAUUSD"},{"market_type":"forexdata","symbol":"UKOIL"},{"market_type":"forexdata","symbol":"CORN"}],"name":""},{"items":[{"market_type":"forexdata","symbol":"XAUUSD"},{"market_type":"forexdata","symbol":"XAGUSD"},{"market_type":"forexdata","symbol":"AUTD"},{"market_type":"forexdata","symbol":"AGTD"}],"name":"贵金属"},{"items":[{"market_type":"forexdata","symbol":"CORN"},{"market_type":"forexdata","symbol":"WHEAT"},{"market_type":"forexdata","symbol":"SOYBEAN"},{"market_type":"forexdata","symbol":"SUGAR"}],"name":"农产品"},{"items":[{"market_type":"forexdata","symbol":"UKOIL"},{"market_type":"forexdata","symbol":"USOIL"},{"market_type":"forexdata","symbol":"NGAS"}],"name":"能源化工"}]' export default { - name: 'jsonEditor-demo', + name: 'JsonEditorDemo', components: { JsonEditor }, data() { return { diff --git a/src/views/components-demo/markdown.vue b/src/views/components-demo/markdown.vue index 4e8b0648..f60911d0 100644 --- a/src/views/components-demo/markdown.vue +++ b/src/views/components-demo/markdown.vue @@ -6,10 +6,10 @@ 相关文章
- +
- To HTML -
+ To HTML +
@@ -27,7 +27,7 @@ const content = ` ` export default { - name: 'markdown-demo', + name: 'MarkdownDemo', components: { MarkdownEditor }, data() { return { @@ -46,4 +46,3 @@ export default { } - diff --git a/src/views/components-demo/mixin.vue b/src/views/components-demo/mixin.vue index 7f713f6d..99b62468 100644 --- a/src/views/components-demo/mixin.vue +++ b/src/views/components-demo/mixin.vue @@ -37,7 +37,7 @@
- 标题 + 标题
@@ -74,20 +74,20 @@ hover text
- +
- +
Share
- +
@@ -104,7 +104,7 @@ import DropdownMenu from '@/components/Share/dropdownMenu' import waves from '@/directive/waves/index.js' // 水波纹指令 export default { - name: 'componentMixin-demo', + name: 'ComponentMixinDemo', components: { PanThumb, MdInput, @@ -134,10 +134,7 @@ export default { { title: '登录权限篇', href: 'https://juejin.im/post/591aa14f570c35006961acac' }, { title: '实战篇', href: 'https://juejin.im/post/593121aa0ce4630057f70d35' }, { title: 'vue-admin-template 篇', href: 'https://juejin.im/post/595b4d776fb9a06bbe7dba56' }, - { title: '自行封装 component', href: 'https://segmentfault.com/a/1190000009090836' }, - { title: '优雅的使用 icon', href: 'https://juejin.im/post/59bb864b5188257e7a427c09' }, - { title: 'webpack4（上）', href: 'https://juejin.im/post/59bb864b5188257e7a427c09' }, - { title: 'webpack4（下）', href: 'https://juejin.im/post/5b5d6d6f6fb9a04fea58aabc' } + { title: '优雅的使用 icon', href: 'https://juejin.im/post/59bb864b5188257e7a427c09' } ] } } diff --git a/src/views/components-demo/splitpane.vue b/src/views/components-demo/splitpane.vue index 5a0bfb2b..dcd87149 100644 --- a/src/views/components-demo/splitpane.vue +++ b/src/views/components-demo/splitpane.vue @@ -3,19 +3,19 @@ SplitPane If you've used codepen, jsfiddle will not be unfamiliar. - Github repository + Github repository - + @@ -27,7 +27,7 @@ import splitPane from 'vue-splitpane' export default { - name: 'splitpane-demo', + name: 'SplitpaneDemo', components: { splitPane }, methods: { resize() { diff --git a/src/views/components-demo/sticky.vue b/src/views/components-demo/sticky.vue index 49772bea..65cfb091 100644 --- a/src/views/components-demo/sticky.vue +++ b/src/views/components-demo/sticky.vue @@ -1,14 +1,14 @@ - diff --git a/src/views/dashboard/admin/components/LineChart.vue b/src/views/dashboard/admin/components/LineChart.vue index 9be9c92d..6c6637a8 100644 --- a/src/views/dashboard/admin/components/LineChart.vue +++ b/src/views/dashboard/admin/components/LineChart.vue @@ -1,5 +1,5 @@ diff --git a/src/views/dashboard/admin/components/TransactionTable.vue b/src/views/dashboard/admin/components/TransactionTable.vue index 7c79b77b..bcbfbb43 100644 --- a/src/views/dashboard/admin/components/TransactionTable.vue +++ b/src/views/dashboard/admin/components/TransactionTable.vue @@ -2,17 +2,17 @@ @@ -22,11 +22,6 @@ import { fetchList } from '@/api/transaction' export default { - data() { - return { - list: null - } - }, filters: { statusFilter(status) { const statusMap = { @@ -39,6 +34,11 @@ export default { return str.substring(0, 30) } }, + data() { + return { + list: null + } + }, created() { this.fetchData() }, diff --git a/src/views/dashboard/admin/index.vue b/src/views/dashboard/admin/index.vue index 8da28543..1a79637a 100644 --- a/src/views/dashboard/admin/index.vue +++ b/src/views/dashboard/admin/index.vue @@ -1,48 +1,47 @@ - diff --git a/src/views/errorLog/errorTestB.vue b/src/views/errorLog/errorTestB.vue index a1303f89..b04c2511 100644 --- a/src/views/errorLog/errorTestB.vue +++ b/src/views/errorLog/errorTestB.vue @@ -1,5 +1,5 @@ diff --git a/src/views/errorPage/401.vue b/src/views/errorPage/401.vue index b8bbb013..d43be52d 100644 --- a/src/views/errorPage/401.vue +++ b/src/views/errorPage/401.vue @@ -1,10 +1,10 @@ @@ -30,7 +30,7 @@ import errGif from '@/assets/401_images/401.gif' export default { - name: 'page401', + name: 'Page401', data() { return { errGif: errGif + '?' + +new Date(), diff --git a/src/views/errorPage/404.vue b/src/views/errorPage/404.vue index 97e57b2f..c3eafea0 100644 --- a/src/views/errorPage/404.vue +++ b/src/views/errorPage/404.vue @@ -10,7 +10,7 @@
OOPS!
版权所有 - 华尔街见闻 + 华尔街见闻
{{ message }}
请检查您输入的网址是否正确，请点击以下按钮返回主页或者发送错误报告
@@ -23,7 +23,7 @@ diff --git a/src/views/example/edit.vue b/src/views/example/edit.vue index 097b6140..c21af0c9 100644 --- a/src/views/example/edit.vue +++ b/src/views/example/edit.vue @@ -1,12 +1,12 @@ diff --git a/src/views/example/list.vue b/src/views/example/list.vue index 7dccafa6..f44d7078 100644 --- a/src/views/example/list.vue +++ b/src/views/example/list.vue @@ -1,41 +1,41 @@