vue2-client 1.15.13 → 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/XPageViewExample/index.vue

@@ -1,149 +1,149 @@
-<script setup>
-import { onMounted, ref } from 'vue'
-import XPageView from '@vue2-client/base-client/components/layout/XPageView'
-
-const xPageViewRef = ref(null)
-
-onMounted(() => {
-  xPageViewRef.value.init({
-    configValue: {
-      type: 'page',
-      onMounted: function (curr) {
-          console.warn(curr.data)
-          // 设置Tab配置数据
-          curr.data.tabData = {
-            index: 0,
-            items: [
-              // 第一组配置
-              {
-                tabConfigs: [
-                  { title: '表单列表', type: 'XFormTable', props: { serviceName: 'af-system', queryParamsName: 'crud_dictionary_manage' } },
-                  { title: '新增表单', type: 'XAddNativeForm', props: { serviceName: 'af-system', configName: 'crud_dictionary_manage_add_form' } }
-                ]
-              },
-              // 第二组配置
-              {
-                tabConfigs: [
-                  { title: '数据列表', type: 'XFormTable', props: { serviceName: 'af-system', queryParamsName: 'crud_dictionary_manage' } },
-                  { title: '编辑表单', type: 'XAddNativeForm', props: { serviceName: 'af-system', configName: 'crud_dictionary_manage_add_form' } },
-                  { title: '查看记录', type: 'XFormTable', props: { serviceName: 'af-system', queryParamsName: 'crud_dictionary_manage' } }
-                ]
-              }
-            ]
-          }
-          console.log('页面初始化完成，全局数据上下文已创建')
-      },
-      gutter: [16, 16],
-      children: [
-        {
-          id: 'controlRow',
-          type: 'row',
-          gutter: 16,
-          template: 'card',
-          children: [
-            {
-              id: 'buttonContainer',
-              span: '24',
-              type: 'row',
-              gutter: 8,
-              children: [
-                {
-                  id: 'reloadButton',
-                  span: '6',
-                  type: 'a-button',
-                  props: {
-                    type: 'primary',
-                    value: '切换Tab配置'
-                  },
-                  children: [
-                    {
-                      type: 'text',
-                      text: '切换Tab配置'
-                    }
-                  ],
-                  event: {
-                    click: function (e, context) {
-                      // 切换Tab配置
-                      const tabData = context.data.tabData
-                      tabData.index = tabData.index === 0 ? 1 : 0
-
-                      // 获取当前配置和Tab组件
-                      const currentConfig = tabData.items[tabData.index]
-                      const tabComponent = context.comps.pageTab
-
-                      if (tabComponent) {
-                        // 更新Tab组件配置
-                        tabComponent.$props.data = currentConfig.tabConfigs
-                        console.log('Tab配置已更新，当前配置索引:', tabData.index)
-
-                        // 更新状态文本
-                        const statusText = context.comps.statusText
-                        if (statusText && statusText.$el) {
-                          statusText.message = `点击按钮切换不同的Tab配置，当前是第${tabData.index + 1}组配置`
-                        }
-                      }
-                    }
-                  }
-                },
-                {
-                  id: 'statusText',
-                  span: '18',
-                  type: 'a-alert',
-                  props: {
-                    message: '点击按钮切换不同的Tab配置，当前是第1组配置',
-                    type: 'success'
-                  }
-                }
-              ]
-            }
-          ]
-        },
-        {
-          id: 'row2',
-          type: 'row',
-          gutter: 16,
-          template: 'none',
-          children: [
-            {
-              id: 'pageTab',
-              span: '24',
-              type: 'XTab',
-              props: {
-                showTabBar: true,
-                data: [
-                  {
-                    title: '表单列表',
-                    type: 'XFormTable',
-                    props: {
-                      serviceName: 'af-system',
-                      queryParamsName: 'crud_dictionary_manage'
-                    }
-                  },
-                  {
-                    title: '新增表单',
-                    type: 'XAddNativeForm',
-                    props: {
-                      serviceName: 'af-system',
-                      configName: 'crud_dictionary_manage_add_form'
-                    }
-                  }
-                ],
-                onChange: function (oldKey, newKey, oldTab, newTab) {
-                  console.log('Tab changed:', oldKey, newKey)
-                }
-              }
-            }
-          ]
-        }
-      ]
-    },
-    serviceName: 'af-his'
-  })
-})
-</script>
-
-<template>
-  <div>
-    <x-page-view ref="xPageViewRef"></x-page-view>
-  </div>
-</template>
+<script setup>
+import { onMounted, ref } from 'vue'
+import XPageView from '@vue2-client/base-client/components/layout/XPageView'
+
+const xPageViewRef = ref(null)
+
+onMounted(() => {
+  xPageViewRef.value.init({
+    configValue: {
+      type: 'page',
+      onMounted: function (curr) {
+          console.warn(curr.data)
+          // 设置Tab配置数据
+          curr.data.tabData = {
+            index: 0,
+            items: [
+              // 第一组配置
+              {
+                tabConfigs: [
+                  { title: '表单列表', type: 'XFormTable', props: { serviceName: 'af-system', queryParamsName: 'crud_dictionary_manage' } },
+                  { title: '新增表单', type: 'XAddNativeForm', props: { serviceName: 'af-system', configName: 'crud_dictionary_manage_add_form' } }
+                ]
+              },
+              // 第二组配置
+              {
+                tabConfigs: [
+                  { title: '数据列表', type: 'XFormTable', props: { serviceName: 'af-system', queryParamsName: 'crud_dictionary_manage' } },
+                  { title: '编辑表单', type: 'XAddNativeForm', props: { serviceName: 'af-system', configName: 'crud_dictionary_manage_add_form' } },
+                  { title: '查看记录', type: 'XFormTable', props: { serviceName: 'af-system', queryParamsName: 'crud_dictionary_manage' } }
+                ]
+              }
+            ]
+          }
+          console.log('页面初始化完成，全局数据上下文已创建')
+      },
+      gutter: [16, 16],
+      children: [
+        {
+          id: 'controlRow',
+          type: 'row',
+          gutter: 16,
+          template: 'card',
+          children: [
+            {
+              id: 'buttonContainer',
+              span: '24',
+              type: 'row',
+              gutter: 8,
+              children: [
+                {
+                  id: 'reloadButton',
+                  span: '6',
+                  type: 'a-button',
+                  props: {
+                    type: 'primary',
+                    value: '切换Tab配置'
+                  },
+                  children: [
+                    {
+                      type: 'text',
+                      text: '切换Tab配置'
+                    }
+                  ],
+                  event: {
+                    click: function (e, context) {
+                      // 切换Tab配置
+                      const tabData = context.data.tabData
+                      tabData.index = tabData.index === 0 ? 1 : 0
+
+                      // 获取当前配置和Tab组件
+                      const currentConfig = tabData.items[tabData.index]
+                      const tabComponent = context.comps.pageTab
+
+                      if (tabComponent) {
+                        // 更新Tab组件配置
+                        tabComponent.$props.data = currentConfig.tabConfigs
+                        console.log('Tab配置已更新，当前配置索引:', tabData.index)
+
+                        // 更新状态文本
+                        const statusText = context.comps.statusText
+                        if (statusText && statusText.$el) {
+                          statusText.message = `点击按钮切换不同的Tab配置，当前是第${tabData.index + 1}组配置`
+                        }
+                      }
+                    }
+                  }
+                },
+                {
+                  id: 'statusText',
+                  span: '18',
+                  type: 'a-alert',
+                  props: {
+                    message: '点击按钮切换不同的Tab配置，当前是第1组配置',
+                    type: 'success'
+                  }
+                }
+              ]
+            }
+          ]
+        },
+        {
+          id: 'row2',
+          type: 'row',
+          gutter: 16,
+          template: 'none',
+          children: [
+            {
+              id: 'pageTab',
+              span: '24',
+              type: 'XTab',
+              props: {
+                showTabBar: true,
+                data: [
+                  {
+                    title: '表单列表',
+                    type: 'XFormTable',
+                    props: {
+                      serviceName: 'af-system',
+                      queryParamsName: 'crud_dictionary_manage'
+                    }
+                  },
+                  {
+                    title: '新增表单',
+                    type: 'XAddNativeForm',
+                    props: {
+                      serviceName: 'af-system',
+                      configName: 'crud_dictionary_manage_add_form'
+                    }
+                  }
+                ],
+                onChange: function (oldKey, newKey, oldTab, newTab) {
+                  console.log('Tab changed:', oldKey, newKey)
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    serviceName: 'af-his'
+  })
+})
+</script>
+
+<template>
+  <div>
+    <x-page-view ref="xPageViewRef"></x-page-view>
+  </div>
+</template>

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

@@ -43,8 +43,6 @@ routerResource.submitTicket = () => import('@vue2-client/pages/system/ticket')
 routerResource.ServiceReview = () => import('@vue2-client/pages/ServiceReview')
 // 系统设置
 routerResource.settings = () => import('@vue2-client/pages/system/settings')
-// AMIS示例页面
-routerResource.amisDemo = () => import('@vue2-client/pages/AMisDemo/AMisDemo')
 // 页面编辑器
 routerResource.editablePage = () => import('@vue2-client/pages/lowCode/lowCodeEditor.vue')
 // 数据检索
@@ -53,16 +51,16 @@ 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/WorkFlowDemo2.vue'),
   // component: () => import('@vue2-client/pages/WorkflowDetail/WorkFlowDemo.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'),
   // component: () => import('@vue2-client/base-client/components/common/XReport/XReportDemo.vue'),
-  component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue'),
+  // component: () => import('@vue2-client/base-client/components/common/XFormTable/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XDatePicker/demo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XTab/XTabDemo.vue'),
   // component: () => import('@vue2-client/base-client/components/common/XRate/demo.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/router.js

@@ -8,8 +8,6 @@ const routes = [
   // 对于每个路由，你都可以使用 'loadView' 方法动态加载对应的组件
   { path: '/Tree', component: loadView('Tree') },
   { path: '/XStepView', component: loadView('XStepView') },
-  { path: '/Amis', component: () => import('@vue2-client/pages/AMisDemo/AMisDemo') },
-  { path: '/Amis2', component: () => import('@vue2-client/pages/AMisDemo/AMisDemo2') },
   { path: '/DynamicStatistics', component: () => import('@vue2-client/pages/DynamicStatistics/index') },
   { path: '/NewDynamicStatistics', component: () => import('@vue2-client/pages/NewDynamicStatistics/index') },
   { path: '/submitTicket', component: () => import('@vue2-client/pages/system/ticket') },

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': {
@@ -163,9 +163,6 @@ module.exports = {
     }))
 
     config.plugins.push(
-      // new CopyPlugin({
-      //   patterns: [{ from: 'node_modules/amis/sdk', to: 'amis/sdk' }],
-      // })
     )
 
     // 生产环境下将资源压缩成gzip格式

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

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