adtec-core-package 2.2.0 → 2.2.1

package/src/components/bpmntree/views/flowDesign/nodes/NotifyNode.vue

@@ -1,115 +1,115 @@
-<script setup lang="ts">
-import Node from './Node.vue'
-import type { ErrorInfo, NotifyNode } from './type'
-import { inject, ref, type Ref, watchEffect } from 'vue'
-import { getRoleListById } from '../../../api/modules/role'
-import type { Field } from '../../../components/Render/type'
-import { getList } from '../../../api/modules/user'
-
-const props = defineProps<{
-  node: NotifyNode
-}>()
-const { fields, nodesError } = inject<{
-  fields: Ref<Field[]>
-  nodesError: Ref<Recordable<ErrorInfo[]>>
-}>('flowDesign', { fields: ref([]), nodesError: ref({}) })
-const viewContent = ref<string>('')
-watchEffect(async () => {
-  const errors: ErrorInfo[] = []
-  const {
-    id,
-    assigneeType,
-    name,
-    users,
-    roles,
-    leader,
-    choice,
-    formUser,
-    formRole,
-    orgLeader,
-    subject,
-    types,
-    content,
-    nodeTag,
-  } = props.node
-  if (assigneeType === 'user') {
-    if (users.length > 0) {
-      try {
-        const res = await getList(users)
-        viewContent.value = res.map((user) => user.userName).join('、')
-      } catch (err: any) {
-        viewContent.value = err.msg
-      }
-    } else {
-      errors.push({ id: id, name: name, message: '未指定人员' })
-      viewContent.value = '未指定人员'
-    }
-  } else if (assigneeType === 'choice') {
-    viewContent.value = `发起人自选（${choice ? '多选' : '单选'}）`
-  } else if (assigneeType === 'self') {
-    viewContent.value = '发起人自己'
-  } else if (assigneeType === 'leader') {
-    viewContent.value = leader === 1 ? '直属上级' : `${leader}级上级`
-  } else if (assigneeType === 'orgLeader') {
-    viewContent.value = orgLeader === 1 ? '直属主管' : `${orgLeader}级主管`
-  } else if (assigneeType === 'formUser') {
-    if (!formUser) {
-      errors.push({ id: id, name: name, message: '未指定自定义人员' })
-    }
-    const title = fields.value.find((e) => e.id === formUser)?.label || formUser || '?'
-    viewContent.value = `自定义（${title}）人员`
-  } else if (assigneeType === 'formRole') {
-    if (!formRole) {
-      errors.push({ id: id, name: name, message: '未指定自定义角色' })
-    }
-    const title = fields.value.find((e) => e.id === formRole)?.label || formRole || '?'
-    viewContent.value = `自定义（${title}）角色`
-  } else if (assigneeType === 'role') {
-    if (roles.length > 0) {
-      // const all = roles.map((id) => getById(id))
-      // Promise.all(all).then((roles) => {
-      //   viewContent.value = roles.map((res) => res.data.name).join('、')
-      // })
-      try {
-        const res = await getRoleListById(roles)
-        viewContent.value = res.map((role) => role.name).join('、')
-      } catch (err: any) {
-        viewContent.value = err.msg
-      }
-    } else {
-      errors.push({ id: id, name: name, message: '未指定角色' })
-      viewContent.value = '未指定角色'
-    }
-  } else {
-    errors.push({ id: id, name: name, message: '未知错误' })
-    viewContent.value = name
-  }
-
-  if (types.length === 0) {
-    errors.push({ id: id, name: name, message: '未指定通知类型' })
-  }
-  if (!subject) {
-    errors.push({ id: id, name: name, message: '消息主题为空' })
-  }
-  if (!content) {
-    errors.push({ id: id, name: name, message: '消息内容为空' })
-  }
-  if (!nodeTag) {
-    errors.push({ id: id, name: name, message: '未设置组件路径' })
-  }
-  // 记录错误
-  if (errors.length > 0) {
-    nodesError.value[id] = errors
-  } else {
-    delete nodesError.value[id]
-  }
-})
-</script>
-
-<template>
-  <Node v-bind="$attrs" icon="el:BellFilled" color="#4292F3" :node="node">
-    <el-text>{{ viewContent }}</el-text>
-  </Node>
-</template>
-
-<style scoped lang="scss"></style>
+<script setup lang="ts">
+import Node from './Node.vue'
+import type { ErrorInfo, NotifyNode } from './type'
+import { inject, ref, type Ref, watchEffect } from 'vue'
+import { getRoleListById } from '../../../api/modules/role'
+import type { Field } from '../../../components/Render/type'
+import { getList } from '../../../api/modules/user'
+
+const props = defineProps<{
+  node: NotifyNode
+}>()
+const { fields, nodesError } = inject<{
+  fields: Ref<Field[]>
+  nodesError: Ref<Recordable<ErrorInfo[]>>
+}>('flowDesign', { fields: ref([]), nodesError: ref({}) })
+const viewContent = ref<string>('')
+watchEffect(async () => {
+  const errors: ErrorInfo[] = []
+  const {
+    id,
+    assigneeType,
+    name,
+    users,
+    roles,
+    leader,
+    choice,
+    formUser,
+    formRole,
+    orgLeader,
+    subject,
+    types,
+    content,
+    nodeTag,
+  } = props.node
+  if (assigneeType === 'user') {
+    if (users.length > 0) {
+      try {
+        const res = await getList(users)
+        viewContent.value = res.map((user) => user.userName).join('、')
+      } catch (err: any) {
+        viewContent.value = err.msg
+      }
+    } else {
+      errors.push({ id: id, name: name, message: '未指定人员' })
+      viewContent.value = '未指定人员'
+    }
+  } else if (assigneeType === 'choice') {
+    viewContent.value = `发起人自选（${choice ? '多选' : '单选'}）`
+  } else if (assigneeType === 'self') {
+    viewContent.value = '发起人自己'
+  } else if (assigneeType === 'leader') {
+    viewContent.value = leader === 1 ? '直属上级' : `${leader}级上级`
+  } else if (assigneeType === 'orgLeader') {
+    viewContent.value = orgLeader === 1 ? '直属主管' : `${orgLeader}级主管`
+  } else if (assigneeType === 'formUser') {
+    if (!formUser) {
+      errors.push({ id: id, name: name, message: '未指定自定义人员' })
+    }
+    const title = fields.value.find((e) => e.id === formUser)?.label || formUser || '?'
+    viewContent.value = `自定义（${title}）人员`
+  } else if (assigneeType === 'formRole') {
+    if (!formRole) {
+      errors.push({ id: id, name: name, message: '未指定自定义角色' })
+    }
+    const title = fields.value.find((e) => e.id === formRole)?.label || formRole || '?'
+    viewContent.value = `自定义（${title}）角色`
+  } else if (assigneeType === 'role') {
+    if (roles.length > 0) {
+      // const all = roles.map((id) => getById(id))
+      // Promise.all(all).then((roles) => {
+      //   viewContent.value = roles.map((res) => res.data.name).join('、')
+      // })
+      try {
+        const res = await getRoleListById(roles)
+        viewContent.value = res.map((role) => role.name).join('、')
+      } catch (err: any) {
+        viewContent.value = err.msg
+      }
+    } else {
+      errors.push({ id: id, name: name, message: '未指定角色' })
+      viewContent.value = '未指定角色'
+    }
+  } else {
+    errors.push({ id: id, name: name, message: '未知错误' })
+    viewContent.value = name
+  }
+
+  if (types.length === 0) {
+    errors.push({ id: id, name: name, message: '未指定通知类型' })
+  }
+  if (!subject) {
+    errors.push({ id: id, name: name, message: '消息主题为空' })
+  }
+  if (!content) {
+    errors.push({ id: id, name: name, message: '消息内容为空' })
+  }
+  if (!nodeTag) {
+    errors.push({ id: id, name: name, message: '未设置组件路径' })
+  }
+  // 记录错误
+  if (errors.length > 0) {
+    nodesError.value[id] = errors
+  } else {
+    delete nodesError.value[id]
+  }
+})
+</script>
+
+<template>
+  <Node v-bind="$attrs" icon="el:BellFilled" color="#4292F3" :node="node">
+    <el-text>{{ viewContent }}</el-text>
+  </Node>
+</template>
+
+<style scoped lang="scss"></style>

