diff --git a/ant-design-vue-jeecg/idea.config.js b/ant-design-vue-jeecg/idea.config.js index 4d86bd94..8318a125 100644 --- a/ant-design-vue-jeecg/idea.config.js +++ b/ant-design-vue-jeecg/idea.config.js @@ -6,19 +6,19 @@ function resolve (dir) { } module.exports = { - context: path.resolve(__dirname, './'), - resolve: { - extensions: ['.js', '.vue', '.json'], - alias: { - 'config': resolve('config'), - '@': resolve('src'), - '@views': resolve('src/views'), - '@comp': resolve('src/components'), - '@core': resolve('src/core'), - '@utils': resolve('src/utils'), - '@entry': resolve('src/entry'), - '@router': resolve('src/router'), - '@store': resolve('src/store') - } - }, -} \ No newline at end of file + context: path.resolve(__dirname, './'), + resolve: { + extensions: ['.js', '.vue', '.json'], + alias: { + 'config': resolve('config'), + '@': resolve('src'), + '@views': resolve('src/views'), + '@comp': resolve('src/components'), + '@core': resolve('src/core'), + '@utils': resolve('src/utils'), + '@entry': resolve('src/entry'), + '@router': resolve('src/router'), + '@store': resolve('src/store') + } + } +} diff --git a/ant-design-vue-jeecg/package.json b/ant-design-vue-jeecg/package.json index 597f6b7b..2343568d 100644 --- a/ant-design-vue-jeecg/package.json +++ b/ant-design-vue-jeecg/package.json @@ -54,8 +54,6 @@ "html-webpack-plugin": "^4.0.0-beta.11", "less": "^3.9.0", "less-loader": "^4.1.0", - "node-sass": "^4.13.1", - "sass-loader": "^7.3.1", "vue-template-compiler": "^2.6.10" }, "eslintConfig": { @@ -65,7 +63,7 @@ }, "extends": [ "plugin:vue/strongly-recommended", - "eslint:recommended" + "@vue/standard" ], "parserOptions": { "parser": "babel-eslint" @@ -93,7 +91,9 @@ "vue/no-use-v-if-with-v-for": 0, "vue/html-closing-bracket-newline": 0, "vue/no-parsing-error": 0, - "no-console": 0 + "no-console": 0, + "no-tabs": 0, + "indent": [1, 4] } }, "postcss": { @@ -104,6 +104,6 @@ "browserslist": [ "> 1%", "last 2 versions", - "not ie <= 8" + "not ie <= 10" ] } diff --git a/ant-design-vue-jeecg/src/assets/checkcode.png b/ant-design-vue-jeecg/src/assets/checkcode.png index ed86ad16..844fa70c 100644 Binary files a/ant-design-vue-jeecg/src/assets/checkcode.png and b/ant-design-vue-jeecg/src/assets/checkcode.png differ diff --git a/ant-design-vue-jeecg/src/components/ChartCard.vue b/ant-design-vue-jeecg/src/components/ChartCard.vue index 8acb150d..a03b31d5 100644 --- a/ant-design-vue-jeecg/src/components/ChartCard.vue +++ b/ant-design-vue-jeecg/src/components/ChartCard.vue @@ -42,7 +42,7 @@ } - \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/components/chart/MiniArea.vue b/ant-design-vue-jeecg/src/components/chart/MiniArea.vue index 1c9b48c5..97c8ff70 100644 --- a/ant-design-vue-jeecg/src/components/chart/MiniArea.vue +++ b/ant-design-vue-jeecg/src/components/chart/MiniArea.vue @@ -64,6 +64,6 @@ } - \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/components/chart/MiniBar.vue b/ant-design-vue-jeecg/src/components/chart/MiniBar.vue index ed62d300..9dd6bca7 100644 --- a/ant-design-vue-jeecg/src/components/chart/MiniBar.vue +++ b/ant-design-vue-jeecg/src/components/chart/MiniBar.vue @@ -71,6 +71,6 @@ } - \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/components/chart/MiniProgress.vue b/ant-design-vue-jeecg/src/components/chart/MiniProgress.vue index 444a9d84..e6668288 100644 --- a/ant-design-vue-jeecg/src/components/chart/MiniProgress.vue +++ b/ant-design-vue-jeecg/src/components/chart/MiniProgress.vue @@ -34,7 +34,7 @@ } - \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/components/jeecg/JSuperQuery.vue b/ant-design-vue-jeecg/src/components/jeecg/JSuperQuery.vue index 31066fec..424d6c21 100644 --- a/ant-design-vue-jeecg/src/components/jeecg/JSuperQuery.vue +++ b/ant-design-vue-jeecg/src/components/jeecg/JSuperQuery.vue @@ -420,7 +420,7 @@ } - - \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/components/jeecgbiz/JSelectMultiUser.vue b/ant-design-vue-jeecg/src/components/jeecgbiz/JSelectMultiUser.vue index 31ee117d..f2f0f2a2 100644 --- a/ant-design-vue-jeecg/src/components/jeecgbiz/JSelectMultiUser.vue +++ b/ant-design-vue-jeecg/src/components/jeecgbiz/JSelectMultiUser.vue @@ -43,4 +43,4 @@ } - \ No newline at end of file + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/components/jeecgbiz/JSelectPosition.vue b/ant-design-vue-jeecg/src/components/jeecgbiz/JSelectPosition.vue index ce5a401e..f863f8e3 100644 --- a/ant-design-vue-jeecg/src/components/jeecgbiz/JSelectPosition.vue +++ b/ant-design-vue-jeecg/src/components/jeecgbiz/JSelectPosition.vue @@ -34,4 +34,4 @@ } - \ No newline at end of file + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/components/jeecgbiz/JSelectRole.vue b/ant-design-vue-jeecg/src/components/jeecgbiz/JSelectRole.vue index 9ef7ffbb..6833a38c 100644 --- a/ant-design-vue-jeecg/src/components/jeecgbiz/JSelectRole.vue +++ b/ant-design-vue-jeecg/src/components/jeecgbiz/JSelectRole.vue @@ -35,4 +35,4 @@ } - \ No newline at end of file + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/components/layouts/BasicLayout.vue b/ant-design-vue-jeecg/src/components/layouts/BasicLayout.vue index 48b3fc51..65b40cd6 100644 --- a/ant-design-vue-jeecg/src/components/layouts/BasicLayout.vue +++ b/ant-design-vue-jeecg/src/components/layouts/BasicLayout.vue @@ -33,7 +33,7 @@ } - - - \ No newline at end of file + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/system/modules/SysCheckRuleTestModal.vue b/ant-design-vue-jeecg/src/views/system/modules/SysCheckRuleTestModal.vue index 4cf61b1e..89b76915 100644 --- a/ant-design-vue-jeecg/src/views/system/modules/SysCheckRuleTestModal.vue +++ b/ant-design-vue-jeecg/src/views/system/modules/SysCheckRuleTestModal.vue @@ -55,4 +55,4 @@ } - \ No newline at end of file + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/system/modules/SysDataSourceModal.vue b/ant-design-vue-jeecg/src/views/system/modules/SysDataSourceModal.vue index 8ae463ba..3d2124ce 100644 --- a/ant-design-vue-jeecg/src/views/system/modules/SysDataSourceModal.vue +++ b/ant-design-vue-jeecg/src/views/system/modules/SysDataSourceModal.vue @@ -224,4 +224,4 @@ } - \ No newline at end of file + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/system/modules/UserRecycleBinModal.vue b/ant-design-vue-jeecg/src/views/system/modules/UserRecycleBinModal.vue index 0bbc79f4..82a6d1d1 100644 --- a/ant-design-vue-jeecg/src/views/system/modules/UserRecycleBinModal.vue +++ b/ant-design-vue-jeecg/src/views/system/modules/UserRecycleBinModal.vue @@ -188,4 +188,4 @@ } - \ No newline at end of file + \ No newline at end of file diff --git a/ant-design-vue-jeecg/src/views/system/modules/UserRoleModal.vue b/ant-design-vue-jeecg/src/views/system/modules/UserRoleModal.vue index 523f92b2..c569ccdc 100644 --- a/ant-design-vue-jeecg/src/views/system/modules/UserRoleModal.vue +++ b/ant-design-vue-jeecg/src/views/system/modules/UserRoleModal.vue @@ -184,7 +184,7 @@ } - -