目录结构修改

vue/full/package.json

@@ -8,27 +8,27 @@
     "svgo": "svgo -f src/asset/icon/svg"
   },
   "dependencies": {
-    "axios": "^0.21.1",
+    "axios": "0.21.4",
-    "decimal.js": "^10.2.1",
+    "decimal.js": "^10.3.1",
-    "el-admin-layout": "^0.9.4",
+    "el-admin-layout": "^0.9.5",
-    "element-ui": "^2.15.6",
+    "element-ui": "^2.15.7",
     "file-saver": "^2.0.5",
-    "js-md5": "^0.7.3",
+    "js-md5": "0.7.3",
     "nprogress": "^0.2.0",
     "pako": "1.0.11",
     "socket.io-client": "2.3.1",
     "vue": "^2.6.14",
     "vue-count-to": "^1.0.13",
-    "vue-router": "^3.5.1",
+    "vue-router": "^3.5.3",
     "vuex": "^3.6.2"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "~5.0.0-alpha.5",
+    "@vue/cli-plugin-babel": "^5.0.0-rc.1",
-    "@vue/cli-service": "~5.0.0-alpha.5",
+    "@vue/cli-service": "^5.0.0-rc.1",
-    "compression-webpack-plugin": "^7.1.2",
+    "compression-webpack-plugin": "^9.0.1",
-    "sass": "^1.32.8",
+    "sass": "^1.44.0",
-    "sass-loader": "^11.0.1",
+    "sass-loader": "^12.3.0",
-    "svg-sprite-loader": "^5.2.1",
+    "svg-sprite-loader": "^6.0.11",
     "svgo": "^1.3.2",
     "vue-template-compiler": "^2.6.14"
   },

vue/full/src/asset/style/cover/el-admin-layout.scss

@@ -1,4 +0,0 @@
-//如果使用auto的话，滚动条会占据容器宽度，这样<list-page/>的自适应高度比较麻烦，所以偷个懒
-.page-main > .page-content {
-    overflow: overlay;
-}

vue/full/src/component/Empty/style.scss

