@hw-component/form 1.9.58 → 1.9.59

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. package/es/DialogForm/DrawerForm/index.js +5 -3
  2. package/es/DialogForm/hooks.d.ts +1 -1
  3. package/es/DialogForm/hooks.js +3 -7
  4. package/lib/DialogForm/DrawerForm/index.js +5 -3
  5. package/lib/DialogForm/hooks.d.ts +1 -1
  6. package/lib/DialogForm/hooks.js +3 -7
  7. package/package.json +1 -1
  8. package/src/components/DialogForm/DrawerForm/index.tsx +2 -0
  9. package/src/components/DialogForm/ModalForm.tsx +0 -2
package/es/DialogForm/DrawerForm/index.js CHANGED
@@ -56,10 +56,11 @@ var Index = function Index(_ref) {
56
56
  modalFormData = _useModifyProps.modalFormData,
57
57
  setModalVisible = _useModifyProps.setModalVisible,
58
58
  initValue = _useModifyProps.initValue,
59
- onAfterClose = _useModifyProps.onAfterClose,
60
59
  formParams = _useModifyProps.formParams,
61
- modalTitle = _useModifyProps.title;
60
+ modalTitle = _useModifyProps.title,
61
+ saveOldParams = _useModifyProps.saveOldParams;
62
62
  var cancel = function cancel() {
63
+ saveOldParams();
63
64
  if (onCancel) {
64
65
  return onCancel === null || onCancel === void 0 ? void 0 : onCancel();
65
66
  }
@@ -127,7 +128,8 @@ var Index = function Index(_ref) {
127
128
  onClose: cancel,
128
129
  afterVisibleChange: function afterVisibleChange(changeVisible) {
129
130
  if (!changeVisible) {
130
- onAfterClose();
131
+ dialogForm === null || dialogForm === void 0 || dialogForm.clear();
132
+ afterClose === null || afterClose === void 0 || afterClose();
131
133
  }
132
134
  },
133
135
  closable: false,
package/es/DialogForm/hooks.d.ts CHANGED
@@ -7,9 +7,9 @@ export declare const useModifyProps: ({ visible, configData, initialValues, dial
7
7
  setModalFormData: React.Dispatch<React.SetStateAction<import("../Form/modal").HItemProps[]>>;
8
8
  initValue: Record<string, any> | undefined;
9
9
  setInitValue: React.Dispatch<React.SetStateAction<Record<string, any> | undefined>>;
10
- onAfterClose: () => void;
11
10
  formParams: any;
12
11
  title: string | number | boolean | {} | React.ReactElement<any, string | React.JSXElementConstructor<any>> | React.ReactNodeArray | React.ReactPortal | null | undefined;
12
+ saveOldParams: () => void;
13
13
  };
14
14
  export declare const useHDialogForm: () => HDialogFormInstance<any, any>;
15
15
  export declare const useCurrentForm: (hDialogForm?: HDialogFormInstance) => HDialogFormInstance<any, any>;
package/es/DialogForm/hooks.js CHANGED
@@ -45,12 +45,8 @@ var useModifyProps = function useModifyProps(_ref) {
45
45
  old: {}
46
46
  };
47
47
  }, []);
48
- var onAfterClose = function onAfterClose() {
48
+ var saveOldParams = function saveOldParams() {
49
49
  saveOldParamsObj.old = dialogForm.outputValues();
50
- setTimeout(function () {
51
- dialogForm.clear();
52
- afterClose === null || afterClose === void 0 || afterClose();
53
- }, 100);
54
50
  };
55
51
  useEffect(function () {
56
52
  setModalVisible(visible);
@@ -98,9 +94,9 @@ var useModifyProps = function useModifyProps(_ref) {
98
94
  setModalFormData: setModalFormData,
99
95
  initValue: initValue,
100
96
  setInitValue: setInitValue,
101
- onAfterClose: onAfterClose,
102
97
  formParams: formParams,
103
- title: modalTitle
98
+ title: modalTitle,
99
+ saveOldParams: saveOldParams
104
100
  };
105
101
  };
106
102
  var useHDialogForm = function useHDialogForm() {
package/lib/DialogForm/DrawerForm/index.js CHANGED
@@ -59,10 +59,11 @@ var Index = function Index(_ref) {
59
59
  modalFormData = _useModifyProps.modalFormData,
60
60
  setModalVisible = _useModifyProps.setModalVisible,
61
61
  initValue = _useModifyProps.initValue,
62
- onAfterClose = _useModifyProps.onAfterClose,
63
62
  formParams = _useModifyProps.formParams,
64
- modalTitle = _useModifyProps.title;
63
+ modalTitle = _useModifyProps.title,
64
+ saveOldParams = _useModifyProps.saveOldParams;
65
65
  var cancel = function cancel() {
66
+ saveOldParams();
66
67
  if (onCancel) {
67
68
  return onCancel === null || onCancel === void 0 ? void 0 : onCancel();
68
69
  }
@@ -130,7 +131,8 @@ var Index = function Index(_ref) {
130
131
  onClose: cancel,
131
132
  afterVisibleChange: function afterVisibleChange(changeVisible) {
132
133
  if (!changeVisible) {
133
- onAfterClose();
134
+ dialogForm === null || dialogForm === void 0 || dialogForm.clear();
135
+ afterClose === null || afterClose === void 0 || afterClose();
134
136
  }
135
137
  },
136
138
  closable: false,
package/lib/DialogForm/hooks.d.ts CHANGED
@@ -7,9 +7,9 @@ export declare const useModifyProps: ({ visible, configData, initialValues, dial
7
7
  setModalFormData: React.Dispatch<React.SetStateAction<import("../Form/modal").HItemProps[]>>;
8
8
  initValue: Record<string, any> | undefined;
9
9
  setInitValue: React.Dispatch<React.SetStateAction<Record<string, any> | undefined>>;
10
- onAfterClose: () => void;
11
10
  formParams: any;
12
11
  title: string | number | boolean | {} | React.ReactElement<any, string | React.JSXElementConstructor<any>> | React.ReactNodeArray | React.ReactPortal | null | undefined;
12
+ saveOldParams: () => void;
13
13
  };
14
14
  export declare const useHDialogForm: () => HDialogFormInstance<any, any>;
15
15
  export declare const useCurrentForm: (hDialogForm?: HDialogFormInstance) => HDialogFormInstance<any, any>;
package/lib/DialogForm/hooks.js CHANGED
@@ -46,12 +46,8 @@ var useModifyProps = function useModifyProps(_ref) {
46
46
  old: {}
47
47
  };
48
48
  }, []);
49
- var onAfterClose = function onAfterClose() {
49
+ var saveOldParams = function saveOldParams() {
50
50
  saveOldParamsObj.old = dialogForm.outputValues();
51
- setTimeout(function () {
52
- dialogForm.clear();
53
- afterClose === null || afterClose === void 0 || afterClose();
54
- }, 100);
55
51
  };
56
52
  React.useEffect(function () {
57
53
  setModalVisible(visible);
@@ -99,9 +95,9 @@ var useModifyProps = function useModifyProps(_ref) {
99
95
  setModalFormData: setModalFormData,
100
96
  initValue: initValue,
101
97
  setInitValue: setInitValue,
102
- onAfterClose: onAfterClose,
103
98
  formParams: formParams,
104
- title: modalTitle
99
+ title: modalTitle,
100
+ saveOldParams: saveOldParams
105
101
  };
106
102
  };
107
103
  var useHDialogForm = function useHDialogForm() {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@hw-component/form",
3
- "version": "1.9.58",
3
+ "version": "1.9.59",
4
4
  "description": "基于antd二次开发",
5
5
  "repository": {
6
6
  "type": "git",
package/src/components/DialogForm/DrawerForm/index.tsx CHANGED
@@ -46,6 +46,7 @@ const Index: React.FC<DialogFormProps> = ({
46
46
  initValue,
47
47
  formParams,
48
48
  title: modalTitle,
49
+ saveOldParams
49
50
  } = useModifyProps({
50
51
  configData,
51
52
  visible,
@@ -58,6 +59,7 @@ const Index: React.FC<DialogFormProps> = ({
58
59
  afterClose,
59
60
  });
60
61
  const cancel = () => {
62
+ saveOldParams();
61
63
  if (onCancel) {
62
64
  return onCancel?.();
63
65
  }
package/src/components/DialogForm/ModalForm.tsx CHANGED
@@ -42,7 +42,6 @@ const Index: React.FC<DialogFormProps> = ({
42
42
  initValue,
43
43
  formParams,
44
44
  title: modalTitle,
45
- saveOldParams,
46
45
  } = useModifyProps({
47
46
  configData,
48
47
  visible,
@@ -53,7 +52,6 @@ const Index: React.FC<DialogFormProps> = ({
53
52
  onCancel,
54
53
  });
55
54
  const cancel = () => {
56
- saveOldParams();
57
55
  if (onCancel) {
58
56
  return onCancel?.();
59
57
  }