@hw-component/form 0.0.8-beta-v9 → 0.0.9-beta-v1

package/es/DialogForm/hooks.js

@@ -46,12 +46,16 @@ var useModifyProps = function useModifyProps(_ref) {
     _useState10 = _slicedToArray(_useState9, 2),
     modalTitle = _useState10[0],
     setModalTitle = _useState10[1];
+  var saveOldParamsObj = useMemo(function () {
+    return {
+      old: {}
+    };
+  }, []);
   var onAfterClose = function onAfterClose() {
     onCancel === null || onCancel === void 0 || onCancel();
+    saveOldParamsObj.old = dialogForm.outputValues();
     setTimeout(function () {
-      if (autoClear) {
-        dialogForm.clear();
-      }
+      dialogForm.clear();
       afterClose === null || afterClose === void 0 || afterClose();
     }, 100);
   };
@@ -86,14 +90,15 @@ var useModifyProps = function useModifyProps(_ref) {
       if (!!changeTitle) {
         setModalTitle(changeTitle);
       }
-      setInitValue(changeInitialValues);
+      var relChangeInitVal = autoClear ? changeInitialValues : _objectSpread(_objectSpread({}, saveOldParamsObj.old), changeInitialValues);
+      setInitValue(relChangeInitVal);
       setModalVisible(true);
     };
     dialogForm.hide = function () {
       setModalVisible(false);
       onAfterClose();
     };
-  }, [afterClose]);
+  }, [afterClose, autoClear]);
   return {
     modalFormData: modalFormData,
     modalVisible: modalVisible,

package/es/Form/hooks/useHForm.js

@@ -174,6 +174,7 @@ var useHForm = (function () {
           cacheValues = values;
           return;
         }
+        console.log("setFieldsValue");
         var newValue = this.formatValues(values);
         form.setFieldsValue(newValue);
       },

package/lib/DialogForm/hooks.js

@@ -47,12 +47,16 @@ var useModifyProps = function useModifyProps(_ref) {
     _useState10 = _slicedToArray(_useState9, 2),
     modalTitle = _useState10[0],
     setModalTitle = _useState10[1];
+  var saveOldParamsObj = React.useMemo(function () {
+    return {
+      old: {}
+    };
+  }, []);
   var onAfterClose = function onAfterClose() {
     onCancel === null || onCancel === void 0 || onCancel();
+    saveOldParamsObj.old = dialogForm.outputValues();
     setTimeout(function () {
-      if (autoClear) {
-        dialogForm.clear();
-      }
+      dialogForm.clear();
       afterClose === null || afterClose === void 0 || afterClose();
     }, 100);
   };
@@ -87,14 +91,15 @@ var useModifyProps = function useModifyProps(_ref) {
       if (!!changeTitle) {
         setModalTitle(changeTitle);
       }
-      setInitValue(changeInitialValues);
+      var relChangeInitVal = autoClear ? changeInitialValues : _objectSpread(_objectSpread({}, saveOldParamsObj.old), changeInitialValues);
+      setInitValue(relChangeInitVal);
       setModalVisible(true);
     };
     dialogForm.hide = function () {
       setModalVisible(false);
       onAfterClose();
     };
-  }, [afterClose]);
+  }, [afterClose, autoClear]);
   return {
     modalFormData: modalFormData,
     modalVisible: modalVisible,

package/lib/Form/hooks/useHForm.js

@@ -177,6 +177,7 @@ var useHForm = (function () {
           cacheValues = values;
           return;
         }
+        console.log("setFieldsValue");
         var newValue = this.formatValues(values);
         form.setFieldsValue(newValue);
       },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hw-component/form",
-  "version": "0.0.8-beta-v9",
+  "version": "0.0.9-beta-v1",
   "description": "基于antd二次开发",
   "repository": {
     "type": "git",

package/src/components/DialogForm/hooks.ts

@@ -23,12 +23,16 @@ export const useModifyProps = ({
   const [initValue, setInitValue] = useState(initialValues);
   const [formParams, setFormParams] = useState(params);
   const [modalTitle, setModalTitle] = useState(title);
+  const saveOldParamsObj=useMemo(()=>{
+      return {
+        old:{}
+      }
+  },[]);
   const onAfterClose = () => {
     onCancel?.();
+    saveOldParamsObj.old=dialogForm.outputValues();
     setTimeout(() => {
-      if (autoClear) {
-        dialogForm.clear();
-      }
+      dialogForm.clear();
       afterClose?.();
     }, 100);
   };
@@ -64,14 +68,15 @@ export const useModifyProps = ({
       if (!!changeTitle) {
         setModalTitle(changeTitle);
       }
-      setInitValue(changeInitialValues);
+      const relChangeInitVal=autoClear?changeInitialValues:{...saveOldParamsObj.old,...changeInitialValues};
+      setInitValue(relChangeInitVal);
       setModalVisible(true);
     };
     dialogForm.hide = () => {
       setModalVisible(false);
       onAfterClose();
     };
-  }, [afterClose]);
+  }, [afterClose,autoClear]);
   return {
     modalFormData,
     modalVisible,

package/src/components/Form/hooks/useHForm.ts

@@ -149,6 +149,7 @@ export default () => {
           cacheValues = values;
           return;
         }
+        console.log("setFieldsValue")
         const newValue = this.formatValues(values);
         form.setFieldsValue(newValue);
       },

package/src/pages/DrawerForm/index.tsx

@@ -107,19 +107,19 @@ const data = [
     },
   },
 ];
+let num=0
 export default () => {
   const modalForm = useHDialogForm();
   return (
     <>
       <Button
         onClick={() => {
+          num++
           modalForm.show({
             initialValues: {
               check1: 1,
-              testStart: "1694747960",
-              testEnd: "1693538359",
               op: 1,
-              opInput: "12121",
+              opInput:num,
             },
           });
         }}

package/src/pages/ModalForm/index.tsx

@@ -165,7 +165,6 @@ export default () => {
       <HFormConfigProvider
         uploadProps={{
           request: () => {
-            console.log("request,request,request,request");
             return Promise.resolve({
               url: "https://gw.alicdn.com/imgextra/i2/O1CN01MYuwJQ1GXVBWryCFJ_!!6000000000632-2-tps-1125-570.png_468x468q75.jpg_.webp",
             });
@@ -175,7 +174,6 @@ export default () => {
         <HModalForm
           configData={data}
           labelWidth={88}
-          autoClear={false}
           contentRender={(node, form) => {
             return (
               <div>
@@ -184,9 +182,6 @@ export default () => {
               </div>
             );
           }}
-          request={(val, params) => {
-            console.log(val, params);
-          }}
           dialogForm={modalForm}
           title="测试"
         />