From 2b2971ec4858f6ddb9f81921fb254a6783f07634 Mon Sep 17 00:00:00 2001
From: ZhengJie <201507802@qq.com>
Date: Wed, 8 Jul 2020 11:20:45 +0800
Subject: [PATCH] =?UTF-8?q?[=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96](v2.5):?=
 =?UTF-8?q?=20node-sass=20=E6=9B=BF=E6=8D=A2=E4=B8=BA=20dart-sass=EF=BC=8C?=
 =?UTF-8?q?=20/deep/=20=E5=8F=98=E6=9B=B4=E4=B8=BA=20::v-deep?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                                  | 10 +++++-----
 src/components/HeaderSearch/index.vue         |  2 +-
 src/layout/components/TagsView/ScrollPane.vue |  2 +-
 src/views/components/Editor.vue               |  2 +-
 src/views/generator/config.vue                |  2 +-
 src/views/mnt/server/index.vue                |  2 +-
 src/views/monitor/server/index.vue            |  2 +-
 src/views/system/dept/index.vue               |  4 ++--
 src/views/system/dict/dictDetail.vue          |  2 +-
 src/views/system/job/index.vue                |  2 +-
 src/views/system/job/module/form.vue          |  2 +-
 src/views/system/menu/index.vue               |  4 ++--
 src/views/system/role/index.vue               |  6 +++---
 src/views/system/timing/log.vue               |  2 +-
 src/views/system/user/index.vue               |  6 +++---
 src/views/tools/email/send.vue                |  2 +-
 src/views/tools/storage/local/index.vue       |  4 ++--
 17 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/package.json b/package.json
