vue2-client 1.8.0-1 → 1.8.0-10

package/.env

@@ -14,3 +14,4 @@ VUE_APP_SINGLEVALUE_KEY=admin.singlevalue
 VUE_APP_DIVISIONSOHCHINA=admin.divisionsohchina
 VUE_APP_WEB_CONFIG_KEY=admin.webconfig
 VUE_APP_API_BASE_URL=http://123.60.214.109:8405
+VUE_APP_SYSTEM_NAME=af-system

package/jest-transform-stub.js

@@ -1,9 +1,8 @@
 module.exports = {
-    process() {
-      return 'module.exports = {};';
+    process () {
+      return 'module.exports = {};'
     },
-    getCacheKey() {
-      return 'lessTransform';
+    getCacheKey () {
+      return 'lessTransform'
     },
-  };
-  
+  }

package/jest.setup.js

@@ -1,7 +1,7 @@
-global.matchMedia = global.matchMedia || function () {
-  return {
-    matches: false,
-    addListener: function () {},
-    removeListener: function () {}
-  }
-}
+global.matchMedia = global.matchMedia || function () {
+  return {
+    matches: false,
+    addListener: function () {},
+    removeListener: function () {}
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.8.0-1",
+  "version": "1.8.0-10",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve",
@@ -32,6 +32,7 @@
     "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",
@@ -57,17 +58,12 @@
     "@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-jest": "^26.6.3",
     "babel-plugin-transform-remove-console": "^6.9.4",
     "compression-webpack-plugin": "^10.0.0",
     "css-minimizer-webpack-plugin": "^5.0.1",
     "deepmerge": "^4.3.1",
-    "document-register-element": "^1.14.10",
     "eslint": "^8.51.0",
-    "eslint-plugin-import": "^2.28.1",
-    "eslint-plugin-node": "^11.1.0",
-    "eslint-plugin-promise": "^6.1.1",
     "eslint-plugin-vue": "^9.17.0",
     "fast-deep-equal": "^3.1.3",
     "jest": "^26.6.3",
@@ -77,17 +73,16 @@
     "script-loader": "^0.7.2",
     "style-resources-loader": "^1.5.0",
     "vue-cli-plugin-style-resources-loader": "^0.1.5",
-    "vue-custom-element": "^3.3.0",
     "vue-jest": "^4.0.1",
     "vue-template-compiler": "^2.7.14",
-    "vuepress": "^1.9.9",
     "webpack": "^5.88.2",
     "webpack-theme-color-replacer": "^1.4.7",
-    "whatwg-fetch": "^3.6.2"
+    "whatwg-fetch": "^3.6.19"
   },
   "browserslist": [
     "> 1%",
     "last 2 versions",
-    "not ie <= 10"
+    "not dead",
+    "not ie 11"
   ]
 }

package/src/base-client/components/common/CreateQuery/CreateQueryItem.vue

@@ -653,6 +653,7 @@ export default {
         rule: {
           required: 'false'
         },
+        column: [],
         selectKey: undefined,
         queryType: '=',
         formType: 'input',
@@ -680,7 +681,7 @@ export default {
     // 编辑数据字段前准备数据
     editColumnItemExecute (_item) {
       this.type = '修改'
-      const defaultValue = { formType: 'input', type: 'string', addOrEdit: 'all', slot: { type: 'default' }, rule: {}, selectKey: {} }
+      const defaultValue = { formType: 'input', type: 'string', addOrEdit: 'all', slot: { type: 'default' }, rule: {}, selectKey: {}, column: [] }
       if (!_item.queryType) {
         defaultValue.queryType = '='
       }

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

@@ -9,7 +9,11 @@
     okText="提交"
     @cancel="close"
     @ok="$refs.nativeForm.onSubmit()">
-    <x-add-native-form ref="nativeForm" @onSubmit="onSubmit" @tempTableModify="tempTableModify"/>
+    <x-add-native-form
+      ref="nativeForm"
+      @afterSubmit="afterSubmit"
+      @onSubmit="onSubmit"
+      @tempTableModify="tempTableModify"/>
   </a-modal>
 </template>
 <script>
@@ -43,6 +47,7 @@ export default {
     },
     methods: {
       init (params) {
+        params.showSubmitBtn = false
         const {
           businessType, title
         } = params
@@ -50,7 +55,7 @@ export default {
         this.title = title
         this.visible = true
         const that = this
-        that.$nextTick(function () {
+        that.$nextTick(() => {
           that.$refs.nativeForm.init(params)
         })
       },
@@ -60,9 +65,20 @@ export default {
       },
       onSubmit (params) {
         this.loading = true
-        this.$emit('onSubmit', params, () => {
-          this.close()
-        })
+        if (this.$listeners.onSubmit) {
+          // 交由父级处理
+          this.$emit('onSubmit', params, () => {
+            this.close()
+          })
+        } else {
+          // 触发默认提交事件
+          this.$refs.nativeForm.defaultSubmit(params.realForm, () => {
+            this.close()
+          })
+        }
+      },
+      afterSubmit (params) {
+        this.$emit('afterSubmit', params)
       },
       tempTableModify (params) {
         this.$emit('tempTableModify', params)

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

@@ -1,63 +1,66 @@
 <template>
-  <a-form-model
-    v-if="loaded"
-    ref="selectForm"
-    :zIndex="1001"
-    :model="form"
-    :rules="rules">
-    <a-row :gutter="16">
-      <x-form-item
-        v-for="(item, index) in realJsonData"
-        :key="index"
-        :attr="item"
-        :disabled="itemDisabled(item)"
-        :files="files"
-        :form="form"
-        :images="images"
-        :service-name="serviceName"
-        mode="新增/修改"
-        :get-data-params="getDataParams"
-      />
-    </a-row>
-    <a-row :gutter="16" v-for="(groupItem, groupIndex) in groupJsonData" :key="groupIndex">
-      <a-card :title="groupItem.name" :bordered="false" size="small">
+  <div>
+    <a-form-model
+      v-if="loaded"
+      ref="selectForm"
+      :zIndex="1001"
+      :model="form"
+      :rules="rules">
+      <a-row :gutter="16">
         <x-form-item
-          v-for="(item, index) in groupItem.groupItems"
+          v-for="(item, index) in realJsonData"
           :key="index"
           :attr="item"
           :disabled="itemDisabled(item)"
           :files="files"
-          :form="form[groupItem.model]"
-          :images="images"
-          :service-name="serviceName"
-          mode="新增/修改"
-          :get-data-params="getDataParams"
-        />
-      </a-card>
-    </a-row>
-    <a-row :gutter="16" v-for="(item, key) in simpleFormJsonData" :key="'row' + key">
-      <a-card :title="item.name" :bordered="false" size="small">
-        <x-form-item
-          v-for="(formItem, formItemIndex) in item.value"
-          :key="key + formItemIndex"
-          :attr="formItem"
-          :disabled="itemDisabled(formItem)"
-          :files="files"
           :form="form"
           :images="images"
           :service-name="serviceName"
           mode="新增/修改"
           :get-data-params="getDataParams"
         />
-      </a-card>
-    </a-row>
-  </a-form-model>
+      </a-row>
+      <a-row :gutter="16" v-for="(groupItem, groupIndex) in groupJsonData" :key="groupIndex">
+        <a-card :title="groupItem.name" :bordered="false" size="small">
+          <x-form-item
+            v-for="(item, index) in groupItem.groupItems"
+            :key="index"
+            :attr="item"
+            :disabled="itemDisabled(item)"
+            :files="files"
+            :form="form[groupItem.model]"
+            :images="images"
+            :service-name="serviceName"
+            mode="新增/修改"
+            :get-data-params="getDataParams"
+          />
+        </a-card>
+      </a-row>
+      <a-row :gutter="16" v-for="(item, key) in simpleFormJsonData" :key="'row' + key">
+        <a-card :title="item.name" :bordered="false" size="small">
+          <x-form-item
+            v-for="(formItem, formItemIndex) in item.value"
+            :key="key + formItemIndex"
+            :attr="formItem"
+            :disabled="itemDisabled(formItem)"
+            :files="files"
+            :form="form"
+            :images="images"
+            :service-name="serviceName"
+            mode="新增/修改"
+            :get-data-params="getDataParams"
+          />
+        </a-card>
+      </a-row>
+    </a-form-model>
+    <a-button v-if="showSubmitBtn" :loading="loading" type="primary" @click="onSubmit()">提交</a-button>
+  </div>
 </template>
 <script>
 import XFormItem from '@vue2-client/base-client/components/common/XForm/XFormItem'
 import { formatDate } from '@vue2-client/utils/util'
 import { mapState } from 'vuex'
-import { runLogic } from '@vue2-client/services/api/common'
+import { addOrModify, runLogic } from '@vue2-client/services/api/common'
 
 export default {
   name: 'XAddNativeForm',
@@ -82,10 +85,16 @@ export default {
       loading: false,
       // 表单Model
       form: {},
+      // 配置名称
+      configName: undefined,
+      // 配置内容，用于查询配置生成器的预览
+      configContent: undefined,
       // 表单项集合
       formItems: [],
       // 服务名称
       serviceName: undefined,
+      // 是否显示提交按钮
+      showSubmitBtn: true,
       // 修改有文件的表单时使用
       files: [],
       images: [],
@@ -142,9 +151,11 @@ export default {
   methods: {
     init (params) {
       const {
-        formItems, viewMode, isHandleFormKey = true, serviceName, isTableTemp = false, modifyModelData = {}, businessType, title, fixedAddForm = {}, getDataParams = {}, simpleFormJsonData = {}
+        configName, configContent, formItems, viewMode, isHandleFormKey = true, showSubmitBtn = true, serviceName, isTableTemp = false, modifyModelData = {}, businessType, title, fixedAddForm = {}, getDataParams = {}, simpleFormJsonData = {}
       } = params
       this.loaded = false
+      this.configName = configName
+      this.configContent = configContent
       if (typeof formItems === 'string') {
           this.formItems = JSON.parse(formItems)
       } else {
@@ -152,6 +163,7 @@ export default {
       }
       this.viewMode = viewMode
       this.isHandleFormKey = isHandleFormKey
+      this.showSubmitBtn = showSubmitBtn
       this.serviceName = serviceName
       this.businessType = businessType
       this.title = title
@@ -334,21 +346,42 @@ export default {
         }
         if (this.viewMode) {
           this.$message.info('预览模式禁止新增和修改')
-          console.log({
+          return false
+        }
+        if (this.$listeners.onSubmit) {
+          // 交由父级处理
+          this.$emit('onSubmit', {
             businessType: this.businessType,
             serviceName: this.serviceName,
             realForm: realForm,
             currUserName: this.currUser.name
           })
-          return false
+        } else {
+          this.defaultSubmit(realForm)
+        }
+      })
+    },
+    // 默认提交事件
+    defaultSubmit (realForm, callback) {
+      // 组织请求
+      const requestParameters = {
+        queryParamsName: this.configName,
+        queryParams: this.configContent,
+        form: realForm,
+        businessType: this.businessType,
+        operator: this.currUser.name
+      }
+      addOrModify(requestParameters, this.serviceName).then(data => {
+        this.$message.success(this.businessType + '成功！')
+        // commit
+        this.$emit('afterSubmit', { type: this.businessType, id: data.id, form: requestParameters.form })
+      }).catch(e => {
+        this.$message.error(this.businessType + '失败：' + e)
+      }).finally(() => {
+        this.loading = false
+        if (callback) {
+          callback()
         }
-        // 交由父级处理
-        this.$emit('onSubmit', {
-          businessType: this.businessType,
-          serviceName: this.serviceName,
-          realForm: realForm,
-          currUserName: this.currUser.name
-        })
       })
     },
     // 获取表单字段实际值

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

@@ -0,0 +1,117 @@
+<template>
+  <div>
+    <a-skeleton :loading="loading" :paragraph="{ rows: 4 }" />
+    <div v-show="!loading">
+      <template v-if="!loadError">
+        <a-descriptions v-if="realData" :column="isMobile ? 1 : column" size="small" :title="title">
+          <a-descriptions-item
+            v-for="(value, key) in realData"
+            :key="key"
+            :label="key">
+            {{ formatText(value) }}
+          </a-descriptions-item>
+        </a-descriptions>
+      </template>
+      <template v-else>
+        <a-empty>
+          <span slot="description"> 页面配置不存在，请联系系统管理员 </span>
+        </a-empty>
+      </template>
+    </div>
+  </div>
+</template>
+<script>
+
+import { mapState } from 'vuex'
+import { getConfig } from '@vue2-client/services/api'
+
+export default {
+  name: 'XDescriptions',
+  components: {
+  },
+  props: {
+    // 标题
+    title: {
+      type: String,
+      required: true
+    },
+    // 内容
+    content: {
+      type: Object,
+      required: true
+    },
+    // 模型名
+    model: {
+      type: String,
+      required: true
+    },
+    // 配置名称
+    configName: {
+      type: String,
+      required: true
+    },
+    // 配置所属命名空间
+    serviceName: {
+      type: String,
+      default: undefined
+    },
+    // 每列显示数量
+    column: {
+      type: Number,
+      default: 2
+    }
+  },
+  created () {
+    this.initConfig()
+  },
+  data () {
+    return {
+      // 加载状态
+      loading: false,
+      loadError: false,
+      realData: undefined
+    }
+  },
+  computed: {
+    ...mapState('setting', ['isMobile'])
+  },
+  methods: {
+    initConfig () {
+      this.loading = true
+      this.loadError = false
+      if (this.configName) {
+        this.getConfig()
+      } else {
+        this.loading = false
+        this.loadError = true
+      }
+    },
+    getConfig () {
+      getConfig(this.configName, this.serviceName, (res) => {
+        const mapIndex = {}
+        res.formJson.filter(item => {
+          const model = item.model
+          return model.indexOf(this.model) > 0
+        })[0].groupItems.forEach(item => {
+          mapIndex[item.model.substring(item.model.indexOf('_') + 1)] = item.name
+        })
+        const result = {}
+        for (const key of Object.keys(this.content)) {
+          const name = mapIndex[key]
+          if (name) {
+            result[name] = this.content[key]
+          } else {
+            result[key] = this.content[key]
+          }
+        }
+        this.realData = result
+        this.loading = false
+      })
+    },
+    // 文字格式化
+    formatText (value) {
+      return value || '--'
+    }
+  }
+}
+</script>

package/src/base-client/components/common/XDescriptions/index.js

@@ -0,0 +1,3 @@
+import XDescriptions from './XDescriptions.vue'
+
+export default XDescriptions

package/src/base-client/components/common/XDescriptions/index.md

@@ -0,0 +1,83 @@
+# XDescriptions
+
+动态Descriptions控件，根据JSON配置动态生成Descriptions
+
+
+## 何时使用
+
+当需要一个动态生成的Descriptions时
+
+
+引用方式：
+
+```javascript
+import XDescriptions from '@vue2-client/base-client/components/XDescriptions/XDescriptions'
+
+export default {
+    components: {
+      XDescriptions
+    }
+}
+```
+
+
+
+## 代码演示
+
+```html
+<x-descriptions
+  title="设备属性"
+  :content="details.prop_json"
+  :queryParamsName="queryParamsName">
+</x-descriptions>
+```
+
+## API
+
+| 参数              | 说明          | 类型     | 默认值  |
+|-----------------|-------------|--------|------|
+| title           | 业务名称        | String | ''   |
+| content         | 业务内容        | String | ''   |
+| queryParamsName | 查询配置JSON文件名 | String | null |
+| serviceName     | 配置所属命名空间    | String | null |
+
+## 例子1
+----
+（基础使用）
+
+```vue
+<template>
+  <x-descriptions
+    title="设备属性"
+    :content="details.prop_json"
+    :configName="configName">
+  </x-descriptions>
+</template>
+
+<script>
+  import XDescriptions from '@vue2-client/base-client/components/XDescriptions/XDescriptions'
+
+  export default {
+    components: {
+      XDescriptions
+    },
+    data () {
+      return {
+        // 查询配置文件名
+        configName: 'logQueryParams',
+        details: {
+          prop_json: {
+              规格: 'G2.5'
+          }
+        }
+      }
+    },
+    created () {
+
+    },
+    methods: {
+
+    }
+  }
+</script>
+```

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

@@ -5,7 +5,7 @@
       <template v-if="!loadError">
         <x-add-form
           ref="xAddForm"
-          @onSubmit="onAddOrEditSubmit"
+          @afterSubmit="onAddOrEditSubmitAfterSubmit"
         />
         <x-form
           ref="xForm"
@@ -57,7 +57,7 @@ import XForm from '@vue2-client/base-client/components/common/XForm'
 import XAddForm from '@vue2-client/base-client/components/common/XAddForm'
 import XTable from '@vue2-client/base-client/components/common/XTable'
 import XImportExcel from '@vue2-client/base-client/components/common/XImportExcel'
-import { addOrModify, getConfig, getConfigByLogic, parseConfig } from '@vue2-client/services/api/common'
+import { getConfig, getConfigByLogic, parseConfig } from '@vue2-client/services/api/common'
 import { mapState } from 'vuex'
 
 export default {
@@ -240,27 +240,12 @@ export default {
       }
     },
     /**
-     * 提交新增表单事件
+     * 提交新增/修改表单后事件
      */
-    onAddOrEditSubmit (res, callback) {
-      // 组织请求
-      const requestParameters = {
-        queryParamsName: this.queryParamsName,
-        queryParams: this.queryParamsJson,
-        form: res.realForm,
-        businessType: res.businessType,
-        operator: res.currUserName
-      }
-      addOrModify(requestParameters, this.serviceName).then(data => {
-        this.$message.success(res.businessType + '成功！')
-        this.refreshTable(res.businessType === '新增')
-        // commit
-        this.$emit('afterSubmit', { type: res.businessType, id: data.id, form: requestParameters.form })
-      }).catch(e => {
-        this.$message.error(res.businessType + '失败：' + e)
-      }).finally(() => {
-        callback()
-      })
+    onAddOrEditSubmitAfterSubmit (res) {
+      this.refreshTable(res.businessType === '新增')
+      // commit
+      this.$emit('afterSubmit', res)
     },
     /**
      * 表格查询后事件
@@ -288,6 +273,8 @@ export default {
         businessType: '新增',
         title: this.title,
         isShow: !res.buttonState || res.buttonState.add || res.buttonState.edit,
+        configName: this.queryParamsName,
+        configContent: this.queryParamsJson,
         formItems: res.formJson,
         viewMode: this.viewMode,
         isTableTemp: this.isTableTemp,
@@ -306,6 +293,8 @@ export default {
         businessType: '修改',
         title: this.title,
         isShow: !res.buttonState || res.buttonState.add || res.buttonState.edit,
+        configName: this.queryParamsName,
+        configContent: this.queryParamsJson,
         formItems: res.formJson,
         viewMode: this.viewMode,
         isTableTemp: this.isTableTemp,

package/src/base-client/components/common/XFormTable/index.md

@@ -38,6 +38,7 @@ export default {
 | title              | 业务名称                    | String  | ''    |
 | queryParamsName    | 查询配置JSON文件名             | String  | null  |
 | queryParamsJson    | 查询配置文件Json，用于查询配置生成器的预览 | Object  | null  |
+| serviceName        | 配置所属命名空间                | String  | null  |
 | logicName          | 通过logic获取表单表格配置         | String  | null  |
 | logicParam         | 执行logic传递的参数            | Object  | null  |
 | fixedQueryForm     | 固定查询表单,会和查询表单合并查询       | Object  | {}    |

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

@@ -44,6 +44,7 @@
                 title="字典数据配置"
                 :fixed-add-form="fixedAddForm"
                 :fixed-query-form="fixedQueryForm"
+                serviceName="af-system"
                 queryParamsName="crud_dictionary_value_manage"
                 @afterSubmit="afterSubmit"
               >

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/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/config/default/setting.config.js

@@ -40,8 +40,6 @@ module.exports = {
     // 通知
     notice: true
   },
-  // 配置的默认命名空间
-  defaultServiceName: 'af-system',
   // 旧系统路径
   iframeSrc: '../singlepage/page.html',
   // 兼容旧版本 V3(最新V3产品)  OA(公司OA)

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/header/AdminHeader.vue

@@ -42,8 +42,8 @@ import { indexedDB } from '@vue2-client/utils/indexedDB'
 
 const loadComponents = (value) => {
   const component = {
-    HeaderSearch: import('./HeaderSearch'),
-    HeaderNotice: import('./HeaderNotice'),
+    HeaderSearch: import('@vue2-client/layouts/header/HeaderSearch'),
+    HeaderNotice: import('@vue2-client/layouts/header/HeaderNotice')
   }
   if (!value) {
     return component

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)
@@ -99,8 +99,8 @@ export default {
       this.loadCacheConfig(val)
     },
     $route: function (newRoute) {
-      this.activePage = newRoute.path
-      const page = this.pageList.find(item => item.path === newRoute.path)
+      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) {
@@ -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)
       }
@@ -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/pages/CreateQueryPage.vue

@@ -24,7 +24,7 @@
     >
       <a-form-model :model="form" :rules="rules" ref="liuliModel">
         <a-form-model-item label="命名空间" prop="namespaceName">
-          <a-input v-model="form.namespaceName" :placeholder="'默认值：' + this.defaultServiceName"/>
+          <a-input v-model="form.namespaceName" :placeholder="'默认值：' + systemName"/>
         </a-form-model-item>
         <a-form-model-item label="配置名称" prop="configName">
           <a-input v-model="form.configName"/>
@@ -58,7 +58,6 @@
 <script>
 import CreateQuery from '@vue2-client/base-client/components/common/CreateQuery'
 import CreateSimpleFormQuery from '@vue2-client/base-client/components/common/CreateSimpleFormQuery'
-import { mapState } from 'vuex'
 import { getNativeConfig } from '@vue2-client/services/api/common'
 
 export default {
@@ -88,7 +87,9 @@ export default {
     }
   },
   computed: {
-    ...mapState('setting', ['defaultServiceName'])
+    systemName () {
+      return process.env.VUE_APP_SYSTEM_NAME
+    }
   },
   methods: {
     showDrawer () {

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

@@ -6,6 +6,7 @@
       :visible.sync="detailVisible"
     />
     <x-form-table
+      serviceName="af-system"
       :queryParamsName="queryParamsName"
       title="字典"
       @action="toDetail">

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

@@ -2,6 +2,7 @@
   <a-card :bordered="false">
     <x-form-table
       title="登录日志"
+      serviceName="af-system"
       :queryParamsName="queryParamsName"
       @action="toDetail">
     </x-form-table>

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

@@ -3,6 +3,7 @@
     <x-form-table
       title="操作日志"
       :queryParamsName="queryParamsName"
+      serviceName="af-system"
       @action="toDetail">
     </x-form-table>
   </a-card>

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

@@ -239,6 +239,7 @@
           <x-form-table
             v-if="tabActiveKey === 'workHistory'"
             :fixed-query-form="fixedQueryForm"
+            serviceName="af-system"
             :queryParamsName="queryParamsName"
             title="已提交工单"
             @action="toDetail">

package/src/services/api/common.js

@@ -5,7 +5,6 @@ import { blobValidate } from '@vue2-client/utils/common'
 import errorCode from '@vue2-client/utils/errorCode'
 import { saveAs } from 'file-saver'
 import { post } from '@vue2-client/services/api/restTools'
-import setting from '@vue2-client/store/modules/setting'
 
 const commonApi = {
   // 获取配置
@@ -36,15 +35,15 @@ const commonApi = {
   getEmpTree: '/api/af-system/logic/getEmpTree',
 }
 
-export function getConfigUrl (serviceName = setting.state.defaultServiceName) {
+export function getConfigUrl (serviceName = process.env.VUE_APP_SYSTEM_NAME) {
   return '/api/' + serviceName + '/' + commonApi.getConfig
 }
 
-export function getNativeConfigUrl (serviceName = setting.state.defaultServiceName) {
+export function getNativeConfigUrl (serviceName = process.env.VUE_APP_SYSTEM_NAME) {
   return '/api/' + serviceName + '/' + commonApi.getNativeConfig
 }
 
-export function parseConfigUrl (serviceName = setting.state.defaultServiceName) {
+export function parseConfigUrl (serviceName = process.env.VUE_APP_SYSTEM_NAME) {
   return '/api/' + serviceName + '/' + commonApi.parseConfig
 }
 
@@ -61,11 +60,11 @@ export function getDictionaryParam () {
  * @param serviceName 命名空间名称
  * @param callback 回调函数
  */
-export function getConfig (configName, serviceName = setting.state.defaultServiceName, callback) {
+export function getConfig (configName, serviceName = process.env.VUE_APP_SYSTEM_NAME, callback) {
   indexedDB.getByWeb(configName, getConfigUrl(serviceName), { configName: configName }, callback)
 }
 
-export function getNativeConfig (configName, serviceName = setting.state.defaultServiceName) {
+export function getNativeConfig (configName, serviceName = process.env.VUE_APP_SYSTEM_NAME) {
   return post(getNativeConfigUrl(serviceName), { configName: configName })
 }
 
@@ -76,7 +75,7 @@ export function getNativeConfig (configName, serviceName = setting.state.default
  * @param serviceName 命名空间名称
  * @param callback 回调函数
  */
-export function getConfigByLogic (logicName, parameter, serviceName = setting.state.defaultServiceName, callback) {
+export function getConfigByLogic (logicName, parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME, callback) {
   indexedDB.getByWeb(`${logicName}_${JSON.stringify(parameter)}`, '/api/' + serviceName + '/logic/' + logicName,
     parameter, callback)
 }
@@ -87,7 +86,7 @@ export function getConfigByLogic (logicName, parameter, serviceName = setting.st
  * @param configType 配置类型
  * @param serviceName 命名空间名称
  */
-export function parseConfig (configContent, configType, serviceName = setting.state.defaultServiceName) {
+export function parseConfig (configContent, configType, serviceName = process.env.VUE_APP_SYSTEM_NAME) {
   const url = parseConfigUrl(serviceName)
   return post(url, {
     configType: configType,
@@ -98,61 +97,61 @@ export function parseConfig (configContent, configType, serviceName = setting.st
 /**
  * 通用执行业务逻辑
  */
-export function runLogic (logicName, parameter, serviceName = setting.state.defaultServiceName) {
+export function runLogic (logicName, parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME) {
   return post('/api/' + serviceName + '/logic/' + logicName, parameter)
 }
 
 /**
  * 通用查询
  */
-export function query (parameter, serviceName = setting.state.defaultServiceName) {
+export function query (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME) {
   return post('/api/' + serviceName + '/' + commonApi.query, parameter, null)
 }
 
 /**
  * 通用表单查询
  */
-export function queryWithResource (parameter, serviceName = setting.state.defaultServiceName) {
+export function queryWithResource (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME) {
   return post('/api/' + serviceName + '/' + commonApi.queryWithResource, parameter, null)
 }
 
 /**
  * 通用新增/修改
  */
-export function addOrModify (parameter, serviceName = setting.state.defaultServiceName) {
+export function addOrModify (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME) {
   return post('/api/' + serviceName + '/' + commonApi.addOrModify, parameter, null)
 }
 
 /**
  * 通用删除
  */
-export function remove (parameter, serviceName = setting.state.defaultServiceName) {
+export function remove (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME) {
   return post('/api/' + serviceName + '/' + commonApi.delete, parameter, null)
 }
 
 /**
  * 通用导入
  */
-export function importData (parameter, serviceName = setting.state.defaultServiceName) {
+export function importData (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME) {
   return post('/api/' + serviceName + '/' + commonApi.importData, parameter, null)
 }
 
 /**
  * 通用导出
  */
-export function exportData (parameter, serviceName = setting.state.defaultServiceName) {
+export function exportData (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME) {
   return post('/api/' + serviceName + '/' + commonApi.exportData, parameter, null)
 }
 
 /**
  * 通用上传
  */
-export function upload (parameter, serviceName = setting.state.defaultServiceName, config) {
+export function upload (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME, config) {
   return post('/api/' + serviceName + '/' + commonApi.upload, parameter, config)
 }
 
 // 通用下载
-export function download (parameter, filename, serviceName = setting.state.defaultServiceName) {
+export function download (parameter, filename, serviceName = process.env.VUE_APP_SYSTEM_NAME) {
   const notificationKey = 'download'
   notification.open({
     key: notificationKey,
@@ -192,7 +191,7 @@ export function download (parameter, filename, serviceName = setting.state.defau
 }
 
 // 文件删除
-export function fileDelete (parameter, serviceName = setting.state.defaultServiceName) {
+export function fileDelete (parameter, serviceName = process.env.VUE_APP_SYSTEM_NAME) {
   return post('/api/' + serviceName + '/' + commonApi.fileEntity, parameter)
 }
 

package/src/services/apiService.js

@@ -5,8 +5,8 @@
 module.exports = {
   LOGIN: `/rs/logic/getLogin`,
   MODIFY_PASSWORD: '/rs/user/modifypwd',
-  V4_LOGIN: '/auth/login',
-  V4_LOGOUT: '/auth/logout',
+  V4_LOGIN: '/api/af-auth/login',
+  V4_LOGOUT: '/api/af-auth/logout',
   ROUTES: `/rs/user/userLogin`,
   SEARCH: `/rs/search`,
   GOODS: `/goods`,

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/request.js

@@ -5,6 +5,7 @@ import notification from 'ant-design-vue/es/notification'
 import errorCode from '@vue2-client/utils/errorCode'
 import qs from 'qs'
 import { logout } from '@vue2-client/services/user'
+import { V4_LOGIN } from '@vue2-client/services/apiService'
 
 // 是否显示重新登录
 let isReloginShow
@@ -134,7 +135,7 @@ function loadInterceptors () {
     // 如果 token 存在
     // 让每个请求携带自定义 token 请根据实际情况自行修改
     if (token) {
-      if (config.url !== '/auth/login') {
+      if (config.url !== V4_LOGIN) {
         // 判断是否为V4环境
         const compatible = getSystemVersion()
         if (compatible === 'V4') {

package/src/utils/routerUtil.js

@@ -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/vue.config.js

@@ -24,11 +24,6 @@ module.exports = {
         ws: false,
         changeOrigin: true
       },
-      '/auth': {
-        pathRewrite: { '^/auth/': '/rs/auth/' },
-        target: local,
-        changeOrigin: true
-      },
       '/api': {
         pathRewrite: { '^/api/af-system/': '/rs/', '^/api/af-iot/': '/rs/' },
         // pathRewrite: { '^/api': '/' },
@@ -40,6 +35,9 @@ module.exports = {
         target: 'http://127.0.0.1:4789',
         changeOrigin: true
       }
+    },
+    client: {
+      overlay: false
     }
   },
   pluginOptions: {
@@ -49,6 +47,14 @@ module.exports = {
     }
   },
   configureWebpack: config => {
+    config.context = path.resolve(__dirname, './')
+    config.resolve = {
+      extensions: ['.js', '.vue', '.json'],
+      alias: {
+        '@': path.resolve('src'),
+        '@vue2-client': path.resolve('src')
+      }
+    }
     config.entry.app = ['core-js/stable', 'regenerator-runtime/runtime', 'whatwg-fetch', './src/main.js']
     config.performance = {
       hints: false
@@ -70,7 +76,7 @@ module.exports = {
     if (isProd) {
       // add `CompressionWebpack` plugin to webpack plugins
       config.plugins.push(new CompressionWebpackPlugin({
-        algorithm: require('zlib').createGzip,
+        algorithm: 'gzip',
         test: new RegExp('\\.(' + productionGzipExtensions.join('|') + ')$'),
         threshold: 10240,
         minRatio: 0.8

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

@@ -1,15 +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
+# 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

package/webpack.config.js

@@ -1,12 +0,0 @@
-'use strict'
-const path = require('path')
-
-module.exports = {
-  context: path.resolve(__dirname, './'),
-  resolve: {
-    extensions: ['.js', '.vue', '.json'],
-    alias: {
-      '@vue2-client': path.resolve('src')
-    }
-  }
-}