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

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

@@ -29,6 +29,7 @@ var useHForm = (function () {
     var initDispatch = {};
     var cacheValues = {};
     var isLoading = false;
+    var initSaveValue = {};
     var norAddItemDispatch = function norAddItemDispatch(name, manual, fn) {
       if (manual === false && name) {
         initDispatch[name] = fn;
@@ -52,6 +53,7 @@ var useHForm = (function () {
         var newValue = {};
         if (cacheValues) {
           newValue = this.formatValues(cacheValues);
+          initSaveValue = newValue;
           form.setFieldsValue(newValue);
         }
         var initKeys = Object.keys(initDispatch);
@@ -82,6 +84,7 @@ var useHForm = (function () {
           return {};
         }
         var newValue = _objectSpread({}, value);
+        console.log(formatSourceData, "formatSourceData");
         var keys = Object.keys(formatSourceData);
         keys.forEach(function (key) {
           var _formatSourceData$key;
@@ -93,6 +96,7 @@ var useHForm = (function () {
           Reflect.deleteProperty(newValue, key);
           newValue = _objectSpread(_objectSpread({}, newValue), resultValue);
         });
+        console.log(newValue, "newVal");
         return newValue;
       },
       dispatch: function dispatch(action) {
@@ -186,6 +190,15 @@ var useHForm = (function () {
           });
         });
       },
+      resetFieldsInitValue: function resetFieldsInitValue() {
+        var oldValue = form.getFieldsValue();
+        var keys = Object.keys(oldValue);
+        var newVale = {};
+        keys.forEach(function (key) {
+          newVale[key] = undefined;
+        });
+        form.setFieldsValue(_objectSpread(_objectSpread({}, newVale), initSaveValue));
+      },
       clear: function clear() {
         form.resetFields();
         isLoading = false;

package/es/Form/modal.d.ts

@@ -106,6 +106,7 @@ export interface HFormInstance extends FormInstance {
     removeDispatchListener: (action?: ActionModal, fn?: argsFn) => void;
     reload: PromiseFnResult;
     clear: VoidFunction;
+    resetFieldsInitValue: VoidFunction;
 }
 export interface ConnectConfigModal {
     format?: Record<string, addFormatItemModal>;

package/es/Switch/index.js

@@ -56,7 +56,6 @@ var Index = function Index(_ref) {
         if (typeof val === "undefined" || val === null) {
           val = close;
         }
-        console.log(val, "");
         return _defineProperty({}, valueName, val);
       },
       outputValue: function outputValue(item, _outputValue) {

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

@@ -32,6 +32,7 @@ var useHForm = (function () {
     var initDispatch = {};
     var cacheValues = {};
     var isLoading = false;
+    var initSaveValue = {};
     var norAddItemDispatch = function norAddItemDispatch(name, manual, fn) {
       if (manual === false && name) {
         initDispatch[name] = fn;
@@ -55,6 +56,7 @@ var useHForm = (function () {
         var newValue = {};
         if (cacheValues) {
           newValue = this.formatValues(cacheValues);
+          initSaveValue = newValue;
           form.setFieldsValue(newValue);
         }
         var initKeys = Object.keys(initDispatch);
@@ -85,6 +87,7 @@ var useHForm = (function () {
           return {};
         }
         var newValue = _objectSpread({}, value);
+        console.log(formatSourceData, "formatSourceData");
         var keys = Object.keys(formatSourceData);
         keys.forEach(function (key) {
           var _formatSourceData$key;
@@ -96,6 +99,7 @@ var useHForm = (function () {
           Reflect.deleteProperty(newValue, key);
           newValue = _objectSpread(_objectSpread({}, newValue), resultValue);
         });
+        console.log(newValue, "newVal");
         return newValue;
       },
       dispatch: function dispatch(action) {
@@ -189,6 +193,15 @@ var useHForm = (function () {
           });
         });
       },
+      resetFieldsInitValue: function resetFieldsInitValue() {
+        var oldValue = form.getFieldsValue();
+        var keys = Object.keys(oldValue);
+        var newVale = {};
+        keys.forEach(function (key) {
+          newVale[key] = undefined;
+        });
+        form.setFieldsValue(_objectSpread(_objectSpread({}, newVale), initSaveValue));
+      },
       clear: function clear() {
         form.resetFields();
         isLoading = false;

package/lib/Form/modal.d.ts

@@ -106,6 +106,7 @@ export interface HFormInstance extends FormInstance {
     removeDispatchListener: (action?: ActionModal, fn?: argsFn) => void;
     reload: PromiseFnResult;
     clear: VoidFunction;
+    resetFieldsInitValue: VoidFunction;
 }
 export interface ConnectConfigModal {
     format?: Record<string, addFormatItemModal>;

package/lib/Switch/index.js

@@ -59,7 +59,6 @@ var Index = function Index(_ref) {
         if (typeof val === "undefined" || val === null) {
           val = close;
         }
-        console.log(val, "");
         return _defineProperty({}, valueName, val);
       },
       outputValue: function outputValue(item, _outputValue) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hw-component/form",
-  "version": "0.0.8-beta-v9",
+  "version": "0.0.9-beta-v2",
   "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,17 @@ 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

@@ -16,7 +16,7 @@ export default () => {
     const initDispatch: Record<string, argsFn> = {};
     let cacheValues: Record<string, any> = {};
     let isLoading = false;
-
+    let initSaveValue={};
     const norAddItemDispatch = (name, manual, fn) => {
       if (manual === false && name) {
         initDispatch[name] = fn;
@@ -42,6 +42,7 @@ export default () => {
         let newValue = {};
         if (cacheValues) {
           newValue = this.formatValues(cacheValues);
+          initSaveValue=newValue;
           form.setFieldsValue(newValue);
         }
         const initKeys = Object.keys(initDispatch);
@@ -66,6 +67,7 @@ export default () => {
           return {};
         }
         let newValue = { ...value };
+        console.log(formatSourceData,"formatSourceData")
         const keys = Object.keys(formatSourceData);
         keys.forEach((key) => {
           const format = formatSourceData[key]?.[formatKey];
@@ -79,6 +81,7 @@ export default () => {
             ...resultValue,
           };
         });
+        console.log(newValue,"newVal")
         return newValue;
       }, //转化方法
       dispatch(action, ...args) {
@@ -160,6 +163,18 @@ export default () => {
           });
         });
       },
+      resetFieldsInitValue:()=>{
+         const oldValue=form.getFieldsValue();
+         const keys=Object.keys(oldValue);
+         const newVale={};
+         keys.forEach((key)=>{
+            newVale[key]=undefined;
+         });
+         form.setFieldsValue({
+           ...newVale,
+           ...initSaveValue,
+         });
+      },
       clear: () => {
         form.resetFields();
         isLoading = false;

package/src/components/Form/modal.ts

@@ -160,6 +160,7 @@ export interface HFormInstance extends FormInstance {
   removeDispatchListener: (action?: ActionModal, fn?: argsFn) => void;
   reload: PromiseFnResult;
   clear: VoidFunction;
+  resetFieldsInitValue:VoidFunction;
 }
 
 export interface ConnectConfigModal {

package/src/components/Switch/index.tsx

@@ -47,7 +47,6 @@ const Index: React.FC<HSwitchProps> = ({
         if (typeof val === "undefined" || val === null) {
           val = close;
         }
-        console.log(val, "");
         return {
           [valueName]: val,
         };

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/Form/index.tsx

@@ -1,6 +1,6 @@
 import { HForm, HFormConfigProvider, useHForm } from "../../components";
 import { useState } from "react";
-import { Button } from "antd";
+import {Button, DatePicker, Form, Input} from "antd";
 
 const formData = (options) => {
   const op = [
@@ -102,12 +102,6 @@ const formData = (options) => {
             datePicker: "fakfjkfjsklfjskljsak",
           };
         },
-        initValueProvider: (item, val) => {
-          console.log(val, "vvv");
-          return {
-            datePicker: 1706510695,
-          };
-        },
       },
       rules: [{ required: true }],
     },
@@ -247,9 +241,14 @@ const Test = (props) => {
 export default () => {
   const form = useHForm();
   const [options, setOptions] = useState([{ label: "1", value: 1 }]);
-
+  const [aForm]=Form.useForm();
   return (
     <div style={{ overflow: "auto", height: "90vh" }}>
+      <Form  form={aForm} initialValues={{ttim:"132123"}}>
+        <Form.Item name="ttim" rules={[{required:true}]}>
+          <Input/>
+        </Form.Item>
+      </Form>
       <HFormConfigProvider
         valueSwitchMap={{ open: 1, close: 2 }}
         valueCheckMap={{ noChecked: 0, checked: 1 }}
@@ -304,14 +303,14 @@ export default () => {
       </HFormConfigProvider>
       <div
         onClick={() => {
-          form.setFieldsValue({ name: "123" });
+          aForm.resetFields();
         }}
       >
         点我
       </div>
       <div
         onClick={() => {
-          form.resetFields();
+          form.resetFieldsInitValue();
         }}
       >
         重置

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="测试"
         />