vue2-client 1.7.20 → 1.8.0-2

package/.eslintrc.js

@@ -3,7 +3,7 @@ module.exports = {
   env: {
     node: true
   },
-  'extends': [
+  extends: [
     'plugin:vue/essential',
     'plugin:vue/strongly-recommended',
     '@vue/standard'
@@ -17,10 +17,11 @@ module.exports = {
     'vue/max-attributes-per-line': [
       2,
       {
-        'singleline': 5,
-        'multiline': {
-          'max': 1,
-          'allowFirstLine': false
+        singleline: {
+          max: 5
+        },
+        multiline: {
+          max: 1,
         }
       }
     ],
@@ -35,38 +36,42 @@ module.exports = {
     'vue/html-closing-bracket-newline': 0,
     'vue/no-parsing-error': 0,
     'vue/name-property-casing': 0,
+    'vue/multi-word-component-names': 0,
+    'vue/no-mutating-props': 0,
     'no-tabs': 0,
-    'quotes': [
+    'multiline-ternary': 0,
+    'object-shorthand': 0,
+    quotes: [
       2,
       'single',
       {
-        'avoidEscape': true,
-        'allowTemplateLiterals': true
+        avoidEscape: true,
+        allowTemplateLiterals: true
       }
     ],
-    'semi': [
+    semi: [
       2,
       'never',
       {
-        'beforeStatementContinuationChars': 'never'
+        beforeStatementContinuationChars: 'never'
       }
     ],
     'no-delete-var': 2,
     'prefer-const': [
       2,
       {
-        'ignoreReadBeforeAssign': false
+        ignoreReadBeforeAssign: false
       }
     ],
     'template-curly-spacing': 'off',
-    'indent': 'off',
+    indent: 'off',
     // 必须使用全等: false
-    'eqeqeq': 0,
+    eqeqeq: 0,
     // 可以使用!! 双重否定
     'no-extra-boolean-cast': 'off'
   },
   parserOptions: {
-    parser: 'babel-eslint'
+    parser: '@babel/eslint-parser'
   },
   overrides: [
     {

package/babel.config.js

@@ -9,13 +9,13 @@ if (IS_PROD) {
 module.exports = {
   presets: [
     '@vue/cli-plugin-babel/preset',
-    ['@vue/babel-preset-jsx', { 'injectH': false }]
+    ['@vue/babel-preset-jsx', { injectH: false }]
   ],
   plugins,
-  'env': {
-    'test': {
-      'presets': ['@babel/preset-env'],
-      'plugins': ['istanbul']
+  env: {
+    test: {
+      presets: ['@babel/preset-env'],
+      plugins: ['istanbul']
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.7.20",
+  "version": "1.8.0-2",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve",
@@ -21,7 +21,7 @@
     "ant-design-vue": "^1.7.8",
     "axios": "^0.27.2",
     "clipboard": "^2.0.11",
-    "core-js": "^3.30.1",
+    "core-js": "^3.33.0",
     "crypto-js": "^4.1.1",
     "date-fns": "^2.29.3",
     "default-passive-events": "^2.0.0",
@@ -32,12 +32,14 @@
     "js-base64": "^3.7.5",
     "js-cookie": "^2.2.1",
     "jsencrypt": "^3.3.2",
+    "lodash.clonedeep": "^4.5.0",
     "lodash.get": "^4.4.2",
     "mockjs": "^1.1.0",
     "nprogress": "^0.2.0",
+    "regenerator-runtime": "^0.14.0",
     "videojs-contrib-hls": "^5.15.0",
     "viser-vue": "^2.4.8",
-    "vue": "2.6.14",
+    "vue": "^2.7.14",
     "vue-i18n": "^8.28.2",
     "vue-json-viewer": "^2.2.22",
     "vue-router": "^3.6.5",
@@ -48,40 +50,27 @@
   },
   "devDependencies": {
     "@ant-design/colors": "^7.0.0",
-    "@babel/core": "^7.21.4",
+    "@babel/core": "^7.22.20",
+    "@babel/eslint-parser": "^7.22.15",
     "@babel/preset-env": "^7.22.20",
-    "@vue/cli-plugin-babel": "^4.5.19",
-    "@vue/cli-plugin-eslint": "^4.5.19",
-    "@vue/cli-service": "^4.5.19",
-    "@vue/eslint-config-standard": "^4.0.0",
+    "@vue/cli-plugin-babel": "^5.0.8",
+    "@vue/cli-plugin-eslint": "^5.0.8",
+    "@vue/cli-service": "^5.0.8",
+    "@vue/eslint-config-standard": "^8.0.1",
     "@vue/test-utils": "^1.3.6",
-    "@vuepress/plugin-back-to-top": "^1.9.9",
-    "babel-core": "^6.22.1",
-    "babel-eslint": "^10.1.0",
-    "babel-jest": "^25.5.1",
-    "babel-loader": "^6.0.0",
-    "babel-plugin-component": "^1.1.1",
-    "babel-plugin-istanbul": "^4.1.1",
-    "babel-plugin-transform-es2015-modules-commonjs": "^6.26.2",
+    "babel-jest": "^26.6.3",
     "babel-plugin-transform-remove-console": "^6.9.4",
-    "babel-plugin-transform-runtime": "^6.22.0",
-    "babel-polyfill": "^6.26.0",
-    "babel-preset-env": "^1.3.2",
-    "babel-preset-react": "^6.24.1",
-    "babel-register": "^6.22.0",
-    "compression-webpack-plugin": "^4.0.1",
+    "compression-webpack-plugin": "^10.0.0",
+    "css-minimizer-webpack-plugin": "^5.0.1",
     "deepmerge": "^4.3.1",
-    "document-register-element": "^1.14.10",
-    "escope": "^4.0.0",
-    "eslint": "^6.8.0",
-    "eslint-plugin-import": "^2.26.0",
+    "eslint": "^8.51.0",
+    "eslint-plugin-import": "^2.28.1",
     "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^4.3.1",
-    "eslint-plugin-standard": "^4.1.0",
-    "eslint-plugin-vue": "^6.2.2",
+    "eslint-plugin-promise": "^6.1.1",
+    "eslint-plugin-vue": "^9.17.0",
     "fast-deep-equal": "^3.1.3",
-    "jest": "^24.0.0",
-    "jest-environment-jsdom": "^23.4.0",
+    "jest": "^26.6.3",
+    "jest-environment-jsdom": "^26.6.2",
     "jest-transform-stub": "^2.0.0",
     "less-loader": "^6.2.0",
     "script-loader": "^0.7.2",
@@ -89,11 +78,10 @@
     "vue-cli-plugin-style-resources-loader": "^0.1.5",
     "vue-custom-element": "^3.3.0",
     "vue-jest": "^4.0.1",
-    "vue-template-compiler": "2.6.14",
-    "vuepress": "^1.9.9",
-    "webpack": "^4.46.0",
+    "vue-template-compiler": "^2.7.14",
+    "webpack": "^5.88.2",
     "webpack-theme-color-replacer": "^1.4.7",
-    "whatwg-fetch": "^3.6.2"
+    "whatwg-fetch": "^3.6.19"
   },
   "browserslist": [
     "> 1%",

package/src/App.vue

@@ -53,7 +53,7 @@ export default {
         themeUtil.changeThemeColor(val, this.theme.mode).then(closeMessage)
       }
     },
-    'layout': function () {
+    layout: function () {
       window.dispatchEvent(new Event('resize'))
     }
   },

package/src/base-client/components/common/AddressSearchCombobox/AddressSearchCombobox.vue

@@ -25,7 +25,7 @@
                   <a-icon type="bank" /> {{ group.title }}
                 </span>
                 <a-select-option v-for="address in group.children" :key="address.label + ' <' + address.value + '>'">
-                  <p class="addressName"><a-icon type="environment" /> <span v-html="highLight(address.label, address.word)">{{ address.label }}</span></p>
+                  <p class="addressName"><a-icon type="environment" /><span v-html="highLight(address.label, address.word)"></span></p>
                   <p v-if="address.address !== '[]'" class="addressRemark">
                     {{ address.address }}
                   </p>
@@ -169,7 +169,7 @@ export default {
             const addressMap = {}
             result.tips.forEach((res) => {
               if (res.location) {
-                if (!addressMap.hasOwnProperty(res.district)) {
+                if (!Object.prototype.hasOwnProperty.call(addressMap, res.district)) {
                   addressMap[res.district] = []
                 }
                 addressMap[res.district].push({

package/src/base-client/components/common/PersonSetting/PersonSetting.vue

@@ -191,13 +191,11 @@ export default {
 }
 
 .ant-card-body {
-  :global {
-    .ant-tree {
-      line-height: 3;
+  .ant-tree {
+    line-height: 3;
 
-      li {
-        position: relative;
-      }
+    li {
+      position: relative;
     }
   }
 }

package/src/base-client/components/common/Upload/Upload.vue

@@ -39,7 +39,7 @@ import { mapState } from 'vuex'
 import { fileDelete, upload } from '@vue2-client/services/api/common'
 
 export default {
-  name: 'uploads',
+  name: 'Uploads',
   data () {
     return {
       uploadedFileList: [],

package/src/base-client/components/common/XAddNativeForm/XAddNativeForm.vue

@@ -233,7 +233,9 @@ export default {
           case 'number':
           case 'integer':
           case 'float':
+            // eslint-disable-next-line no-case-declarations
             let defaultValue
+            // eslint-disable-next-line no-case-declarations
             let message
             switch (item.rule.type) {
               case 'number':

package/src/base-client/components/common/XForm/XForm.vue

@@ -145,7 +145,9 @@ export default {
           case 'number':
           case 'integer':
           case 'float':
+            // eslint-disable-next-line no-case-declarations
             let defaultValue
+            // eslint-disable-next-line no-case-declarations
             let message
             switch (item.rule.type) {
               case 'number':

package/src/base-client/components/system/DictionaryDetailsView/DictionaryDetailsView.vue

@@ -27,7 +27,7 @@
           </div>
         </div>
         <!-- actions -->
-        <template v-slot:extra>
+        <template #extra>
           <a-button-group style="margin-right: 4px;">
             <a-button type="dashed" @click="initView" :loading="loadDetails">刷新</a-button>
           </a-button-group>
@@ -114,8 +114,8 @@ export default {
     // 初始化组件
     initView () {
       this.tabActiveKey = '1'
-      this.fixedQueryForm['v_f_dictionary_id'] = this.id
-      this.fixedAddForm['v_f_dictionary_id'] = this.id
+      this.fixedQueryForm.v_f_dictionary_id = this.id
+      this.fixedAddForm.v_f_dictionary_id = this.id
       this.getDetails(this.id)
     },
     onClose () {

package/src/base-client/plugins/AppData.js

@@ -56,7 +56,7 @@ const GetAppDataService = {
     const str = localStorage.getItem(process.env.VUE_APP_BADGE_KEY)
     const object = JSON.parse(str)
     const result = object[key]
-    if (result && result.hasOwnProperty(value)) {
+    if (result && Object.prototype.hasOwnProperty.call(result, value)) {
       return result[value]
     } else {
       return null

package/src/base-client/plugins/Config.js

@@ -1,4 +1,3 @@
-
 const asyncReady = async function (vm, name) {
   // 获取配置信息
   try {

package/src/base-client/plugins/GetLoginInfoService.js

@@ -51,10 +51,12 @@ async function getGasman () {
 // eslint-disable-next-line
 async function getLic () {
   try {
-    const getLic = await post(SEARCH, { data: {
+    const getLic = await post(SEARCH, {
+      data: {
         source: 'this.getRights().where(row.getType()==$function$ && row.getPath($name$).indexOf($资源操作$) != -1)',
         userid: Vue.$login.f.id
-      } }, { resolveMsg: null, rejectMsg: null })
+      }
+    }, { resolveMsg: null, rejectMsg: null })
     const arry = []
     getLic.forEach((item) => {
       arry.push(item.name)

package/src/base-client/plugins/tabs-page-plugin.js

@@ -17,8 +17,9 @@ const TabsPagePlugin = {
         },
         $setPageTitle (route, title) {
           if (title) {
-            let path = typeof route === 'object' ? route.path : route
-            path = path && path.split('?')[0]
+            // let path = typeof route === 'object' ? route.path : route
+            // path = path && path.split('?')[0]
+            const path = typeof route === 'object' ? this.$router.resolve(route).route.fullPath : route
             this.$store.commit('setting/setCustomTitle', { path, title })
           }
         }
@@ -26,8 +27,8 @@ const TabsPagePlugin = {
       computed: {
         customTitle () {
           const customTitles = this.$store.state.setting.customTitles
-          const path = this.$route.path.split('?')[0]
-          const custom = customTitles.find(item => item.path === path)
+          // const path = this.$route.path.split('?')[0]
+          const custom = customTitles.find(item => item.path === this.$route.fullPath)
           return custom && custom.title
         }
       }

package/src/components/FilePreview/FilePreview.vue

@@ -111,8 +111,8 @@ export default {
         this.previewImageSrc = this.path
         this.showImagePreview = 2
       } else if (this.isVideo()) {
-        this.playerOptions['sources'][0]['type'] = 'video/' + this.path.substring(this.path.lastIndexOf('.') + 1)
-        this.playerOptions['sources'][0]['src'] = this.path
+        this.playerOptions.sources[0].type = 'video/' + this.path.substring(this.path.lastIndexOf('.') + 1)
+        this.playerOptions.sources[0].src = this.path
         this.showImagePreview = 3
       } else {
         const previewDocUrl = this.previewDocService + encodeURIComponent(Base64.encode(this.fileServer + this.path))

package/src/components/NumberInfo/NumberInfo.vue

@@ -50,5 +50,5 @@ export default {
 </script>
 
 <style lang="less" scoped>
-  @import "index";
+  //@import "index";
 </style>

package/src/components/checkbox/ColorCheckbox.vue

@@ -103,7 +103,7 @@ export default {
   },
   inject: ['groupContext'],
   watch: {
-    'sChecked': function () {
+    sChecked: function () {
       const value = {
         value: this.value,
         color: this.color,

package/src/components/checkbox/ImgCheckbox.vue

@@ -36,7 +36,7 @@ const Group = {
     }
   },
   watch: {
-    'values': function (value) {
+    values: function (value) {
       this.$emit('change', value)
       // // 此条件是为解决单选时，触发两次chang事件问题
       // if (!(newVal.length === 1 && oldVal.length === 1 && newVal[0] === oldVal[0])) {
@@ -102,7 +102,7 @@ export default {
   },
   inject: ['groupContext'],
   watch: {
-    'sChecked': function () {
+    sChecked: function () {
       const option = {
         value: this.value,
         checked: this.sChecked

package/src/components/menu/menu.js

@@ -134,7 +134,7 @@ export default {
         this.sOpenKeys = this.cachedOpenKeys
       }
     },
-    '$route': function () {
+    $route: function () {
       if (this.$route.meta && this.$route.meta.singlePage) {
         this.setSingle(this.$route)
       }

package/src/components/tool/AStepItem.vue

@@ -53,7 +53,7 @@ export default {
   :global{
     .ant-steps-item-process{
       .linkable{
-        color: @primary-color;
+        //color: @primary-color;
       }
     }
   }

package/src/config/default/antd.config.js

@@ -22,10 +22,11 @@ const ANTD = {
       'component-background': '#fff',
       'heading-color': 'rgba(0, 0, 0, 0.85)',
       'text-color': 'rgba(0, 0, 0, 0.65)',
-      'text-color-inverse': '#fff',
+      'text-color-inverse': '#fefefe',
       'text-color-secondary': 'rgba(0, 0, 0, 0.45)',
       'shadow-color': 'rgba(0, 0, 0, 0.15)',
       'border-color-split': '#f0f0f0',
+      'border-color-base': '#d9d9d9',
       'background-color-light': '#fafafa',
       'background-color-base': '#f5f5f5',
       'table-selected-row-bg': '#fafafa',
@@ -34,8 +35,9 @@ const ANTD = {
       'disabled-color': 'rgba(0, 0, 0, 0.25)',
       'menu-dark-color': 'rgba(254, 254, 254, 0.65)',
       'menu-dark-highlight-color': '#fefefe',
+      'menu-dark-selected-item-icon-color': '#fefefe',
       'menu-dark-arrow-color': '#fefefe',
-      'btn-primary-color': '#fff'
+      'btn-primary-color': '#fefefe'
     },
     light: {
       'layout-body-background': '#f0f2f5',
@@ -43,10 +45,11 @@ const ANTD = {
       'component-background': '#fff',
       'heading-color': 'rgba(0, 0, 0, 0.85)',
       'text-color': 'rgba(0, 0, 0, 0.65)',
-      'text-color-inverse': '#fff',
+      'text-color-inverse': '#fefefe',
       'text-color-secondary': 'rgba(0, 0, 0, 0.45)',
       'shadow-color': 'rgba(0, 0, 0, 0.15)',
       'border-color-split': '#f0f0f0',
+      'border-color-base': '#d9d9d9',
       'background-color-light': '#fafafa',
       'background-color-base': '#f5f5f5',
       'table-selected-row-bg': '#fafafa',
@@ -56,7 +59,7 @@ const ANTD = {
       'menu-dark-color': 'rgba(1, 1, 1, 0.65)',
       'menu-dark-highlight-color': '#fefefe',
       'menu-dark-arrow-color': '#fefefe',
-      'btn-primary-color': '#fff'
+      'btn-primary-color': '#fefefe'
     },
     night: {
       'layout-body-background': '#000',
@@ -64,10 +67,11 @@ const ANTD = {
       'component-background': '#141414',
       'heading-color': 'rgba(255, 255, 255, 0.85)',
       'text-color': 'rgba(255, 255, 255, 0.85)',
-      'text-color-inverse': '#141414',
+      'text-color-inverse': '#fefefe',
       'text-color-secondary': 'rgba(255, 255, 255, 0.45)',
       'shadow-color': 'rgba(255, 255, 255, 0.15)',
       'border-color-split': '#303030',
+      'border-color-base': '#282828',
       'background-color-light': '#ffffff0a',
       'background-color-base': '#2a2a2a',
       'table-selected-row-bg': '#ffffff0a',
@@ -76,8 +80,9 @@ const ANTD = {
       'disabled-color': 'rgba(255, 255, 255, 0.25)',
       'menu-dark-color': 'rgba(254, 254, 254, 0.65)',
       'menu-dark-highlight-color': '#fefefe',
+      'menu-dark-selected-item-icon-color': '#fefefe',
       'menu-dark-arrow-color': '#fefefe',
-      'btn-primary-color': '#141414'
+      'btn-primary-color': '#fefefe'
     }
   }
 }

package/src/layouts/PageLayout.vue

@@ -99,7 +99,7 @@ export default {
       const routes = this.$route.matched
       const path = this.$route.path
       const breadcrumb = []
-      routes.filter(item => path.includes(item.path))
+      routes.filter(item => path.includes(item.path) || item.regex.test(path))
         .forEach(route => {
         const path = route.path.length === 0 ? '/home' : route.path
         breadcrumb.push(this.$t(getI18nKey(path)))

package/src/layouts/SinglePageView.vue

@@ -67,9 +67,10 @@ export default {
       })
     } else if (this.singlePageUrl.indexOf('http') !== -1) {
       if (this.singlePageUrl.indexOf('?goto=') !== -1) {
-        this.singlePageUrl = this.singlePageUrl + '&f_user_id=' + this.currUser.username + '&password=' + this.currUser.password
+        this.url = this.singlePageUrl + '&f_user_id=' + this.currUser.username + '&password=' + this.currUser.password
+      } else {
+        this.url = this.singlePageUrl
       }
-      this.url = this.singlePageUrl
     } else {
       this.url = this.iframeSrc
     }

package/src/layouts/header/HeaderNotice.vue

@@ -135,9 +135,10 @@ export default {
         this.loading = false
         return
       }
-      this.loadding = true
+      if (this.show) return
+      this.loading = true
       setTimeout(() => {
-        this.loadding = false
+        this.loading = false
       }, 1000)
     }
   }

package/src/layouts/tabs/TabsHead.vue

@@ -97,8 +97,7 @@
         this.$emit('contextmenu', pageKey, e)
       },
       pageName (page) {
-        const pagePath = page.fullPath.split('?')[0]
-        const custom = this.customTitles.find(item => item.path === pagePath)
+        const custom = this.customTitles.find(item => item.path === page.path)
         return (custom && custom.title) || page.title || this.$t(getI18nKey(page.keyPath))
       }
     }

package/src/layouts/tabs/TabsView.vue

@@ -14,7 +14,7 @@
       <div :class="['tabs-view-content', layout, pageWidth]" :style="`margin-top: ${multiPage ? -24 : 0}px`">
         <page-toggle-transition v-show="!$route.meta.singlePage" :disabled="animate.disabled" :animate="animate.name" :direction="animate.direction">
           <a-keep-alive :exclude-keys="excludeKeys" v-if="multiPage && cachePage" v-model="clearCaches">
-            <router-view v-if="!refreshing" ref="tabContent" :key="$route.path" />
+            <router-view v-if="!refreshing" ref="tabContent" :key="$route.fullPath" />
           </a-keep-alive>
           <router-view ref="tabContent" v-else-if="!refreshing" />
         </page-toggle-transition>
@@ -75,10 +75,10 @@ export default {
     this.loadCacheConfig(this.$router?.options?.routes)
     this.loadCachedTabs()
     const route = this.$route
-    if (this.pageList.findIndex(item => item.path === route.path) === -1) {
+    if (this.pageList.findIndex(item => item.path === route.fullPath) === -1) {
       this.pageList.push(this.createPage(route))
     }
-    this.activePage = route.path
+    this.activePage = route.fullPath
     if (this.multiPage) {
       this.$nextTick(() => {
         this.setCachedKey(route)
@@ -98,9 +98,9 @@ export default {
       this.excludeKeys = []
       this.loadCacheConfig(val)
     },
-    '$route': function (newRoute) {
-      this.activePage = newRoute.path
-      const page = this.pageList.find(item => item.path === newRoute.path)
+    $route: function (newRoute) {
+      this.activePage = newRoute.fullPath
+      const page = this.pageList.find(item => item.path === newRoute.fullPath)
       if (!this.multiPage) {
         this.pageList = [this.createPage(newRoute)]
       } else if (page) {
@@ -114,7 +114,7 @@ export default {
         })
       }
     },
-    'multiPage': function (newVal) {
+    multiPage: function (newVal) {
       if (!newVal) {
         this.pageList = [this.createPage(this.$route)]
         this.removeListener()
@@ -288,7 +288,7 @@ export default {
         keyPath: route.matched[route.matched.length - 1].path,
         fullPath: route.fullPath,
         loading: false,
-        path: route.path,
+        path: route.fullPath,
         title: route.meta && route.meta.page && route.meta.page.title,
         unclose: route.meta && route.meta.page && (route.meta.page.closable === false)
       }
@@ -315,7 +315,7 @@ export default {
         try {
           // 加载缓存的单页面
           const allCachedPath = JSON.parse(cachedTabsStr).map(str => { return str.fullPath })
-          this.allSinglePages.map(item => {
+          this.allSinglePages.forEach(item => {
             if (allCachedPath.includes(item.fullPath)) {
               // 如果缓存中有单页面  加载到 state.single
               this.setSingle(item)
@@ -340,7 +340,7 @@ export default {
           this.allSinglePages.push(item)
         }
         if (!cacheAble) {
-          this.excludeKeys.push(new RegExp(`${item.path}\\d+$`))
+          this.excludeKeys.push(new RegExp(`${item.path.replace(/:[^/]*/g, '[^/]*')}(\\?.*)?\\d*$`))
         }
         if (item.children) {
           this.loadCacheConfig(item.children, cacheAble)

package/src/mock/extend/index.js

@@ -63,7 +63,8 @@ Random.extend({
     const time = new Date()
     const hour = time.getHours()
     return hour < 9
-      ? timeList[0] : (hour <= 11 ? timeList[1] : (hour <= 13 ? timeList[2] : (hour <= 20 ? timeList[3] : timeList[4])))
+      ? timeList[0]
+      : (hour <= 11 ? timeList[1] : (hour <= 13 ? timeList[2] : (hour <= 20 ? timeList[3] : timeList[4])))
   },
   avatar () {
     return this.pick(avatars)

package/src/mock/goods/index.js

@@ -7,13 +7,13 @@ const current = new Date().getTime()
 const goodsList = Mock.mock({
   'list|100': [{
     'id|+1': 0,
-    'name': '@GOODS',
-    'orderId': `${current}-@integer(1,100)`,
+    name: '@GOODS',
+    orderId: `${current}-@integer(1,100)`,
     'status|1-4': 1,
-    'send': '@BOOLEAN',
-    'sendTime': '@DATETIME',
-    'orderDate': '@DATE',
-    'auditTime': '@TIME'
+    send: '@BOOLEAN',
+    sendTime: '@DATETIME',
+    orderDate: '@DATE',
+    auditTime: '@TIME'
   }]
 })
 

package/src/pages/login/Login.vue

@@ -229,7 +229,7 @@ export default {
 
 <style lang="less" scoped>
 .common-layout {
-  background-image: url('/img/login/background.webp');
+  background-image: url('/public/img/login/background.webp');
   background-size: cover;
   background-position: center;
   .content {
@@ -248,7 +248,7 @@ export default {
       display: flex;
       .illustration {
         flex: 1;
-        background-image: url("/img/login/illustration.webp");
+        background-image: url("/public/img/login/illustration.webp");
         background-size: contain;
         background-position: center;
         background-repeat: no-repeat;

package/src/pages/system/monitor/loginInfor/index.vue

@@ -12,7 +12,7 @@
 import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
 
 export default {
-  name: 'loginInfor',
+  name: 'LoginInfor',
   components: {
     XFormTable
   },

package/src/pages/system/monitor/operLog/index.vue

@@ -12,7 +12,7 @@
 import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
 
 export default {
-  name: 'operLog',
+  name: 'OperLog',
   components: {
     XFormTable
   },

package/src/pages/system/settings/modifyPassword.vue

@@ -34,7 +34,7 @@ import { logout, modifyPassword } from '@vue2-client/services/user'
 import { mapState } from 'vuex'
 
 export default {
-  name: 'modifyPassword',
+  name: 'ModifyPassword',
   computed: {
     ...mapState('account', { currUser: 'user' })
   },

package/src/pages/system/ticket/index.vue

@@ -257,7 +257,7 @@ import submitTicketSuccess from './submitTicketSuccess'
 import Upload from '@vue2-client/base-client/components/common/Upload'
 
 export default {
-  name: 'submitTicket',
+  name: 'SubmitTicket',
   components: {
     XFormTable,
     submitTicketSuccess,
@@ -322,7 +322,7 @@ export default {
     this.form.name = this.$route.query.orgName
     this.form.contact = this.$route.query.contact
     this.form.phone = this.$route.query.phone
-    this.fixedQueryForm['t_uploader'] = this.currUser.orgName
+    this.fixedQueryForm.t_uploader = this.currUser.orgName
   },
   methods: {
     toDetail (record, id) {

package/src/pages/system/ticket/submitTicketSuccess.vue

@@ -77,7 +77,7 @@ const AStepItemGroup = AStepItem.Group
 const DetailListItem = DetailList.Item
 
 export default {
-  name: 'submitTicketSuccess',
+  name: 'SubmitTicketSuccess',
   components: { AStepItemGroup, AStepItem, DetailListItem, DetailList, Result, FileItem, ImageItem, FilePreview },
   props: {
     // 工单序列号

package/src/services/api/common.js

@@ -180,7 +180,7 @@ export function download (parameter, filename, serviceName = setting.state.defau
     } else {
       const resText = await data.text()
       const rspObj = JSON.parse(resText)
-      const errMsg = errorCode[rspObj.code] || rspObj.msg || errorCode['default']
+      const errMsg = errorCode[rspObj.code] || rspObj.msg || errorCode.default
       message.error(errMsg)
     }
     notification.close(notificationKey)

package/src/utils/authority-utils.js

@@ -8,10 +8,12 @@ function hasPermission (authority, permissions) {
   let required = '*'
   if (typeof authority === 'string') {
     required = authority
+  } else if (Array.isArray(authority)) {
+    required = authority
   } else if (typeof authority === 'object') {
     required = authority.permission
   }
-  return required === '*' || (permissions && permissions.findIndex(item => item === required || item.id === required) !== -1)
+  return required === '*' || hasAnyItem(required, permissions, (r, t) => !!(r === t || r === t.id))
 }
 
 /**
@@ -24,25 +26,23 @@ function hasRole (authority, roles) {
   if (typeof authority === 'object') {
     required = authority.role
   }
-  return authority === '*' || hasAnyRole(required, roles)
+  return authority === '*' || hasAnyItem(required, roles, (r, t) => !!(r === t || r === t.id))
 }
 
 /**
- * 判断是否有需要的任意一个角色
- * @param required {String | Array[String]} 需要的角色，可以是单个角色或者一个角色数组
- * @param roles 拥有的角色
+ * 判断目标数组是否有所需元素
+ * @param {String | String[]}required 所需元素，数组或单个元素
+ * @param {String[]|Object[]} source 目标数组
+ * @param {Function} filter 匹配条件
+ * (r: String, s: String|Object) => boolean
  * @returns {boolean}
  */
-function hasAnyRole (required, roles) {
+function hasAnyItem (required, source, filter) {
   if (!required) {
     return false
-  } else if (Array.isArray(required)) {
-    return roles.findIndex(role => {
-      return required.findIndex(item => item === role || item === role.id) !== -1
-    }) !== -1
-  } else {
-    return roles.findIndex(role => role === required || role.id === required) !== -1
   }
+  const checkedList = Array.isArray(required) ? required : [required]
+  return !!source.find(s => checkedList.find(r => filter(r, s)))
 }
 
 /**

package/src/utils/errorCode.js

@@ -1,6 +1,6 @@
 export default {
-  '401': '认证失败，无法访问系统资源',
-  '403': '当前操作没有权限',
-  '404': '访问资源不存在',
-  'default': '系统未知错误，请反馈给管理员'
+  401: '认证失败，无法访问系统资源',
+  403: '当前操作没有权限',
+  404: '访问资源不存在',
+  default: '系统未知错误，请反馈给管理员'
 }

package/src/utils/login.js

@@ -109,16 +109,19 @@ function afterLogin (res, options) {
             afterGeneral(result, options)
             setAccessToken(data)
             if (result.deps === '用户工单登记') {
-              router.push(setting.ticketPage).catch(() => {})
+              router.push(setting.ticketPage).catch(() => {
+              })
             } else {
               console.log('去往的页面', pathname)
-              router.push(pathname).catch(() => {})
+              router.push(pathname).catch(() => {
+              })
             }
           })
-          .finally(() => {})
+          .finally(() => {
+          })
+      })
+      .catch((res) => {
       })
-      .catch((res) => {})
-  } else {
   }
 }
 export function startLogin (options) {

package/src/utils/map-utils.js

@@ -19,19 +19,27 @@ async function GetGDMap (secretKey, key) {
   }
   return Amap
 }
+
+async function getGDMap (address) {
+  new (await GetGDMap()).Geocoder({
+    radius: 500 // 范围，默认：500
+  }).getLocation(address, function (status, result) {
+    if (status === 'complete' && result.geocodes.length) {
+      return ({ lng: result.geocodes[0].location.lng, lat: result.geocodes[0].location.lat })
+    } else {
+      // eslint-disable-next-line prefer-promise-reject-errors
+      throw new Error('根据经纬度查询地址失败')
+    }
+  })
+}
+
 async function GetLocation (address) {
-  return new Promise(async (resolve, reject) => {
-    new (await GetGDMap()).Geocoder({
-      radius: 500 // 范围，默认：500
-    }).getLocation(address, function (status, result) {
-      console.log(result)
-      if (status === 'complete' && result.geocodes.length) {
-        resolve({ lng: result.geocodes[0].location.lng, lat: result.geocodes[0].location.lat })
-      } else {
-        // eslint-disable-next-line prefer-promise-reject-errors
-        reject('根据经纬度查询地址失败')
-      }
-    })
+  return new Promise((resolve, reject) => {
+    try {
+      resolve(getGDMap(address))
+    } catch (e) {
+      reject(e)
+    }
   })
 }
 export { GetGDMap, GetLocation }

package/src/utils/request.js

@@ -161,7 +161,7 @@ function loadInterceptors () {
     // 判断是否为V4环境，不为compatible赋初始值
     // 其有可能是undefined未定义，或第一次使用本系统LocalStorage在初始化，获得的值为null
     const compatible = getSystemVersion()
-    if (compatible === 'V4' || (res.data.code && res.data.hasOwnProperty('msg'))) {
+    if (compatible === 'V4' || (res.data.code && Object.prototype.hasOwnProperty.call(res.data, 'msg'))) {
       // 请求rul
       const requestUrl = res.config.url
       if (res.data.data) {
@@ -170,7 +170,7 @@ function loadInterceptors () {
       // 未设置状态码则默认成功状态
       const code = res.data.code || 200
       // 获取错误信息
-      const msg = errorCode[code] || res.data.msg || errorCode['default']
+      const msg = errorCode[code] || res.data.msg || errorCode.default
       // 二进制数据则直接返回
       if (res.request.responseType === 'blob' || res.request.responseType === 'arraybuffer') {
         return res.data

package/src/utils/routerUtil.js

@@ -67,14 +67,14 @@ function parseRoutes (routesConfig, routerMap) {
     } else if (typeof item === 'object') {
       // 当没有设置路由对象名或者设置的是blank路由对象时, 给空界面, path为名称
       if (!item.router || item.router === 'blank') {
-        router = routerMap['blank']
+        router = routerMap.blank
         item.path = encodeURI(item.name)
       } else {
         router = routerMap[item.router]
       }
       // 查看是否是单页面
       if (item.meta && item.meta.singlePage) {
-        router = routerMap['singlePage']
+        router = routerMap.singlePage
         item.path = encodeURI(item.name)
       }
       // 当没在动态路由对象中找到时, 不添加到路由
@@ -117,6 +117,9 @@ function parseRoutes (routesConfig, routerMap) {
       redirect: routeCfg.redirect || router.redirect,
       meta: { ...meta, authority: meta.authority || '*' }
     }
+    if (router.beforeEnter) {
+      route.beforeEnter = router.beforeEnter
+    }
     if (routeCfg.invisible || router.invisible) {
       route.meta.invisible = true
     }
@@ -265,7 +268,7 @@ function formatAuthority (routes, pAuthorities = []) {
       let authority = {}
       if (!meta.authority) {
         authority = defaultAuthority
-      } else if (typeof meta.authority === 'string') {
+      } else if (typeof meta.authority === 'string' || Array.isArray(meta.authority)) {
         authority.permission = meta.authority
       } else if (typeof meta.authority === 'object') {
         authority = meta.authority

package/src/utils/util.js

@@ -57,7 +57,7 @@ export function formatDate (dateStr, fmt) {
     'm+': date.getMinutes(),
     's+': date.getSeconds(),
     'q+': Math.floor((date.getMonth() + 3) / 3),
-    'S': date.getMilliseconds()
+    S: date.getMilliseconds()
   }
   if (!fmt) {
     fmt = 'yyyy-MM-dd hh:mm:ss'
@@ -91,7 +91,8 @@ export function timeFix () {
   const time = new Date()
   const hour = time.getHours()
   return hour < 9
-    ? timeList[0] : (hour <= 11 ? timeList[1] : (hour <= 13 ? timeList[2] : (hour <= 20 ? timeList[3] : timeList[4])))
+    ? timeList[0]
+    : (hour <= 11 ? timeList[1] : (hour <= 13 ? timeList[2] : (hour <= 20 ? timeList[3] : timeList[4])))
 }
 
 /**

package/vue.config.js

@@ -4,12 +4,13 @@ const ThemeColorReplacer = require('webpack-theme-color-replacer')
 const { getThemeColors, modifyVars } = require('./src/utils/themeUtil')
 const { resolveCss } = require('./src/utils/theme-color-replacer-extend')
 const CompressionWebpackPlugin = require('compression-webpack-plugin')
+const CssMinimizerPlugin = require('css-minimizer-webpack-plugin')
 
 const productionGzipExtensions = ['js', 'css']
 const isProd = process.env.NODE_ENV === 'production'
 
-const server = 'http://221.193.244.147:9600'
-const local = 'http://221.193.244.147:9600/webmeter'
+const server = 'http://61.134.55.234:8405'
+const local = 'http://61.134.55.234:8456/webmeter'
 // const local = 'http://localhost:8080'
 
 module.exports = {
@@ -48,7 +49,7 @@ module.exports = {
     }
   },
   configureWebpack: config => {
-    config.entry.app = ['babel-polyfill', 'whatwg-fetch', './src/main.js']
+    config.entry.app = ['core-js/stable', 'regenerator-runtime/runtime', 'whatwg-fetch', './src/main.js']
     config.performance = {
       hints: false
     }
@@ -61,12 +62,15 @@ module.exports = {
       })
     )
     // Ignore all locale files of moment.js
-    config.plugins.push(new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/))
+    config.plugins.push(new webpack.IgnorePlugin({
+      resourceRegExp: /^\.\/locale$/,
+      contextRegExp: /moment$/
+    }))
     // 生产环境下将资源压缩成gzip格式
     if (isProd) {
       // add `CompressionWebpack` plugin to webpack plugins
       config.plugins.push(new CompressionWebpackPlugin({
-        algorithm: 'gzip',
+        algorithm: require('zlib').createGzip,
         test: new RegExp('\\.(' + productionGzipExtensions.join('|') + ')$'),
         threshold: 10240,
         minRatio: 0.8
@@ -80,11 +84,17 @@ module.exports = {
   chainWebpack: config => {
     // 生产环境下关闭css压缩的 colormin 项，因为此项优化与主题色替换功能冲突
     if (isProd) {
-      config.plugin('optimize-css')
-        .tap(args => {
-          args[0].cssnanoOptions.preset[1].colormin = false
-          return args
-        })
+      config.optimization.minimizer('css').use(CssMinimizerPlugin, [{
+        minimizerOptions: {
+          preset: [
+            'default',
+            {
+              discardComments: { removeAll: true },
+              colormin: false,
+            }
+          ]
+        }
+      }])
     }
     config.resolve.alias.set('@vue2-client', path.resolve(__dirname, 'src'))
   },

package//350/277/201/347/247/273/346/227/245/345/277/227.md

@@ -0,0 +1,15 @@
+# vue2迁移vue3
+
+1. 完成vue-cli，webpack，babel，eslint的升级
+   - core-js 3.30.1 -> 3.33.0
+   - add regenerator-runtime
+   - @babel/core 7.21.4 -> 7.22.20
+   - babel-eslint 10.1.0 -> @babel/eslint-parser 7.22.15
+   - @vue/cli 4.5.19 -> 5.0.8
+   - babel-jest 25.5.1 -> 26.6.3
+   - eslint 6.8.0 -> 7.32.0
+   - jest 24.0.0 -> 26.6.3
+   - webpack 4.46.0 -> 5.88.2
+2. 完成vue2的2.7升级
+   - vue 2.6.14 -> 2.7.14
+   - eslint 7.32.0 -> 8.51.0