From 45abd7191b05b3056c0247877d1718e8ed004ae0 Mon Sep 17 00:00:00 2001
From: GAOANG <1140589958@qq.com>
Date: Mon, 7 Apr 2025 18:19:21 +0800
Subject: [PATCH 1/2] =?UTF-8?q?feat:=20=E7=A7=BB=E5=8A=A8=E7=AB=AF?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E4=BF=AE=E6=94=B9=E4=BB=A5=E9=80=82=E9=85=8D?=
 =?UTF-8?q?PC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/SecondDev/OpinionDialog.vue |  2 +-
 src/utils/helper/generatorHelper.ts        | 35 +++++++++++++++++-----
 2 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/src/components/SecondDev/OpinionDialog.vue b/src/components/SecondDev/OpinionDialog.vue
index 9cb6283..c04eab8 100644
--- a/src/components/SecondDev/OpinionDialog.vue
+++ b/src/components/SecondDev/OpinionDialog.vue
@@ -175,7 +175,7 @@
                 return message.error('请选择审批人');
             }
             flowNextNodes.value.forEach((nNode) => {
-                nextTaskUser[nNode.activityId] = isEnd.value ? '' : nNode.assignees.join(',');
+                nextTaskUser[nNode.activityId] = isEnd.value ? '' : (typeof(nNode.assignees) == 'string' ? nNode.assignees : nNode.assignees.join(','));
             });
         }
         if (_action.value === 'reject') {
diff --git a/src/utils/helper/generatorHelper.ts b/src/utils/helper/generatorHelper.ts
index 13fd87f..0840b22 100644
--- a/src/utils/helper/generatorHelper.ts
+++ b/src/utils/helper/generatorHelper.ts
@@ -2318,7 +2318,8 @@ export const listProps = {
   datasource: [],
   workflowConfig:{
     Pk:'${designType == 'data' ? camelCase(mainTable.pkField) : 'id'}',
-    Formid:'${model.formId}'
+    Formid:'${model.formId}',
+    schemaId: '',
   },
   //列配置
   columnConfigs: [
@@ -2374,7 +2375,7 @@ export const listProps = {
 
 export const formProps =  ${JSON.stringify(formProps, (key, value) => {
     if (key === 'api') {
-      //TODO  后续新增API 这里也要修改
+      //TODO  后续新增API 这里也要修改 
       if (value.toString().includes('uploadApi')) {
         return `#{upload}#`;
       } else {
@@ -2622,6 +2623,22 @@ async function setWorkflowForm(){
   renderKey.value++;
   await setForm();
 }
+// 根据行唯一ID查询行数据，并设置表单数据   【编辑】
+async function setFormDataFromId(rowId, skipUpdate) {
+    try {
+      const {
+        data
+      } = await get${pascalMainTableName}(rowId);
+      if (skipUpdate) {
+          return data;
+      }
+      setFormData(data);
+      formConfig.id = data[rowKey]
+      return data;  
+    } catch (error) {
+
+    }
+  }
 // 工作流辅助设置表单数据
 function setWorkflowFormData(formProps){
   let options = cloneDeep(formProps);
@@ -2649,15 +2666,17 @@ async function validate() {
 	try {
 		await formRef.value.validate();
     const formData = await formRef.value.getFormData();
-		if(formConfig.type == FromPageType.EDIT){
-      formData[listProps.rowKey]=formConfig.id;
+		if(formData[rowKey]){
+      formConfig.id = formData[rowKey]
 			await update${pascalMainTableName}(formData);
-      formModelIdVal[listProps.rowKey]=formConfig.id;
+      formModelIdVal[rowKey]=formConfig.id;
 		}
 		else{
-			let res  = await add${pascalMainTableName}(formData);
-      formModelIdVal[listProps.rowKey]=res.data;
+			let res = await add${pascalMainTableName}(formData);
+      formModelIdVal[rowKey]=res.data;
+      formConfig.id = res.data
 		}
+    await setFormDataFromId(formConfig.id)
 	} catch (err) {
 		console.log(err);
 	}
@@ -2685,7 +2704,7 @@ async function reset() {
 async function getFormData() {
 	let formModelObj =  await formRef.value.getFormData();
   if(formConfig.type == FromPageType.EDIT||formConfig.type == FromPageType.VIEW){
-      formModelObj[listProps.rowKey]=formConfig.id;
+      formModelObj[rowKey]=formConfig.id;
 	}
   return formModelObj;
 }

From 892d5ae49554c29bd55d90b7492d19f1a8e34a4c Mon Sep 17 00:00:00 2001
From: GAOANG <1140589958@qq.com>
Date: Wed, 9 Apr 2025 10:50:28 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=20=E7=A7=BB=E5=8A=A8=E7=AB=AF?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9=EF=BC=9A?=
 =?UTF-8?q?=20=E8=A1=A8=E5=8D=95=E6=95=B0=E6=8D=AE=E5=8F=96=E4=B8=BB?=
 =?UTF-8?q?=E8=A1=A8=E6=95=B0=E6=8D=AE=E8=80=8C=E9=9D=9E=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/helper/generatorHelper.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/helper/generatorHelper.ts b/src/utils/helper/generatorHelper.ts
index 0840b22..a1c1824 100644
--- a/src/utils/helper/generatorHelper.ts
+++ b/src/utils/helper/generatorHelper.ts
@@ -2591,7 +2591,7 @@ async function setForm(){
         data
       } = await get${pascalMainTableName}(formConfig.id);
       if (data) {
-        await formRef.value.setFormData({...data,...props.formModel})
+        await formRef.value.setFormData({...props.formModel, ...data})
       }
     }
     //新增