From 557bc29d24b576fe6e7f21226141674aab49833c Mon Sep 17 00:00:00 2001
From: Lesan <1960681385@qq.com>
Date: Wed, 4 Dec 2024 08:37:45 +0800
Subject: [PATCH 1/9] =?UTF-8?q?fix:=20=E4=B8=9A=E5=8A=A1=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=9D=83=E9=99=90=E4=B8=BA=E7=A9=BA=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../package/penal/custom-config/components/UserTask.vue         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/bpmnProcessDesigner/package/penal/custom-config/components/UserTask.vue b/src/components/bpmnProcessDesigner/package/penal/custom-config/components/UserTask.vue
index c592ed5f..85a4b726 100644
--- a/src/components/bpmnProcessDesigner/package/penal/custom-config/components/UserTask.vue
+++ b/src/components/bpmnProcessDesigner/package/penal/custom-config/components/UserTask.vue
@@ -193,7 +193,7 @@ const { buttonsSetting, btnDisplayNameEdit, changeBtnDisplayName, btnDisplayName
   useButtonsSetting()
 
 // 字段权限
-const fieldsPermissionEl = ref()
+const fieldsPermissionEl = ref([])
 const { formType, fieldsPermissionConfig, getNodeConfigFormFields } = useFormFieldsPermission(
   FieldPermissionType.READ
 )

From 6e077ac7d970f4962ccaa910076881058448b967 Mon Sep 17 00:00:00 2001
From: Lesan <1960681385@qq.com>
Date: Wed, 4 Dec 2024 11:32:57 +0800
Subject: [PATCH 2/9] =?UTF-8?q?feat:=20BPM=E8=AE=BE=E8=AE=A1=E5=99=A8?=
 =?UTF-8?q?=E9=80=82=E9=85=8DSimple=E8=AE=BE=E8=AE=A1=E5=99=A8=EF=BC=8C?=
 =?UTF-8?q?=E5=A4=9A=E5=AE=9E=E4=BE=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../multi-instance/ElementMultiInstance.vue   | 116 +++++++++++++++++-
 1 file changed, 114 insertions(+), 2 deletions(-)

diff --git a/src/components/bpmnProcessDesigner/package/penal/multi-instance/ElementMultiInstance.vue b/src/components/bpmnProcessDesigner/package/penal/multi-instance/ElementMultiInstance.vue
index 7cd16f77..69f5107f 100644
--- a/src/components/bpmnProcessDesigner/package/penal/multi-instance/ElementMultiInstance.vue
+++ b/src/components/bpmnProcessDesigner/package/penal/multi-instance/ElementMultiInstance.vue
@@ -1,6 +1,30 @@
 <template>
   <div class="panel-tab__content">
-    <el-form label-width="90px">
+    <el-radio-group v-model="approveMethod" @change="onApproveMethodChange">
+      <div class="flex-col">
+        <div v-for="(item, index) in APPROVE_METHODS" :key="index">
+          <el-radio :value="item.value" :label="item.value">
+            {{ item.label }}
+          </el-radio>
+          <el-form-item prop="approveRatio">
+            <el-input-number
+              v-model="approveRatio"
+              :min="10"
+              :max="100"
+              :step="10"
+              size="small"
+              v-if="
+                item.value === ApproveMethodType.APPROVE_BY_RATIO &&
+                approveMethod === ApproveMethodType.APPROVE_BY_RATIO
+              "
+              @change="onApproveRatioChange"
+            />
+          </el-form-item>
+        </div>
+      </div>
+    </el-radio-group>
+    <!-- 与Simple设计器配置合并，保留以前的代码 -->
+    <el-form label-width="90px" style="display: none">
       <el-form-item label="快捷配置">
         <el-button size="small" @click="changeConfig('依次审批')">依次审批</el-button>
         <el-button size="small" @click="changeConfig('会签')">会签</el-button>
@@ -76,6 +100,8 @@
 </template>
 
 <script lang="ts" setup>
+import { ApproveMethodType, APPROVE_METHODS } from '@/components/SimpleProcessDesignerV2/src/consts'
+
 defineOptions({ name: 'ElementMultiInstance' })
 
 const props = defineProps({
@@ -267,6 +293,91 @@ const changeConfig = (config) => {
   }
 }
 
+/**
+ * -----新版本多实例-----
+ */
+const approveMethod = ref(1)
+const approveRatio = ref(100)
+const getElementLoopNew = ({ loopCharacteristics }) => {
+  if (!loopCharacteristics) {
+    approveMethod.value = ApproveMethodType.RANDOM_SELECT_ONE_APPROVE
+    return
+  }
+  if (loopCharacteristics.isSequential) {
+    approveMethod.value = ApproveMethodType.SEQUENTIAL_APPROVE
+  } else {
+    if (loopCharacteristics.completionCondition.body === '${ nrOfCompletedInstances > 0 }') {
+      approveMethod.value = ApproveMethodType.ANY_APPROVE
+    }
+    if (
+      loopCharacteristics.completionCondition.body.includes('nrOfCompletedInstances/nrOfInstances')
+    ) {
+      approveMethod.value = ApproveMethodType.APPROVE_BY_RATIO
+    }
+  }
+}
+const onApproveMethodChange = () => {
+  approveRatio.value = 100
+  updateLoopCharacteristics()
+}
+const onApproveRatioChange = () => {
+  updateLoopCharacteristics()
+}
+const updateLoopCharacteristics = () => {
+  if (approveMethod.value === ApproveMethodType.RANDOM_SELECT_ONE_APPROVE) {
+    bpmnInstances().modeling.updateProperties(toRaw(bpmnElement.value), {
+      loopCharacteristics: null
+    })
+    return
+  }
+  if (approveMethod.value === ApproveMethodType.APPROVE_BY_RATIO) {
+    multiLoopInstance.value = bpmnInstances().moddle.create(
+      'bpmn:MultiInstanceLoopCharacteristics',
+      { isSequential: false, collection: '${coll_userList}' }
+    )
+    multiLoopInstance.value.completionCondition = bpmnInstances().moddle.create(
+      'bpmn:FormalExpression',
+      {
+        body: '${ nrOfCompletedInstances/nrOfInstances >= ' + approveRatio.value / 100 + '}'
+      }
+    )
+  }
+  if (approveMethod.value === ApproveMethodType.ANY_APPROVE) {
+    multiLoopInstance.value = bpmnInstances().moddle.create(
+      'bpmn:MultiInstanceLoopCharacteristics',
+      { isSequential: false, collection: '${coll_userList}' }
+    )
+    multiLoopInstance.value.completionCondition = bpmnInstances().moddle.create(
+      'bpmn:FormalExpression',
+      {
+        body: '${ nrOfCompletedInstances > 0 }'
+      }
+    )
+  }
+  if (approveMethod.value === ApproveMethodType.SEQUENTIAL_APPROVE) {
+    multiLoopInstance.value = bpmnInstances().moddle.create(
+      'bpmn:MultiInstanceLoopCharacteristics',
+      { isSequential: true, collection: '${coll_userList}' }
+    )
+    multiLoopInstance.value.loopCardinality = bpmnInstances().moddle.create(
+      'bpmn:FormalExpression',
+      {
+        body: '1'
+      }
+    )
+    multiLoopInstance.value.completionCondition = bpmnInstances().moddle.create(
+      'bpmn:FormalExpression',
+      {
+        body: '${ nrOfCompletedInstances >= nrOfInstances }'
+      }
+    )
+  }
+
+  bpmnInstances().modeling.updateProperties(toRaw(bpmnElement.value), {
+    loopCharacteristics: toRaw(multiLoopInstance.value)
+  })
+}
+
 onBeforeUnmount(() => {
   multiLoopInstance.value = null
   bpmnElement.value = null
@@ -276,7 +387,8 @@ watch(
   () => props.businessObject,
   (val) => {
     bpmnElement.value = bpmnInstances().bpmnElement
-    getElementLoop(val)
+    // getElementLoop(val)
+    getElementLoopNew(val)
   },
   { immediate: true }
 )

From f0c797deacfa0bf458fc9e79c94c729eb724b57d Mon Sep 17 00:00:00 2001
From: Lesan <1960681385@qq.com>
Date: Wed, 4 Dec 2024 11:41:06 +0800
Subject: [PATCH 3/9] =?UTF-8?q?fix:=20=E9=9B=AA=E8=8A=B1id=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4int=E7=B2=BE=E5=BA=A6=E4=B8=A2=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../package/penal/task/task-components/UserTask.vue             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/bpmnProcessDesigner/package/penal/task/task-components/UserTask.vue b/src/components/bpmnProcessDesigner/package/penal/task/task-components/UserTask.vue
index f404ef74..0eb45f7c 100644
--- a/src/components/bpmnProcessDesigner/package/penal/task/task-components/UserTask.vue
+++ b/src/components/bpmnProcessDesigner/package/penal/task/task-components/UserTask.vue
@@ -172,7 +172,7 @@ const resetTaskForm = () => {
     } else {
       userTaskForm.value.candidateParam = businessObject.candidateParam
         .split(',')
-        .map((item) => +item)
+        .map((item) => item)
     }
   } else {
     userTaskForm.value.candidateParam = []

From 175d6ba0cbfb725566d0cab03f6c09e85d659ddd Mon Sep 17 00:00:00 2001
From: Lesan <1960681385@qq.com>
Date: Wed, 4 Dec 2024 13:39:11 +0800
Subject: [PATCH 4/9] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0=E6=89=80?=
 =?UTF-8?q?=E9=9C=80flowableDescriptor?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../descriptor/flowableDescriptor.json        | 56 +++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/src/components/bpmnProcessDesigner/package/designer/plugins/descriptor/flowableDescriptor.json b/src/components/bpmnProcessDesigner/package/designer/plugins/descriptor/flowableDescriptor.json
index 31fb7d85..cfb5c722 100644
--- a/src/components/bpmnProcessDesigner/package/designer/plugins/descriptor/flowableDescriptor.json
+++ b/src/components/bpmnProcessDesigner/package/designer/plugins/descriptor/flowableDescriptor.json
@@ -1357,6 +1357,62 @@
           "isBody": true
         }
       ]
+    },
+    {
+      "name": "ApproveType",
+      "superClass": ["Element"],
+      "meta": {
+        "allowedIn": ["bpmn:UserTask"]
+      },
+      "properties": [
+        {
+          "name": "value",
+          "type": "Integer",
+          "isBody": true
+        }
+      ]
+    },
+    {
+      "name": "ApproveMethod",
+      "superClass": ["Element"],
+      "meta": {
+        "allowedIn": ["bpmn:UserTask"]
+      },
+      "properties": [
+        {
+          "name": "value",
+          "type": "Integer",
+          "isBody": true
+        }
+      ]
+    },
+    {
+      "name": "CandidateStrategy",
+      "superClass": ["Element"],
+      "meta": {
+        "allowedIn": ["bpmn:UserTask"]
+      },
+      "properties": [
+        {
+          "name": "value",
+          "type": "Integer",
+          "isBody": true
+        }
+      ]
+    },
+    {
+      "name": "CandidateParam",
+      "superClass": ["Element"],
+      "meta": {
+        "allowedIn": ["bpmn:UserTask"]
+      },
+      "properties": [
+        {
+          "name": "value",
+          "type": "Integer",
+          "isBody": true
+        }
+      ]
     }
   ],
   "emumerations": []

