diff --git a/ant-design-vue-jeecg/idea.config.js b/ant-design-vue-jeecg/idea.config.js
index 4d86bd94a2aca3c8b54fa25e4d8ce128459c40c3..8318a1253757a6028c794f3c91978f1b15de92e7 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 597f6b7b81129baac5ff0967d30f5267d6941d63..2343568d88cc6afb7c96d5ef7686ba628d986b1c 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 ed86ad16d9581a2ee7643d2294b4a4cb4b84c205..844fa70c56861efed68553088cfa059cd2a3a612 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 8acb150d6f72925e23dd461f05799204a14b5603..a03b31d5648eb462d95aebb0c87b826ab92609af 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 1c9b48c5cd64a56ce6fa7ce3ec47fb5769d6dafd..97c8ff70e3cce4ba10411b7afc81be8733b70776 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 ed62d3003a9495200b26a3299711fa19abe727b8..9dd6bca7cf9479137ee13c7f013961581869a3c1 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 444a9d84f12619f8cc06ebfc91a34f40c9f009e4..e6668288f874c98d624c486287babd51e11e9ea1 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 31066fec6f81d4256e47aaaa2dfb5aa2b8727e41..424d6c216735878fda1388a239b92199666a4ef4 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 31ee117d716fbdc82f70397df12cd2105b3c158f..f2f0f2a2827065efa02a98d9e137ecba0c6c2d61 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 ce5a401e707adae26e34a26b8d5cde698332f013..f863f8e3716a157a4d9e4a19c6568827ef6f78ac 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 9ef7ffbbdf4276cd1ff793574c717a2cd75a2821..6833a38c7332b02a7cefcb54e777131f3b26437e 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 48b3fc511c2ca23b845814963a7c8f60405f3d28..65b40cd63cd385f2fe7e711ea47e992077fede6c 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 4cf61b1e33c2dc74f5759ce333f1bc695c7b9078..89b769158a918a37f65d940fbe2833df41cbeb4a 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 8ae463ba61dafa2994d6a5b3a97c48d671092054..3d2124ce792cebae9562e9cc384d0045b999147a 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 0bbc79f4b397c26527f24a973e6d40473019c867..82a6d1d10b9fbb5ccb519def9fd60d95fc197cab 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 523f92b23560370fc5c7b39b85f966058aee1314..c569ccdc640a21c11adbd326dc060a98d01c0d1d 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 @@
}
-
-