adtec-core-package 2.3.0 → 2.3.1

package/src/components/workflow/TaskOperation.vue

@@ -1,241 +1,241 @@
-<!--创建人 xux-->
-<!--说明: 任务操作工具-->
-<!--创建时间: 2024/11/14 上午11:45-->
-<!--修改时间: 2024/11/14 上午11:45-->
-<template>
-  <div ref="taskFlexRef">
-    <el-flex align="center" justify="flex-end" v-loading="taskLoading">
-      <slot name="left"></slot>
-      <el-button v-if="params?.cancelBtnText !== ''" @click="params?.cancelFunction">{{ params?.cancelBtnText ?? '取消' }}</el-button>
-      <el-button v-if="showProcessBtn"  type="info" @click="processShow = true">流程详情</el-button>
-      <template v-if="isAssignee">
-        <el-button type="primary" @click="openDialog('assignee')">指定执行人</el-button>
-      </template>
-      <template v-if="!isAssignee && task?.taskId && task?.operations">
-        <el-button
-          v-if="params?.saveBtnText"
-          type="primary"
-          @click="params?.saveFunction"
-        >{{ params?.saveBtnText }}</el-button
-        >
-        <el-button
-          v-if="task?.operations.indexOf('addMulti') > -1"
-          type="warning"
-          @click="openDialog('addMulti')"
-        >加签</el-button
-        >
-        <el-button
-          v-if="task?.operations.indexOf('minusMulti') > -1"
-          type="danger"
-          @click="openDialog('minusMulti')"
-        >减签</el-button
-        >
-        <el-button
-          v-if="task?.operations.indexOf('refuse') > -1 && params?.refuseBtnText !== ''"
-          type="danger"
-          @click="openDialog('refuse')"
-        >{{ params?.refuseBtnText ?? '终止' }}</el-button
-        >
-        <el-button
-          v-if="task?.operations.indexOf('transfer') > -1 && params?.transferBtnText !== ''"
-          type="warning"
-          @click="openDialog('transfer')"
-        >{{ params?.transferBtnText ?? '转办' }}</el-button
-        >
-        <el-button
-          v-if="task?.operations.indexOf('back') > -1 && params?.backBtnText !== ''"
-          type="danger"
-          @click="openDialog('back')"
-        >{{ params?.backBtnText ?? '退回' }}</el-button
-        >
-        <el-button
-          v-if="task?.operations.indexOf('complete') > -1 && params?.completeBtnText !== ''"
-          type="primary"
-          @click="openDialog('complete')"
-        >{{ params?.completeBtnText ?? '同意' }}</el-button
-        >
-      </template>
-      <slot name="right"></slot>
-      <select-assignee-dialog ref="assigneeRef" @success="selectAssigneeSuccess"></select-assignee-dialog>
-      <select-return-activity-dialog
-        ref="returnActivityRef"
-        @success="reloadTask"
-      ></select-return-activity-dialog>
-      <check-dialog
-        ref="checkRef"
-        @open-assignee="openAssignee"
-        @success="operSuccess"
-      ></check-dialog>
-      <add-or-minus-multi-dialog
-        ref="addOrMinusMultiRef"
-      ></add-or-minus-multi-dialog>
-      <Teleport to="body">
-        <process-detail-dialog v-model="processShow" :task="task"></process-detail-dialog>
-      </Teleport>
-    </el-flex>
-  </div>
-</template>
-<script setup lang="ts">
-import { type PropType, ref, watch, watchEffect, onMounted, computed } from 'vue'
-import workflowInstApi from '../../api/workflow/workflowInstApi'
-import type { IWfTaskVo } from '../../interface/workflow/IWfTaskVo'
-import { ElMessage, ElLoading  } from 'element-plus'
-import SelectAssigneeDialog from './components/SelectAssigneeDialog.vue'
-import SelectReturnActivityDialog from './components/SelectReturnActivityDialog.vue'
-import ProcessDetailDialog from './components/ProcessDetailDialog.vue'
-import AddOrMinusMultiDialog from './components/AddOrMinusMultiDialog.vue'
-import CheckDialog from './components/CheckDialog.vue'
-import type { ITaskOperate } from '../../hooks/userWorkflowHooks'
-import frameworkUtils from '../../utils/FrameworkUtils.ts'
-import { userInfoStore } from '../../stores/userInfoStore.ts'
-import WujieVue from 'wujie-vue3'
-const processShow = ref(false)
-const taskFlexRef = ref<HTMLElement | null>(null);
-const $props = defineProps({
-  // modelValue: { type: Object, required: false },
-  taskId: { type: String, required: true },
-  showProcessBtn: { type: Boolean, required: false, default: false },
-  params: { type: Object as PropType<ITaskOperate>, required: false },
-})
-
-const emit = defineEmits(['success'])
-const task = ref<IWfTaskVo>({ taskId: '', comment: '' })
-const checkRef = ref()
-const assigneeRef = ref()
-const returnActivityRef = ref()
-const addOrMinusMultiRef = ref()
-// const userId = userInfoStore().getUserInfo.id
-const isAssignee = computed(() => {
-  return task.value?.operations === 'assignee' ? true : false
-})
-const dialogType = ref('')
-const openDialog = async (type: string) => {
-  if (type) dialogType.value = type
-  if (!task.value) return
-  // try {
-  //   if (type === 'complete') {
-  //     //同意
-  //     // _inject?.businessComplete?.()
-  //     task.value.variables = $props.params?.completeFunction?.()
-  //   } else if (type === 'refuse') {
-  //     //终止
-  //     $props.params?.refuseFunction?.()
-  //   } else if (type === 'back') {
-  //     //回退
-  //     $props.params?.backFunction?.()
-  //   } else if (type === 'transfer') {
-  //     //转办
-  //     $props.params?.transferFunction?.()
-  //   }
-  // } catch (err: any) {
-  //   frameworkUtils.messageError(err)
-  //   return
-  // }
-  let commentReadonly = false
-  if (type === 'complete' && $props.params?.beforeCompleteFunction) {
-    try {
-      const res = await $props.params?.beforeCompleteFunction({
-        taskId: task.value.taskId,
-        userId: userInfoStore().getUserInfo.id,
-        comment: '同意。'
-      })
-      if (res === false) return
-      if (res?.readonly) {
-        commentReadonly = true
-      }
-      task.value = {...task.value,...res}
-    } catch (err: any) {
-      return
-    }
-  }
-  if (type === 'addMulti' || type === 'minusMulti') { //加减签
-    addOrMinusMultiRef.value?.open(task.value.taskId, type)
-  } else if (type === 'assignee') { //指定审批人
-    openAssignee(task.value.taskId)
-  } else {
-    checkRef.value?.open(task.value, type, $props?.params, commentReadonly)
-  }
-}
-
-const selectAssigneeSuccess = () => {
-  // _inject?.workflowComplete?.()
-  $props.params?.workflowComplete()
-  emit('success')
-}
-const openAssignee = (taskId: string) => {
-  assigneeRef.value?.open(taskId)
-}
-const operSuccess = (taskVo: IWfTaskVo) => {
-  task.value = taskVo
-  $props.params?.workflowComplete()
-  WujieVue.bus.$emit('todoRefresh')
-  WujieVue.bus.$emit('homePageRefresh')
-  emit('success')
-}
-
-// 向上定义递归查找函数
-const findParentWithClass = (element: HTMLElement | null, targetClass: string): HTMLElement | null => {
-  if (!element) {
-    return null;
-  }
-  if (element.classList?.contains(targetClass)) {
-    return element;
-  }
-  return findParentWithClass(element.parentElement, targetClass);
-}
-// 定义查找 todo-dialog-class 元素的方法
-const findTodoDialog = () => {
-  const targetElement = findParentWithClass(taskFlexRef.value as HTMLElement, 'todo-dialog-class');
-  if (targetElement) {
-    console.log('找到满足条件的元素:', targetElement);
-  } else {
-    console.log('未找到满足条件的元素');
-  }
-  return targetElement
-}
-let parentDom: any
-onMounted(() => {
-  parentDom = findTodoDialog();
-  reloadTask()
-})
-let loading: any
-const taskLoading = ref(false)
-const loadStart = async () => {
-  taskLoading.value = true
-  // loading = ElLoading.service({
-  //   target: parentDom,
-  //   lock: true,
-  //   background: 'rgba(0, 0, 0, 0)',
-  // })
-}
-const loadEnd = () => {
-  taskLoading.value = false
-  // loading.close()
-}
-const reloadTask = async () => {
-  if ($props.taskId) {
-    try {
-      loadStart()
-      task.value = await workflowInstApi.getTaskInst($props.taskId)
-      if (task.value.finishTime) {
-        // ElMessage.info('该待办已完成！')
-        console.log('该待办已完成！')
-      }
-    } catch (err: any) {
-      frameworkUtils.messageError(err)
-    } finally {
-      loadEnd()
-    }
-  }
-}
-watch(() => $props.taskId, reloadTask)
-// watchEffect(() => {
-//   //需要指定实际处理人
-//   isAssignee.value = task.value?.operations === 'assignee'
-//   if (!task.value || !task.value?.taskId) {
-//     reloadTask()
-//   }
-// })
-
-</script>
-<style scoped lang="scss"></style>
+<!--创建人 xux-->
+<!--说明: 任务操作工具-->
+<!--创建时间: 2024/11/14 上午11:45-->
+<!--修改时间: 2024/11/14 上午11:45-->
+<template>
+  <div ref="taskFlexRef">
+    <el-flex align="center" justify="flex-end" v-loading="taskLoading">
+      <slot name="left"></slot>
+      <el-button v-if="params?.cancelBtnText !== ''" @click="params?.cancelFunction">{{ params?.cancelBtnText ?? '取消' }}</el-button>
+      <el-button v-if="showProcessBtn"  type="info" @click="processShow = true">流程详情</el-button>
+      <template v-if="isAssignee">
+        <el-button type="primary" @click="openDialog('assignee')">指定执行人</el-button>
+      </template>
+      <template v-if="!isAssignee && task?.taskId && task?.operations">
+        <el-button
+          v-if="params?.saveBtnText"
+          type="primary"
+          @click="params?.saveFunction"
+        >{{ params?.saveBtnText }}</el-button
+        >
+        <el-button
+          v-if="task?.operations.indexOf('addMulti') > -1"
+          type="warning"
+          @click="openDialog('addMulti')"
+        >加签</el-button
+        >
+        <el-button
+          v-if="task?.operations.indexOf('minusMulti') > -1"
+          type="danger"
+          @click="openDialog('minusMulti')"
+        >减签</el-button
+        >
+        <el-button
+          v-if="task?.operations.indexOf('refuse') > -1 && params?.refuseBtnText !== ''"
+          type="danger"
+          @click="openDialog('refuse')"
+        >{{ params?.refuseBtnText ?? '终止' }}</el-button
+        >
+        <el-button
+          v-if="task?.operations.indexOf('transfer') > -1 && params?.transferBtnText !== ''"
+          type="warning"
+          @click="openDialog('transfer')"
+        >{{ params?.transferBtnText ?? '转办' }}</el-button
+        >
+        <el-button
+          v-if="task?.operations.indexOf('back') > -1 && params?.backBtnText !== ''"
+          type="danger"
+          @click="openDialog('back')"
+        >{{ params?.backBtnText ?? '退回' }}</el-button
+        >
+        <el-button
+          v-if="task?.operations.indexOf('complete') > -1 && params?.completeBtnText !== ''"
+          type="primary"
+          @click="openDialog('complete')"
+        >{{ params?.completeBtnText ?? '同意' }}</el-button
+        >
+      </template>
+      <slot name="right"></slot>
+      <select-assignee-dialog ref="assigneeRef" @success="selectAssigneeSuccess"></select-assignee-dialog>
+      <select-return-activity-dialog
+        ref="returnActivityRef"
+        @success="reloadTask"
+      ></select-return-activity-dialog>
+      <check-dialog
+        ref="checkRef"
+        @open-assignee="openAssignee"
+        @success="operSuccess"
+      ></check-dialog>
+      <add-or-minus-multi-dialog
+        ref="addOrMinusMultiRef"
+      ></add-or-minus-multi-dialog>
+      <Teleport to="body">
+        <process-detail-dialog v-model="processShow" :task="task"></process-detail-dialog>
+      </Teleport>
+    </el-flex>
+  </div>
+</template>
+<script setup lang="ts">
+import { type PropType, ref, watch, watchEffect, onMounted, computed } from 'vue'
+import workflowInstApi from '../../api/workflow/workflowInstApi'
+import type { IWfTaskVo } from '../../interface/workflow/IWfTaskVo'
+import { ElMessage, ElLoading  } from 'element-plus'
+import SelectAssigneeDialog from './components/SelectAssigneeDialog.vue'
+import SelectReturnActivityDialog from './components/SelectReturnActivityDialog.vue'
+import ProcessDetailDialog from './components/ProcessDetailDialog.vue'
+import AddOrMinusMultiDialog from './components/AddOrMinusMultiDialog.vue'
+import CheckDialog from './components/CheckDialog.vue'
+import type { ITaskOperate } from '../../hooks/userWorkflowHooks'
+import frameworkUtils from '../../utils/FrameworkUtils.ts'
+import { userInfoStore } from '../../stores/userInfoStore.ts'
+import WujieVue from 'wujie-vue3'
+const processShow = ref(false)
+const taskFlexRef = ref<HTMLElement | null>(null);
+const $props = defineProps({
+  // modelValue: { type: Object, required: false },
+  taskId: { type: String, required: true },
+  showProcessBtn: { type: Boolean, required: false, default: false },
+  params: { type: Object as PropType<ITaskOperate>, required: false },
+})
+
+const emit = defineEmits(['success'])
+const task = ref<IWfTaskVo>({ taskId: '', comment: '' })
+const checkRef = ref()
+const assigneeRef = ref()
+const returnActivityRef = ref()
+const addOrMinusMultiRef = ref()
+// const userId = userInfoStore().getUserInfo.id
+const isAssignee = computed(() => {
+  return task.value?.operations === 'assignee' ? true : false
+})
+const dialogType = ref('')
+const openDialog = async (type: string) => {
+  if (type) dialogType.value = type
+  if (!task.value) return
+  // try {
+  //   if (type === 'complete') {
+  //     //同意
+  //     // _inject?.businessComplete?.()
+  //     task.value.variables = $props.params?.completeFunction?.()
+  //   } else if (type === 'refuse') {
+  //     //终止
+  //     $props.params?.refuseFunction?.()
+  //   } else if (type === 'back') {
+  //     //回退
+  //     $props.params?.backFunction?.()
+  //   } else if (type === 'transfer') {
+  //     //转办
+  //     $props.params?.transferFunction?.()
+  //   }
+  // } catch (err: any) {
+  //   frameworkUtils.messageError(err)
+  //   return
+  // }
+  let commentReadonly = false
+  if (type === 'complete' && $props.params?.beforeCompleteFunction) {
+    try {
+      const res = await $props.params?.beforeCompleteFunction({
+        taskId: task.value.taskId,
+        userId: userInfoStore().getUserInfo.id,
+        comment: '同意。'
+      })
+      if (res === false) return
+      if (res?.readonly) {
+        commentReadonly = true
+      }
+      task.value = {...task.value,...res}
+    } catch (err: any) {
+      return
+    }
+  }
+  if (type === 'addMulti' || type === 'minusMulti') { //加减签
+    addOrMinusMultiRef.value?.open(task.value.taskId, type)
+  } else if (type === 'assignee') { //指定审批人
+    openAssignee(task.value.taskId)
+  } else {
+    checkRef.value?.open(task.value, type, $props?.params, commentReadonly)
+  }
+}
+
+const selectAssigneeSuccess = () => {
+  // _inject?.workflowComplete?.()
+  $props.params?.workflowComplete()
+  emit('success')
+}
+const openAssignee = (taskId: string) => {
+  assigneeRef.value?.open(taskId)
+}
+const operSuccess = (taskVo: IWfTaskVo) => {
+  task.value = taskVo
+  $props.params?.workflowComplete()
+  WujieVue.bus.$emit('todoRefresh')
+  WujieVue.bus.$emit('homePageRefresh')
+  emit('success')
+}
+
+// 向上定义递归查找函数
+const findParentWithClass = (element: HTMLElement | null, targetClass: string): HTMLElement | null => {
+  if (!element) {
+    return null;
+  }
+  if (element.classList?.contains(targetClass)) {
+    return element;
+  }
+  return findParentWithClass(element.parentElement, targetClass);
+}
+// 定义查找 todo-dialog-class 元素的方法
+const findTodoDialog = () => {
+  const targetElement = findParentWithClass(taskFlexRef.value as HTMLElement, 'todo-dialog-class');
+  if (targetElement) {
+    console.log('找到满足条件的元素:', targetElement);
+  } else {
+    console.log('未找到满足条件的元素');
+  }
+  return targetElement
+}
+let parentDom: any
+onMounted(() => {
+  parentDom = findTodoDialog();
+  reloadTask()
+})
+let loading: any
+const taskLoading = ref(false)
+const loadStart = async () => {
+  taskLoading.value = true
+  // loading = ElLoading.service({
+  //   target: parentDom,
+  //   lock: true,
+  //   background: 'rgba(0, 0, 0, 0)',
+  // })
+}
+const loadEnd = () => {
+  taskLoading.value = false
+  // loading.close()
+}
+const reloadTask = async () => {
+  if ($props.taskId) {
+    try {
+      loadStart()
+      task.value = await workflowInstApi.getTaskInst($props.taskId)
+      if (task.value.finishTime) {
+        // ElMessage.info('该待办已完成！')
+        console.log('该待办已完成！')
+      }
+    } catch (err: any) {
+      frameworkUtils.messageError(err)
+    } finally {
+      loadEnd()
+    }
+  }
+}
+watch(() => $props.taskId, reloadTask)
+// watchEffect(() => {
+//   //需要指定实际处理人
+//   isAssignee.value = task.value?.operations === 'assignee'
+//   if (!task.value || !task.value?.taskId) {
+//     reloadTask()
+//   }
+// })
+
+</script>
+<style scoped lang="scss"></style>

