@hw-component/form 1.10.66 → 1.10.68

package/es/DialogForm/DrawerForm/index.js

@@ -50,7 +50,6 @@ var Index = function Index(_ref) {
       dialogForm: currentForm,
       params: params,
       title: title,
-      onCancel: onCancel,
       autoClear: autoClear,
       afterClose: afterClose
     }),
@@ -114,7 +113,8 @@ var Index = function Index(_ref) {
     footer: footer,
     confirmLoading: loading,
     params: formParams,
-    onOk: footerOnOk
+    onOk: footerOnOk,
+    onCancel: onCancel
   });
   var node = modalFormData && jsx(HForm, _objectSpread(_objectSpread({
     configData: modalFormData,

package/es/DialogForm/hooks.d.ts

@@ -1,6 +1,6 @@
 import React from "react";
 import type { DialogFormProps, HDialogFormInstance, ModifyPropsModal } from "./modal";
-export declare const useModifyProps: ({ visible, configData, initialValues, dialogForm, afterClose, params, title, autoClear, onCancel }: ModifyPropsModal) => {
+export declare const useModifyProps: ({ visible, configData, initialValues, dialogForm, afterClose, params, title, autoClear }: ModifyPropsModal) => {
     modalFormData: import("../Form/modal").HItemProps[] | undefined;
     modalVisible: boolean | undefined;
     setModalVisible: React.Dispatch<React.SetStateAction<boolean | undefined>>;
@@ -17,5 +17,5 @@ export declare const useSub: ({ request, onFinish }: Partial<DialogFormProps>) =
 interface FooterRenderParamsModal extends Omit<DialogFormProps, "configData"> {
     onOk: VoidFunction;
 }
-export declare const useFooterRender: ({ footer, confirmLoading, dialogForm, params, onOk, }: FooterRenderParamsModal) => any;
+export declare const useFooterRender: ({ footer, confirmLoading, dialogForm, params, onOk, onCancel, }: FooterRenderParamsModal) => any;
 export {};

package/es/DialogForm/hooks.js

@@ -19,8 +19,7 @@ var useModifyProps = function useModifyProps(_ref) {
     afterClose = _ref.afterClose,
     params = _ref.params,
     title = _ref.title,
-    autoClear = _ref.autoClear,
-    onCancel = _ref.onCancel;
+    autoClear = _ref.autoClear;
   var _useState = useState(visible),
     _useState2 = _slicedToArray(_useState, 2),
     modalVisible = _useState2[0],
@@ -88,10 +87,6 @@ var useModifyProps = function useModifyProps(_ref) {
       setModalVisible(true);
     };
     dialogForm.hide = function () {
-      if (onCancel) {
-        onCancel();
-        return;
-      }
       setModalVisible(false);
     };
   }, [afterClose, autoClear]);
@@ -182,7 +177,8 @@ var useFooterRender = function useFooterRender(_ref4) {
     confirmLoading = _ref4.confirmLoading,
     dialogForm = _ref4.dialogForm,
     params = _ref4.params,
-    onOk = _ref4.onOk;
+    onOk = _ref4.onOk,
+    _onCancel = _ref4.onCancel;
   if (footer === null) {
     return null;
   }
@@ -191,7 +187,11 @@ var useFooterRender = function useFooterRender(_ref4) {
   }
   return footer || jsx(Footer, {
     onCancel: function onCancel() {
-      dialogForm === null || dialogForm === void 0 || dialogForm.hide();
+      if (dialogForm) {
+        dialogForm.hide();
+        return;
+      }
+      _onCancel === null || _onCancel === void 0 || _onCancel();
     },
     onOk: onOk,
     confirmLoading: confirmLoading

package/lib/DialogForm/DrawerForm/index.js

@@ -53,7 +53,6 @@ var Index = function Index(_ref) {
       dialogForm: currentForm,
       params: params,
       title: title,
-      onCancel: onCancel,
       autoClear: autoClear,
       afterClose: afterClose
     }),
@@ -117,7 +116,8 @@ var Index = function Index(_ref) {
     footer: footer,
     confirmLoading: loading,
     params: formParams,
-    onOk: footerOnOk
+    onOk: footerOnOk,
+    onCancel: onCancel
   });
   var node = modalFormData && jsxRuntime.jsx(index.default, _objectSpread(_objectSpread({
     configData: modalFormData,

package/lib/DialogForm/hooks.d.ts

@@ -1,6 +1,6 @@
 import React from "react";
 import type { DialogFormProps, HDialogFormInstance, ModifyPropsModal } from "./modal";
-export declare const useModifyProps: ({ visible, configData, initialValues, dialogForm, afterClose, params, title, autoClear, onCancel }: ModifyPropsModal) => {
+export declare const useModifyProps: ({ visible, configData, initialValues, dialogForm, afterClose, params, title, autoClear }: ModifyPropsModal) => {
     modalFormData: import("../Form/modal").HItemProps[] | undefined;
     modalVisible: boolean | undefined;
     setModalVisible: React.Dispatch<React.SetStateAction<boolean | undefined>>;
@@ -17,5 +17,5 @@ export declare const useSub: ({ request, onFinish }: Partial<DialogFormProps>) =
 interface FooterRenderParamsModal extends Omit<DialogFormProps, "configData"> {
     onOk: VoidFunction;
 }
-export declare const useFooterRender: ({ footer, confirmLoading, dialogForm, params, onOk, }: FooterRenderParamsModal) => any;
+export declare const useFooterRender: ({ footer, confirmLoading, dialogForm, params, onOk, onCancel, }: FooterRenderParamsModal) => any;
 export {};

package/lib/DialogForm/hooks.js

@@ -20,8 +20,7 @@ var useModifyProps = function useModifyProps(_ref) {
     afterClose = _ref.afterClose,
     params = _ref.params,
     title = _ref.title,
-    autoClear = _ref.autoClear,
-    onCancel = _ref.onCancel;
+    autoClear = _ref.autoClear;
   var _useState = React.useState(visible),
     _useState2 = _slicedToArray(_useState, 2),
     modalVisible = _useState2[0],
@@ -89,10 +88,6 @@ var useModifyProps = function useModifyProps(_ref) {
       setModalVisible(true);
     };
     dialogForm.hide = function () {
-      if (onCancel) {
-        onCancel();
-        return;
-      }
       setModalVisible(false);
     };
   }, [afterClose, autoClear]);
@@ -183,7 +178,8 @@ var useFooterRender = function useFooterRender(_ref4) {
     confirmLoading = _ref4.confirmLoading,
     dialogForm = _ref4.dialogForm,
     params = _ref4.params,
-    onOk = _ref4.onOk;
+    onOk = _ref4.onOk,
+    _onCancel = _ref4.onCancel;
   if (footer === null) {
     return null;
   }
@@ -192,7 +188,11 @@ var useFooterRender = function useFooterRender(_ref4) {
   }
   return footer || jsxRuntime.jsx(Footer.default, {
     onCancel: function onCancel() {
-      dialogForm === null || dialogForm === void 0 || dialogForm.hide();
+      if (dialogForm) {
+        dialogForm.hide();
+        return;
+      }
+      _onCancel === null || _onCancel === void 0 || _onCancel();
     },
     onOk: onOk,
     confirmLoading: confirmLoading

package/package.json

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

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

@@ -55,7 +55,6 @@ const Index: React.FC<DialogFormProps> = ({
     dialogForm: currentForm,
     params,
     title,
-    onCancel,
     autoClear,
     afterClose,
   });
@@ -88,6 +87,7 @@ const Index: React.FC<DialogFormProps> = ({
     confirmLoading: loading,
     params: formParams,
     onOk: footerOnOk,
+    onCancel
   });
   const node = modalFormData && (
     <HForm

package/src/components/DialogForm/hooks.tsx

@@ -16,8 +16,7 @@ export const useModifyProps = ({
   afterClose,
   params,
   title,
-  autoClear,
-    onCancel
+  autoClear
 }: ModifyPropsModal) => {
   const [modalVisible, setModalVisible] = useState(visible);
   const [modalFormData, setModalFormData] = useState(configData);
@@ -74,10 +73,6 @@ export const useModifyProps = ({
       setModalVisible(true);
     };
     dialogForm.hide = () => {
-      if (onCancel){
-        onCancel();
-        return;
-      }
       setModalVisible(false);
     };
   }, [afterClose, autoClear]);
@@ -163,6 +158,7 @@ export const useFooterRender = ({
   dialogForm,
   params,
   onOk,
+  onCancel,
 }: FooterRenderParamsModal) => {
   if (footer === null) {
     return null;
@@ -174,7 +170,11 @@ export const useFooterRender = ({
     footer || (
       <Footer
         onCancel={() => {
-          dialogForm?.hide();
+          if (dialogForm){
+            dialogForm.hide();
+            return;
+          }
+          onCancel?.();
         }}
         onOk={onOk}
         confirmLoading={confirmLoading}