@hw-component/form 1.9.83 → 1.9.85

package/es/DialogForm/DrawerForm/index.js

@@ -127,6 +127,13 @@ var Index = function Index(_ref) {
     infoRequest: infoRequest,
     labelWidth: labelWidth
   }));
+  var selfAfterClose = function selfAfterClose() {
+    if (autoClear) {
+      dialogForm === null || dialogForm === void 0 || dialogForm.clear();
+      return;
+    }
+    dialogForm === null || dialogForm === void 0 || dialogForm.resetFormStatus();
+  };
   return jsx(Drawer, _objectSpread(_objectSpread({
     visible: modalVisible,
     title: jsx(Title, {
@@ -140,9 +147,7 @@ var Index = function Index(_ref) {
       if (changeVisible) {
         return;
       }
-      if (autoClear) {
-        dialogForm === null || dialogForm === void 0 || dialogForm.clear();
-      }
+      selfAfterClose();
       afterClose === null || afterClose === void 0 || afterClose();
     },
     closable: false,

package/es/DialogForm/ModalForm.js

@@ -44,15 +44,18 @@ var Index = function Index(_ref) {
       dialogForm: currentForm,
       params: params,
       title: title,
-      onCancel: onCancel
+      onCancel: onCancel,
+      autoClear: autoClear
     }),
     modalVisible = _useModifyProps.modalVisible,
     modalFormData = _useModifyProps.modalFormData,
     setModalVisible = _useModifyProps.setModalVisible,
     initValue = _useModifyProps.initValue,
     formParams = _useModifyProps.formParams,
-    modalTitle = _useModifyProps.title;
+    modalTitle = _useModifyProps.title,
+    saveOldParams = _useModifyProps.saveOldParams;
   var cancel = function cancel() {
+    saveOldParams();
     if (onCancel) {
       return onCancel === null || onCancel === void 0 ? void 0 : onCancel();
     }
@@ -116,15 +119,20 @@ var Index = function Index(_ref) {
     params: formParams,
     onOk: footerOnOk
   });
+  var selfAfterClose = function selfAfterClose() {
+    if (autoClear) {
+      dialogForm === null || dialogForm === void 0 || dialogForm.clear();
+      return;
+    }
+    dialogForm === null || dialogForm === void 0 || dialogForm.resetFormStatus();
+  };
   return jsx(Modal, _objectSpread(_objectSpread({
     title: modalTitle,
     visible: modalVisible,
     onCancel: cancel,
     confirmLoading: loading,
     afterClose: function afterClose() {
-      if (autoClear) {
-        currentForm.clear();
-      }
+      selfAfterClose();
       _afterClose === null || _afterClose === void 0 || _afterClose();
     }
   }, props), {}, {

package/es/DialogForm/hooks.js

@@ -47,7 +47,6 @@ var useModifyProps = function useModifyProps(_ref) {
   }, []);
   var saveOldParams = function saveOldParams() {
     saveOldParamsObj.old = dialogForm.outputValues();
-    console.log(saveOldParamsObj.old, "saveOldParamsObj.old");
   };
   useEffect(function () {
     setModalVisible(visible);
@@ -81,7 +80,6 @@ var useModifyProps = function useModifyProps(_ref) {
         setModalTitle(changeTitle);
       }
       var relChangeInitVal = autoClear ? changeInitialValues : _objectSpread(_objectSpread({}, saveOldParamsObj.old), changeInitialValues);
-      console.log(relChangeInitVal, "relChangeInitVal");
       setInitValue(relChangeInitVal);
       setModalVisible(true);
     };

package/es/Form/hooks/useHForm.js

@@ -201,6 +201,9 @@ var useHForm = (function () {
         form.resetFields();
         isLoading = false;
       },
+      resetFormStatus: function resetFormStatus() {
+        isLoading = false;
+      },
       inited: false
     });
   }, []);

package/es/Form/modal.d.ts

@@ -151,6 +151,7 @@ export interface HFormInstance extends FormInstance {
     resetFieldsInitValue: (values?: Record<string, any>) => void;
     clearFormat: (name: string) => void;
     inited: boolean;
+    resetFormStatus: VoidFunction;
 }
 export interface ConnectConfigModal {
     format?: Record<string, addFormatItemModal>;

package/es/TDPicker/RangePicker.js

@@ -68,7 +68,6 @@ var HRangePicker = function HRangePicker(_ref) {
           }
         });
         var hasKeys = Object.keys(resultObj).length !== 0;
-        console.log(initValue, dateMapKeys, valueName, resultObj, "resultObjresultObjresultObj");
         return _defineProperty({}, valueName, hasKeys ? resultObj : null);
       },
       outputValue: function outputValue(item, _outputValue) {

package/lib/DialogForm/DrawerForm/index.js

@@ -130,6 +130,13 @@ var Index = function Index(_ref) {
     infoRequest: infoRequest,
     labelWidth: labelWidth
   }));
+  var selfAfterClose = function selfAfterClose() {
+    if (autoClear) {
+      dialogForm === null || dialogForm === void 0 || dialogForm.clear();
+      return;
+    }
+    dialogForm === null || dialogForm === void 0 || dialogForm.resetFormStatus();
+  };
   return jsxRuntime.jsx(antd.Drawer, _objectSpread(_objectSpread({
     visible: modalVisible,
     title: jsxRuntime.jsx(Title.default, {
@@ -143,9 +150,7 @@ var Index = function Index(_ref) {
       if (changeVisible) {
         return;
       }
-      if (autoClear) {
-        dialogForm === null || dialogForm === void 0 || dialogForm.clear();
-      }
+      selfAfterClose();
       afterClose === null || afterClose === void 0 || afterClose();
     },
     closable: false,

package/lib/DialogForm/ModalForm.js

@@ -47,15 +47,18 @@ var Index = function Index(_ref) {
       dialogForm: currentForm,
       params: params,
       title: title,
-      onCancel: onCancel
+      onCancel: onCancel,
+      autoClear: autoClear
     }),
     modalVisible = _useModifyProps.modalVisible,
     modalFormData = _useModifyProps.modalFormData,
     setModalVisible = _useModifyProps.setModalVisible,
     initValue = _useModifyProps.initValue,
     formParams = _useModifyProps.formParams,
-    modalTitle = _useModifyProps.title;
+    modalTitle = _useModifyProps.title,
+    saveOldParams = _useModifyProps.saveOldParams;
   var cancel = function cancel() {
+    saveOldParams();
     if (onCancel) {
       return onCancel === null || onCancel === void 0 ? void 0 : onCancel();
     }
@@ -119,15 +122,20 @@ var Index = function Index(_ref) {
     params: formParams,
     onOk: footerOnOk
   });
+  var selfAfterClose = function selfAfterClose() {
+    if (autoClear) {
+      dialogForm === null || dialogForm === void 0 || dialogForm.clear();
+      return;
+    }
+    dialogForm === null || dialogForm === void 0 || dialogForm.resetFormStatus();
+  };
   return jsxRuntime.jsx(antd.Modal, _objectSpread(_objectSpread({
     title: modalTitle,
     visible: modalVisible,
     onCancel: cancel,
     confirmLoading: loading,
     afterClose: function afterClose() {
-      if (autoClear) {
-        currentForm.clear();
-      }
+      selfAfterClose();
       _afterClose === null || _afterClose === void 0 || _afterClose();
     }
   }, props), {}, {

package/lib/DialogForm/hooks.js

@@ -48,7 +48,6 @@ var useModifyProps = function useModifyProps(_ref) {
   }, []);
   var saveOldParams = function saveOldParams() {
     saveOldParamsObj.old = dialogForm.outputValues();
-    console.log(saveOldParamsObj.old, "saveOldParamsObj.old");
   };
   React.useEffect(function () {
     setModalVisible(visible);
@@ -82,7 +81,6 @@ var useModifyProps = function useModifyProps(_ref) {
         setModalTitle(changeTitle);
       }
       var relChangeInitVal = autoClear ? changeInitialValues : _objectSpread(_objectSpread({}, saveOldParamsObj.old), changeInitialValues);
-      console.log(relChangeInitVal, "relChangeInitVal");
       setInitValue(relChangeInitVal);
       setModalVisible(true);
     };

package/lib/Form/hooks/useHForm.js

@@ -204,6 +204,9 @@ var useHForm = (function () {
         form.resetFields();
         isLoading = false;
       },
+      resetFormStatus: function resetFormStatus() {
+        isLoading = false;
+      },
       inited: false
     });
   }, []);

package/lib/Form/modal.d.ts

@@ -151,6 +151,7 @@ export interface HFormInstance extends FormInstance {
     resetFieldsInitValue: (values?: Record<string, any>) => void;
     clearFormat: (name: string) => void;
     inited: boolean;
+    resetFormStatus: VoidFunction;
 }
 export interface ConnectConfigModal {
     format?: Record<string, addFormatItemModal>;

package/lib/TDPicker/RangePicker.js

@@ -71,7 +71,6 @@ var HRangePicker = function HRangePicker(_ref) {
           }
         });
         var hasKeys = Object.keys(resultObj).length !== 0;
-        console.log(initValue, dateMapKeys, valueName, resultObj, "resultObjresultObjresultObj");
         return _defineProperty({}, valueName, hasKeys ? resultObj : null);
       },
       outputValue: function outputValue(item, _outputValue) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hw-component/form",
-  "version": "1.9.83",
+  "version": "1.9.85",
   "description": "基于antd二次开发",
   "repository": {
     "type": "git",

package/src/components/DialogForm/DrawerForm/index.tsx

@@ -102,6 +102,13 @@ const Index: React.FC<DialogFormProps> = ({
       labelWidth={labelWidth}
     />
   );
+  const selfAfterClose=()=>{
+    if (autoClear){
+      dialogForm?.clear();
+      return;
+    }
+    dialogForm?.resetFormStatus();
+  }
   return (
     <Drawer
       visible={modalVisible}
@@ -112,9 +119,7 @@ const Index: React.FC<DialogFormProps> = ({
         if (changeVisible){
           return;
         }
-        if (autoClear){
-          dialogForm?.clear();
-        }
+        selfAfterClose();
         afterClose?.();
       }}
       closable={false}

package/src/components/DialogForm/ModalForm.tsx

@@ -43,6 +43,7 @@ const Index: React.FC<DialogFormProps> = ({
     initValue,
     formParams,
     title: modalTitle,
+    saveOldParams,
   } = useModifyProps({
     configData,
     visible,
@@ -51,8 +52,10 @@ const Index: React.FC<DialogFormProps> = ({
     params,
     title,
     onCancel,
+    autoClear
   });
   const cancel = () => {
+    saveOldParams();
     if (onCancel) {
       return onCancel?.();
     }
@@ -93,6 +96,13 @@ const Index: React.FC<DialogFormProps> = ({
     params: formParams,
     onOk:footerOnOk
   });
+  const selfAfterClose=()=>{
+    if (autoClear){
+      dialogForm?.clear();
+      return;
+    }
+    dialogForm?.resetFormStatus();
+  }
   return (
     <Modal
       title={modalTitle}
@@ -100,9 +110,7 @@ const Index: React.FC<DialogFormProps> = ({
       onCancel={cancel}
       confirmLoading={loading}
       afterClose={() => {
-        if (autoClear) {
-          currentForm.clear();
-        }
+        selfAfterClose();
         afterClose?.();
       }}
       {...props}

package/src/components/DialogForm/hooks.tsx

@@ -30,7 +30,6 @@ export const useModifyProps = ({
   }, []);
   const saveOldParams = () => {
     saveOldParamsObj.old = dialogForm.outputValues();
-    console.log(saveOldParamsObj.old,"saveOldParamsObj.old")
   };
   useEffect(() => {
     setModalVisible(visible);
@@ -66,7 +65,6 @@ export const useModifyProps = ({
       const relChangeInitVal = autoClear
         ? changeInitialValues
         : { ...saveOldParamsObj.old, ...changeInitialValues };
-      console.log(relChangeInitVal,"relChangeInitVal")
       setInitValue(relChangeInitVal);
       setModalVisible(true);
     };

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

@@ -190,6 +190,9 @@ export default () => {
         form.resetFields();
         isLoading = false;
       },
+      resetFormStatus:()=>{
+        isLoading = false;
+      },
       inited:false
     };
   }, []);

package/src/components/Form/modal.ts

@@ -210,6 +210,7 @@ export interface HFormInstance extends FormInstance {
   resetFieldsInitValue: (values?: Record<string, any>) => void;
   clearFormat: (name: string) => void;
   inited:boolean;
+  resetFormStatus:VoidFunction
 }
 
 export interface ConnectConfigModal {

package/src/components/TDPicker/RangePicker.tsx

@@ -61,7 +61,6 @@ const HRangePicker: React.FC<HRangePickerProps> = ({
           }
         });
         const hasKeys = Object.keys(resultObj).length !== 0;
-        console.log(initValue,dateMapKeys,valueName,resultObj,"resultObjresultObjresultObj")
         return {
           [valueName as string]: hasKeys ? resultObj : null,
         };