【缺陷修复】延迟器节点名称修复问题，延迟器节点高亮问题

src/components/SimpleProcessDesignerV2/src/nodes-config/ConditionNodeConfig.vue

@@ -47,10 +47,9 @@ import {
   SimpleFlowNode,
   SimpleFlowNode,
   ConditionType,
   ConditionType,
   COMPARISON_OPERATORS,
   COMPARISON_OPERATORS,
-  ProcessVariableEnum
 } from '../consts'
 } from '../consts'
 import { getDefaultConditionNodeName } from '../utils'
 import { getDefaultConditionNodeName } from '../utils'
-import { useFormFields } from '../node'
+import { useFormFieldsAndStartUser } from '../node'
 import Condition from './components/Condition.vue'
 import Condition from './components/Condition.vue'
 const message = useMessage() // 消息弹窗
 const message = useMessage() // 消息弹窗
 defineOptions({
 defineOptions({
@@ -176,23 +175,12 @@ const getShowText = (): string => {
   }
   }
   return showText
   return showText
 }
 }
-
-const fieldsInfo = useFormFields()
-/** 条件规则可选择的表单字段 */
-const fieldOptions = computed(() => {
-  const fieldsCopy = fieldsInfo.slice()
-  // 固定添加发起人 ID 字段
-  fieldsCopy.unshift({
-    field: ProcessVariableEnum.START_USER_ID,
-    title: '发起人',
-    required: true
-  })
-  return fieldsCopy
-})
+// 流程表单字段和发起人字段
+const fieldOptions = useFormFieldsAndStartUser()
 
 
 /** 获取字段名称 */
 /** 获取字段名称 */
 const getFieldTitle = (field: string) => {
 const getFieldTitle = (field: string) => {
-  const item = fieldOptions.value.find((item) => item.field === field)
+  const item = fieldOptions.find((item) => item.field === field)
   return item?.title
   return item?.title
 }
 }
 
 

src/components/SimpleProcessDesignerV2/src/nodes-config/DelayTimerNodeConfig.vue

@@ -124,6 +124,7 @@ const saveConfig = async () => {
   if (!valid) return false
   if (!valid) return false
   const showText = getShowText()
   const showText = getShowText()
   if (!showText) return false
   if (!showText) return false
+  currentNode.value.name = nodeName.value!
   currentNode.value.showText = showText
   currentNode.value.showText = showText
   if (configForm.value.delayType === DelayTypeEnum.FIXED_TIME_DURATION) {
   if (configForm.value.delayType === DelayTypeEnum.FIXED_TIME_DURATION) {
     currentNode.value.delaySetting = {
     currentNode.value.delaySetting = {

src/components/SimpleProcessDesignerV2/src/nodes-config/TriggerNodeConfig.vue

@@ -192,6 +192,7 @@ const saveConfig = async () => {
   if (!valid) return false
   if (!valid) return false
   const showText = getShowText()
   const showText = getShowText()
   if (!showText) return false
   if (!showText) return false
+  currentNode.value.name = nodeName.value!
   currentNode.value.showText = showText
   currentNode.value.showText = showText
   currentNode.value.triggerSetting = configForm.value
   currentNode.value.triggerSetting = configForm.value
   settingVisible.value = false
   settingVisible.value = false

src/components/SimpleProcessDesignerV2/src/nodes-config/components/Condition.vue

@@ -138,11 +138,10 @@ import {
   COMPARISON_OPERATORS,
   COMPARISON_OPERATORS,
   CONDITION_CONFIG_TYPES,
   CONDITION_CONFIG_TYPES,
   ConditionType,
   ConditionType,
-  DEFAULT_CONDITION_GROUP_VALUE,
-  ProcessVariableEnum
+  DEFAULT_CONDITION_GROUP_VALUE
 } from '../../consts'
 } from '../../consts'
 import { BpmModelFormType } from '@/utils/constants'
 import { BpmModelFormType } from '@/utils/constants'
-import { useFormFields } from '../../node'
+import { useFormFieldsAndStartUser } from '../../node'
 
 
 const props = defineProps({
 const props = defineProps({
   modelValue: {
   modelValue: {
@@ -170,17 +169,10 @@ const conditionConfigTypes = computed(() => {
     }
     }
   })
   })
 })
 })
+
 /** 条件规则可选择的表单字段 */
 /** 条件规则可选择的表单字段 */
-const fieldOptions = computed(() => {
-  const fieldsCopy = useFormFields().slice()
-  // 固定添加发起人 ID 字段
-  fieldsCopy.unshift({
-    field: ProcessVariableEnum.START_USER_ID,
-    title: '发起人',
-    required: true
-  })
-  return fieldsCopy
-})
+const fieldOptions = useFormFieldsAndStartUser()
+
 // 表单校验规则
 // 表单校验规则
 const formRules = reactive({
 const formRules = reactive({
   conditionType: [{ required: true, message: '配置方式不能为空', trigger: 'blur' }],
   conditionType: [{ required: true, message: '配置方式不能为空', trigger: 'blur' }],

src/views/bpm/processInstance/detail/ProcessInstanceSimpleViewer.vue

@@ -114,6 +114,16 @@ const setSimpleModelNodeTaskStatus = (
       simpleModel.activityStatus = TaskStatusEnum.NOT_START
       simpleModel.activityStatus = TaskStatusEnum.NOT_START
     }
     }
   }
   }
+  // 触发器节点
+  if (simpleModel.type === NodeType.TRIGGER_NODE) {
+    // 触发器节点,只有通过和未执行状态
+    if (finishedActivityIds.includes(simpleModel.id)) {
+      simpleModel.activityStatus = TaskStatusEnum.APPROVE
+    } else {
+      simpleModel.activityStatus = TaskStatusEnum.NOT_START
+    }
+  }
+
   // 条件节点对应 SequenceFlow
   // 条件节点对应 SequenceFlow
   if (simpleModel.type === NodeType.CONDITION_NODE) {
   if (simpleModel.type === NodeType.CONDITION_NODE) {
     // 条件节点,只有通过和未执行状态
     // 条件节点,只有通过和未执行状态