@hw-component/form 1.10.90 → 1.10.91

package/es/DialogForm/ModalForm.js

@@ -55,6 +55,10 @@ var Index = function Index(_ref) {
     modalTitle = _useModifyProps.title,
     saveOldParams = _useModifyProps.saveOldParams;
   var cancel = function cancel() {
+    if (dialogForm) {
+      dialogForm.hide();
+      return;
+    }
     saveOldParams();
     if (onCancel) {
       return onCancel === null || onCancel === void 0 ? void 0 : onCancel();

package/es/DialogForm/hooks.js

@@ -196,7 +196,7 @@ var useFooterRender = function useFooterRender(_ref4) {
     dialogForm = _ref4.dialogForm,
     params = _ref4.params,
     onOk = _ref4.onOk,
-    _onCancel = _ref4.onCancel;
+    onCancel = _ref4.onCancel;
   if (footer === null) {
     return null;
   }
@@ -204,13 +204,7 @@ var useFooterRender = function useFooterRender(_ref4) {
     return footer(dialogForm, confirmLoading, params);
   }
   return footer || jsx(Footer, {
-    onCancel: function onCancel() {
-      if (dialogForm) {
-        dialogForm.hide();
-        return;
-      }
-      _onCancel === null || _onCancel === void 0 || _onCancel();
-    },
+    onCancel: onCancel,
     onOk: onOk,
     confirmLoading: confirmLoading
   });

package/lib/DialogForm/ModalForm.js

@@ -58,6 +58,10 @@ var Index = function Index(_ref) {
     modalTitle = _useModifyProps.title,
     saveOldParams = _useModifyProps.saveOldParams;
   var cancel = function cancel() {
+    if (dialogForm) {
+      dialogForm.hide();
+      return;
+    }
     saveOldParams();
     if (onCancel) {
       return onCancel === null || onCancel === void 0 ? void 0 : onCancel();

package/lib/DialogForm/hooks.js

@@ -197,7 +197,7 @@ var useFooterRender = function useFooterRender(_ref4) {
     dialogForm = _ref4.dialogForm,
     params = _ref4.params,
     onOk = _ref4.onOk,
-    _onCancel = _ref4.onCancel;
+    onCancel = _ref4.onCancel;
   if (footer === null) {
     return null;
   }
@@ -205,13 +205,7 @@ var useFooterRender = function useFooterRender(_ref4) {
     return footer(dialogForm, confirmLoading, params);
   }
   return footer || jsxRuntime.jsx(Footer.default, {
-    onCancel: function onCancel() {
-      if (dialogForm) {
-        dialogForm.hide();
-        return;
-      }
-      _onCancel === null || _onCancel === void 0 || _onCancel();
-    },
+    onCancel: onCancel,
     onOk: onOk,
     confirmLoading: confirmLoading
   });

package/package.json

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

package/src/components/DialogForm/ModalForm.tsx

@@ -55,6 +55,10 @@ const Index: React.FC<DialogFormProps> = ({
     autoClear,
   });
   const cancel = () => {
+    if (dialogForm){
+      dialogForm.hide();
+      return ;
+    }
     saveOldParams();
     if (onCancel) {
       return onCancel?.();

package/src/components/DialogForm/hooks.tsx

@@ -183,13 +183,7 @@ export const useFooterRender = ({
   return (
     footer || (
       <Footer
-        onCancel={() => {
-          if (dialogForm) {
-            dialogForm.hide();
-            return;
-          }
-          onCancel?.();
-        }}
+        onCancel={onCancel}
         onOk={onOk}
         confirmLoading={confirmLoading}
       />

package/src/pages/ModalForm/index.tsx

@@ -71,6 +71,7 @@ export default () => {
           configData={data}
           visible={visible}
           onCancel={()=>{
+              console.log("fffff")
               setVisible(false);
           }}
           formItemStyle={{