@hw-component/form 0.0.6-beta-v7 → 0.0.6-beta-v9

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,17 @@ var DrawerForm = (function (_ref) {
       visible: visible,
       initialValues: initialValues,
       dialogForm: currentForm,
-      params: params
+      params: params,
+      title: title,
+      onCancel: onCancel
     }),
     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 +86,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,
@@ -43,7 +42,8 @@ var ModalForm = (function (_ref) {
       initialValues: initialValues,
       dialogForm: currentForm,
       params: params,
-      title: title
+      title: title,
+      onCancel: onCancel
     }),
     modalVisible = _useModifyProps.modalVisible,
     modalFormData = _useModifyProps.modalFormData,

package/es/DialogForm/hooks.d.ts

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

package/es/DialogForm/hooks.js

@@ -23,7 +23,8 @@ var useModifyProps = function useModifyProps(_ref) {
     dialogForm = _ref.dialogForm,
     afterClose = _ref.afterClose,
     params = _ref.params,
-    title = _ref.title;
+    title = _ref.title,
+    onCancel = _ref.onCancel;
   var _useState = useState(visible),
     _useState2 = _slicedToArray(_useState, 2),
     modalVisible = _useState2[0],
@@ -45,6 +46,7 @@ var useModifyProps = function useModifyProps(_ref) {
     modalTitle = _useState10[0],
     setModalTitle = _useState10[1];
   var onAfterClose = function onAfterClose() {
+    onCancel === null || onCancel === void 0 || onCancel();
     setTimeout(function () {
       dialogForm.clear();
       afterClose === null || afterClose === void 0 || afterClose();
@@ -62,6 +64,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/DialogForm/modal.d.ts

@@ -10,6 +10,7 @@ export interface ModifyPropsModal<P = any> {
     afterClose?: VoidFunction;
     params?: P;
     title?: DialogFormProps["title"];
+    onCancel?: VoidFunction;
 }
 export interface ShowParamsModal<P = any, T = any> {
     configData?: HItemProps[];

package/es/Form/hooks/index.d.ts

@@ -9,7 +9,7 @@ export declare const useCurrentForm: (form?: HFormInstance) => HFormInstance;
 type ParamsModal = Omit<HFormProps, "configData">;
 export declare const useInfoReq: ({ initialValues, infoRequest, form, params, request, onFinish, }: ParamsModal) => {
     subControl: import("@ahooksjs/use-request/lib/types").BaseResult<void, [value: any]>;
-    infoControl: import("@ahooksjs/use-request/lib/types").BaseResult<import("rc-field-form/lib/interface").Store, [reqParams?: any]>;
+    infoControl: import("@ahooksjs/use-request/lib/types").BaseResult<any, [reqParams?: any]>;
 };
 export declare const useDefaultComponents: () => any;
 export declare const useValuesChange: ({ onValuesChange, dispatch, form, }: UseValuesChangeModal) => (changedValues: any, values: any) => void;

package/es/Form/hooks/index.js

@@ -63,33 +63,29 @@ var useInfoReq = function useInfoReq(_ref) {
   });
   var infoControl = useRequest( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
     var reqParams,
+      result,
       setValue,
       _args2 = arguments;
     return _regeneratorRuntime.wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
           reqParams = _args2.length > 0 && _args2[0] !== undefined ? _args2[0] : reqData.params;
-          setValue = initialValues;
           reqData.params = reqParams;
-          if (!(!initialValues && !infoRequest)) {
-            _context2.next = 6;
-            break;
-          }
-          form === null || form === void 0 || form.setFieldsValue({});
-          return _context2.abrupt("return", {});
-        case 6:
           if (!infoRequest) {
-            _context2.next = 10;
+            _context2.next = 8;
             break;
           }
-          _context2.next = 9;
+          _context2.next = 5;
           return infoRequest(reqParams);
-        case 9:
-          setValue = _context2.sent;
-        case 10:
+        case 5:
+          result = _context2.sent;
+          form === null || form === void 0 || form.setFieldsValue(result);
+          return _context2.abrupt("return", result || {});
+        case 8:
+          setValue = initialValues || {};
           form === null || form === void 0 || form.setFieldsValue(setValue);
-          return _context2.abrupt("return", setValue || {});
-        case 12:
+          return _context2.abrupt("return", setValue);
+        case 11:
         case "end":
           return _context2.stop();
       }

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,17 @@ var DrawerForm = (function (_ref) {
       visible: visible,
       initialValues: initialValues,
       dialogForm: currentForm,
-      params: params
+      params: params,
+      title: title,
+      onCancel: onCancel
     }),
     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 +89,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,
@@ -46,7 +45,8 @@ var ModalForm = (function (_ref) {
       initialValues: initialValues,
       dialogForm: currentForm,
       params: params,
-      title: title
+      title: title,
+      onCancel: onCancel
     }),
     modalVisible = _useModifyProps.modalVisible,
     modalFormData = _useModifyProps.modalFormData,

package/lib/DialogForm/hooks.d.ts

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

package/lib/DialogForm/hooks.js

@@ -24,7 +24,8 @@ var useModifyProps = function useModifyProps(_ref) {
     dialogForm = _ref.dialogForm,
     afterClose = _ref.afterClose,
     params = _ref.params,
-    title = _ref.title;
+    title = _ref.title,
+    onCancel = _ref.onCancel;
   var _useState = React.useState(visible),
     _useState2 = _slicedToArray(_useState, 2),
     modalVisible = _useState2[0],
@@ -46,6 +47,7 @@ var useModifyProps = function useModifyProps(_ref) {
     modalTitle = _useState10[0],
     setModalTitle = _useState10[1];
   var onAfterClose = function onAfterClose() {
+    onCancel === null || onCancel === void 0 || onCancel();
     setTimeout(function () {
       dialogForm.clear();
       afterClose === null || afterClose === void 0 || afterClose();
@@ -63,6 +65,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/DialogForm/modal.d.ts

@@ -10,6 +10,7 @@ export interface ModifyPropsModal<P = any> {
     afterClose?: VoidFunction;
     params?: P;
     title?: DialogFormProps["title"];
+    onCancel?: VoidFunction;
 }
 export interface ShowParamsModal<P = any, T = any> {
     configData?: HItemProps[];

package/lib/Form/hooks/index.d.ts

@@ -9,7 +9,7 @@ export declare const useCurrentForm: (form?: HFormInstance) => HFormInstance;
 type ParamsModal = Omit<HFormProps, "configData">;
 export declare const useInfoReq: ({ initialValues, infoRequest, form, params, request, onFinish, }: ParamsModal) => {
     subControl: import("@ahooksjs/use-request/lib/types").BaseResult<void, [value: any]>;
-    infoControl: import("@ahooksjs/use-request/lib/types").BaseResult<import("rc-field-form/lib/interface").Store, [reqParams?: any]>;
+    infoControl: import("@ahooksjs/use-request/lib/types").BaseResult<any, [reqParams?: any]>;
 };
 export declare const useDefaultComponents: () => any;
 export declare const useValuesChange: ({ onValuesChange, dispatch, form, }: UseValuesChangeModal) => (changedValues: any, values: any) => void;

package/lib/Form/hooks/index.js

@@ -64,33 +64,29 @@ var useInfoReq = function useInfoReq(_ref) {
   });
   var infoControl = ahooks.useRequest( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
     var reqParams,
+      result,
       setValue,
       _args2 = arguments;
     return _regeneratorRuntime.wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
           reqParams = _args2.length > 0 && _args2[0] !== undefined ? _args2[0] : reqData.params;
-          setValue = initialValues;
           reqData.params = reqParams;
-          if (!(!initialValues && !infoRequest)) {
-            _context2.next = 6;
-            break;
-          }
-          form === null || form === void 0 || form.setFieldsValue({});
-          return _context2.abrupt("return", {});
-        case 6:
           if (!infoRequest) {
-            _context2.next = 10;
+            _context2.next = 8;
             break;
           }
-          _context2.next = 9;
+          _context2.next = 5;
           return infoRequest(reqParams);
-        case 9:
-          setValue = _context2.sent;
-        case 10:
+        case 5:
+          result = _context2.sent;
+          form === null || form === void 0 || form.setFieldsValue(result);
+          return _context2.abrupt("return", result || {});
+        case 8:
+          setValue = initialValues || {};
           form === null || form === void 0 || form.setFieldsValue(setValue);
-          return _context2.abrupt("return", setValue || {});
-        case 12:
+          return _context2.abrupt("return", setValue);
+        case 11:
         case "end":
           return _context2.stop();
       }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hw-component/form",
-  "version": "0.0.6-beta-v7",
+  "version": "0.0.6-beta-v9",
   "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,15 @@ export default ({
     initValue,
     onAfterClose,
     formParams,
+    title:modalTitle
   } = useModifyProps({
     configData,
     visible,
     initialValues,
     dialogForm: currentForm,
     params,
+    title,
+    onCancel
   });
   const cancel = () => {
     onAfterClose();
@@ -67,7 +70,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,
@@ -35,6 +35,7 @@ export default ({
     dialogForm: currentForm,
     params,
     title,
+    onCancel
   });
   const cancel = () => {
     if (onCancel) {

package/src/components/DialogForm/hooks.ts

@@ -15,6 +15,7 @@ export const useModifyProps = ({
   afterClose,
   params,
   title,
+                                 onCancel
 }: ModifyPropsModal) => {
   const [modalVisible, setModalVisible] = useState(visible);
   const [modalFormData, setModalFormData] = useState(configData);
@@ -22,6 +23,7 @@ export const useModifyProps = ({
   const [formParams, setFormParams] = useState(params);
   const [modalTitle, setModalTitle] = useState(title);
   const onAfterClose = () => {
+    onCancel?.();
     setTimeout(() => {
       dialogForm.clear();
       afterClose?.();
@@ -41,6 +43,9 @@ export const useModifyProps = ({
   useEffect(() => {
     setModalTitle(title);
   }, [title]);
+  useEffect(() => {
+    setInitValue(initialValues);
+  }, [initialValues]);
   useEffect(() => {
     dialogForm.show = (showParams = {}) => {
       const {

package/src/components/DialogForm/modal.ts

@@ -12,6 +12,7 @@ export interface ModifyPropsModal<P = any> {
   afterClose?: VoidFunction;
   params?: P;
   title?: DialogFormProps["title"];
+  onCancel?: VoidFunction;
 }
 export interface ShowParamsModal<P = any, T = any> {
   configData?: HItemProps[];

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

@@ -44,17 +44,15 @@ export const useInfoReq = ({
     { manual: true }
   );
   const infoControl = useRequest(async (reqParams = reqData.params) => {
-    let setValue = initialValues;
     reqData.params = reqParams;
-    if (!initialValues && !infoRequest) {
-      form?.setFieldsValue({});
-      return {};
-    }
     if (infoRequest) {
-      setValue = await infoRequest(reqParams);
+      const result = await infoRequest(reqParams);
+      form?.setFieldsValue(result);
+      return result || {};
     }
+    const setValue = initialValues||{};
     form?.setFieldsValue(setValue);
-    return setValue || {};
+    return setValue;
   });
   const { run, mutate } = infoControl;
   useEffect(() => {

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