package/src/components/bpmntree/views/flowDesign/nodes/ParallelNode.vue

@@ -1,20 +1,20 @@
-<script setup lang="ts">
-import type { ParallelNode } from './type'
-import GatewayNode from './GatewayNode.vue'
-
-defineProps<{
-  node: ParallelNode
-}>()
-</script>
-
-<template>
-  <GatewayNode v-bind="$attrs" :node="node">
-    <template #default="{ addNode, readOnly }">
-      <el-button type="primary" :disabled="readOnly" @click="addNode('concurrent', node)" plain round
-        >添加并行分支</el-button
-      >
-    </template>
-  </GatewayNode>
-</template>
-
-<style scoped lang="scss"></style>
+<script setup lang="ts">
+import type { ParallelNode } from './type'
+import GatewayNode from './GatewayNode.vue'
+
+defineProps<{
+  node: ParallelNode
+}>()
+</script>
+
+<template>
+  <GatewayNode v-bind="$attrs" :node="node">
+    <template #default="{ addNode, readOnly }">
+      <el-button type="primary" :disabled="readOnly" @click="addNode('concurrent', node)" plain round
+        >添加并行分支</el-button
+      >
+    </template>
+  </GatewayNode>
+</template>
+
+<style scoped lang="scss"></style>

package/src/components/bpmntree/views/flowDesign/nodes/PopoverView.vue

