@hzab/flowlong-designer 1.0.7-beta → 1.0.7-beta2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hzab/flowlong-designer",
-  "version": "1.0.7-beta",
+  "version": "1.0.7-beta2",
   "description": "自定义审批流配置组件",
   "main": "src",
   "scripts": {

package/src/components/NodeWrap/Nodes/Approver/index.tsx

@@ -121,24 +121,28 @@ export const Approver = (props) => {
   }
 
   function onDrawerSave() {
-    signatureConfigurationRef.current.form.validateFields().then(() => {
-      const { extendConfig } = form;
+    signatureConfigurationRef.current.form.validateFields().then((res) => {
+      const { extendConfig = {} }: any = form;
       const newValue = {
         ...form,
+        extendConfig: { ...form?.extendConfig, ...res?.extendConfig },
       };
-      if (!extendConfig.isChecked) {
-        newValue.extendConfig.directorUsers = [];
-        newValue.extendConfig.directorWorkAddr = false;
-      } else {
-        if (extendConfig.approvalEnd == 2) {
+      if (form.setType == "20") {
+        if (!extendConfig?.isChecked) {
+          newValue.extendConfig.directorUsers = [];
           newValue.extendConfig.directorWorkAddr = false;
         } else {
-          newValue.extendConfig.directorWorkAddr = true;
-          newValue.extendConfig.directorUsers = [];
+          if (extendConfig?.approvalEnd == 2) {
+            newValue.extendConfig.directorWorkAddr = false;
+          } else {
+            newValue.extendConfig.directorWorkAddr = true;
+            newValue.extendConfig.directorUsers = [];
+          }
         }
+        delete newValue.extendConfig?.approvalEnd;
+        delete newValue.extendConfig?.isChecked;
       }
-      delete newValue.extendConfig.approvalEnd;
-      delete newValue.extendConfig.isChecked;
+
       setForm(newValue);
       // 强制更新数据
       onChange && onChange(newValue);

package/src/components/NodeWrap/Nodes/Promoter/index.tsx

@@ -74,12 +74,7 @@ export const Promoter = (props) => {
     signatureConfigurationRef.current.form.validateFields().then((res) => {
       const newValue = {
         ...form,
-        extendConfig: {
-          needSign: res?.needSign, //当前节点需要签名
-          needConfirm: res?.needConfirm, //当前节点需要二次确认
-          confirmTxt: res?.confirmTxt,
-          usePreSign: res?.usePreSign,
-        },
+        extendConfig: res?.extendConfig,
       };
       setForm(newValue);
       onChange && onChange({ ...newValue });

package/src/components/NodeWrap/Nodes/Send/index.tsx

@@ -121,6 +121,23 @@ export const Approver = (props) => {
   }
 
   function onDrawerSave() {
+    const newValue = JSON.parse(JSON.stringify(form));
+    const { extendConfig } = newValue;
+    if (form.setType == "20") {
+      if (!extendConfig?.isChecked) {
+        newValue.extendConfig.directorUsers = [];
+        newValue.extendConfig.directorWorkAddr = false;
+      } else {
+        if (extendConfig?.approvalEnd == 2) {
+          newValue.extendConfig.directorWorkAddr = false;
+        } else {
+          newValue.extendConfig.directorWorkAddr = true;
+          newValue.extendConfig.directorUsers = [];
+        }
+      }
+      delete newValue.extendConfig?.approvalEnd;
+      delete newValue.extendConfig?.isChecked;
+    }
     // 强制更新数据
     onChange && onChange(form);
     onDrawerClose();

package/src/components/NodeWrap/components/SignatureConfiguration/index.tsx

@@ -27,9 +27,10 @@ const SignatureConfiguration = (props: any, ref: any) => {
       form,
     };
   });
+
   useEffect(() => {
     if (formData?.extendConfig) {
-      form.setFieldsValue(formData?.extendConfig);
+      form.setFieldValue("extendConfig", formData?.extendConfig);
       setIsSignature(formData?.extendConfig?.needSign);
       setSecondaryConfirmation(formData?.extendConfig?.needConfirm);
     } else if (type === "approver") {