From eb6f3a3e4953faf0dd147c8aae41b8fc6302be04 Mon Sep 17 00:00:00 2001
From: Lesan <1960681385@qq.com>
Date: Wed, 4 Dec 2024 15:21:22 +0800
Subject: [PATCH 5/9] =?UTF-8?q?refactor:=20=E9=80=9A=E8=BF=87ExtensionElem?=
 =?UTF-8?q?ents=E8=8E=B7=E5=8F=96=E5=A4=9A=E5=AE=9E=E4=BE=8B=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../package/penal/PropertiesPanel.vue         |   2 +-
 .../custom-config/components/UserTask.vue     |   2 +-
 .../multi-instance/ElementMultiInstance.vue   | 144 ++++++++++--------
 3 files changed, 79 insertions(+), 69 deletions(-)

diff --git a/src/components/bpmnProcessDesigner/package/penal/PropertiesPanel.vue b/src/components/bpmnProcessDesigner/package/penal/PropertiesPanel.vue
index c32c7620..cf836952 100644
--- a/src/components/bpmnProcessDesigner/package/penal/PropertiesPanel.vue
+++ b/src/components/bpmnProcessDesigner/package/penal/PropertiesPanel.vue
@@ -36,7 +36,7 @@
         key="multiInstance"
       >
         <template #title><Icon icon="ep:help-filled" />多实例（会签配置）</template>