@@ -1,78 +1,78 @@
-<!--创建人 xux-->
-<!--说明: PopoverView-->
-<!--创建时间: 2024/11/13 下午10:49-->
-<!--修改时间: 2024/11/13 下午10:49-->
-<template>
-  <div v-for="(item, index) in tasks" :key="item.taskId" style="width: 100%">
-    <el-row style="height: 20px">
-      <el-col :span="24">
-        <el-tooltip
-          v-if="item.assigneeName"
-          :content="item.assigneeName"
-          placement="top"
-          effect="light"
-        >
-          <span class="ellipsis">处理人：{{ item.assigneeName }}</span>
-        </el-tooltip>
-      </el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="24">开始时间：{{ item.createTime?.substring(0, 19) }}</el-col>
-    </el-row>
-    <el-row v-if="item.finishTime">
-      <el-col :span="24">结束时间：{{ item.finishTime.substring(0, 19) }}</el-col>
-    </el-row>
-    <el-row v-if="item.commentList?.[0]?.fullMessage">
-      <el-col :span="24"
-        >处理意见：{{ item.commentList?.[item.commentList.length - 1]?.fullMessage }}</el-col
-      >
-    </el-row>
-    <el-row>
-      <el-col :span="24">状态：{{ getStatus(item) }}</el-col>
-    </el-row>
-    <el-row v-if="tasks.length > 0 && index != tasks.length - 1">
-      <el-col :span="24">
-        <el-divider style="margin: 5px 0"></el-divider>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-<script setup lang="ts">
-import { computed } from 'vue'
-import type { IWfTaskVo } from '../../../../../interface/workflow/IWfTaskVo'
-import type { FlowNode } from '../../../views/flowDesign/nodes/type'
-const getStatus = (task: IWfTaskVo) => {
-  if (!task.finishTime) {
-    if (task.operations && task.operations === 'assignee') {
-      return '待指定审批人'
-    }
-    return '待办'
-  } else {
-    if (task.taskLocalVars && task.taskLocalVars.firstTask) {
-      return '提交'
-    }
-    if (task.commentList && task.commentList.length > 0) {
-      return ['待办', '已办', '已办', '终止', '委派', '转办', '终止', '撤回'][
-        Number(task.commentList[task.commentList.length - 1].type)
-      ]
-    }
-    return ''
-  }
-}
-const props = defineProps<{
-  node: FlowNode
-  tasks: IWfTaskVo[]
-}>()
-const tasks = computed(() => {
-  return props.tasks.filter((x) => !(x.finishTime && x.commentList?.length == 0))
-})
-</script>
-<style scoped lang="scss">
-.ellipsis {
-  display: inline-block; /* 或 block */
-  max-width: 100%; /* 设置宽度 */
-  overflow: hidden; /* 隐藏超出的内容 */
-  white-space: nowrap; /* 强制不换行 */
-  text-overflow: ellipsis; /* 超出显示省略号 */
-}
-</style>
+<!--创建人 xux-->
+<!--说明: PopoverView-->
+<!--创建时间: 2024/11/13 下午10:49-->
+<!--修改时间: 2024/11/13 下午10:49-->
+<template>
+  <div v-for="(item, index) in tasks" :key="item.taskId" style="width: 100%">
+    <el-row style="height: 20px">
+      <el-col :span="24">
+        <el-tooltip
+          v-if="item.assigneeName"
+          :content="item.assigneeName"
+          placement="top"
+          effect="light"
+        >
+          <span class="ellipsis">处理人：{{ item.assigneeName }}</span>
+        </el-tooltip>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="24">开始时间：{{ item.createTime?.substring(0, 19) }}</el-col>
+    </el-row>
+    <el-row v-if="item.finishTime">
+      <el-col :span="24">结束时间：{{ item.finishTime.substring(0, 19) }}</el-col>
+    </el-row>
+    <el-row v-if="item.commentList?.[0]?.fullMessage">
+      <el-col :span="24"
+        >处理意见：{{ item.commentList?.[item.commentList.length - 1]?.fullMessage }}</el-col
+      >
+    </el-row>
+    <el-row>
+      <el-col :span="24">状态：{{ getStatus(item) }}</el-col>
+    </el-row>
+    <el-row v-if="tasks.length > 0 && index != tasks.length - 1">
+      <el-col :span="24">
+        <el-divider style="margin: 5px 0"></el-divider>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+<script setup lang="ts">
+import { computed } from 'vue'
+import type { IWfTaskVo } from '../../../../../interface/workflow/IWfTaskVo'
+import type { FlowNode } from '../../../views/flowDesign/nodes/type'
+const getStatus = (task: IWfTaskVo) => {
+  if (!task.finishTime) {
+    if (task.operations && task.operations === 'assignee') {
+      return '待指定审批人'
+    }
+    return '待办'
+  } else {
+    if (task.taskLocalVars && task.taskLocalVars.firstTask) {
+      return '提交'
+    }
+    if (task.commentList && task.commentList.length > 0) {
+      return ['待办', '已办', '已办', '终止', '委派', '转办', '终止', '撤回'][
+        Number(task.commentList[task.commentList.length - 1].type)
+      ]
+    }
+    return ''
+  }
+}
+const props = defineProps<{
+  node: FlowNode
+  tasks: IWfTaskVo[]
+}>()
+const tasks = computed(() => {
+  return props.tasks.filter((x) => !(x.finishTime && x.commentList?.length == 0))
+})
+</script>
+<style scoped lang="scss">
+.ellipsis {
+  display: inline-block; /* 或 block */
+  max-width: 100%; /* 设置宽度 */
+  overflow: hidden; /* 隐藏超出的内容 */
+  white-space: nowrap; /* 强制不换行 */
+  text-overflow: ellipsis; /* 超出显示省略号 */
+}
+</style>

