adtec-core-package 2.4.8 → 2.5.0

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

@@ -1,93 +1,93 @@
-<script setup lang="ts">
-import Node from './Node.vue'
-import type { CcNode, 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 props = defineProps<{
-  node: CcNode
-}>()
-const { fields, nodesError } = inject<{
-  fields: Ref<Field[]>
-  nodesError: Ref<Recordable<ErrorInfo[]>>
-}>('flowDesign', { fields: ref([]), nodesError: ref({}) })
-const content = ref<string>('')
-watchEffect(async () => {
-  const errors: ErrorInfo[] = []
-  const { id, assigneeType, name, users, roles, leader, choice, formUser, formRole, orgLeader } =
-    props.node
-  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) => getByUsername(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 {
-    errors.push({ id: id, name: name, message: '未知错误' })
-    content.value = name
-  }
-
-  // 记录错误
-  if (errors.length > 0) {
-    nodesError.value[id] = errors
-  } else {
-    delete nodesError.value[id]
-  }
-})
-</script>
-
-<template>
-  <Node v-bind="$attrs" icon="el:Promotion" color="rgb(50, 150, 250)" :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 { CcNode, 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 props = defineProps<{
+  node: CcNode
+}>()
+const { fields, nodesError } = inject<{
+  fields: Ref<Field[]>
+  nodesError: Ref<Recordable<ErrorInfo[]>>
+}>('flowDesign', { fields: ref([]), nodesError: ref({}) })
+const content = ref<string>('')
+watchEffect(async () => {
+  const errors: ErrorInfo[] = []
+  const { id, assigneeType, name, users, roles, leader, choice, formUser, formRole, orgLeader } =
+    props.node
+  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) => getByUsername(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 {
+    errors.push({ id: id, name: name, message: '未知错误' })
+    content.value = name
+  }
+
+  // 记录错误
+  if (errors.length > 0) {
+    nodesError.value[id] = errors
+  } else {
+    delete nodesError.value[id]
+  }
+})
+</script>
+
+<template>
+  <Node v-bind="$attrs" icon="el:Promotion" color="rgb(50, 150, 250)" :node="node">
+    <el-text>{{ content }}</el-text>
+  </Node>
+</template>
+
+<style scoped lang="scss"></style>

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

@@ -1,61 +1,61 @@
-<!--创建人 xux-->
-<!--说明: ConcurrentNode-->
-<!--创建时间: 2024/10/18 上午11:47-->
-<!--修改时间: 2024/10/18 上午11:47-->
-<script setup lang="ts">
-import type { ConcurrentNode, ErrorInfo } from './type'
-import { inject, ref, type Ref, watchEffect } from 'vue'
-import Node from './Node.vue'
-
-const props = withDefaults(
-  defineProps<{
-    node: ConcurrentNode
-    hiddenPanel?: boolean
-  }>(),
-  {
-    hiddenPanel: true,
-  },
-)
-const { nodesError } = inject<{
-  nodesError: Ref<Recordable<ErrorInfo[]>>
-}>('flowDesign', { nodesError: ref({}) })
-
-const content = ref<string>('并行执行')
-watchEffect(() => {
-  const errors: ErrorInfo[] = []
-  const { id, name, child } = props.node
-  if (!child) {
-    errors.push({ id: id, name: name, message: '分支下节点为空' })
-  }
-  // 记录错误
-  if (errors.length > 0) {
-    nodesError.value[id] = errors
-  } else {
-    delete nodesError.value[id]
-  }
-})
-</script>
-
-<template>
-  <div class="branch-node">
-    <Node
-      v-bind="$attrs"
-      icon="pg"
-      color="#10AAB5"
-      :node="node"
-      :readOnly="false"
-      :hidden-panel="hiddenPanel"
-    >
-      <el-text>{{ content }}</el-text>
-      <!--      <slot name="append" />-->
-    </Node>
-  </div>
-</template>
-
-<style scoped lang="scss">
-.branch-node {
-  :deep(.node-box) {
-    margin: 40px 30px 0;
-  }
-}
-</style>
+<!--创建人 xux-->
+<!--说明: ConcurrentNode-->
+<!--创建时间: 2024/10/18 上午11:47-->
+<!--修改时间: 2024/10/18 上午11:47-->
+<script setup lang="ts">
+import type { ConcurrentNode, ErrorInfo } from './type'
+import { inject, ref, type Ref, watchEffect } from 'vue'
+import Node from './Node.vue'
+
+const props = withDefaults(
+  defineProps<{
+    node: ConcurrentNode
+    hiddenPanel?: boolean
+  }>(),
+  {
+    hiddenPanel: true,
+  },
+)
+const { nodesError } = inject<{
+  nodesError: Ref<Recordable<ErrorInfo[]>>
+}>('flowDesign', { nodesError: ref({}) })
+
+const content = ref<string>('并行执行')
+watchEffect(() => {
+  const errors: ErrorInfo[] = []
+  const { id, name, child } = props.node
+  if (!child) {
+    errors.push({ id: id, name: name, message: '分支下节点为空' })
+  }
+  // 记录错误
+  if (errors.length > 0) {
+    nodesError.value[id] = errors
+  } else {
+    delete nodesError.value[id]
+  }
+})
+</script>
+
+<template>
+  <div class="branch-node">
+    <Node
+      v-bind="$attrs"
+      icon="pg"
+      color="#10AAB5"
+      :node="node"
+      :readOnly="false"
+      :hidden-panel="hiddenPanel"
+    >
+      <el-text>{{ content }}</el-text>
+      <!--      <slot name="append" />-->
+    </Node>
+  </div>
+</template>
+
+<style scoped lang="scss">
+.branch-node {
+  :deep(.node-box) {
+    margin: 40px 30px 0;
+  }
+}
+</style>

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

@@ -1,60 +1,60 @@
-<script setup lang="ts">
-import type { ConditionNode, ErrorInfo, FlowNode } from './type'
-import { inject, ref, type Ref, watchEffect } from 'vue'
-import Node from './Node.vue'
-
-const props = defineProps<{
-  node: ConditionNode
-}>()
-const { nodesError, getNodeById } = inject<{
-  nodesError: Ref<Recordable<ErrorInfo[]>>
-  getNodeById: (id: string) => FlowNode
-}>('flowDesign', { nodesError: ref({}), getNodeById: (id: string) => undefined })
-const content = ref<string>('')
-watchEffect(() => {
-  const errors: ErrorInfo[] = []
-  const { id, name, def, conditions, child } = props.node
-  if (def) {
-    content.value = '不满足其他条件，进入此分支'
-  } else if (conditions.conditions.length > 0 || (conditions.groups?.length || 0) > 0) {
-    const count = conditions.conditions.length + (conditions.groups?.length || 0)
-    content.value = `已设置（${count}）个条件`
-    if (!child) {
-      errors.push({ id: id, name: name, message: '分支下节点为空' })
-    }
-  } else {
-    errors.push({ id: id, name: name, message: '未设置条件' })
-    content.value = '未设置条件'
-  }
-  // 记录错误
-  if (errors.length > 0) {
-    nodesError.value[id] = errors
-  } else {
-    delete nodesError.value[id]
-  }
-})
-</script>
-
-<template>
-  <div class="branch-node">
-<!--    :readOnly="node.def"-->
-    <Node
-      v-bind="$attrs"
-      :icon="getNodeById(node.pid!)?.type === 'exclusive' ? 'eg' : 'ig'"
-      :node="node"
-      :color="getNodeById(node.pid!)?.type === 'exclusive' ? '#DE8142' : '#7836CF'"
-      :readOnly="false"
-    >
-      <el-text>{{ content }}</el-text>
-      <slot name="append" />
-    </Node>
-  </div>
-</template>
-
-<style scoped lang="scss">
-.branch-node {
-  :deep(.node-box) {
-    margin: 40px 30px 0;
-  }
-}
-</style>
+<script setup lang="ts">
+import type { ConditionNode, ErrorInfo, FlowNode } from './type'
+import { inject, ref, type Ref, watchEffect } from 'vue'
+import Node from './Node.vue'
+
+const props = defineProps<{
+  node: ConditionNode
+}>()
+const { nodesError, getNodeById } = inject<{
+  nodesError: Ref<Recordable<ErrorInfo[]>>
+  getNodeById: (id: string) => FlowNode
+}>('flowDesign', { nodesError: ref({}), getNodeById: (id: string) => undefined })
+const content = ref<string>('')
+watchEffect(() => {
+  const errors: ErrorInfo[] = []
+  const { id, name, def, conditions, child } = props.node
+  if (def) {
+    content.value = '不满足其他条件，进入此分支'
+  } else if (conditions.conditions.length > 0 || (conditions.groups?.length || 0) > 0) {
+    const count = conditions.conditions.length + (conditions.groups?.length || 0)
+    content.value = `已设置（${count}）个条件`
+    if (!child) {
+      errors.push({ id: id, name: name, message: '分支下节点为空' })
+    }
+  } else {
+    errors.push({ id: id, name: name, message: '未设置条件' })
+    content.value = '未设置条件'
+  }
+  // 记录错误
+  if (errors.length > 0) {
+    nodesError.value[id] = errors
+  } else {
+    delete nodesError.value[id]
+  }
+})
+</script>
+
+<template>
+  <div class="branch-node">
+<!--    :readOnly="node.def"-->
+    <Node
+      v-bind="$attrs"
+      :icon="getNodeById(node.pid!)?.type === 'exclusive' ? 'eg' : 'ig'"
+      :node="node"
+      :color="getNodeById(node.pid!)?.type === 'exclusive' ? '#DE8142' : '#7836CF'"
+      :readOnly="false"
+    >
+      <el-text>{{ content }}</el-text>
+      <slot name="append" />
+    </Node>
+  </div>
+</template>
+
+<style scoped lang="scss">
+.branch-node {
+  :deep(.node-box) {
+    margin: 40px 30px 0;
+  }
+}
+</style>

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

@@ -1,80 +1,80 @@
-<script setup lang="ts">
-import type { FlowNode } from './type'
-import { computed, inject, ref, type Ref, watchEffect } from 'vue'
-import type { IWfProcessInstVo } from '../../../../../interface/workflow/IWfTaskVo'
-
-const _inject = inject<{
-  readOnly?: Ref<boolean>
-  processInst: Ref<IWfProcessInstVo>
-}>('flowDesign', { readOnly: ref(false), processInst: ref<IWfProcessInstVo>({}) })
-const $emits = defineEmits<{
-  (e: 'activeNode', node: FlowNode): void
-}>()
-const $props = withDefaults(
-  defineProps<{
-    node: FlowNode
-    readOnly?: boolean
-  }>(),
-  {
-    readOnly: false,
-  },
-)
-const _readOnly = computed(() => _inject.readOnly?.value || $props.readOnly)
-const activeNode = () => {
-  if (_readOnly.value) return
-  $emits('activeNode', $props.node)
-}
-const iconColor = ref('#0b83de')
-watchEffect(() => {
-  if (_inject.processInst.value?.flows && $props.node) {
-    if (_inject.processInst.value.flows.some((x) => x.taskDefKey === 'end')) {
-      iconColor.value = '#18ad43'
-    } else {
-      iconColor.value = '#9B9EA1'
-    }
-  }
-})
-</script>
-
-<template>
-  <div class="node-box">
-    <div class="end-node-circle"></div>
-    <!--    <div class="end-node" @click="activeNode">-->
-    <!--      <el-text>{{ node.name }}</el-text>-->
-    <!--    </div>-->
-    <el-flex class="end-node" @click="activeNode" align="center">
-      <el-icons model-value="adtec-end" size="30"></el-icons>
-      <!--      <el-text>{{ node.name }}</el-text>-->
-    </el-flex>
-  </div>
-</template>
-
-<style scoped lang="scss">
-.node-box {
-  position: relative;
-  padding-bottom: 50px;
-
-  .end-node-circle {
-    width: 10px;
-    height: 10px;
-    border-radius: 50%;
-    background-color: var(--el-border-color);
-    margin: auto auto 5px;
-  }
-
-  .end-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);
-    &:hover {
-      box-shadow: 0 0 5px 0 var(--el-color-primary);
-    }
-  }
-}
-</style>
+<script setup lang="ts">
+import type { FlowNode } from './type'
+import { computed, inject, ref, type Ref, watchEffect } from 'vue'
+import type { IWfProcessInstVo } from '../../../../../interface/workflow/IWfTaskVo'
+
+const _inject = inject<{
+  readOnly?: Ref<boolean>
+  processInst: Ref<IWfProcessInstVo>
+}>('flowDesign', { readOnly: ref(false), processInst: ref<IWfProcessInstVo>({}) })
+const $emits = defineEmits<{
+  (e: 'activeNode', node: FlowNode): void
+}>()
+const $props = withDefaults(
+  defineProps<{
+    node: FlowNode
+    readOnly?: boolean
+  }>(),
+  {
+    readOnly: false,
+  },
+)
+const _readOnly = computed(() => _inject.readOnly?.value || $props.readOnly)
+const activeNode = () => {
+  if (_readOnly.value) return
+  $emits('activeNode', $props.node)
+}
+const iconColor = ref('#0b83de')
+watchEffect(() => {
+  if (_inject.processInst.value?.flows && $props.node) {
+    if (_inject.processInst.value.flows.some((x) => x.taskDefKey === 'end')) {
+      iconColor.value = '#18ad43'
+    } else {
+      iconColor.value = '#9B9EA1'
+    }
+  }
+})
+</script>
+
+<template>
+  <div class="node-box">
+    <div class="end-node-circle"></div>
+    <!--    <div class="end-node" @click="activeNode">-->
+    <!--      <el-text>{{ node.name }}</el-text>-->
+    <!--    </div>-->
+    <el-flex class="end-node" @click="activeNode" align="center">
+      <el-icons model-value="adtec-end" size="30"></el-icons>
+      <!--      <el-text>{{ node.name }}</el-text>-->
+    </el-flex>
+  </div>
+</template>
+
+<style scoped lang="scss">
+.node-box {
+  position: relative;
+  padding-bottom: 50px;
+
+  .end-node-circle {
+    width: 10px;
+    height: 10px;
+    border-radius: 50%;
+    background-color: var(--el-border-color);
+    margin: auto auto 5px;
+  }
+
+  .end-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);
+    &:hover {
+      box-shadow: 0 0 5px 0 var(--el-color-primary);
+    }
+  }
+}
+</style>

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

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