Merge branch 'feature/1.8.0-uniapp' of https://gitee.com/zhijiantianya/ruoyi-vue-pro into feature/1.8.0-uniapp

Author: LAPTOP-CNV4CMCJ\cheng

.eslintrc.js

@@ -15,13 +15,6 @@ module.exports = {
   // add your custom rules here
   //it is base on https://github.com/vuejs/eslint-config-vue
   rules: {
-    "vue/max-attributes-per-line": [2, {
-      "singleline": 10,
-      "multiline": {
-        "max": 1,
-        "allowFirstLine": false
-      }
-    }],
     "vue/singleline-html-element-content-newline": "off",
     "vue/multiline-html-element-content-newline":"off",
     "vue/name-property-casing": ["error", "PascalCase"],

build/index.js

@@ -12,8 +12,8 @@ if (process.env.npm_config_preview || rawArgv.includes('--preview')) {
   const port = 9526
   const publicPath = config.publicPath
 
-  var connect = require('connect')
-  var serveStatic = require('serve-static')
+  const connect = require('connect')
+  const serveStatic = require('serve-static')
   const app = connect()
 
   app.use(

package.json

@@ -40,67 +40,65 @@
     "url": "https://github.com/YunaiV/ruoyi-vue-pro"
   },
   "dependencies": {
+    "@babel/parser": "7.18.4",
     "@riophae/vue-treeselect": "0.4.0",
-    "axios": "0.24.0",
+    "axios": "0.27.2",
+    "bpmn-js-token-simulation": "0.10.0",
     "clipboard": "2.0.8",
-    "core-js": "^3.21.1",
+    "core-js": "^3.26.0",
+    "crypto-js": "^4.0.0",
     "echarts": "4.9.0",
-    "element-ui": "2.15.8",
+    "element-ui": "2.15.10",
     "file-saver": "2.0.5",
-    "fuse.js": "6.4.3",
+    "fuse.js": "6.6.2",
     "highlight.js": "9.18.5",
     "js-beautify": "1.13.0",
-    "jsencrypt": "3.0.0-rc.1",
-    "crypto-js": "^4.0.0",
+    "jsencrypt": "3.3.1",
+    "min-dash": "3.5.2",
     "nprogress": "0.2.0",
     "quill": "1.3.7",
     "screenfull": "5.0.2",
     "sortablejs": "1.10.2",
-    "vue": "2.6.12",
+    "throttle-debounce": "2.1.0",
+    "vue": "2.7.0",
     "vue-count-to": "1.0.13",
-    "vue-cropper": "0.5.5",
+    "vue-cropper": "0.5.8",
     "vue-meta": "^2.4.0",
     "vue-router": "3.4.9",
     "vuedraggable": "2.24.3",
-    "vuex": "3.6.0",
-    "bpmn-js-token-simulation": "0.10.0",
-    "min-dash": "3.5.2",
-    "xml-js": "1.6.11",
-    "@babel/parser": "7.7.4",
-    "throttle-debounce": "2.1.0"
+    "vuex": "3.6.2",
+    "xml-js": "1.6.11"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "4.4.6",
-    "@vue/cli-plugin-eslint": "4.4.6",
-    "@vue/cli-service": "4.4.6",
+    "@vue/cli-plugin-babel": "4.5.18",
+    "@vue/cli-plugin-eslint": "4.5.18",
+    "@vue/cli-service": "4.5.18",
+    "@vue/compiler-sfc": "^3.0.1",
+    "@vue/eslint-config-prettier": "^5.0.0",
     "babel-eslint": "10.1.0",
+    "bpmn-js": "8.9.0",
+    "bpmn-js-properties-panel": "0.46.0",
     "chalk": "4.1.0",
     "compression-webpack-plugin": "5.0.2",
     "connect": "3.6.6",
     "eslint": "7.15.0",
-    "eslint-plugin-vue": "7.2.0",
-    "lint-staged": "10.5.3",
-    "sass": "1.32.13",
+    "eslint-config-airbnb-base": "^14.0.0",
+    "eslint-plugin-import": "^2.26.0",
+    "eslint-plugin-prettier": "^3.1.0",
+    "eslint-plugin-vue": "9.0.0",
+    "fs-extra": "^8.1.0",
+    "lint-staged": "12.5.0",
     "runjs": "4.4.2",
-    "sass-loader": "10.1.1",
+    "sass": "1.3.0",
+    "sass-loader": "10.2.0",
     "script-ext-html-webpack-plugin": "2.1.5",
     "svg-sprite-loader": "5.1.1",
-    "vue-template-compiler": "2.6.12",
-    "vue2-ace-editor": "^0.0.15",
-    "@vue/compiler-sfc": "^3.0.1",
-    "@vue/eslint-config-prettier": "^5.0.0",
-    "bpmn-js": "8.9.0",
-    "bpmn-js-properties-panel": "0.46.0",
-    "eslint-plugin-prettier": "^3.1.0",
-    "fs-extra": "^8.1.0",
     "terser-webpack-plugin": "^4.2.3",
-    "webpack-bundle-analyzer": "^3.9.0",
-    "eslint-config-airbnb-base": "^14.0.0",
-    "eslint-plugin-import": "^2.20.0"
+    "webpack-bundle-analyzer": "^3.9.0"
   },
   "engines": {
-    "node": ">=8.9",
-    "npm": ">= 3.0.0"
+    "node": ">= 10.13.0",
+    "npm": ">= 5.0.0"
   },
   "browserslist": [
     "> 1%",

src/App.vue

@@ -1,12 +1,16 @@
 <template>
   <div id="app">
     <router-view />
+    <theme-picker />
   </div>
 </template>
 
 <script>
-export default  {
-  name:  'App',
+import ThemePicker from "@/components/ThemePicker";
+
+export default {
+  name: "App",
+  components: { ThemePicker },
   metaInfo() {
     return {
       title: this.$store.state.settings.dynamicTitle && this.$store.state.settings.title,
@@ -15,5 +19,10 @@ export default  {
       }
     }
   }
-}
+};
 </script>
+<style scoped>
+#app .theme-picker {
+  display: none;
+}
+</style>