@@ -1,4 +1,4 @@
-@import "~@/asset/style/var";
+@import "~@/style/var";
 
 .ant-empty {
     padding: 20px;

vue/full/src/component/LinerProgress/style.scss

@@ -1,4 +1,4 @@
-@import "~@/asset/style/var";
+@import "~@/style/var";
 
 .liner-progress {
     position: relative;

vue/full/src/component/RegionSelector/Tab/style.scss

@@ -1,4 +1,4 @@
-@import "~@/asset/style/var";
+@import "~@/style/var";
 
 .rg-header,
 .rg-search {

vue/full/src/component/TreeSelect/index.vue

@@ -201,7 +201,7 @@ export default {
 </script>
 
 <style lang="scss">
-@import "~@/asset/style/var";
+@import "~@/style/var";
 
 .tree-select-container {
     padding: 8px;

vue/full/src/component/Upload/style.scss

@@ -1,4 +1,4 @@
-@import "~@/asset/style/var";
+@import "~@/style/var";
 
 $--upload-size: 90px;
 

vue/full/src/component/abstract/Dialog/index.vue

@@ -1,5 +1,5 @@
 <script type="text/jsx">
-import cssVar from '@/asset/style/var.scss'
+import cssVar from '@/style/var.scss'
 import LoadingMask from './LoadingMask'
 
 export default {

vue/full/src/component/form/Anchor/index.vue

@@ -122,8 +122,8 @@ export default {
 </script>
 
 <style lang="scss">
-@import "~@/asset/style/mixin.scss";
+@import "~@/style/mixin.scss";
-@import "~@/asset/style/var";
+@import "~@/style/var";
 
 .form-anchor {
     position: fixed;

vue/full/src/component/form/ValidateInfo/style.scss

@@ -1,4 +1,4 @@
-@import "~@/asset/style/var";
+@import "~@/style/var";
 
 .form-validate-info {
     &.el-popper {

vue/full/src/globalMethod/Verify/style.scss

@@ -1,4 +1,4 @@
-@import "~@/asset/style/var";
+@import "~@/style/var";
 
 .puzzle-container {
     position: absolute;

vue/full/src/layout/component/SettingDrawer/component/checkbox/style.scss

@@ -1,4 +1,4 @@
-@import "~@/asset/style/var";
+@import "~@/style/var";
 
 .checkbox-group {
     display: flex;

vue/full/src/layout/component/SettingDrawer/style.scss

@@ -1,4 +1,4 @@
-@import "~@/asset/style/var";
+@import "~@/style/var";
 @import "./component/checkbox/style";
 
 .setting-drawer {

vue/full/src/main.js

@@ -1,7 +1,7 @@
 import Vue from 'vue'
 import Element from 'element-ui'
 import ElementPersonal from '@ele'
-import './asset/style/index.scss'
+import './style/index.scss'
 import './asset/icon'
 import './directive'
 import App from './App'

vue/full/src/style/index.scss

@@ -6,7 +6,6 @@
 //layout中的样式需要覆盖element-ui原定义，所以放element-ui的后面
 @import "~@/layout/style.scss";
 @import "./cover/element-ui.scss";
-@import "./cover/el-admin-layout.scss";
 @import "./nprogress.scss";
 
 html {

vue/full/src/view/_app/login/style.scss

@@ -1,4 +1,4 @@
-@import "~@/asset/style/var";
+@import "~@/style/var";
 
 .login-page {
     $background-color: #2d3a4b;

vue/full/src/view/_common/DetailPage/style.scss

@@ -1,6 +1,6 @@
-@import "~@/asset/style/var";
+@import "~@/style/var";
 @import "~el-admin-layout/src/style/var";
-@import "~@/asset/style/mixin.scss";
+@import "~@/style/mixin.scss";
 
 .detail-page {
     &.el-loading-parent--relative {

vue/full/src/view/_common/ExceptionPage/style.scss

@@ -1,5 +1,5 @@
-@import "~@/asset/style/var";
+@import "~@/style/var";
-@import "~@/asset/style/mixin.scss";
+@import "~@/style/mixin.scss";
 
 .exception {
     width: 100%;

vue/full/src/view/admin/index/component/PanelGroup/PanelGroupItem.vue

@@ -31,8 +31,8 @@ export default {
 </script>
 
 <style lang="scss">
-@import "~@/asset/style/var";
+@import "~@/style/var";
-@import "~@/asset/style/mixin.scss";
+@import "~@/style/mixin.scss";
 
 .card-panel {
     height: 108px;

vue/full/src/view/admin/index/component/PanelGroup/index.vue

@@ -8,7 +8,7 @@
 
 <script>
 import PanelGroupItem from './PanelGroupItem'
-import cssVar from '@/asset/style/var.scss'
+import cssVar from '@/style/var.scss'
 import {getFourBlock} from '@/api/statistic'
 import {isEmpty} from "@/util"
 import {auth} from "@/util/auth"

vue/full/src/view/admin/userCenter/component/UserCard.vue

@@ -53,7 +53,7 @@ export default {
 </script>
 
 <style lang="scss">
-@import "~@/asset/style/var";
+@import "~@/style/var";
 
 .user-card {
     .avatar-container {

vue/full/src/view/example/component/skeletonPage.vue

@@ -40,7 +40,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "~@/asset/style/var";
+@import "~@/style/var";
 
 .q-skeleton + .q-skeleton {
     margin-top: 20px;

vue/full/src/view/example/test/develop/component/ImageCompressTest.vue

@@ -174,7 +174,7 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-@import "~@/asset/style/var";
+@import "~@/style/var";
 
 .container {
     max-width: 1200px;

vue/full/vue.config.js

@@ -7,24 +7,35 @@ function resolve(dir) {
     return path.join(__dirname, dir)
 }
 
+/**
+ * @type {import('@vue/cli-service').UserConfig}
+ */
 module.exports = {
     publicPath: settings.contextPath,
     outputDir: 'dist',
     assetsDir: 'static',
     runtimeCompiler: true,
     lintOnSave: false,
-    productionSourceMap: isDev,
+    productionSourceMap: false,
     transpileDependencies: ['el-admin-layout'],
-    devServer: {
+    configureWebpack: {
-        port: process.env.port || 8079,
+        name: settings.title,
-        contentBasePublicPath: settings.contextPath,
+        resolve: {
-        open: true,
+            alias: {
-        overlay: {
+                '@': resolve('src'),
-            warnings: true,
+                '@ele': resolve('element-ui-personal')
-            errors: true
+            }
         },
-        proxy:
+        devServer: {
-            settings.useMock
+            port: process.env.port || 8079,
+            client: {
+                overlay: {
+                    warnings: true,
+                    errors: true
+                },
+            },
+            proxy:
+              settings.useMock
                 ? null
                 : {
                     [settings.apiPrefix]: {
@@ -37,14 +48,10 @@ module.exports = {
                         }
                     }
                 },
-        before: settings.useMock ? app => require('./mock')(app) : undefined
+            onBeforeSetupMiddleware(devServer) {
-    },
+                if (settings.useMock) {
-    configureWebpack: {
+                    require('./mock')(devServer.app)
-        name: settings.title,
+                }
-        resolve: {
-            alias: {
-                '@': resolve('src'),
-                '@ele': resolve('element-ui-personal')
             }
         }
     },