adtec-core-package 2.4.8 → 2.5.0

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

@@ -1,184 +1,184 @@
-<script setup lang="ts">
-import type { PopoverInstance } from 'element-plus'
-import type { NodeType } from './type'
-import { inject, ref, type Ref } from 'vue'
-import FlowIcon from '../../../components/FlowIcon/index'
-
-const { readOnly } = inject<{
-  readOnly?: Ref<boolean>
-}>('flowDesign', { readOnly: ref(false) })
-const popoverRef = ref<PopoverInstance>()
-const $emits = defineEmits<{
-  (e: 'addNode', type: NodeType): void
-}>()
-const addApprovalNode = () => {
-  $emits('addNode', 'approval')
-  popoverRef.value?.hide()
-}
-const addCcNode = () => {
-  $emits('addNode', 'cc')
-  popoverRef.value?.hide()
-}
-const addExclusiveNode = () => {
-  $emits('addNode', 'exclusive')
-  popoverRef.value?.hide()
-}
-const addInclusiveNode = () => {
-  $emits('addNode', 'inclusive')
-  popoverRef.value?.hide()
-}
-const addParallelNode = () => {
-  $emits('addNode', 'parallel')
-  popoverRef.value?.hide()
-}
-const addTimerNode = () => {
-  $emits('addNode', 'timer')
-  popoverRef.value?.hide()
-}
-const addNotifyNode = () => {
-  $emits('addNode', 'notify')
-  popoverRef.value?.hide()
-}
-const addJumpNode = () => {
-  $emits('addNode', 'jump')
-  popoverRef.value?.hide()
-}
-</script>
-
-<template>
-  <div class="add-but">
-    <el-popover
-      placement="bottom-start"
-      ref="popoverRef"
-      trigger="click"
-      title="添加节点"
-      :width="305"
-    >
-      <el-space wrap>
-        <div class="node-select" @click="addApprovalNode">
-          <flow-icon name="el:UserFilled" />
-          <el-text>审批步骤</el-text>
-        </div>
-        <!--        <div class="node-select" @click="addCcNode">-->
-        <!--          <flow-icon name="el:Promotion" />-->
-        <!--          <el-text>抄送人</el-text>-->
-        <!--        </div>-->
-        <div class="node-select" @click="addExclusiveNode">
-          <flow-icon name="eg" />
-          <el-text>互斥条件</el-text>
-        </div>
-        <div class="node-select" @click="addInclusiveNode">
-          <flow-icon name="ig" />
-          <el-text>包容条件</el-text>
-        </div>
-        <div class="node-select" @click="addParallelNode">
-          <flow-icon name="pg" />
-          <el-text>并行条件</el-text>
-        </div>
-        <!--        <div class="node-select" @click="addTimerNode">-->
-        <!--          <flow-icon name="el:Timer" />-->
-        <!--          <el-text>计时等待</el-text>-->
-        <!--        </div>-->
-        <div class="node-select" @click="addNotifyNode">
-          <flow-icon name="el:BellFilled" />
-          <el-text>消息通知</el-text>
-        </div>
-        <div class="node-select" @click="addJumpNode">
-          <flow-icon name="forward" />
-          <el-text>节点跳转</el-text>
-        </div>
-      </el-space>
-      <template #reference>
-        <el-button
-          v-show="!readOnly"
-          icon="Plus"
-          type="primary"
-          style="z-index: 1"
-          circle
-        ></el-button>
-      </template>
-    </el-popover>
-  </div>
-</template>
-
-<style scoped lang="scss">
-.node-select {
-  cursor: pointer;
-  display: flex;
-  padding: 8px;
-  width: 135px;
-  border-radius: 10px;
-  position: relative;
-  background-color: var(--el-fill-color-light);
-
-  &:hover {
-    background-color: var(--el-color-primary-light-9);
-    box-shadow: var(--el-box-shadow-light);
-    color: var(--el-color-primary);
-  }
-
-  .svg-icon {
-    font-size: 25px;
-    padding: 5px;
-    border-radius: 50%;
-    color: var(--el-color-white);
-
-    &.UserFilled {
-      background-color: #0070d2;
-    }
-
-    &.Promotion {
-      background-color: #3296fa;
-    }
-
-    &.eg {
-      background-color: #de8142;
-    }
-
-    &.ig {
-      background-color: #7836cf;
-    }
-
-    &.pg {
-      background-color: #10aab5;
-    }
-
-    &.Timer {
-      background-color: #e872b7;
-    }
-
-    &.BellFilled {
-      background-color: #4292f3;
-    }
-
-    &.forward {
-      background-color: #f5c827;
-    }
-  }
-
-  .el-text {
-    margin-left: 10px;
-  }
-}
-
-.add-but {
-  display: flex;
-  justify-content: center;
-  width: 100%;
-  padding: 10px 0 20px;
-  position: relative;
-
-  &:before {
-    content: '';
-    position: absolute;
-    top: 0;
-    left: 0;
-    right: 0;
-    bottom: 0;
-    margin: auto;
-    width: 1px;
-    height: 100%;
-    background-color: var(--el-border-color);
-  }
-}
-</style>
+<script setup lang="ts">
+import type { PopoverInstance } from 'element-plus'
+import type { NodeType } from './type'
+import { inject, ref, type Ref } from 'vue'
+import FlowIcon from '../../../components/FlowIcon/index'
+
+const { readOnly } = inject<{
+  readOnly?: Ref<boolean>
+}>('flowDesign', { readOnly: ref(false) })
+const popoverRef = ref<PopoverInstance>()
+const $emits = defineEmits<{
+  (e: 'addNode', type: NodeType): void
+}>()
+const addApprovalNode = () => {
+  $emits('addNode', 'approval')
+  popoverRef.value?.hide()
+}
+const addCcNode = () => {
+  $emits('addNode', 'cc')
+  popoverRef.value?.hide()
+}
+const addExclusiveNode = () => {
+  $emits('addNode', 'exclusive')
+  popoverRef.value?.hide()
+}
+const addInclusiveNode = () => {
+  $emits('addNode', 'inclusive')
+  popoverRef.value?.hide()
+}
+const addParallelNode = () => {
+  $emits('addNode', 'parallel')
+  popoverRef.value?.hide()
+}
+const addTimerNode = () => {
+  $emits('addNode', 'timer')
+  popoverRef.value?.hide()
+}
+const addNotifyNode = () => {
+  $emits('addNode', 'notify')
+  popoverRef.value?.hide()
+}
+const addJumpNode = () => {
+  $emits('addNode', 'jump')
+  popoverRef.value?.hide()
+}
+</script>
+
+<template>
+  <div class="add-but">
+    <el-popover
+      placement="bottom-start"
+      ref="popoverRef"
+      trigger="click"
+      title="添加节点"
+      :width="305"
+    >
+      <el-space wrap>
+        <div class="node-select" @click="addApprovalNode">
+          <flow-icon name="el:UserFilled" />
+          <el-text>审批步骤</el-text>
+        </div>
+        <!--        <div class="node-select" @click="addCcNode">-->
+        <!--          <flow-icon name="el:Promotion" />-->
+        <!--          <el-text>抄送人</el-text>-->
+        <!--        </div>-->
+        <div class="node-select" @click="addExclusiveNode">
+          <flow-icon name="eg" />
+          <el-text>互斥条件</el-text>
+        </div>
+        <div class="node-select" @click="addInclusiveNode">
+          <flow-icon name="ig" />
+          <el-text>包容条件</el-text>
+        </div>
+        <div class="node-select" @click="addParallelNode">
+          <flow-icon name="pg" />
+          <el-text>并行条件</el-text>
+        </div>
+        <!--        <div class="node-select" @click="addTimerNode">-->
+        <!--          <flow-icon name="el:Timer" />-->
+        <!--          <el-text>计时等待</el-text>-->
+        <!--        </div>-->
+        <div class="node-select" @click="addNotifyNode">
+          <flow-icon name="el:BellFilled" />
+          <el-text>消息通知</el-text>
+        </div>
+        <div class="node-select" @click="addJumpNode">
+          <flow-icon name="forward" />
+          <el-text>节点跳转</el-text>
+        </div>
+      </el-space>
+      <template #reference>
+        <el-button
+          v-show="!readOnly"
+          icon="Plus"
+          type="primary"
+          style="z-index: 1"
+          circle
+        ></el-button>
+      </template>
+    </el-popover>
+  </div>
+</template>
+
+<style scoped lang="scss">
+.node-select {
+  cursor: pointer;
+  display: flex;
+  padding: 8px;
+  width: 135px;
+  border-radius: 10px;
+  position: relative;
+  background-color: var(--el-fill-color-light);
+
+  &:hover {
+    background-color: var(--el-color-primary-light-9);
+    box-shadow: var(--el-box-shadow-light);
+    color: var(--el-color-primary);
+  }
+
+  .svg-icon {
+    font-size: 25px;
+    padding: 5px;
+    border-radius: 50%;
+    color: var(--el-color-white);
+
+    &.UserFilled {
+      background-color: #0070d2;
+    }
+
+    &.Promotion {
+      background-color: #3296fa;
+    }
+
+    &.eg {
+      background-color: #de8142;
+    }
+
+    &.ig {
+      background-color: #7836cf;
+    }
+
+    &.pg {
+      background-color: #10aab5;
+    }
+
+    &.Timer {
+      background-color: #e872b7;
+    }
+
+    &.BellFilled {
+      background-color: #4292f3;
+    }
+
+    &.forward {
+      background-color: #f5c827;
+    }
+  }
+
+  .el-text {
+    margin-left: 10px;
+  }
+}
+
+.add-but {
+  display: flex;
+  justify-content: center;
+  width: 100%;
+  padding: 10px 0 20px;
+  position: relative;
+
+  &:before {
+    content: '';
+    position: absolute;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    margin: auto;
+    width: 1px;
+    height: 100%;
+    background-color: var(--el-border-color);
+  }
+}
+</style>

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