index d90f327..4381e9b 100644
--- a/package.json
+++ b/package.json
@@ -70,8 +70,8 @@
   },
   "devDependencies": {
     "@babel/core": "7.0.0",
-    "@babel/register": "7.0.0",
     "@babel/parser": "^7.7.4",
+    "@babel/register": "7.0.0",
     "@vue/cli-plugin-babel": "3.5.3",
     "@vue/cli-plugin-eslint": "^3.9.1",
     "@vue/cli-plugin-unit-jest": "3.5.3",
@@ -81,6 +81,8 @@
     "babel-core": "7.0.0-bridge.0",
     "babel-eslint": "10.0.1",
     "babel-jest": "23.6.0",
+    "babel-plugin-dynamic-import-node": "2.3.0",
+    "babel-plugin-transform-remove-console": "^6.9.4",
     "chalk": "2.4.2",
     "chokidar": "2.1.5",
     "connect": "3.6.6",
@@ -90,18 +92,16 @@
     "http-proxy-middleware": "^0.19.1",
     "husky": "1.3.1",
     "lint-staged": "8.1.5",
-    "node-sass": "^4.9.0",
     "plop": "2.3.0",
     "runjs": "^4.3.2",
+    "sass": "^1.26.10",
     "sass-loader": "^7.1.0",
     "script-ext-html-webpack-plugin": "2.1.3",
     "script-loader": "0.7.2",
     "serve-static": "^1.13.2",
     "svg-sprite-loader": "4.1.3",
     "svgo": "1.2.0",
-    "vue-template-compiler": "2.6.10",
-    "babel-plugin-transform-remove-console": "^6.9.4",
-    "babel-plugin-dynamic-import-node": "2.3.0"
+    "vue-template-compiler": "2.6.10"
   },
   "engines": {
     "node": ">=8.9",
diff --git a/src/components/HeaderSearch/index.vue b/src/components/HeaderSearch/index.vue
index bdc1deb..c713efc 100644
--- a/src/components/HeaderSearch/index.vue
+++ b/src/components/HeaderSearch/index.vue
@@ -167,7 +167,7 @@ export default {
     display: inline-block;
     vertical-align: middle;
 
-    /deep/ .el-input__inner {
+   ::v-deep .el-input__inner {
       border-radius: 0;
       border: 0;
       padding-left: 0;
diff --git a/src/layout/components/TagsView/ScrollPane.vue b/src/layout/components/TagsView/ScrollPane.vue
index 0ec76e7..ba4840d 100644
--- a/src/layout/components/TagsView/ScrollPane.vue
+++ b/src/layout/components/TagsView/ScrollPane.vue
@@ -73,7 +73,7 @@ export default {
   position: relative;
   overflow: hidden;
   width: 100%;
-  /deep/ {
+ ::v-deep {
     .el-scrollbar__bar {
       bottom: 0px;
     }
diff --git a/src/views/components/Editor.vue b/src/views/components/Editor.vue
index 415ad15..2befe93 100644
--- a/src/views/components/Editor.vue
+++ b/src/views/components/Editor.vue
@@ -66,7 +66,7 @@ export default {
   .text {
     text-align:left;
   }
-  /deep/ .w-e-text-container {
+ ::v-deep .w-e-text-container {
     height: 420px !important;
   }
 </style>
diff --git a/src/views/generator/config.vue b/src/views/generator/config.vue
index 951acc6..2690dd5 100644
--- a/src/views/generator/config.vue
+++ b/src/views/generator/config.vue
@@ -319,7 +319,7 @@ export default {
 </style>
 
 <style scoped>
-  /deep/ .input-with-select .el-input-group__prepend {
+ ::v-deep .input-with-select .el-input-group__prepend {
     background-color: #fff;
   }
 </style>
diff --git a/src/views/mnt/server/index.vue b/src/views/mnt/server/index.vue
index 5eb4bb8..901eb21 100644
--- a/src/views/mnt/server/index.vue
+++ b/src/views/mnt/server/index.vue
@@ -134,7 +134,7 @@ export default {
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  /deep/ .el-input-number .el-input__inner {
+ ::v-deep .el-input-number .el-input__inner {
     text-align: left;
   }
 </style>
diff --git a/src/views/monitor/server/index.vue b/src/views/monitor/server/index.vue
index 905b2aa..4dac1d9 100644
--- a/src/views/monitor/server/index.vue
+++ b/src/views/monitor/server/index.vue
@@ -251,7 +251,7 @@ export default {
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  /deep/ .box-card {
+ ::v-deep .box-card {
     margin-bottom: 5px;
     span {
       margin-right: 28px;
diff --git a/src/views/system/dept/index.vue b/src/views/system/dept/index.vue
index a401576..3cd9d09 100644
--- a/src/views/system/dept/index.vue
+++ b/src/views/system/dept/index.vue
@@ -246,13 +246,13 @@ export default {
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  /deep/ .vue-treeselect__control, /deep/ .vue-treeselect__placeholder, /deep/ .vue-treeselect__single-value {
+ ::v-deep .vue-treeselect__control,::v-deep .vue-treeselect__placeholder,::v-deep .vue-treeselect__single-value {
     height: 30px;
     line-height: 30px;
   }
 </style>
 <style rel="stylesheet/scss" lang="scss" scoped>
-  /deep/ .el-input-number .el-input__inner {
+ ::v-deep .el-input-number .el-input__inner {
     text-align: left;
   }
 </style>
diff --git a/src/views/system/dict/dictDetail.vue b/src/views/system/dict/dictDetail.vue
index d35adb4..34945bc 100644
--- a/src/views/system/dict/dictDetail.vue
+++ b/src/views/system/dict/dictDetail.vue
@@ -109,7 +109,7 @@ export default {
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  /deep/ .el-input-number .el-input__inner {
+ ::v-deep .el-input-number .el-input__inner {
     text-align: left;
   }
 </style>
diff --git a/src/views/system/job/index.vue b/src/views/system/job/index.vue
index 466fdea..f801686 100644
--- a/src/views/system/job/index.vue
+++ b/src/views/system/job/index.vue
@@ -109,7 +109,7 @@ export default {
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  /deep/ .el-input-number .el-input__inner {
+ ::v-deep .el-input-number .el-input__inner {
     text-align: left;
   }
 </style>
diff --git a/src/views/system/job/module/form.vue b/src/views/system/job/module/form.vue
index 1803e96..aa538fb 100644
--- a/src/views/system/job/module/form.vue
+++ b/src/views/system/job/module/form.vue
@@ -104,7 +104,7 @@ export default {
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  /deep/ .el-input-number .el-input__inner {
+ ::v-deep .el-input-number .el-input__inner {
     text-align: left;
   }
 </style>
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 17e1f7d..8496fa3 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -246,10 +246,10 @@ export default {
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  /deep/ .el-input-number .el-input__inner {
+ ::v-deep .el-input-number .el-input__inner {
     text-align: left;
   }
-  /deep/ .vue-treeselect__control, /deep/ .vue-treeselect__placeholder, /deep/ .vue-treeselect__single-value {
+ ::v-deep .vue-treeselect__control,::v-deep .vue-treeselect__placeholder,::v-deep .vue-treeselect__single-value {
     height: 30px;
     line-height: 30px;
   }
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index de1f6b0..02dead3 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -348,13 +348,13 @@ export default {
 </style>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  /deep/ .el-input-number .el-input__inner {
+ ::v-deep .el-input-number .el-input__inner {
     text-align: left;
   }
-  /deep/ .vue-treeselect__multi-value{
+ ::v-deep .vue-treeselect__multi-value{
     margin-bottom: 0;
   }
-  /deep/ .vue-treeselect__multi-value-item{
+ ::v-deep .vue-treeselect__multi-value-item{
     border: 0;
     padding: 0;
   }
diff --git a/src/views/system/timing/log.vue b/src/views/system/timing/log.vue
index d6bee93..cd08287 100644
--- a/src/views/system/timing/log.vue
+++ b/src/views/system/timing/log.vue
@@ -102,7 +102,7 @@ export default {
     color: #444;
     background: #ffffff !important;
   }
-  /deep/ .el-dialog__body{
+ ::v-deep .el-dialog__body{
     padding: 0 20px 10px 20px !important;
   }
 </style>
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index ad5f4ab..561f858 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -372,8 +372,8 @@ export default {
         })
         return false
       }
-      crud.form.roles = userRoles
-      crud.form.jobs = userJobs
+      // crud.form.roles = userRoles
+      // crud.form.jobs = userJobs
       return true
     },
     // 获取左侧部门数据
@@ -491,7 +491,7 @@ export default {
 </script>
 
 <style rel="stylesheet/scss" lang="scss" scoped>
-  /deep/ .vue-treeselect__control, /deep/ .vue-treeselect__placeholder, /deep/ .vue-treeselect__single-value {
+ ::v-deep .vue-treeselect__control,::v-deep .vue-treeselect__placeholder,::v-deep .vue-treeselect__single-value {
     height: 30px;
     line-height: 30px;
   }
diff --git a/src/views/tools/email/send.vue b/src/views/tools/email/send.vue
index 1aed640..e95885e 100644
--- a/src/views/tools/email/send.vue
+++ b/src/views/tools/email/send.vue
@@ -136,7 +136,7 @@ export default {
     margin: 20px;
     width: 730px;
   }
-  /deep/ .w-e-text-container {
+ ::v-deep .w-e-text-container {
     height: 360px !important;
   }
 </style>
diff --git a/src/views/tools/storage/local/index.vue b/src/views/tools/storage/local/index.vue
index a515def..0aa2596 100644
--- a/src/views/tools/storage/local/index.vue
+++ b/src/views/tools/storage/local/index.vue
@@ -179,10 +179,10 @@ export default {
 </script>
 
 <style scoped>
-  /deep/ .el-image__error, .el-image__placeholder{
+ ::v-deep .el-image__error, .el-image__placeholder{
     background: none;
   }
-  /deep/ .el-image-viewer__wrapper{
+ ::v-deep .el-image-viewer__wrapper{
     top: 55px;
   }
 </style>