Commit d6eac2dc8db77cc631ff9310ae2ef47ea56bb7f8
1 parent
b368ad76
前端更新插件版本
Showing
7 changed files
with
47 additions
and
62 deletions
ruoyi-ui/package.json
| ... | ... | @@ -9,11 +9,7 @@ |
| 9 | 9 | "build:prod": "vue-cli-service build", |
| 10 | 10 | "build:stage": "vue-cli-service build --mode staging", |
| 11 | 11 | "preview": "node build/index.js --preview", |
| 12 | - "lint": "eslint --ext .js,.vue src", | |
| 13 | - "test:unit": "jest --clearCache && vue-cli-service test:unit", | |
| 14 | - "test:ci": "npm run lint && npm run test:unit", | |
| 15 | - "svgo": "svgo -f src/icons/svg --config=src/icons/svgo.yml", | |
| 16 | - "new": "plop" | |
| 12 | + "lint": "eslint --ext .js,.vue src" | |
| 17 | 13 | }, |
| 18 | 14 | "husky": { |
| 19 | 15 | "hooks": { |
| ... | ... | @@ -41,59 +37,44 @@ |
| 41 | 37 | }, |
| 42 | 38 | "dependencies": { |
| 43 | 39 | "@riophae/vue-treeselect": "0.4.0", |
| 44 | - "axios": "0.18.1", | |
| 45 | - "clipboard": "2.0.4", | |
| 40 | + "axios": "0.21.0", | |
| 41 | + "clipboard": "2.0.6", | |
| 46 | 42 | "core-js": "3.8.1", |
| 47 | - "echarts": "4.2.1", | |
| 43 | + "echarts": "4.9.0", | |
| 48 | 44 | "element-ui": "2.14.1", |
| 49 | - "file-saver": "2.0.1", | |
| 50 | - "js-beautify": "1.10.2", | |
| 51 | - "fuse.js": "3.4.4", | |
| 52 | - "js-cookie": "2.2.0", | |
| 45 | + "file-saver": "2.0.4", | |
| 46 | + "fuse.js": "6.4.3", | |
| 47 | + "js-beautify": "1.13.0", | |
| 48 | + "js-cookie": "2.2.1", | |
| 53 | 49 | "jsencrypt": "3.0.0-rc.1", |
| 54 | - "normalize.css": "7.0.0", | |
| 55 | 50 | "nprogress": "0.2.0", |
| 56 | - "path-to-regexp": "2.4.0", | |
| 57 | - "screenfull": "4.2.0", | |
| 58 | - "sortablejs": "1.8.4", | |
| 59 | - "vue": "2.6.10", | |
| 60 | - "vue-count-to": "1.0.13", | |
| 51 | + "path-to-regexp": "6.2.0", | |
| 61 | 52 | "quill": "1.3.7", |
| 62 | - "vue-cropper": "0.4.9", | |
| 53 | + "screenfull": "5.0.2", | |
| 54 | + "sortablejs": "1.10.2", | |
| 55 | + "vue": "2.6.12", | |
| 56 | + "vue-count-to": "1.0.13", | |
| 57 | + "vue-cropper": "0.5.5", | |
| 63 | 58 | "vue-router": "3.4.9", |
| 64 | - "vue-splitpane": "1.0.4", | |
| 65 | - "vuedraggable": "2.20.0", | |
| 66 | - "vuex": "3.1.0" | |
| 59 | + "vuedraggable": "2.24.3", | |
| 60 | + "vuex": "3.6.0" | |
| 67 | 61 | }, |
| 68 | 62 | "devDependencies": { |
| 69 | - "@vue/cli-plugin-babel": "4.4.4", | |
| 70 | - "@vue/cli-plugin-eslint": "4.4.4", | |
| 71 | - "@vue/cli-plugin-unit-jest": "4.4.4", | |
| 72 | - "@vue/cli-service": "4.4.4", | |
| 73 | - "@vue/test-utils": "1.0.0-beta.29", | |
| 74 | - "autoprefixer": "9.5.1", | |
| 63 | + "@vue/cli-plugin-babel": "4.4.6", | |
| 64 | + "@vue/cli-plugin-eslint": "4.4.6", | |
| 65 | + "@vue/cli-service": "4.4.6", | |
| 75 | 66 | "babel-eslint": "10.1.0", |
| 76 | - "babel-jest": "23.6.0", | |
| 77 | - "babel-plugin-dynamic-import-node": "2.3.3", | |
| 78 | - "chalk": "2.4.2", | |
| 79 | - "chokidar": "2.1.5", | |
| 67 | + "chalk": "4.1.0", | |
| 80 | 68 | "connect": "3.6.6", |
| 81 | - "eslint": "6.7.2", | |
| 82 | - "eslint-plugin-vue": "6.2.2", | |
| 83 | - "html-webpack-plugin": "3.2.0", | |
| 84 | - "husky": "1.3.1", | |
| 85 | - "lint-staged": "8.1.5", | |
| 86 | - "mockjs": "1.0.1-beta3", | |
| 87 | - "plop": "2.3.0", | |
| 88 | - "runjs": "4.3.2", | |
| 89 | - "node-sass": "4.14.1", | |
| 90 | - "sass-loader": "8.0.2", | |
| 91 | - "script-ext-html-webpack-plugin": "2.1.3", | |
| 92 | - "script-loader": "0.7.2", | |
| 93 | - "serve-static": "1.13.2", | |
| 94 | - "svg-sprite-loader": "4.1.3", | |
| 95 | - "svgo": "1.2.0", | |
| 96 | - "vue-template-compiler": "2.6.10" | |
| 69 | + "eslint": "7.15.0", | |
| 70 | + "eslint-plugin-vue": "7.2.0", | |
| 71 | + "lint-staged": "10.5.3", | |
| 72 | + "sass": "1.30.0", | |
| 73 | + "runjs": "4.4.2", | |
| 74 | + "sass-loader": "10.1.0", | |
| 75 | + "script-ext-html-webpack-plugin": "2.1.5", | |
| 76 | + "svg-sprite-loader": "5.1.1", | |
| 77 | + "vue-template-compiler": "2.6.12" | |
| 97 | 78 | }, |
| 98 | 79 | "engines": { |
| 99 | 80 | "node": ">=8.9", | ... | ... |
ruoyi-ui/src/assets/styles/sidebar.scss
| ... | ... | @@ -92,6 +92,15 @@ |
| 92 | 92 | background-color: rgba(0, 0, 0, 0.06) !important; |
| 93 | 93 | } |
| 94 | 94 | } |
| 95 | + | |
| 96 | + & .theme-dark .nest-menu .el-submenu>.el-submenu__title, | |
| 97 | + & .theme-dark .el-submenu .el-menu-item { | |
| 98 | + background-color: $subMenuBg !important; | |
| 99 | + | |
| 100 | + &:hover { | |
| 101 | + background-color: $subMenuHover !important; | |
| 102 | + } | |
| 103 | + } | |
| 95 | 104 | } |
| 96 | 105 | |
| 97 | 106 | .hideSidebar { | ... | ... |
ruoyi-ui/src/components/HeaderSearch/index.vue
| ... | ... | @@ -12,7 +12,7 @@ |
| 12 | 12 | class="header-search-select" |
| 13 | 13 | @change="change" |
| 14 | 14 | > |
| 15 | - <el-option v-for="item in options" :key="item.path" :value="item" :label="item.title.join(' > ')" /> | |
| 15 | + <el-option v-for="option in options" :key="option.item.path" :value="option.item" :label="option.item.title.join(' > ')" /> | |
| 16 | 16 | </el-select> |
| 17 | 17 | </div> |
| 18 | 18 | </template> |
| ... | ... | @@ -167,7 +167,7 @@ export default { |
| 167 | 167 | display: inline-block; |
| 168 | 168 | vertical-align: middle; |
| 169 | 169 | |
| 170 | - /deep/ .el-input__inner { | |
| 170 | + ::v-deep .el-input__inner { | |
| 171 | 171 | border-radius: 0; |
| 172 | 172 | border: 0; |
| 173 | 173 | padding-left: 0; | ... | ... |
ruoyi-ui/src/components/Screenfull/index.vue
| ... | ... | @@ -22,11 +22,8 @@ export default { |
| 22 | 22 | }, |
| 23 | 23 | methods: { |
| 24 | 24 | click() { |
| 25 | - if (!screenfull.enabled) { | |
| 26 | - this.$message({ | |
| 27 | - message: 'you browser can not work', | |
| 28 | - type: 'warning' | |
| 29 | - }) | |
| 25 | + if (!screenfull.isEnabled) { | |
| 26 | + this.$message({ message: '你的浏览器不支持全屏', type: 'warning' }) | |
| 30 | 27 | return false |
| 31 | 28 | } |
| 32 | 29 | screenfull.toggle() |
| ... | ... | @@ -35,12 +32,12 @@ export default { |
| 35 | 32 | this.isFullscreen = screenfull.isFullscreen |
| 36 | 33 | }, |
| 37 | 34 | init() { |
| 38 | - if (screenfull.enabled) { | |
| 35 | + if (screenfull.isEnabled) { | |
| 39 | 36 | screenfull.on('change', this.change) |
| 40 | 37 | } |
| 41 | 38 | }, |
| 42 | 39 | destroy() { |
| 43 | - if (screenfull.enabled) { | |
| 40 | + if (screenfull.isEnabled) { | |
| 44 | 41 | screenfull.off('change', this.change) |
| 45 | 42 | } |
| 46 | 43 | } | ... | ... |
ruoyi-ui/src/layout/components/TagsView/ScrollPane.vue
ruoyi-ui/src/main.js
ruoyi-ui/vue.config.js
| ... | ... | @@ -109,8 +109,8 @@ module.exports = { |
| 109 | 109 | }) |
| 110 | 110 | config.optimization.runtimeChunk('single'), |
| 111 | 111 | { |
| 112 | - from: path.resolve(__dirname, './public/robots.txt'),//防爬虫文件 | |
| 113 | - to:'./',//到根目录下 | |
| 112 | + from: path.resolve(__dirname, './public/robots.txt'), //防爬虫文件 | |
| 113 | + to: './', //到根目录下 | |
| 114 | 114 | } |
| 115 | 115 | } |
| 116 | 116 | ) | ... | ... |