package/src/components/bpmntree/views/flowDesign/nodes/StartNode.vue

@@ -1,84 +1,84 @@
-<script setup lang="ts">
-import Node from './Node.vue'
-import type { ErrorInfo, FlowNode, NodeType, StartNode } from './type'
-import { computed, inject, ref, type Ref, watchEffect } from 'vue'
-import Add from './Add.vue'
-import type { IWfProcessInstVo } from '../../../../../interface/workflow/IWfTaskVo'
-
-const props = defineProps<{
-  node: StartNode
-}>()
-const _inject = inject<{
-  nodesError: Ref<Recordable<ErrorInfo[]>>
-  readOnly?: Ref<boolean>
-  processInst: Ref<IWfProcessInstVo>
-}>('flowDesign', {
-  nodesError: ref({}),
-  readOnly: ref(false),
-  processInst: ref<IWfProcessInstVo>({}),
-})
-const $emits = defineEmits<{
-  (e: 'addNode', type: NodeType, node: FlowNode): void
-  (e: 'activeNode', node: FlowNode): void
-}>()
-const iconColor = ref('#0b83de')
-watchEffect(() => {
-  // const errors: ErrorInfo[] = []
-  // const { id, name, child } = props.node
-  // if (child?.type === 'end') {
-  //   errors.push({ id: id, name: name, message: '发起下节点为空' })
-  // }
-  if (_inject.processInst.value && props.node) {
-    iconColor.value = '#18ad43'
-  }
-})
-const _readOnly = computed(() => _inject.readOnly?.value)
-const activeNode = () => {
-  if (_readOnly.value) return
-  $emits('activeNode', props.node)
-}
-const addNode = (type: NodeType) => {
-  $emits('addNode', type, props.node)
-}
-</script>
-
-<template>
-  <div class="node-box">
-    <!--    <div class="end-node-circle"></div>-->
-    <el-flex class="start-node" @click="activeNode" align="center">
-      <el-icons model-value="adtec-start" size="30"></el-icons>
-      <!--      <el-text>流程开启</el-text>-->
-    </el-flex>
-    <Add @add-node="addNode" />
-  </div>
-</template>
-
-<style scoped lang="scss">
-.node-box {
-  position: relative;
-  padding-bottom: 0;
-  padding-top: 40px;
-  //.end-node-circle {
-  //  width: 10px;
-  //  height: 10px;
-  //  border-radius: 50%;
-  //  background-color: var(--el-border-color);
-  //  margin: auto auto 5px;
-  //}
-
-  .start-node {
-    position: relative;
-    background: white; //var(--el-border-color-lighter);
-    padding: 6px;
-    border-radius: 24px;
-    cursor: pointer;
-    overflow: visible;
-    z-index: 10;
-    box-shadow: var(--el-box-shadow-light);
-    color: v-bind(iconColor); //#0b83de; //#18ad43;
-    &:hover {
-      box-shadow: 0 0 5px 0 var(--el-color-primary);
-    }
-  }
-}
-</style>
+<script setup lang="ts">
+import Node from './Node.vue'
+import type { ErrorInfo, FlowNode, NodeType, StartNode } from './type'
+import { computed, inject, ref, type Ref, watchEffect } from 'vue'
+import Add from './Add.vue'
+import type { IWfProcessInstVo } from '../../../../../interface/workflow/IWfTaskVo'
+
+const props = defineProps<{
+  node: StartNode
+}>()
+const _inject = inject<{
+  nodesError: Ref<Recordable<ErrorInfo[]>>
+  readOnly?: Ref<boolean>
+  processInst: Ref<IWfProcessInstVo>
+}>('flowDesign', {
+  nodesError: ref({}),
+  readOnly: ref(false),
+  processInst: ref<IWfProcessInstVo>({}),
+})
+const $emits = defineEmits<{
+  (e: 'addNode', type: NodeType, node: FlowNode): void
+  (e: 'activeNode', node: FlowNode): void
+}>()
+const iconColor = ref('#0b83de')
+watchEffect(() => {
+  // const errors: ErrorInfo[] = []
+  // const { id, name, child } = props.node
+  // if (child?.type === 'end') {
+  //   errors.push({ id: id, name: name, message: '发起下节点为空' })
+  // }
+  if (_inject.processInst.value && props.node) {
+    iconColor.value = '#18ad43'
+  }
+})
+const _readOnly = computed(() => _inject.readOnly?.value)
+const activeNode = () => {
+  if (_readOnly.value) return
+  $emits('activeNode', props.node)
+}
+const addNode = (type: NodeType) => {
+  $emits('addNode', type, props.node)
+}
+</script>
+
+<template>
+  <div class="node-box">
+    <!--    <div class="end-node-circle"></div>-->
+    <el-flex class="start-node" @click="activeNode" align="center">
+      <el-icons model-value="adtec-start" size="30"></el-icons>
+      <!--      <el-text>流程开启</el-text>-->
+    </el-flex>
+    <Add @add-node="addNode" />
+  </div>
+</template>
+
+<style scoped lang="scss">
+.node-box {
+  position: relative;
+  padding-bottom: 0;
+  padding-top: 40px;
+  //.end-node-circle {
+  //  width: 10px;
+  //  height: 10px;
+  //  border-radius: 50%;
+  //  background-color: var(--el-border-color);
+  //  margin: auto auto 5px;
+  //}
+
+  .start-node {
+    position: relative;
+    background: white; //var(--el-border-color-lighter);
+    padding: 6px;
+    border-radius: 24px;
+    cursor: pointer;
+    overflow: visible;
+    z-index: 10;
+    box-shadow: var(--el-box-shadow-light);
+    color: v-bind(iconColor); //#0b83de; //#18ad43;
+    &:hover {
+      box-shadow: 0 0 5px 0 var(--el-color-primary);
+    }
+  }
+}
+</style>