From d6eac2dc8db77cc631ff9310ae2ef47ea56bb7f8 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Fri, 11 Dec 2020 09:27:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E6=9B=B4=E6=96=B0=E6=8F=92?=
=?UTF-8?q?=E4=BB=B6=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
ruoyi-ui/package.json | 77 +++++++------------
ruoyi-ui/src/assets/styles/sidebar.scss | 9 +++
.../src/components/HeaderSearch/index.vue | 4 +-
ruoyi-ui/src/components/Screenfull/index.vue | 11 +--
.../layout/components/TagsView/ScrollPane.vue | 2 +-
ruoyi-ui/src/main.js | 2 -
ruoyi-ui/vue.config.js | 4 +-
7 files changed, 47 insertions(+), 62 deletions(-)
diff --git a/ruoyi-ui/package.json b/ruoyi-ui/package.json
index 0521365..f87c171 100644
--- a/ruoyi-ui/package.json
+++ b/ruoyi-ui/package.json
@@ -9,11 +9,7 @@
"build:prod": "vue-cli-service build",
"build:stage": "vue-cli-service build --mode staging",
"preview": "node build/index.js --preview",
- "lint": "eslint --ext .js,.vue src",
- "test:unit": "jest --clearCache && vue-cli-service test:unit",
- "test:ci": "npm run lint && npm run test:unit",
- "svgo": "svgo -f src/icons/svg --config=src/icons/svgo.yml",
- "new": "plop"
+ "lint": "eslint --ext .js,.vue src"
},
"husky": {
"hooks": {
@@ -41,59 +37,44 @@
},
"dependencies": {
"@riophae/vue-treeselect": "0.4.0",
- "axios": "0.18.1",
- "clipboard": "2.0.4",
+ "axios": "0.21.0",
+ "clipboard": "2.0.6",
"core-js": "3.8.1",
- "echarts": "4.2.1",
+ "echarts": "4.9.0",
"element-ui": "2.14.1",
- "file-saver": "2.0.1",
- "js-beautify": "1.10.2",
- "fuse.js": "3.4.4",
- "js-cookie": "2.2.0",
+ "file-saver": "2.0.4",
+ "fuse.js": "6.4.3",
+ "js-beautify": "1.13.0",
+ "js-cookie": "2.2.1",
"jsencrypt": "3.0.0-rc.1",
- "normalize.css": "7.0.0",
"nprogress": "0.2.0",
- "path-to-regexp": "2.4.0",
- "screenfull": "4.2.0",
- "sortablejs": "1.8.4",
- "vue": "2.6.10",
- "vue-count-to": "1.0.13",
+ "path-to-regexp": "6.2.0",
"quill": "1.3.7",
- "vue-cropper": "0.4.9",
+ "screenfull": "5.0.2",
+ "sortablejs": "1.10.2",
+ "vue": "2.6.12",
+ "vue-count-to": "1.0.13",
+ "vue-cropper": "0.5.5",
"vue-router": "3.4.9",
- "vue-splitpane": "1.0.4",
- "vuedraggable": "2.20.0",
- "vuex": "3.1.0"
+ "vuedraggable": "2.24.3",
+ "vuex": "3.6.0"
},
"devDependencies": {
- "@vue/cli-plugin-babel": "4.4.4",
- "@vue/cli-plugin-eslint": "4.4.4",
- "@vue/cli-plugin-unit-jest": "4.4.4",
- "@vue/cli-service": "4.4.4",
- "@vue/test-utils": "1.0.0-beta.29",
- "autoprefixer": "9.5.1",
+ "@vue/cli-plugin-babel": "4.4.6",
+ "@vue/cli-plugin-eslint": "4.4.6",
+ "@vue/cli-service": "4.4.6",
"babel-eslint": "10.1.0",
- "babel-jest": "23.6.0",
- "babel-plugin-dynamic-import-node": "2.3.3",
- "chalk": "2.4.2",
- "chokidar": "2.1.5",
+ "chalk": "4.1.0",
"connect": "3.6.6",
- "eslint": "6.7.2",
- "eslint-plugin-vue": "6.2.2",
- "html-webpack-plugin": "3.2.0",
- "husky": "1.3.1",
- "lint-staged": "8.1.5",
- "mockjs": "1.0.1-beta3",
- "plop": "2.3.0",
- "runjs": "4.3.2",
- "node-sass": "4.14.1",
- "sass-loader": "8.0.2",
- "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"
+ "eslint": "7.15.0",
+ "eslint-plugin-vue": "7.2.0",
+ "lint-staged": "10.5.3",
+ "sass": "1.30.0",
+ "runjs": "4.4.2",
+ "sass-loader": "10.1.0",
+ "script-ext-html-webpack-plugin": "2.1.5",
+ "svg-sprite-loader": "5.1.1",
+ "vue-template-compiler": "2.6.12"
},
"engines": {
"node": ">=8.9",
diff --git a/ruoyi-ui/src/assets/styles/sidebar.scss b/ruoyi-ui/src/assets/styles/sidebar.scss
index d870010..9fad799 100644
--- a/ruoyi-ui/src/assets/styles/sidebar.scss
+++ b/ruoyi-ui/src/assets/styles/sidebar.scss
@@ -92,6 +92,15 @@
background-color: rgba(0, 0, 0, 0.06) !important;
}
}
+
+ & .theme-dark .nest-menu .el-submenu>.el-submenu__title,
+ & .theme-dark .el-submenu .el-menu-item {
+ background-color: $subMenuBg !important;
+
+ &:hover {
+ background-color: $subMenuHover !important;
+ }
+ }
}
.hideSidebar {
diff --git a/ruoyi-ui/src/components/HeaderSearch/index.vue b/ruoyi-ui/src/components/HeaderSearch/index.vue
index 6fe5fd6..b2533f3 100644
--- a/ruoyi-ui/src/components/HeaderSearch/index.vue
+++ b/ruoyi-ui/src/components/HeaderSearch/index.vue
@@ -12,7 +12,7 @@
class="header-search-select"
@change="change"
>
- <el-option v-for="item in options" :key="item.path" :value="item" :label="item.title.join(' > ')" />
+ <el-option v-for="option in options" :key="option.item.path" :value="option.item" :label="option.item.title.join(' > ')" />
</el-select>
</div>
</template>
@@ -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/ruoyi-ui/src/components/Screenfull/index.vue b/ruoyi-ui/src/components/Screenfull/index.vue
index 099d74d..85937c9 100644
--- a/ruoyi-ui/src/components/Screenfull/index.vue
+++ b/ruoyi-ui/src/components/Screenfull/index.vue
@@ -22,11 +22,8 @@ export default {
},
methods: {
click() {
- if (!screenfull.enabled) {
- this.$message({
- message: 'you browser can not work',
- type: 'warning'
- })
+ if (!screenfull.isEnabled) {
+ this.$message({ message: '你的浏览器不支持全屏', type: 'warning' })
return false
}
screenfull.toggle()
@@ -35,12 +32,12 @@ export default {
this.isFullscreen = screenfull.isFullscreen
},
init() {
- if (screenfull.enabled) {
+ if (screenfull.isEnabled) {
screenfull.on('change', this.change)
}
},
destroy() {
- if (screenfull.enabled) {
+ if (screenfull.isEnabled) {
screenfull.off('change', this.change)
}
}
diff --git a/ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue b/ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue
index dd4b77f..c110bf1 100644
--- a/ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue
+++ b/ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue
@@ -82,7 +82,7 @@ export default {
position: relative;
overflow: hidden;
width: 100%;
- /deep/ {
+ ::v-deep {
.el-scrollbar__bar {
bottom: 0px;
}
diff --git a/ruoyi-ui/src/main.js b/ruoyi-ui/src/main.js
index 27a0ba6..27539a2 100644
--- a/ruoyi-ui/src/main.js
+++ b/ruoyi-ui/src/main.js
@@ -2,8 +2,6 @@ import Vue from 'vue'
import Cookies from 'js-cookie'
-import 'normalize.css/normalize.css' // a modern alternative to CSS resets
-
import Element from 'element-ui'
import './assets/styles/element-variables.scss'
diff --git a/ruoyi-ui/vue.config.js b/ruoyi-ui/vue.config.js
index fb70857..c8e87d4 100644
--- a/ruoyi-ui/vue.config.js
+++ b/ruoyi-ui/vue.config.js
@@ -109,8 +109,8 @@ module.exports = {
})
config.optimization.runtimeChunk('single'),
{
- from: path.resolve(__dirname, './public/robots.txt'),//防爬虫文件
- to:'./',//到根目录下
+ from: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件
+ to: './', //到根目录下
}
}
)