@@ -1,127 +1,127 @@
-<script setup lang="ts">
-import Node from './Node.vue'
-import type { ApprovalNode, ErrorInfo } from './type'
-import { inject, ref, type Ref, watchEffect } from 'vue'
-import type { Field } from '../../../components/Render/type'
-import { getRoleListById } from '../../../api/modules/role'
-import { getList } from '../../../api/modules/user'
-
-const { fields, nodesError } = inject<{
-  fields: Ref<Field[]>
-  nodesError: Ref<Recordable<ErrorInfo[]>>
-}>('flowDesign', { fields: ref([]), nodesError: ref({}) })
-const props = defineProps<{
-  node: ApprovalNode
-}>()
-const content = ref<string>('')
-watchEffect(async () => {
-  const errors: ErrorInfo[] = []
-  const {
-    id,
-    name,
-    assigneeType,
-    nobody,
-    nobodyUsers,
-    choice,
-    formUser,
-    formRole,
-    leader,
-    orgLeader,
-    users,
-    roles,
-    msgTypes,
-    msgSubject,
-    msgContent,
-    nodeTag,
-  } = props.node
-  // if (msgTypes && msgTypes.length > 0) {
-  //   if (!msgSubject || msgSubject === '') {
-  //     errors.push({ id: id, name: name, message: '通知主题为空' })
-  //   }
-  //   if (!msgContent || msgContent === '') {
-  //     errors.push({ id: id, name: name, message: '通知内容为空' })
-  //   }
-  // }
-  if (assigneeType === 'user') {
-    if (users.length > 0) {
-      try {
-        const res = await getList(users)
-        content.value = res.map((user) => user.userName).join('、')
-      } catch (err: any) {
-        content.value = err.msg
-      }
-      // const all = users.map((user) => getList(user))
-      // Promise.all(all).then((users) => {
-      //   content.value = users.map((user) => user.data.name).join('、')
-      // })
-    } else {
-      errors.push({ id: id, name: name, message: '未指定人员' })
-      content.value = '未指定人员'
-    }
-  } else if (assigneeType === 'choice') {
-    content.value = `发起人自选（${choice ? '多选' : '单选'}）`
-  } else if (assigneeType === 'self') {
-    content.value = '发起人自己'
-  } else if (assigneeType === 'leader') {
-    content.value = leader === 1 ? '直属上级' : `${leader}级上级`
-  } else if (assigneeType === 'orgLeader') {
-    content.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 || '?'
-    content.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 || '?'
-    content.value = `自定义（${title}）角色`
-  } else if (assigneeType === 'role') {
-    if (roles.length > 0) {
-      // const all = roles.map((id) => getById(id))
-      // Promise.all(all).then((roles) => {
-      //   content.value = roles.map((res) => res.data.name).join('、')
-      // })
-      try {
-        const res = await getRoleListById(roles)
-        content.value = res.map((role) => role.name).join('、')
-      } catch (err: any) {
-        content.value = err.msg
-      }
-    } else {
-      errors.push({ id: id, name: name, message: '未指定角色' })
-      content.value = '未指定角色'
-    }
-  } else if (assigneeType === 'autoRefuse') {
-    content.value = '系统自动拒绝'
-  } else {
-    errors.push({ id: id, name: name, message: '未知错误' })
-    content.value = name
-  }
-  if (nobody === 'assign') {
-    if (!nobodyUsers || nobodyUsers.length === 0) {
-      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:UserFilled" color="#0070d2" :node="node">
-    <el-text>{{ content }}</el-text>
-  </Node>
-</template>
-
-<style scoped lang="scss"></style>
+<script setup lang="ts">
+import Node from './Node.vue'
+import type { ApprovalNode, ErrorInfo } from './type'
+import { inject, ref, type Ref, watchEffect } from 'vue'
+import type { Field } from '../../../components/Render/type'
+import { getRoleListById } from '../../../api/modules/role'
+import { getList } from '../../../api/modules/user'
+
+const { fields, nodesError } = inject<{
+  fields: Ref<Field[]>
+  nodesError: Ref<Recordable<ErrorInfo[]>>
+}>('flowDesign', { fields: ref([]), nodesError: ref({}) })
+const props = defineProps<{
+  node: ApprovalNode
+}>()
+const content = ref<string>('')
+watchEffect(async () => {
+  const errors: ErrorInfo[] = []
+  const {
+    id,
+    name,
+    assigneeType,
+    nobody,
+    nobodyUsers,
+    choice,
+    formUser,
+    formRole,
+    leader,
+    orgLeader,
+    users,
+    roles,
+    msgTypes,
+    msgSubject,
+    msgContent,
+    nodeTag,
+  } = props.node
+  // if (msgTypes && msgTypes.length > 0) {
+  //   if (!msgSubject || msgSubject === '') {
+  //     errors.push({ id: id, name: name, message: '通知主题为空' })
+  //   }
+  //   if (!msgContent || msgContent === '') {
+  //     errors.push({ id: id, name: name, message: '通知内容为空' })
+  //   }
+  // }
+  if (assigneeType === 'user') {
+    if (users.length > 0) {
+      try {
+        const res = await getList(users)
+        content.value = res.map((user) => user.userName).join('、')
+      } catch (err: any) {
+        content.value = err.msg
+      }
+      // const all = users.map((user) => getList(user))
+      // Promise.all(all).then((users) => {
+      //   content.value = users.map((user) => user.data.name).join('、')
+      // })
+    } else {
+      errors.push({ id: id, name: name, message: '未指定人员' })
+      content.value = '未指定人员'
+    }
+  } else if (assigneeType === 'choice') {
+    content.value = `发起人自选（${choice ? '多选' : '单选'}）`
+  } else if (assigneeType === 'self') {
+    content.value = '发起人自己'
+  } else if (assigneeType === 'leader') {
+    content.value = leader === 1 ? '直属上级' : `${leader}级上级`
+  } else if (assigneeType === 'orgLeader') {
+    content.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 || '?'
+    content.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 || '?'
+    content.value = `自定义（${title}）角色`
+  } else if (assigneeType === 'role') {
+    if (roles.length > 0) {
+      // const all = roles.map((id) => getById(id))
+      // Promise.all(all).then((roles) => {
+      //   content.value = roles.map((res) => res.data.name).join('、')
+      // })
+      try {
+        const res = await getRoleListById(roles)
+        content.value = res.map((role) => role.name).join('、')
+      } catch (err: any) {
+        content.value = err.msg
+      }
+    } else {
+      errors.push({ id: id, name: name, message: '未指定角色' })
+      content.value = '未指定角色'
+    }
+  } else if (assigneeType === 'autoRefuse') {
+    content.value = '系统自动拒绝'
+  } else {
+    errors.push({ id: id, name: name, message: '未知错误' })
+    content.value = name
+  }
+  if (nobody === 'assign') {
+    if (!nobodyUsers || nobodyUsers.length === 0) {
+      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:UserFilled" color="#0070d2" :node="node">
+    <el-text>{{ content }}</el-text>
+  </Node>
+</template>
+
+<style scoped lang="scss"></style>