vue2-client 1.15.14 → 1.15.15

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

@@ -50,7 +50,7 @@ export default {
   name: 'WorkflowLog',
   props: {
     workflowId: {
-      type: String,
+      type: [String, Number],
       required: true
     }
   },

package/src/pages/WorkflowDetail/WorkflowPageDetail/components/WorkflowPersonSelector.vue

@@ -1,28 +1,30 @@
 <template>
   <div v-if="workflowHandleWrap.needSelectPerson">
-    <!-- 多分支选择（包含WF_RESULT的情况） -->
-    <template v-if="workflowHandleWrap.isWfResultBranch && workflowHandleWrap.branchNodes.length > 0">
-      <a-form-item
-        v-for="node in workflowHandleWrap.branchNodes"
-        :key="node.stepId"
-        :label="`${node.stepName}处理人`"
-        required
-      >
-        <a-select
-          :value="getBranchPersonValue(node.stepId)"
-          :getPopupContainer="(triggerNode) => triggerNode.parentNode"
-          @change="setBranchPersonValue(node.stepId, $event, node.chargePersonOptions)"
-          :placeholder="`请选择${node.stepName}的处理人`"
-          :options="node.chargePersonOptions"
-          :filter-option="filterOption"
-          style="width: 195px"
-          show-search
+    <!-- 多分支选择（包含WF_RESULT的条件分支或并行分支的情况） -->
+    <template v-if="workflowHandleWrap.needMultipleBranchSelection && workflowHandleWrap.branchNodes.length > 0">
+      <template v-for="node in workflowHandleWrap.branchNodes">
+        <a-form-item
+          v-if="node.needSelectPerson"
+          :key="node.stepId"
+          :label="`${node.stepName}处理人`"
+          required
         >
-          <a-select-option v-for="option in node.chargePersonOptions" :key="option.value" :value="option.value">
-            {{ option.label }}
-          </a-select-option>
-        </a-select>
-      </a-form-item>
+          <a-select
+            :value="getBranchPersonValue(node.stepId)"
+            :getPopupContainer="(triggerNode) => triggerNode.parentNode"
+            @change="setBranchPersonValue(node.stepId, $event, node.chargePersonOptions)"
+            :placeholder="`请选择${node.stepName}的处理人`"
+            :options="node.chargePersonOptions"
+            :filter-option="filterOption"
+            style="width: 195px"
+            show-search
+          >
+            <a-select-option v-for="option in node.chargePersonOptions" :key="option.value" :value="option.value">
+              {{ option.label }}
+            </a-select-option>
+          </a-select>
+        </a-form-item>
+      </template>
     </template>
 
     <!-- 单分支选择（前台可计算的情况） -->
@@ -90,7 +92,7 @@ export default {
 
     // 获取分支选择标签文本
     getBranchSelectionLabel () {
-      if (this.workflowHandleWrap.isWfResultBranch) {
+      if (this.workflowHandleWrap.needMultipleBranchSelection) {
         return '分支节点处理人选择'
       } else if (this.workflowHandleWrap.calculatedTargetNode) {
         return `请选择${this.workflowHandleWrap.getStepNameByStepId(this.workflowHandleWrap.calculatedTargetNode)}处理人`

package/src/pages/addressSelect/addressDemo.vue

@@ -1,24 +1,24 @@
-<template>
-  <!--  测试界面——测试地址选择新增组件-->
-  <div>
-    <a-button @click="open">打开选择地址弹窗</a-button>
-    <address-select :addressShow="showDialog"/>
-  </div>
-</template>
-
-  <script>
-  import AddressSelect from '@/pages/addressSelect'
-
-  export default {
-    components: { AddressSelect },
-    data: () => ({
-      showDialog: false
-    }),
-    methods: {
-      open () {
-        console.log('打开选择地址弹窗')
-        this.showDialog = true
-      }
-    }
-  }
-  </script>
+<template>
+  <!--  测试界面——测试地址选择新增组件-->
+  <div>
+    <a-button @click="open">打开选择地址弹窗</a-button>
+    <address-select :addressShow="showDialog"/>
+  </div>
+</template>
+
+  <script>
+  import AddressSelect from '@/pages/addressSelect'
+
+  export default {
+    components: { AddressSelect },
+    data: () => ({
+      showDialog: false
+    }),
+    methods: {
+      open () {
+        console.log('打开选择地址弹窗')
+        this.showDialog = true
+      }
+    }
+  }
+  </script>

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

@@ -51,7 +51,7 @@ routerResource.dynamicStatistics = () => import('@vue2-client/pages/DynamicStati
 routerResource.newDynamicStatistics = () => import('@vue2-client/pages/NewDynamicStatistics')
 // 示例页面
 routerResource.example = {
-  path: 'example',
+path: 'example',
   name: '示例主页面',
   component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo2.vue'),
   // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.vue'),

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/services/api/workFlow.js

@@ -18,16 +18,12 @@ const workFlowViewApi = {
   afterWorkFlowFinalStepSubmit: '/logic/afterWorkFlowFinalStepSubmit',
   // 获取步骤留言和表单填写人姓名
   getStepNoteAndHandler: '/logic/getStepNoteAndHandler',
-  // 更新步骤信息
-  updateWorkFlowStepData: '/logic/updateWorkFlowStepData',
   // 保存工作流日志
   saveWorkFlowLog: '/logic/saveWorkFlowLog',
   // 获取工作流日志
   getWorkFlowLog: '/logic/getWorkFlowLog',
   // 获取员工任务详情信息
   getEmployeeTaskDetail: '/logic/getEmployeeTaskDetail',
-  // 根据流程名称获取所有步骤名称
-  getWorkFlowStepNames: '/logic/getWorkFlowStepNames',
   // 获取工作流任务留言
   getWorkFlowLeaveMessage: '/logic/getWorkFlowLeaveMessage',
   // 更新任务完成时间

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)
+  })
+})

package/vue.config.js

@@ -53,8 +53,8 @@ module.exports = {
         changeOrigin: true
       },
       '/api/af-apply': {
-        // pathRewrite: { '^/api/af-apply': '/' },
-        target: revenue,
+        pathRewrite: { '^/api/af-apply': '/' },
+        target: 'http://127.0.0.1:9031',
         changeOrigin: true
       },
       '/api/af-scada': {