Merge branch 'dev' into dev-cjw

# Conflicts:
#	src/utils/helper/generatorHelper.ts

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') {

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: [
@@ -2590,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})
       }
     }
     //新增
@@ -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);
@@ -2652,16 +2669,17 @@ let formModelIdVal = reactive({
 	try {
 		await formRef.value.validate();
     const formData = await formRef.value.getFormData();
-		if(formConfig.type == FromPageType.EDIT || formModelIdVal[listProps.rowKey]){
-      formData[listProps.rowKey]=formConfig.id;
+		if(formData[rowKey]){
+      formConfig.id = formData[rowKey]
 			await update${pascalMainTableName}(formData);
-      formModelIdVal[listProps.rowKey] = isFirst.value ? formConfig.id : formModelIdVal[listProps.rowKey];
+      formModelIdVal[rowKey]=formConfig.id;
 		}
 		else{
-			let res  = await add${pascalMainTableName}(formData);
-      isFirst.value = false;
-      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);
 	}
@@ -2689,7 +2707,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;
 }