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; } 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 { 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 { 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 { 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 { 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 { 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 { 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 { 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 { 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 {