@hw-component/form 0.0.6-beta-v6 → 0.0.6-beta-v8

package/es/DialogForm/DrawerForm/index.js

@@ -32,8 +32,7 @@ var DrawerForm = (function (_ref) {
     var dialogForm = _ref.dialogForm,
     _ref$closable = _ref.closable,
     closable = _ref$closable === void 0 ? true : _ref$closable,
-    _ref$initialValues = _ref.initialValues,
-    initialValues = _ref$initialValues === void 0 ? {} : _ref$initialValues,
+    initialValues = _ref.initialValues,
     labelWidth = _ref.labelWidth,
     onOk = _ref.onOk,
     onFinish = _ref.onFinish;
@@ -50,14 +49,16 @@ var DrawerForm = (function (_ref) {
       visible: visible,
       initialValues: initialValues,
       dialogForm: currentForm,
-      params: params
+      params: params,
+      title: title
     }),
     modalVisible = _useModifyProps.modalVisible,
     modalFormData = _useModifyProps.modalFormData,
     setModalVisible = _useModifyProps.setModalVisible,
     initValue = _useModifyProps.initValue,
     onAfterClose = _useModifyProps.onAfterClose,
-    formParams = _useModifyProps.formParams;
+    formParams = _useModifyProps.formParams,
+    modalTitle = _useModifyProps.title;
   var cancel = function cancel() {
     onAfterClose();
     if (onCancel) {
@@ -84,7 +85,7 @@ var DrawerForm = (function (_ref) {
   return jsx(Drawer, _objectSpread(_objectSpread({
     visible: modalVisible,
     title: jsx(Title, {
-      title: title,
+      title: modalTitle,
       closable: closable,
       onCancel: cancel
     })

package/es/DialogForm/ModalForm.js

@@ -28,8 +28,7 @@ var ModalForm = (function (_ref) {
     request = _ref.request,
     _afterClose = _ref.afterClose,
     dialogForm = _ref.dialogForm,
-    _ref$initialValues = _ref.initialValues,
-    initialValues = _ref$initialValues === void 0 ? {} : _ref$initialValues,
+    initialValues = _ref.initialValues,
     onFinish = _ref.onFinish,
     params = _ref.params,
     onOk = _ref.onOk,
@@ -69,7 +68,7 @@ var ModalForm = (function (_ref) {
     onCancel: cancel,
     confirmLoading: loading,
     afterClose: function afterClose() {
-      currentForm.resetFields();
+      currentForm.clear();
       _afterClose === null || _afterClose === void 0 || _afterClose();
     }
   }, props), {}, {

package/es/DialogForm/hooks.js

@@ -46,7 +46,7 @@ var useModifyProps = function useModifyProps(_ref) {
     setModalTitle = _useState10[1];
   var onAfterClose = function onAfterClose() {
     setTimeout(function () {
-      dialogForm.resetFields();
+      dialogForm.clear();
       afterClose === null || afterClose === void 0 || afterClose();
     }, 100);
   };
@@ -62,6 +62,9 @@ var useModifyProps = function useModifyProps(_ref) {
   useEffect(function () {
     setModalTitle(title);
   }, [title]);
+  useEffect(function () {
+    setInitValue(initialValues);
+  }, [initialValues]);
   useEffect(function () {
     dialogForm.show = function () {
       var showParams = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};

package/es/Form/hooks/useHForm.js

@@ -185,7 +185,7 @@ var useHForm = (function () {
           });
         });
       },
-      resetFields: function resetFields() {
+      clear: function clear() {
         form.resetFields();
         isLoading = false;
       }

package/es/Form/modal.d.ts

@@ -99,6 +99,7 @@ export interface HFormInstance extends FormInstance {
     addDispatchListener: AddDispatchListenerFn;
     removeDispatchListener: (action?: ActionModal, fn?: argsFn) => void;
     reload: PromiseFnResult;
+    clear: VoidFunction;
 }
 export interface ConnectConfigModal {
     format?: Record<string, addFormatItemModal>;

package/lib/DialogForm/DrawerForm/index.js

@@ -35,8 +35,7 @@ var DrawerForm = (function (_ref) {
     var dialogForm = _ref.dialogForm,
     _ref$closable = _ref.closable,
     closable = _ref$closable === void 0 ? true : _ref$closable,
-    _ref$initialValues = _ref.initialValues,
-    initialValues = _ref$initialValues === void 0 ? {} : _ref$initialValues,
+    initialValues = _ref.initialValues,
     labelWidth = _ref.labelWidth,
     onOk = _ref.onOk,
     onFinish = _ref.onFinish;
@@ -53,14 +52,16 @@ var DrawerForm = (function (_ref) {
       visible: visible,
       initialValues: initialValues,
       dialogForm: currentForm,
-      params: params
+      params: params,
+      title: title
     }),
     modalVisible = _useModifyProps.modalVisible,
     modalFormData = _useModifyProps.modalFormData,
     setModalVisible = _useModifyProps.setModalVisible,
     initValue = _useModifyProps.initValue,
     onAfterClose = _useModifyProps.onAfterClose,
-    formParams = _useModifyProps.formParams;
+    formParams = _useModifyProps.formParams,
+    modalTitle = _useModifyProps.title;
   var cancel = function cancel() {
     onAfterClose();
     if (onCancel) {
@@ -87,7 +88,7 @@ var DrawerForm = (function (_ref) {
   return jsxRuntime.jsx(antd.Drawer, _objectSpread(_objectSpread({
     visible: modalVisible,
     title: jsxRuntime.jsx(Title.default, {
-      title: title,
+      title: modalTitle,
       closable: closable,
       onCancel: cancel
     })

package/lib/DialogForm/ModalForm.js

@@ -31,8 +31,7 @@ var ModalForm = (function (_ref) {
     request = _ref.request,
     _afterClose = _ref.afterClose,
     dialogForm = _ref.dialogForm,
-    _ref$initialValues = _ref.initialValues,
-    initialValues = _ref$initialValues === void 0 ? {} : _ref$initialValues,
+    initialValues = _ref.initialValues,
     onFinish = _ref.onFinish,
     params = _ref.params,
     onOk = _ref.onOk,
@@ -72,7 +71,7 @@ var ModalForm = (function (_ref) {
     onCancel: cancel,
     confirmLoading: loading,
     afterClose: function afterClose() {
-      currentForm.resetFields();
+      currentForm.clear();
       _afterClose === null || _afterClose === void 0 || _afterClose();
     }
   }, props), {}, {

package/lib/DialogForm/hooks.js

@@ -47,7 +47,7 @@ var useModifyProps = function useModifyProps(_ref) {
     setModalTitle = _useState10[1];
   var onAfterClose = function onAfterClose() {
     setTimeout(function () {
-      dialogForm.resetFields();
+      dialogForm.clear();
       afterClose === null || afterClose === void 0 || afterClose();
     }, 100);
   };
@@ -63,6 +63,9 @@ var useModifyProps = function useModifyProps(_ref) {
   React.useEffect(function () {
     setModalTitle(title);
   }, [title]);
+  React.useEffect(function () {
+    setInitValue(initialValues);
+  }, [initialValues]);
   React.useEffect(function () {
     dialogForm.show = function () {
       var showParams = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};

package/lib/Form/hooks/useHForm.js

@@ -188,7 +188,7 @@ var useHForm = (function () {
           });
         });
       },
-      resetFields: function resetFields() {
+      clear: function clear() {
         form.resetFields();
         isLoading = false;
       }

package/lib/Form/modal.d.ts

@@ -99,6 +99,7 @@ export interface HFormInstance extends FormInstance {
     addDispatchListener: AddDispatchListenerFn;
     removeDispatchListener: (action?: ActionModal, fn?: argsFn) => void;
     reload: PromiseFnResult;
+    clear: VoidFunction;
 }
 export interface ConnectConfigModal {
     format?: Record<string, addFormatItemModal>;

package/package.json

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

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

@@ -15,7 +15,7 @@ export default ({
   afterClose,
   dialogForm,
   closable = true,
-  initialValues = {},
+  initialValues,
   labelWidth,
   onOk,
   onFinish,
@@ -35,12 +35,14 @@ export default ({
     initValue,
     onAfterClose,
     formParams,
+    title:modalTitle
   } = useModifyProps({
     configData,
     visible,
     initialValues,
     dialogForm: currentForm,
     params,
+    title
   });
   const cancel = () => {
     onAfterClose();
@@ -67,7 +69,7 @@ export default ({
   return (
     <Drawer
       visible={modalVisible}
-      title={<Title title={title} closable={closable} onCancel={cancel} />}
+      title={<Title title={modalTitle} closable={closable} onCancel={cancel} />}
       {...props}
       onClose={cancel}
       closable={false}

package/src/components/DialogForm/ModalForm.tsx

@@ -12,7 +12,7 @@ export default ({
   request,
   afterClose,
   dialogForm,
-  initialValues = {},
+  initialValues,
   onFinish,
   params,
   onOk,
@@ -50,7 +50,7 @@ export default ({
       onCancel={cancel}
       confirmLoading={loading}
       afterClose={() => {
-        currentForm.resetFields();
+        currentForm.clear();
         afterClose?.();
       }}
       {...props}

package/src/components/DialogForm/hooks.ts

@@ -23,7 +23,7 @@ export const useModifyProps = ({
   const [modalTitle, setModalTitle] = useState(title);
   const onAfterClose = () => {
     setTimeout(() => {
-      dialogForm.resetFields();
+      dialogForm.clear();
       afterClose?.();
     }, 100);
   };
@@ -41,6 +41,9 @@ export const useModifyProps = ({
   useEffect(() => {
     setModalTitle(title);
   }, [title]);
+  useEffect(() => {
+    setInitValue(initialValues);
+  }, [initialValues]);
   useEffect(() => {
     dialogForm.show = (showParams = {}) => {
       const {

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

@@ -159,7 +159,7 @@ export default () => {
           });
         });
       },
-      resetFields: () => {
+      clear: () => {
         form.resetFields();
         isLoading = false;
       },

package/src/components/Form/modal.ts

@@ -147,6 +147,7 @@ export interface HFormInstance extends FormInstance {
   addDispatchListener: AddDispatchListenerFn;
   removeDispatchListener: (action?: ActionModal, fn?: argsFn) => void;
   reload: PromiseFnResult;
+  clear:VoidFunction;
 }
 
 export interface ConnectConfigModal {

package/src/pages/ModalForm/index.tsx

@@ -1,5 +1,7 @@
 import { Button } from "antd";
 import { HModalForm, useHDialogForm ,HFormConfigProvider} from "../../components";
+import {useState} from "react";
+import {ShowParamsModal} from "@/components/DialogForm/modal";
 const data = [
   {
     label: "输入框",
@@ -118,6 +120,8 @@ const data = [
 let num = 0;
 export default () => {
   const modalForm = useHDialogForm();
+  const [testModal,setTestModal]=useState<ShowParamsModal>({});
+  const {visible,params}=testModal;
   return (
     <>
       <Button