@hw-component/form 0.0.1-beta-v2 → 0.0.1-beta-v3

package/es/ModalForm/hooks.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import type { HModalFormInstance, ModifyPropsModal } from "@/components/ModalForm/modal";
-export declare const useModifyProps: ({ visible, configData, initialValues, }: ModifyPropsModal) => {
+export declare const useModifyProps: ({ visible, configData, initialValues, modalForm }: ModifyPropsModal) => {
     modalFormData: import("../Form/modal").HItemProps[];
     modalVisible: boolean | undefined;
     setModalVisible: import("react").Dispatch<import("react").SetStateAction<boolean | undefined>>;

package/es/ModalForm/hooks.js

@@ -17,7 +17,8 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 var useModifyProps = function useModifyProps(_ref) {
   var visible = _ref.visible,
     configData = _ref.configData,
-    initialValues = _ref.initialValues;
+    initialValues = _ref.initialValues,
+    modalForm = _ref.modalForm;
   var _useState = useState(visible),
     _useState2 = _slicedToArray(_useState, 2),
     modalVisible = _useState2[0],
@@ -36,6 +37,20 @@ var useModifyProps = function useModifyProps(_ref) {
   useEffect(function () {
     setModalFormData(configData);
   }, [configData]);
+  useEffect(function () {
+    modalForm.show = function (_ref2) {
+      var changeConfigData = _ref2.configData,
+        changeInitialValues = _ref2.initialValues;
+      if (!!changeConfigData) {
+        setModalFormData(changeConfigData);
+      }
+      setInitValue(changeInitialValues);
+      setModalVisible(true);
+    };
+    modalForm.hide = function () {
+      setModalVisible(false);
+    };
+  }, []);
   return {
     modalFormData: modalFormData,
     modalVisible: modalVisible,

package/es/ModalForm/index.js

@@ -1,10 +1,10 @@
 // welcome to hoo hoo hoo
-import React, { useEffect } from 'react';
+import React from 'react';
 import _extends from '@babel/runtime-corejs3/helpers/extends';
 import _objectWithoutProperties from '@babel/runtime-corejs3/helpers/objectWithoutProperties';
 import { Modal } from 'antd';
 import HForm from '../Form/index.js';
-import { useModifyProps, useCurrentForm } from './hooks.js';
+import { useCurrentForm, useModifyProps } from './hooks.js';
 
 var _excluded = ["visible", "title", "onCancel", "configData", "infoRequest", "request", "afterClose", "modalForm", "initialValues"];
 var ModalForm = (function (_ref) {
@@ -19,32 +19,17 @@ var ModalForm = (function (_ref) {
     _ref$initialValues = _ref.initialValues,
     initialValues = _ref$initialValues === void 0 ? {} : _ref$initialValues,
     props = _objectWithoutProperties(_ref, _excluded);
+  var currentForm = useCurrentForm(modalForm);
   var _useModifyProps = useModifyProps({
       configData: configData,
       visible: visible,
-      initialValues: initialValues
+      initialValues: initialValues,
+      modalForm: currentForm
     }),
     modalVisible = _useModifyProps.modalVisible,
     modalFormData = _useModifyProps.modalFormData,
     setModalVisible = _useModifyProps.setModalVisible,
-    setModalFormData = _useModifyProps.setModalFormData,
-    initValue = _useModifyProps.initValue,
-    setInitValue = _useModifyProps.setInitValue;
-  var currentForm = useCurrentForm(modalForm);
-  useEffect(function () {
-    currentForm.show = function (_ref2) {
-      var changeConfigData = _ref2.configData,
-        changeInitialValues = _ref2.initialValues;
-      if (!!changeConfigData) {
-        setModalFormData(changeConfigData);
-      }
-      setInitValue(changeInitialValues);
-      setModalVisible(true);
-    };
-    currentForm.hide = function () {
-      setModalVisible(false);
-    };
-  }, []);
+    initValue = _useModifyProps.initValue;
   var cancel = function cancel(e) {
     if (onCancel) {
       return onCancel === null || onCancel === void 0 ? void 0 : onCancel(e);
@@ -59,7 +44,9 @@ var ModalForm = (function (_ref) {
       currentForm.resetFields();
       _afterClose === null || _afterClose === void 0 ? void 0 : _afterClose();
     }
-  }, props), /*#__PURE__*/React.createElement(HForm, _extends({
+  }, props, {
+    destroyOnClose: true
+  }), /*#__PURE__*/React.createElement(HForm, _extends({
     configData: modalFormData,
     initialValues: initValue
   }, props, {

package/es/ModalForm/modal.d.ts

@@ -6,8 +6,11 @@ export interface ModifyPropsModal {
     configData: HItemProps[];
     visible?: boolean;
     initialValues?: Record<string, any>;
+    modalForm: HModalFormInstance;
 }
-export interface ShowParamsModal extends Partial<ModifyPropsModal> {
+export interface ShowParamsModal {
+    configData?: HItemProps[];
+    visible?: boolean;
     initialValues?: Record<string, any>;
 }
 export interface HModalFormInstance extends HFormInstance {

package/lib/ModalForm/hooks.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import type { HModalFormInstance, ModifyPropsModal } from "@/components/ModalForm/modal";
-export declare const useModifyProps: ({ visible, configData, initialValues, }: ModifyPropsModal) => {
+export declare const useModifyProps: ({ visible, configData, initialValues, modalForm }: ModifyPropsModal) => {
     modalFormData: import("../Form/modal").HItemProps[];
     modalVisible: boolean | undefined;
     setModalVisible: import("react").Dispatch<import("react").SetStateAction<boolean | undefined>>;

package/lib/ModalForm/hooks.js

@@ -18,7 +18,8 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 var useModifyProps = function useModifyProps(_ref) {
   var visible = _ref.visible,
     configData = _ref.configData,
-    initialValues = _ref.initialValues;
+    initialValues = _ref.initialValues,
+    modalForm = _ref.modalForm;
   var _useState = React.useState(visible),
     _useState2 = _slicedToArray(_useState, 2),
     modalVisible = _useState2[0],
@@ -37,6 +38,20 @@ var useModifyProps = function useModifyProps(_ref) {
   React.useEffect(function () {
     setModalFormData(configData);
   }, [configData]);
+  React.useEffect(function () {
+    modalForm.show = function (_ref2) {
+      var changeConfigData = _ref2.configData,
+        changeInitialValues = _ref2.initialValues;
+      if (!!changeConfigData) {
+        setModalFormData(changeConfigData);
+      }
+      setInitValue(changeInitialValues);
+      setModalVisible(true);
+    };
+    modalForm.hide = function () {
+      setModalVisible(false);
+    };
+  }, []);
   return {
     modalFormData: modalFormData,
     modalVisible: modalVisible,

package/lib/ModalForm/index.js

@@ -22,32 +22,17 @@ var ModalForm = (function (_ref) {
     _ref$initialValues = _ref.initialValues,
     initialValues = _ref$initialValues === void 0 ? {} : _ref$initialValues,
     props = _objectWithoutProperties(_ref, _excluded);
+  var currentForm = hooks.useCurrentForm(modalForm);
   var _useModifyProps = hooks.useModifyProps({
       configData: configData,
       visible: visible,
-      initialValues: initialValues
+      initialValues: initialValues,
+      modalForm: currentForm
     }),
     modalVisible = _useModifyProps.modalVisible,
     modalFormData = _useModifyProps.modalFormData,
     setModalVisible = _useModifyProps.setModalVisible,
-    setModalFormData = _useModifyProps.setModalFormData,
-    initValue = _useModifyProps.initValue,
-    setInitValue = _useModifyProps.setInitValue;
-  var currentForm = hooks.useCurrentForm(modalForm);
-  React.useEffect(function () {
-    currentForm.show = function (_ref2) {
-      var changeConfigData = _ref2.configData,
-        changeInitialValues = _ref2.initialValues;
-      if (!!changeConfigData) {
-        setModalFormData(changeConfigData);
-      }
-      setInitValue(changeInitialValues);
-      setModalVisible(true);
-    };
-    currentForm.hide = function () {
-      setModalVisible(false);
-    };
-  }, []);
+    initValue = _useModifyProps.initValue;
   var cancel = function cancel(e) {
     if (onCancel) {
       return onCancel === null || onCancel === void 0 ? void 0 : onCancel(e);
@@ -62,7 +47,9 @@ var ModalForm = (function (_ref) {
       currentForm.resetFields();
       _afterClose === null || _afterClose === void 0 ? void 0 : _afterClose();
     }
-  }, props), /*#__PURE__*/React.createElement(index.default, _extends({
+  }, props, {
+    destroyOnClose: true
+  }), /*#__PURE__*/React.createElement(index.default, _extends({
     configData: modalFormData,
     initialValues: initValue
   }, props, {

package/lib/ModalForm/modal.d.ts

@@ -6,8 +6,11 @@ export interface ModifyPropsModal {
     configData: HItemProps[];
     visible?: boolean;
     initialValues?: Record<string, any>;
+    modalForm: HModalFormInstance;
 }
-export interface ShowParamsModal extends Partial<ModifyPropsModal> {
+export interface ShowParamsModal {
+    configData?: HItemProps[];
+    visible?: boolean;
     initialValues?: Record<string, any>;
 }
 export interface HModalFormInstance extends HFormInstance {

package/package.json

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

package/src/components/ModalForm/hooks.ts

@@ -2,13 +2,14 @@ import { useEffect, useMemo, useState } from "react";
 import useHForm from "../Form/hooks/useHForm";
 import type {
   HModalFormInstance,
-  ModifyPropsModal,
+  ModifyPropsModal
 } from "@/components/ModalForm/modal";
 
 export const useModifyProps = ({
   visible,
   configData,
   initialValues,
+  modalForm
 }: ModifyPropsModal) => {
   const [modalVisible, setModalVisible] = useState(visible);
   const [modalFormData, setModalFormData] = useState(configData);
@@ -19,6 +20,21 @@ export const useModifyProps = ({
   useEffect(() => {
     setModalFormData(configData);
   }, [configData]);
+  useEffect(() => {
+    modalForm.show = ({
+                          configData: changeConfigData,
+                          initialValues: changeInitialValues,
+                        }) => {
+      if (!!changeConfigData) {
+        setModalFormData(changeConfigData);
+      }
+      setInitValue(changeInitialValues);
+      setModalVisible(true);
+    };
+    modalForm.hide = () => {
+      setModalVisible(false);
+    };
+  }, []);
   return {
     modalFormData,
     modalVisible,

package/src/components/ModalForm/index.tsx

@@ -15,31 +15,13 @@ export default ({
   initialValues = {},
   ...props
 }: ModalFormProps) => {
+  const currentForm = useCurrentForm(modalForm);
   const {
     modalVisible,
     modalFormData,
     setModalVisible,
-    setModalFormData,
     initValue,
-    setInitValue,
-  } = useModifyProps({ configData, visible, initialValues });
-
-  const currentForm = useCurrentForm(modalForm);
-  useEffect(() => {
-    currentForm.show = ({
-      configData: changeConfigData,
-      initialValues: changeInitialValues,
-    }) => {
-      if (!!changeConfigData) {
-        setModalFormData(changeConfigData);
-      }
-      setInitValue(changeInitialValues);
-      setModalVisible(true);
-    };
-    currentForm.hide = () => {
-      setModalVisible(false);
-    };
-  }, []);
+  } = useModifyProps({ configData, visible, initialValues ,modalForm:currentForm});
   const cancel = (e) => {
     if (onCancel) {
       return onCancel?.(e);
@@ -56,6 +38,7 @@ export default ({
         afterClose?.();
       }}
       {...props}
+      destroyOnClose={true}
     >
       <HForm
         configData={modalFormData}

package/src/components/ModalForm/modal.ts

@@ -8,8 +8,11 @@ export interface ModifyPropsModal {
   configData: HItemProps[];
   visible?: boolean;
   initialValues?: Record<string, any>;
+  modalForm:HModalFormInstance
 }
-export interface ShowParamsModal extends Partial<ModifyPropsModal> {
+export interface ShowParamsModal{
+  configData?: HItemProps[];
+  visible?: boolean;
   initialValues?: Record<string, any>;
 }