-        <element-multi-instance :business-object="elementBusinessObject" :type="elementType" />
+        <element-multi-instance :id="elementId" :business-object="elementBusinessObject" :type="elementType" />
       </el-collapse-item>
       <el-collapse-item name="listeners" key="listeners">
         <template #title><Icon icon="ep:bell-filled" />执行监听器</template>
diff --git a/src/components/bpmnProcessDesigner/package/penal/custom-config/components/UserTask.vue b/src/components/bpmnProcessDesigner/package/penal/custom-config/components/UserTask.vue
index 85a4b726..eb1c218c 100644
--- a/src/components/bpmnProcessDesigner/package/penal/custom-config/components/UserTask.vue
+++ b/src/components/bpmnProcessDesigner/package/penal/custom-config/components/UserTask.vue
@@ -246,7 +246,7 @@ const resetCustomConfigList = () => {
     elExtensionElements.value.values?.filter(
       (ex) => ex.$type === `${prefix}:AssignEmptyUserIds`
     )?.[0] || bpmnInstances().moddle.create(`${prefix}:AssignEmptyUserIds`, { value: '' })
-  assignEmptyUserIds.value = assignEmptyUserIdsEl.value.value.split(',').map((item) => {
+  assignEmptyUserIds.value = assignEmptyUserIdsEl.value.value?.split(',').map((item) => {
     // 如果数字超出了最大安全整数范围，则将其作为字符串处理
     let num = Number(item)
     return num > Number.MAX_SAFE_INTEGER || num < -Number.MAX_SAFE_INTEGER ? item : num
diff --git a/src/components/bpmnProcessDesigner/package/penal/multi-instance/ElementMultiInstance.vue b/src/components/bpmnProcessDesigner/package/penal/multi-instance/ElementMultiInstance.vue
index 69f5107f..1ee68e86 100644
--- a/src/components/bpmnProcessDesigner/package/penal/multi-instance/ElementMultiInstance.vue
+++ b/src/components/bpmnProcessDesigner/package/penal/multi-instance/ElementMultiInstance.vue
@@ -106,7 +106,8 @@ defineOptions({ name: 'ElementMultiInstance' })
 
 const props = defineProps({
   businessObject: Object,
-  type: String
+  type: String,
+  id: String
 })
 const prefix = inject('prefix')
 const loopCharacteristics = ref('')
@@ -296,25 +297,17 @@ const changeConfig = (config) => {
 /**
  * -----新版本多实例-----
  */
-const approveMethod = ref(1)
+const approveMethod = ref()
 const approveRatio = ref(100)
-const getElementLoopNew = ({ loopCharacteristics }) => {
-  if (!loopCharacteristics) {
-    approveMethod.value = ApproveMethodType.RANDOM_SELECT_ONE_APPROVE
-    return
-  }
-  if (loopCharacteristics.isSequential) {
-    approveMethod.value = ApproveMethodType.SEQUENTIAL_APPROVE
-  } else {
-    if (loopCharacteristics.completionCondition.body === '${ nrOfCompletedInstances > 0 }') {
-      approveMethod.value = ApproveMethodType.ANY_APPROVE
-    }
-    if (
-      loopCharacteristics.completionCondition.body.includes('nrOfCompletedInstances/nrOfInstances')
-    ) {
-      approveMethod.value = ApproveMethodType.APPROVE_BY_RATIO
-    }
-  }
+const otherExtensions = ref()
+const getElementLoopNew = () => {
+  const extensionElements = bpmnElement.value.businessObject?.extensionElements ?? []
+  approveMethod.value = extensionElements.values.filter(
+    (ex) => ex.$type === `${prefix}:ApproveMethod`
+  )?.[0]?.value
+
+  otherExtensions.value =
+    extensionElements.values.filter((ex) => ex.$type !== `${prefix}:ApproveMethod`) ?? []
 }
 const onApproveMethodChange = () => {
   approveRatio.value = 100
@@ -324,57 +317,70 @@ const onApproveRatioChange = () => {
   updateLoopCharacteristics()
 }
 const updateLoopCharacteristics = () => {
+  // 根据ApproveMethod生成multiInstanceLoopCharacteristics节点
   if (approveMethod.value === ApproveMethodType.RANDOM_SELECT_ONE_APPROVE) {
     bpmnInstances().modeling.updateProperties(toRaw(bpmnElement.value), {
       loopCharacteristics: null
     })
-    return
-  }
-  if (approveMethod.value === ApproveMethodType.APPROVE_BY_RATIO) {
-    multiLoopInstance.value = bpmnInstances().moddle.create(
-      'bpmn:MultiInstanceLoopCharacteristics',
-      { isSequential: false, collection: '${coll_userList}' }
-    )
-    multiLoopInstance.value.completionCondition = bpmnInstances().moddle.create(
-      'bpmn:FormalExpression',
-      {
-        body: '${ nrOfCompletedInstances/nrOfInstances >= ' + approveRatio.value / 100 + '}'
-      }
-    )
-  }
-  if (approveMethod.value === ApproveMethodType.ANY_APPROVE) {
-    multiLoopInstance.value = bpmnInstances().moddle.create(
-      'bpmn:MultiInstanceLoopCharacteristics',
-      { isSequential: false, collection: '${coll_userList}' }
-    )
-    multiLoopInstance.value.completionCondition = bpmnInstances().moddle.create(
-      'bpmn:FormalExpression',
-      {
-        body: '${ nrOfCompletedInstances > 0 }'
-      }
-    )
-  }
-  if (approveMethod.value === ApproveMethodType.SEQUENTIAL_APPROVE) {
-    multiLoopInstance.value = bpmnInstances().moddle.create(
-      'bpmn:MultiInstanceLoopCharacteristics',
-      { isSequential: true, collection: '${coll_userList}' }
-    )
-    multiLoopInstance.value.loopCardinality = bpmnInstances().moddle.create(
-      'bpmn:FormalExpression',
-      {
-        body: '1'
-      }
-    )
-    multiLoopInstance.value.completionCondition = bpmnInstances().moddle.create(
-      'bpmn:FormalExpression',
-      {
-        body: '${ nrOfCompletedInstances >= nrOfInstances }'
-      }
-    )
+  } else {
+    if (approveMethod.value === ApproveMethodType.APPROVE_BY_RATIO) {
+      multiLoopInstance.value = bpmnInstances().moddle.create(
+        'bpmn:MultiInstanceLoopCharacteristics',
+        { isSequential: false, collection: '${coll_userList}' }
+      )
+      multiLoopInstance.value.completionCondition = bpmnInstances().moddle.create(
+        'bpmn:FormalExpression',
+        {
+          body: '${ nrOfCompletedInstances/nrOfInstances >= ' + approveRatio.value / 100 + '}'
+        }
+      )
+    }
+    if (approveMethod.value === ApproveMethodType.ANY_APPROVE) {
+      multiLoopInstance.value = bpmnInstances().moddle.create(
+        'bpmn:MultiInstanceLoopCharacteristics',
+        { isSequential: false, collection: '${coll_userList}' }
+      )
+      multiLoopInstance.value.completionCondition = bpmnInstances().moddle.create(
+        'bpmn:FormalExpression',
+        {
+          body: '${ nrOfCompletedInstances > 0 }'
+        }
+      )
+    }
+    if (approveMethod.value === ApproveMethodType.SEQUENTIAL_APPROVE) {
+      multiLoopInstance.value = bpmnInstances().moddle.create(
+        'bpmn:MultiInstanceLoopCharacteristics',
+        { isSequential: true, collection: '${coll_userList}' }
+      )
+      multiLoopInstance.value.loopCardinality = bpmnInstances().moddle.create(
+        'bpmn:FormalExpression',
+        {
+          body: '1'
+        }
+      )
+      multiLoopInstance.value.completionCondition = bpmnInstances().moddle.create(
+        'bpmn:FormalExpression',
+        {
+          body: '${ nrOfCompletedInstances >= nrOfInstances }'
+        }
+      )
+    }
+    bpmnInstances().modeling.updateProperties(toRaw(bpmnElement.value), {
+      loopCharacteristics: toRaw(multiLoopInstance.value)
+    })
   }
 
+  // 添加ApproveMethod到ExtensionElements
+  const extensions = bpmnInstances().moddle.create('bpmn:ExtensionElements', {
+    values: [
+      ...otherExtensions.value,
+      bpmnInstances().moddle.create(`${prefix}:ApproveMethod`, {
+        value: approveMethod.value
+      })
+    ]
+  })
   bpmnInstances().modeling.updateProperties(toRaw(bpmnElement.value), {
-    loopCharacteristics: toRaw(multiLoopInstance.value)
+    extensionElements: extensions
   })
 }
 
@@ -384,11 +390,15 @@ onBeforeUnmount(() => {
 })
 
 watch(
-  () => props.businessObject,
+  () => props.id,
   (val) => {
-    bpmnElement.value = bpmnInstances().bpmnElement
-    // getElementLoop(val)
-    getElementLoopNew(val)
+    if (val) {
+      nextTick(() => {
+        bpmnElement.value = bpmnInstances().bpmnElement
+        // getElementLoop(val)
+        getElementLoopNew()
+      })
+    }
   },
   { immediate: true }
 )

From abdaf2e0ca83b9adafa890fec643c88b614ea7de Mon Sep 17 00:00:00 2001
From: Lesan <1960681385@qq.com>
Date: Wed, 4 Dec 2024 15:39:40 +0800
Subject: [PATCH 6/9] =?UTF-8?q?refactor:=20=E9=80=9A=E8=BF=87extensionElem?=
 =?UTF-8?q?ents=E6=9D=A5=E5=AD=98=E5=82=A8=E5=80=99=E9=80=89=E5=AE=A1?=
 =?UTF-8?q?=E6=89=B9=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../penal/task/task-components/UserTask.vue   | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/src/components/bpmnProcessDesigner/package/penal/task/task-components/UserTask.vue b/src/components/bpmnProcessDesigner/package/penal/task/task-components/UserTask.vue
index 0eb45f7c..3def6a28 100644
--- a/src/components/bpmnProcessDesigner/package/penal/task/task-components/UserTask.vue
+++ b/src/components/bpmnProcessDesigner/package/penal/task/task-components/UserTask.vue
@@ -142,6 +142,7 @@ const props = defineProps({
   id: String,
   type: String
 })
+const prefix = inject('prefix')
 const userTaskForm = ref({
   candidateStrategy: undefined, // 分配规则
   candidateParam: [] // 分配选项
@@ -154,12 +155,39 @@ const deptTreeOptions = ref() // 部门树
 const postOptions = ref<PostApi.PostVO[]>([]) // 岗位列表
 const userOptions = ref<UserApi.UserVO[]>([]) // 用户列表
 const userGroupOptions = ref<UserGroupApi.UserGroupVO[]>([]) // 用户组列表
+const otherExtensions = ref()
 
 const resetTaskForm = () => {
   const businessObject = bpmnElement.value.businessObject
   if (!businessObject) {
     return
   }
+
+  const extensionElements = businessObject?.extensionElements ?? []
+  userTaskForm.value.candidateStrategy = extensionElements.values?.filter(
+    (ex) => ex.$type === `${prefix}:CandidateStrategy`
+  )?.[0]?.value
+  const candidateParamStr = extensionElements.values?.filter(
+    (ex) => ex.$type === `${prefix}:CandidateParam`
+  )?.[0]?.value
+  if (candidateParamStr && candidateParamStr.length > 0) {
+    if (userTaskForm.value.candidateStrategy === 60) {
+      // 特殊：流程表达式，只有一个 input 输入框
+      userTaskForm.value.candidateParam = [candidateParamStr]
+    } else {
+      userTaskForm.value.candidateParam = candidateParamStr.split(',').map((item) => item)
+    }
+  } else {
+    userTaskForm.value.candidateParam = []
+  }
+
+  otherExtensions.value =
+    extensionElements.values?.filter(
+      (ex) => ex.$type !== `${prefix}:CandidateStrategy` && ex.$type !== `${prefix}:CandidateParam`
+    ) ?? []
+
+  // 改用通过extensionElements来存储数据
+  return
   if (businessObject.candidateStrategy != undefined) {
     userTaskForm.value.candidateStrategy = parseInt(businessObject.candidateStrategy) as any
   } else {
@@ -187,6 +215,23 @@ const changeCandidateStrategy = () => {
 
 /** 选中某个 options 时候，更新 bpmn 图  */
 const updateElementTask = () => {
+  const extensions = bpmnInstances().moddle.create('bpmn:ExtensionElements', {
+    values: [
+      ...otherExtensions.value,
+      bpmnInstances().moddle.create(`${prefix}:CandidateStrategy`, {
+        value: userTaskForm.value.candidateStrategy
+      }),
+      bpmnInstances().moddle.create(`${prefix}:CandidateParam`, {
+        value: userTaskForm.value.candidateParam.join(',')
+      })
+    ]
+  })
+  bpmnInstances().modeling.updateProperties(toRaw(bpmnElement.value), {
+    extensionElements: extensions
+  })
+
+  // 改用通过extensionElements来存储数据
+  return
   bpmnInstances().modeling.updateProperties(toRaw(bpmnElement.value), {
     candidateStrategy: userTaskForm.value.candidateStrategy,
     candidateParam: userTaskForm.value.candidateParam.join(',')

From 8ea43f30afa7276accaf41151adc5c0c54a5fd22 Mon Sep 17 00:00:00 2001
From: Lesan <1960681385@qq.com>
Date: Wed, 4 Dec 2024 15:49:58 +0800
Subject: [PATCH 7/9] =?UTF-8?q?fix:=20=E9=9B=AA=E8=8A=B1id=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4int=E7=B2=BE=E5=BA=A6=E4=B8=A2=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../package/penal/task/task-components/UserTask.vue         | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/bpmnProcessDesigner/package/penal/task/task-components/UserTask.vue b/src/components/bpmnProcessDesigner/package/penal/task/task-components/UserTask.vue
index 3def6a28..ecd6fbf4 100644
--- a/src/components/bpmnProcessDesigner/package/penal/task/task-components/UserTask.vue
+++ b/src/components/bpmnProcessDesigner/package/penal/task/task-components/UserTask.vue
@@ -175,7 +175,11 @@ const resetTaskForm = () => {
       // 特殊：流程表达式，只有一个 input 输入框
       userTaskForm.value.candidateParam = [candidateParamStr]
     } else {
-      userTaskForm.value.candidateParam = candidateParamStr.split(',').map((item) => item)
+      userTaskForm.value.candidateParam = candidateParamStr.split(',').map((item) => {
+        // 如果数字超出了最大安全整数范围，则将其作为字符串处理
+        let num = Number(item)
+        return num > Number.MAX_SAFE_INTEGER || num < -Number.MAX_SAFE_INTEGER ? item : num
+      })
     }
   } else {
     userTaskForm.value.candidateParam = []

From c00e6988a511e1d0411255151a3057c2dcd45ac5 Mon Sep 17 00:00:00 2001
From: Lesan <1960681385@qq.com>
Date: Wed, 4 Dec 2024 15:49:58 +0800
Subject: [PATCH 8/9] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E5=90=8E=E5=AD=97=E6=AE=B5=E6=9D=83=E9=99=90=E9=9C=80=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../custom-config/components/UserTask.vue     | 19 ++++++++++---------
 .../penal/task/task-components/UserTask.vue   |  6 +++++-
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/src/components/bpmnProcessDesigner/package/penal/custom-config/components/UserTask.vue b/src/components/bpmnProcessDesigner/package/penal/custom-config/components/UserTask.vue
index eb1c218c..4e1e3f14 100644
--- a/src/components/bpmnProcessDesigner/package/penal/custom-config/components/UserTask.vue
+++ b/src/components/bpmnProcessDesigner/package/penal/custom-config/components/UserTask.vue
@@ -270,17 +270,18 @@ const resetCustomConfigList = () => {
 
   // 字段权限
   if (formType.value === 10) {
-    fieldsPermissionEl.value = elExtensionElements.value.values?.filter(
+    const fieldsPermissionList = elExtensionElements.value.values?.filter(
       (ex) => ex.$type === `${prefix}:FieldsPermission`
     )
-    if (fieldsPermissionEl.value.length === 0) {
-      getNodeConfigFormFields()
-      fieldsPermissionConfig.value.forEach((el) => {
-        fieldsPermissionEl.value.push(
-          bpmnInstances().moddle.create(`${prefix}:FieldsPermission`, el)
-        )
-      })
-    }
+    fieldsPermissionEl.value = []
+    getNodeConfigFormFields()
+    fieldsPermissionConfig.value.forEach((element) => {
+      element.permission =
+        fieldsPermissionList?.find((obj) => obj.field === element.field)?.permission ?? '1'
+      fieldsPermissionEl.value.push(
+        bpmnInstances().moddle.create(`${prefix}:FieldsPermission`, element)
+      )
+    })
   }
 
   // 保留剩余扩展元素，便于后面更新该元素对应属性
diff --git a/src/components/bpmnProcessDesigner/package/penal/task/task-components/UserTask.vue b/src/components/bpmnProcessDesigner/package/penal/task/task-components/UserTask.vue
index 3def6a28..ecd6fbf4 100644
--- a/src/components/bpmnProcessDesigner/package/penal/task/task-components/UserTask.vue
+++ b/src/components/bpmnProcessDesigner/package/penal/task/task-components/UserTask.vue
@@ -175,7 +175,11 @@ const resetTaskForm = () => {
       // 特殊：流程表达式，只有一个 input 输入框
       userTaskForm.value.candidateParam = [candidateParamStr]
     } else {
-      userTaskForm.value.candidateParam = candidateParamStr.split(',').map((item) => item)
+      userTaskForm.value.candidateParam = candidateParamStr.split(',').map((item) => {
+        // 如果数字超出了最大安全整数范围，则将其作为字符串处理
+        let num = Number(item)
+        return num > Number.MAX_SAFE_INTEGER || num < -Number.MAX_SAFE_INTEGER ? item : num
+      })
     }
   } else {
     userTaskForm.value.candidateParam = []

From e8315e286489ea7c3b859b9a21d1960476308b30 Mon Sep 17 00:00:00 2001
From: Lesan <1960681385@qq.com>
Date: Thu, 5 Dec 2024 10:45:30 +0800
Subject: [PATCH 9/9] =?UTF-8?q?fix:=20CandidateParam=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E5=BA=94=E4=B8=BAString?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../package/designer/plugins/descriptor/flowableDescriptor.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/bpmnProcessDesigner/package/designer/plugins/descriptor/flowableDescriptor.json b/src/components/bpmnProcessDesigner/package/designer/plugins/descriptor/flowableDescriptor.json
index cfb5c722..a5e122ea 100644
--- a/src/components/bpmnProcessDesigner/package/designer/plugins/descriptor/flowableDescriptor.json
+++ b/src/components/bpmnProcessDesigner/package/designer/plugins/descriptor/flowableDescriptor.json
@@ -1409,7 +1409,7 @@
       "properties": [
         {
           "name": "value",
-          "type": "Integer",
+          "type": "String",
           "isBody": true
         }
       ]