vue2-client 1.15.23 → 1.15.25

package/jest.config.js

@@ -1,22 +1,22 @@
-const path = require('path')
-require('dotenv').config({ path: path.resolve(__dirname, '.env') })
-
-module.exports = {
-    setupFiles: ['<rootDir>/jest.setup.js'],
-    moduleNameMapper: {
-      '^@vue2-client/(.*)$': '<rootDir>/src/$1',
-      '^@/(.*)$': '<rootDir>/src/$1',
-      '\\.(css|less)$': 'identity-obj-proxy',
-    },
-    moduleFileExtensions: ['js', 'json', 'jsx', 'ts', 'tsx', 'node', 'vue'],
-    testEnvironment: 'jsdom',
-    transform: {
-      '^.+\\.js$': 'babel-jest',
-      '^.+\\.vue$': 'vue-jest',
-      '^.+\\.less$': 'jest-transform-stub',
-    },
-    transformIgnorePatterns: [
-      '/node_modules/(?!ant-design-vue)',
-    ]
-    // 其他 Jest 配置项...
-  }
+const path = require('path')
+require('dotenv').config({ path: path.resolve(__dirname, '.env') })
+
+module.exports = {
+    setupFiles: ['<rootDir>/jest.setup.js'],
+    moduleNameMapper: {
+      '^@vue2-client/(.*)$': '<rootDir>/src/$1',
+      '^@/(.*)$': '<rootDir>/src/$1',
+      '\\.(css|less)$': 'identity-obj-proxy',
+    },
+    moduleFileExtensions: ['js', 'json', 'jsx', 'ts', 'tsx', 'node', 'vue'],
+    testEnvironment: 'jsdom',
+    transform: {
+      '^.+\\.js$': 'babel-jest',
+      '^.+\\.vue$': 'vue-jest',
+      '^.+\\.less$': 'jest-transform-stub',
+    },
+    transformIgnorePatterns: [
+      '/node_modules/(?!ant-design-vue)',
+    ]
+    // 其他 Jest 配置项...
+  }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vue2-client",
-  "version": "1.15.23",
+  "version": "1.15.25",
   "private": false,
   "scripts": {
     "serve": "SET NODE_OPTIONS=--openssl-legacy-provider && vue-cli-service serve --no-eslint",

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

@@ -377,7 +377,8 @@ export default {
           if (this.form[key] === null || this.form[key] === '') {
             this.form[key] = undefined
           }
-          if (Array.isArray(this.form[key]) && this.form[key].length === 0) {
+          // 树形选择框重置后会重置为[undefined],查询时为[null]
+          if (Array.isArray(this.form[key]) && (this.form[key].length === 0 || this.form[key][0] === null || this.form[key][0] === undefined)) {
             this.form[key] = undefined
           }
           // 如果 form 中没有值，但是有默认值

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

@@ -1,105 +1,105 @@
-<template>
-  <div class="demo-container">
-    <h2>XFormItem Demo</h2>
-
-    <!-- 查询模式演示 -->
-    <div class="demo-section">
-      <h3>查询模式</h3>
-      <x-form-item
-        :attr="queryAttr"
-        :form="queryForm"
-        mode="查询"
-        :showLabel="true"
-      />
-      <div class="value-display">
-        当前值: {{ queryForm.rate || '未选择' }}
-      </div>
-    </div>
-
-    <!-- 新增模式演示 -->
-    <div class="demo-section">
-      <h3>新增模式</h3>
-      <x-form-item
-        :attr="addAttr"
-        :form="addForm"
-        mode="新增/修改"
-        :showLabel="true"
-      />
-      <div class="value-display">
-        当前值: {{ addForm.rate || '未评分' }}
-      </div>
-    </div>
-  </div>
-</template>
-
-<script>
-import XFormItem from './XFormItem.vue'
-
-export default {
-  name: 'XFormItemDemo',
-  components: {
-    XFormItem
-  },
-  data () {
-    return {
-      // 查询表单配置
-      queryAttr: {
-        type: 'rate',
-        name: '评分查询',
-        queryType: 'IN',
-        model: 'rate',
-        placeholder: '请选择评分',
-        allowHalf: true,
-        maxCount: 5
-      },
-      queryForm: {
-      },
-
-      // 新增表单配置
-      addAttr: {
-        type: 'rate',
-        name: '评分',
-        model: 'rate',
-        allowHalf: true,
-        maxCount: 10
-      },
-      addForm: {
-        rate: 3
-      }
-    }
-  }
-}
-</script>
-
-<style lang="less" scoped>
-.demo-container {
-  padding: 20px;
-  max-width: 800px;
-  margin: 0 auto;
-  background-color: #f5f5f5;
-
-  h2 {
-    margin-bottom: 20px;
-    color: #1890ff;
-  }
-
-  .demo-section {
-    margin-bottom: 30px;
-    padding: 20px;
-    border: 1px solid #e8e8e8;
-    border-radius: 4px;
-
-    h3 {
-      margin-bottom: 16px;
-      color: #333;
-    }
-
-    .value-display {
-      margin-top: 16px;
-      padding: 8px;
-      background-color: #f5f5f5;
-      border-radius: 4px;
-    }
-  }
-}
-</style>
+<template>
+  <div class="demo-container">
+    <h2>XFormItem Demo</h2>
+
+    <!-- 查询模式演示 -->
+    <div class="demo-section">
+      <h3>查询模式</h3>
+      <x-form-item
+        :attr="queryAttr"
+        :form="queryForm"
+        mode="查询"
+        :showLabel="true"
+      />
+      <div class="value-display">
+        当前值: {{ queryForm.rate || '未选择' }}
+      </div>
+    </div>
+
+    <!-- 新增模式演示 -->
+    <div class="demo-section">
+      <h3>新增模式</h3>
+      <x-form-item
+        :attr="addAttr"
+        :form="addForm"
+        mode="新增/修改"
+        :showLabel="true"
+      />
+      <div class="value-display">
+        当前值: {{ addForm.rate || '未评分' }}
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import XFormItem from './XFormItem.vue'
+
+export default {
+  name: 'XFormItemDemo',
+  components: {
+    XFormItem
+  },
+  data () {
+    return {
+      // 查询表单配置
+      queryAttr: {
+        type: 'rate',
+        name: '评分查询',
+        queryType: 'IN',
+        model: 'rate',
+        placeholder: '请选择评分',
+        allowHalf: true,
+        maxCount: 5
+      },
+      queryForm: {
+      },
+
+      // 新增表单配置
+      addAttr: {
+        type: 'rate',
+        name: '评分',
+        model: 'rate',
+        allowHalf: true,
+        maxCount: 10
+      },
+      addForm: {
+        rate: 3
+      }
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.demo-container {
+  padding: 20px;
+  max-width: 800px;
+  margin: 0 auto;
+  background-color: #f5f5f5;
+
+  h2 {
+    margin-bottom: 20px;
+    color: #1890ff;
+  }
+
+  .demo-section {
+    margin-bottom: 30px;
+    padding: 20px;
+    border: 1px solid #e8e8e8;
+    border-radius: 4px;
+
+    h3 {
+      margin-bottom: 16px;
+      color: #333;
+    }
+
+    .value-display {
+      margin-top: 16px;
+      padding: 8px;
+      background-color: #f5f5f5;
+      border-radius: 4px;
+    }
+  }
+}
+</style>

package/src/base-client/components/common/XRate/demo.vue

@@ -1,102 +1,102 @@
-<template>
-  <div class="demo-container">
-    <h2>XRate 评分组件示例</h2>
-
-    <div class="demo-section">
-      <h3>基础用法</h3>
-      <x-rate v-model="basicRate" />
-      <div>当前值: {{ basicRate }}</div>
-      <a-button @click="resetBasicRate">重置</a-button>
-    </div>
-
-    <div class="demo-section">
-      <h3>允许半星</h3>
-      <x-rate v-model="halfRate" :allow-half="true" />
-      <div>当前值: {{ halfRate }}</div>
-    </div>
-
-    <div class="demo-section">
-      <h3>自定义最大分值</h3>
-      <x-rate v-model="customRate" :max-count="10" />
-      <div>当前值: {{ customRate }}</div>
-    </div>
-
-    <div class="demo-section">
-      <h3>查询模式</h3>
-      <x-rate v-model="queryRate" mode="查询" />
-      <div>当前值: {{ queryRate }}</div>
-    </div>
-
-    <div class="demo-section">
-      <h3>查询模式（多选）</h3>
-      <x-rate v-model="queryMultiRate" mode="查询" query-type="IN" />
-      <div>当前值: {{ queryMultiRate }}</div>
-    </div>
-
-    <div class="demo-section">
-      <h3>禁用状态</h3>
-      <x-rate v-model="disabledRate" :disabled="true" />
-      <div>当前值: {{ disabledRate }}</div>
-    </div>
-
-    <div class="demo-section">
-      <h3>空值处理</h3>
-      <x-rate v-model="emptyRate" />
-      <div>当前值: {{ emptyRate }}</div>
-      <a-button @click="clearRate">清除</a-button>
-    </div>
-  </div>
-</template>
-
-<script>
-import XRate from './index.vue'
-
-export default {
-  name: 'XRateDemo',
-  components: {
-    XRate
-  },
-  data () {
-    return {
-      basicRate: 3,
-      halfRate: 3.5,
-      customRate: 7,
-      queryRate: 4,
-      queryMultiRate: [3, 4],
-      disabledRate: 2,
-      emptyRate: undefined
-    }
-  },
-  methods: {
-    resetBasicRate () {
-      this.basicRate = 3
-    },
-    clearRate () {
-      this.emptyRate = undefined
-    }
-  }
-}
-</script>
-
-<style lang="less" scoped>
-.demo-container {
-  padding: 20px;
-
-  .demo-section {
-    margin-bottom: 30px;
-    padding: 20px;
-    border: 1px solid #eee;
-    border-radius: 4px;
-
-    h3 {
-      margin-top: 0;
-      margin-bottom: 16px;
-      color: #333;
-    }
-
-    .ant-btn {
-      margin-top: 8px;
-    }
-  }
-}
-</style>
+<template>
+  <div class="demo-container">
+    <h2>XRate 评分组件示例</h2>
+
+    <div class="demo-section">
+      <h3>基础用法</h3>
+      <x-rate v-model="basicRate" />
+      <div>当前值: {{ basicRate }}</div>
+      <a-button @click="resetBasicRate">重置</a-button>
+    </div>
+
+    <div class="demo-section">
+      <h3>允许半星</h3>
+      <x-rate v-model="halfRate" :allow-half="true" />
+      <div>当前值: {{ halfRate }}</div>
+    </div>
+
+    <div class="demo-section">
+      <h3>自定义最大分值</h3>
+      <x-rate v-model="customRate" :max-count="10" />
+      <div>当前值: {{ customRate }}</div>
+    </div>
+
+    <div class="demo-section">
+      <h3>查询模式</h3>
+      <x-rate v-model="queryRate" mode="查询" />
+      <div>当前值: {{ queryRate }}</div>
+    </div>
+
+    <div class="demo-section">
+      <h3>查询模式（多选）</h3>
+      <x-rate v-model="queryMultiRate" mode="查询" query-type="IN" />
+      <div>当前值: {{ queryMultiRate }}</div>
+    </div>
+
+    <div class="demo-section">
+      <h3>禁用状态</h3>
+      <x-rate v-model="disabledRate" :disabled="true" />
+      <div>当前值: {{ disabledRate }}</div>
+    </div>
+
+    <div class="demo-section">
+      <h3>空值处理</h3>
+      <x-rate v-model="emptyRate" />
+      <div>当前值: {{ emptyRate }}</div>
+      <a-button @click="clearRate">清除</a-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import XRate from './index.vue'
+
+export default {
+  name: 'XRateDemo',
+  components: {
+    XRate
+  },
+  data () {
+    return {
+      basicRate: 3,
+      halfRate: 3.5,
+      customRate: 7,
+      queryRate: 4,
+      queryMultiRate: [3, 4],
+      disabledRate: 2,
+      emptyRate: undefined
+    }
+  },
+  methods: {
+    resetBasicRate () {
+      this.basicRate = 3
+    },
+    clearRate () {
+      this.emptyRate = undefined
+    }
+  }
+}
+</script>
+
+<style lang="less" scoped>
+.demo-container {
+  padding: 20px;
+
+  .demo-section {
+    margin-bottom: 30px;
+    padding: 20px;
+    border: 1px solid #eee;
+    border-radius: 4px;
+
+    h3 {
+      margin-top: 0;
+      margin-bottom: 16px;
+      color: #333;
+    }
+
+    .ant-btn {
+      margin-top: 8px;
+    }
+  }
+}
+</style>

package/src/layouts/BlankView.vue

@@ -1,9 +1,8 @@
 <template>
   <page-toggle-transition :disabled="animate.disabled" :animate="animate.name" :direction="animate.direction">
-    <a-keep-alive :exclude-keys="excludeKeys" v-if="cachePage && isMicroAppEnv" v-model="clearCaches">
+    <a-keep-alive :exclude-keys="excludeKeys" v-model="clearCaches">
       <router-view v-if="!refreshing" :key="$route.path" />
     </a-keep-alive>
-    <router-view v-else-if="!refreshing" />
   </page-toggle-transition>
 </template>
 

package/src/pages/WorkflowDetail/WorkFlowDemo3.vue

@@ -0,0 +1,203 @@
+<template>
+  <div id="beingProcessed">
+    <x-form-table
+      title="我的工单"
+      ref="xFormTable"
+      :queryParamsName="queryParamsName"
+      :fixed-query-form="{
+        users_f_handler_id: currUser.id,
+      }"
+      @action="toDetail">
+      <template slot="button">
+        <a-button @click="addApply">
+          <a-icon type="plus"/>
+          发起报建
+        </a-button>
+      </template>
+    </x-form-table>
+    <a-modal
+      v-model="applyAddFlag"
+      :footer="null"
+      :dialog-style="{ top: '5rem' }"
+      :z-index="1001"
+      title="发起报建"
+      :destroyOnClose="true">
+      <x-add-native-form ref="xForm" @onSubmit="applySubmit"/>
+    </a-modal>
+    <WorkflowDetail
+      ref="workFlow"
+      @success="success"
+      @nextClick="nextClick"
+      @x-form-item-emit-func="handleFormItemEvent"
+    >
+    </WorkflowDetail>
+    <!--  地址选择器  -->
+    <address-select ref="addressSelect" @setAddress="setForm"></address-select>
+  </div>
+</template>
+
+<script>
+import WorkflowDetail from '@vue2-client/pages/WorkflowDetail/WorkflowDetail.vue'
+import XFormTable from '@vue2-client/base-client/components/common/XFormTable/XFormTable'
+import XAddNativeForm from '@vue2-client/base-client/components/common/XAddNativeForm/XAddNativeForm.vue'
+import { getConfigByName, runLogic } from '@vue2-client/services/api/common'
+import { mapState } from 'vuex'
+import AddressSelect from '@vue2-client/pages/addressSelect/index.vue'
+import XFormGroup from '@vue2-client/base-client/components/common/XFormGroup'
+
+export default {
+  name: 'Apply',
+  components: {
+    XFormTable,
+    XAddNativeForm,
+    WorkflowDetail,
+    AddressSelect,
+    XFormGroup,
+  },
+  // 透传给子组件的方法（目前XFormTable接了）
+  provide () {
+    return {
+      generalFunction: {
+        setCancel: this.setCancel,
+        chargeAdd: this.chargeAdd,
+        addUser: this.addUser,
+        editUser: this.editUser,
+        addContract: this.addContract,
+        addcharge: this.addcharge,
+        updateFormData: this.updateFormData,
+        chargeCancel: this.chargeCancel,
+        chargeBatchRefund: this.chargeBatchRefund,
+      }
+    }
+  },
+  data () {
+    return {
+      // 查询配置文件名
+      queryParamsName: 'ApplyProcessCRUD',
+      // 发起报建弹框控制
+      applyAddFlag: false,
+      // 提交加载动画
+      confirmLoading: false,
+      refreshFn: null,
+      chargeVisible: false
+    }
+  },
+  computed: {
+    ...mapState('account', { currUser: 'user' }),
+  },
+  methods: {
+    addApply () {
+      console.log('打开了吗')
+      this.applyAddFlag = true
+      this.$nextTick(
+        () => {
+          getConfigByName('addApplyForm', 'af-apply', (res) => {
+            this.$refs.xForm.init({
+              businessType: '新增',
+              title: '发起报建',
+              ...res
+            })
+          })
+        }
+      )
+    },
+    applySubmit (formData) {
+      runLogic('addApply', formData).then(
+        res => {
+          this.$message.success('发起报建成功')
+          this.$refs.xFormTable.refreshTable(true)
+          this.applyAddFlag = false
+        }
+      ).catch(() => {
+        this.applyAddFlag = false
+      })
+    },
+    success () {
+      console.log('完工')
+    },
+    toDetail (record, id) {
+      this.$refs.workFlow.init({
+        workflowId: record.ab_f_workflow_id
+      })
+    },
+    handleFormItemEvent (func, data, value) {
+      console.log('打印一下：', func, data, value)
+      if (func === 'selectAddress') {
+        this.$refs.addressSelect.setFormShow()
+      }
+    },
+    setForm (record) {
+      this.$refs.workFlow.setFormValue({ address: record.f_address, address_id: record.f_address_id })
+    },
+    nextClick ({ form, formStep, workflowId }) {
+      console.log('success', form, formStep, workflowId)
+      const data = {
+        workflowId,
+        form,
+        formStep
+      }
+      runLogic('applySubmitAfter', data, 'af-apply').then(
+        res => {
+          if (res) {
+            // this.$message.success('提交成功！')
+            this.$refs.xFormTable.refreshTable(true)
+          }
+        }
+      )
+    },
+    // 协议作废
+    setCancel (record, refreshFn) {
+      this.$refs.cancelContract.setCancel(record, refreshFn)
+    },
+    // 增值收费新增
+    chargeAdd (refreshFn) {
+      this.$refs.addCharge.chargeAdd(this.$refs.workFlow.workflowId, refreshFn)
+    },
+    // 协议新增
+    addContract (refreshFn) {
+      this.$refs.addContract.addContract(this.$refs.workFlow.workflowId, refreshFn)
+    },
+    // 新增用户
+    addUser (refreshFn) {
+      if (this.$refs.workFlow.$refs.baseInformation.details.f_workflow_define_name != '团购报建流程') {
+        this.$message.success('只有团购报建流程才可以新增用户信息!')
+        return
+      }
+      this.$refs.addUser.addUser(this.$refs.workFlow.workflowId, refreshFn)
+    },
+    // 编辑用户
+    editUser (record, refreshFn) {
+      this.$refs.addUser.editUser(record, refreshFn)
+    },
+    // 新增收费
+    addcharge (refreshFn) {
+      this.$refs.addApplyCharge.addcharge(this.$refs.workFlow.workflowId, refreshFn)
+    },
+    // 报装缴费页面初始化
+    updateFormData (workflowId) {
+      if (this.$refs.workFlow.$refs.baseInformation.details.f_sub_state == '报装缴费') {
+        runLogic('getApplyBusinessrecode', { f_workflow_id: workflowId }, 'af-apply').then((res) => {
+          this.$refs.workFlow.$refs.workflowHandle.$refs.xAddForm.setForm(res)
+        })
+      } else if (this.$refs.workFlow.$refs.baseInformation.details.f_sub_state == '合同签订') {
+        runLogic('queryAgreementAmount', { workflowId: workflowId }, 'af-apply').then((res) => {
+          this.$refs.workFlow.$refs.workflowHandle.$refs.xAddForm.setForm({ add_amount: res[0].f_contract_money })
+        })
+      }
+    },
+    // 增值收费单个数据的撤销功能
+    chargeCancel (record, refreshFn) {
+      this.$refs.cancel.chargeCancel(record, refreshFn)
+    },
+    // 批量撤销(退费)
+    chargeBatchRefund (selectedRowKeys, selectedRows, refreshFn) {
+      if (selectedRowKeys.length === 0 || selectedRows.length === 0) {
+        this.$message.warn('请选择要退费的记录', 5)
+        return
+      }
+      const workflowId = this.$refs.workFlow.workflowId
+      this.$refs.batchRefund.selectRow(selectedRowKeys, selectedRows, refreshFn, workflowId)
+    }
+  }
+}
+</script>

package/src/pages/WorkflowDetail/WorkflowPageDetail/WorkFlowHandle.vue

@@ -67,6 +67,7 @@
           <a-card :bordered="false" :loading="loadingHistory" :body-style="{ paddingTop: 0 }">
             <x-tab
               v-if="showTab"
+              :compProp="{ buttonState: { extra: true }, disableAction: false }"
               :local-config="tabDesigner"
               :extra-data="{ workflowId:workflowId }"
               :body-style="{ padding: 0 }"
@@ -390,9 +391,14 @@ export default {
           return true
         }
       } else {
+        // 当前进行节点的数据
         const step = this.stepsForChild.find(item => item.id === this.activeStepId)
         // 检查角色和部门权限
         if (step && step.properties && step.properties.chargePerson) {
+          // 如果当前节点的负责人选项中有设置选择人员 当前节点就只能由上一步设置的负责人操作
+          if (step.properties.chargePerson.needSelectPerson) {
+            return step.handler === this.currUser.name
+          }
           if (step.properties.chargePerson.personList && step.properties.chargePerson.personList.length > 0) {
             // 使用some方法判断当前人员是否满足任一条件
             return step.properties.chargePerson.personList.some(item => {
@@ -774,6 +780,12 @@ export default {
             this.loadingHistory = true
             this.currentStepId = this.preBtnTo
             this.activeStepId = this.preBtnTo
+
+            // 新增：重置按钮状态
+            this.stepDone = false
+            this.beforeStepActive = false
+            this.operationType = 'submit'
+
             this.$emit('refresh')
             this.onClose()
             this.init()

package/src/router/async/router.map.js

@@ -54,8 +54,9 @@ routerResource.example = {
 path: 'example',
   name: '示例主页面',
   // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo2.vue'),
+  component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo3.vue'),
   // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),
-  component: () => import('@vue2-client/pages/addressSelect/addressDemo.vue'),
+  // component: () => import('@vue2-client/pages/addressSelect/addressDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XDescriptions/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XAddNativeForm/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XFormGroup/demo.vue'),
@@ -99,7 +100,7 @@ const routerMap = {
     path: '/',
     name: '首页',
     // 只有在非微前端环境下才进行重定向，或者通过环境变量控制
-    redirect: process.env.VUE_APP_SINGLE_PAPER === 'TRUE' ? undefined : homePage,
+    redirect: window.__MICRO_APP_ENVIRONMENT__ ? undefined : homePage,
     component: process.env.VUE_APP_SINGLE_PAPER === 'TRUE' ? view.blank : view.tabs,
   },
   exp403: {

package/src/router/index.js

@@ -1,27 +1,27 @@
-import { formatRoutes } from '@vue2-client/utils/routerUtil'
-
-// 不需要登录拦截的路由配置
-const loginIgnore = {
-  names: ['404', '403'], // 根据路由名称匹配
-  paths: ['/login', '/example', '/system/example', '/system/example/default', '/system/example/sub-example', '/submitTicket', '/submitTicket/', '/ServiceReview', '/DynamicStatistics', '/NewDynamicStatistics'], // 根据路由fullPath匹配
-  /**
-   * 判断路由是否包含在该配置中
-   * @param route vue-router 的 route 对象
-   * @returns {boolean}
-   */
-  includes (route) {
-    return this.names.includes(route.name) || this.paths.includes(route.path)
-  }
-}
-
-/**
- * 初始化路由实例
- * @param isAsync 是否异步路由模式
- * @returns {RouterOptions}
- */
-function initRouter (isAsync) {
-  const options = require('./async/config.async').default
-  formatRoutes(options.routes)
-  return options
-}
-export { loginIgnore, initRouter }
+import { formatRoutes } from '@vue2-client/utils/routerUtil'
+
+// 不需要登录拦截的路由配置
+const loginIgnore = {
+  names: ['404', '403'], // 根据路由名称匹配
+  paths: ['/login', '/example', '/system/example', '/system/example/default', '/system/example/sub-example', '/submitTicket', '/submitTicket/', '/ServiceReview', '/DynamicStatistics', '/NewDynamicStatistics'], // 根据路由fullPath匹配
+  /**
+   * 判断路由是否包含在该配置中
+   * @param route vue-router 的 route 对象
+   * @returns {boolean}
+   */
+  includes (route) {
+    return this.names.includes(route.name) || this.paths.includes(route.path)
+  }
+}
+
+/**
+ * 初始化路由实例
+ * @param isAsync 是否异步路由模式
+ * @returns {RouterOptions}
+ */
+function initRouter (isAsync) {
+  const options = require('./async/config.async').default
+  formatRoutes(options.routes)
+  return options
+}
+export { loginIgnore, initRouter }

package/src/utils/routerUtil.js

@@ -182,7 +182,7 @@ function loadRoutes (routesConfig) {
     if (routesConfig && routesConfig.length > 0) {
       const routes = parseRoutes(routesConfig, appRouterMap.routerMap)
       // 设置路由首页
-      if (process.env.VUE_APP_SINGLE_PAPER !== 'TRUE') {
+      if (!window.__MICRO_APP_ENVIRONMENT__) {
         routes[0].redirect = store.state.setting.homePage
       }
       let finalRoutes = mergeRoutes(basicOptions.routes, routes)

package/test/request.test.js

@@ -1,17 +1,17 @@
-import EncryptUtil from '@vue2-client/utils/EncryptUtil'
-import { test, describe } from '@jest/globals'
-
-describe('请求加密模块', () => {
-  const VALID_KEY = 'a964287a2cef8781ed76bd63dcadd578'
-  const TEST_PAYLOAD = {
-    username: 'admin',
-    password: 'P@ssw0rd_测试',
-    timestamp: Date.now()
-  }
-
-  // CBC加密测试
-  test('应生成有效的加密字符串', () => {
-    const encrypted = EncryptUtil.AESEncryptCBC(TEST_PAYLOAD, VALID_KEY)
-    console.log(encrypted)
-  })
-})
+import EncryptUtil from '@vue2-client/utils/EncryptUtil'
+import { test, describe } from '@jest/globals'
+
+describe('请求加密模块', () => {
+  const VALID_KEY = 'a964287a2cef8781ed76bd63dcadd578'
+  const TEST_PAYLOAD = {
+    username: 'admin',
+    password: 'P@ssw0rd_测试',
+    timestamp: Date.now()
+  }
+
+  // CBC加密测试
+  test('应生成有效的加密字符串', () => {
+    const encrypted = EncryptUtil.AESEncryptCBC(TEST_PAYLOAD, VALID_KEY)
+    console.log(encrypted)
+  })
+})