package/src/components/workflow/WorkflowTodoDialog.vue

@@ -1,87 +1,87 @@
-<!--创建人 xux-->
-<!--说明: 工作流待办组件-->
-<!--创建时间: 2025/1/20 下午5:27-->
-<!--修改时间: 2025/1/20 下午5:27-->
-<template>
-  <component :is="compInst" ref="compRef" v-model="showComp" class="todo-dialog-class">
-    <template v-if="taskId" #workflow>
-      <!--      @success="emit('workflowComplete')"-->
-      <task-operation
-        v-if="taskOperationShow"
-        :show-process-btn="true"
-        :taskId="taskId"
-        :params="compRef?.taskOption"
-      >
-      </task-operation>
-    </template>
-  </component>
-</template>
-<script setup lang="ts">
-import type { IParameter } from '../../interface/Message'
-import { nextTick, onMounted, onUnmounted, ref } from 'vue'
-const applicationModule = import.meta.env.VITE_APPLICATION_MODULE
-import TaskOperation from './TaskOperation.vue'
-import modules from '../../utils/modules'
-import { ElMessage } from 'element-plus'
-import { useEventBus } from '@vueuse/core'
-// const emit = defineEmits(['workflowComplete'])
-const compInst = ref()
-const compRef = ref()
-const showComp = ref(false)
-const taskId = ref('')
-const taskOperationShow=ref(true)
-onMounted(() => {
-  //@ts-ignore
-  window.$wujie?.bus.$off(applicationModule + 'WorkflowTodoBus')
-  //@ts-ignore
-  window.$wujie?.bus.$on(applicationModule + 'WorkflowTodoBus', async (params: IParameter[]) => {
-    initTodoDialog(params)
-  })
-})
-onUnmounted(() => {
-  //@ts-ignore
-  window.$wujie?.bus.$off(applicationModule + 'WorkflowTodoBus')
-})
-//待办展现逻辑
-const initTodoDialog = async (params: IParameter[]) => {
-  showComp.value = false
-  let linkModelPath = params?.find((x: IParameter) => x.code === 'nodeTag')?.value
-  //去除应用前缀
-  if (linkModelPath.indexOf(':') > -1) {
-    linkModelPath = linkModelPath.split(':')[1]
-  }
-  if (!linkModelPath) {
-    ElMessage.warning('未设置流程前端组件')
-    return
-  }
-  if (linkModelPath) {
-
-    if (linkModelPath.indexOf('/') > -1) {
-      //组件
-      showComp.value = true
-      const comp = modules[linkModelPath]
-      const d: any = await comp()
-      compInst.value = d.default
-      taskOperationShow.value = false
-      nextTick(() => {
-        taskOperationShow.value = true
-        if (compRef.value?.initByWorkflow) {
-          taskId.value = params?.find((x: IParameter) => x.code === 'taskId')?.value
-          const wParam = {
-            businessId: params?.find((x: IParameter) => x.code === 'businessId')?.value,
-            taskId: taskId.value,
-            nodeTag: params?.find((x: IParameter) => x.code === 'nodeTag')?.value,
-            nodeParam: params?.find((x: IParameter) => x.code === 'nodeParam')?.value,
-          }
-          compRef.value?.initByWorkflow(wParam)
-        }
-      })
-    } else { //菜单
-      const menuCode = params?.find((x: IParameter) => x.code === 'menuCode')?.value
-      const bus = useEventBus<IParameter[]>((menuCode ?? linkModelPath) + '_message')
-      bus.emit(params)
-    }
-  }
-}
-</script>
-<style scoped lang="scss"></style>
+<!--创建人 xux-->
+<!--说明: 工作流待办组件-->
+<!--创建时间: 2025/1/20 下午5:27-->
+<!--修改时间: 2025/1/20 下午5:27-->
+<template>
+  <component :is="compInst" ref="compRef" v-model="showComp" class="todo-dialog-class">
+    <template v-if="taskId" #workflow>
+      <!--      @success="emit('workflowComplete')"-->
+      <task-operation
+        v-if="taskOperationShow"
+        :show-process-btn="true"
+        :taskId="taskId"
+        :params="compRef?.taskOption"
+      >
+      </task-operation>
+    </template>
+  </component>
+</template>
+<script setup lang="ts">
+import type { IParameter } from '../../interface/Message'
+import { nextTick, onMounted, onUnmounted, ref } from 'vue'
+const applicationModule = import.meta.env.VITE_APPLICATION_MODULE
+import TaskOperation from './TaskOperation.vue'
+import modules from '../../utils/modules'
+import { ElMessage } from 'element-plus'
+import { useEventBus } from '@vueuse/core'
+// const emit = defineEmits(['workflowComplete'])
+const compInst = ref()
+const compRef = ref()
+const showComp = ref(false)
+const taskId = ref('')
+const taskOperationShow=ref(true)
+onMounted(() => {
+  //@ts-ignore
+  window.$wujie?.bus.$off(applicationModule + 'WorkflowTodoBus')
+  //@ts-ignore
+  window.$wujie?.bus.$on(applicationModule + 'WorkflowTodoBus', async (params: IParameter[]) => {
+    initTodoDialog(params)
+  })
+})
+onUnmounted(() => {
+  //@ts-ignore
+  window.$wujie?.bus.$off(applicationModule + 'WorkflowTodoBus')
+})
+//待办展现逻辑
+const initTodoDialog = async (params: IParameter[]) => {
+  showComp.value = false
+  let linkModelPath = params?.find((x: IParameter) => x.code === 'nodeTag')?.value
+  //去除应用前缀
+  if (linkModelPath.indexOf(':') > -1) {
+    linkModelPath = linkModelPath.split(':')[1]
+  }
+  if (!linkModelPath) {
+    ElMessage.warning('未设置流程前端组件')
+    return
+  }
+  if (linkModelPath) {
+
+    if (linkModelPath.indexOf('/') > -1) {
+      //组件
+      showComp.value = true
+      const comp = modules[linkModelPath]
+      const d: any = await comp()
+      compInst.value = d.default
+      taskOperationShow.value = false
+      nextTick(() => {
+        taskOperationShow.value = true
+        if (compRef.value?.initByWorkflow) {
+          taskId.value = params?.find((x: IParameter) => x.code === 'taskId')?.value
+          const wParam = {
+            businessId: params?.find((x: IParameter) => x.code === 'businessId')?.value,
+            taskId: taskId.value,
+            nodeTag: params?.find((x: IParameter) => x.code === 'nodeTag')?.value,
+            nodeParam: params?.find((x: IParameter) => x.code === 'nodeParam')?.value,
+          }
+          compRef.value?.initByWorkflow(wParam)
+        }
+      })
+    } else { //菜单
+      const menuCode = params?.find((x: IParameter) => x.code === 'menuCode')?.value
+      const bus = useEventBus<IParameter[]>((menuCode ?? linkModelPath) + '_message')
+      bus.emit(params)
+    }
+  }
+}
+</script>
+<style scoped lang="scss"></style>