@hw-component/form 1.10.88 → 1.10.90

package/es/DialogForm/ModalForm.js

@@ -98,7 +98,7 @@ var Index = function Index(_ref) {
   }();
   var footerOnOk = function footerOnOk() {
     if (modalFormData) {
-      dialogForm === null || dialogForm === void 0 || dialogForm.submit();
+      currentForm === null || currentForm === void 0 || currentForm.submit();
       return;
     }
     finish({}, formParams);
@@ -114,18 +114,19 @@ var Index = function Index(_ref) {
     infoRequest: infoRequest
   }));
   var defaultFooter = useFooterRender({
-    dialogForm: dialogForm,
+    dialogForm: currentForm,
     footer: footer,
     confirmLoading: loading,
     params: formParams,
-    onOk: footerOnOk
+    onOk: footerOnOk,
+    onCancel: cancel
   });
   var selfAfterClose = function selfAfterClose() {
     if (autoClear) {
-      dialogForm === null || dialogForm === void 0 || dialogForm.clear();
+      currentForm === null || currentForm === void 0 || currentForm.clear();
       return;
     }
-    dialogForm === null || dialogForm === void 0 || dialogForm.resetFormStatus();
+    currentForm === null || currentForm === void 0 || currentForm.resetFormStatus();
   };
   return jsx(Modal, _objectSpread(_objectSpread({
     title: modalTitle,
@@ -138,7 +139,6 @@ var Index = function Index(_ref) {
       setLoading(false);
     }
   }, props), {}, {
-    onOk: currentForm.submit,
     destroyOnClose: destroyOnClose,
     footer: defaultFooter,
     children: jsx(Index$1, _objectSpread(_objectSpread({}, providerConfig), {}, {

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

@@ -2,7 +2,7 @@ import type React from "react";
 import type { HFormInstance, HFormItemProps, HItemProps } from "../modal";
 import type { LabelAlignModal } from "../modal";
 import type { HelperModal } from "../modal";
-import { Rule } from "rc-field-form/lib/interface";
+import type { Rule } from "rc-field-form/lib/interface";
 export declare const useFormItemDomControl: ({ shouldUpdate, hide, dependencies, hidden, }: HItemProps) => ({ shouldUpdate, dependencies, hide, itemSpan, hidden, ...props }: HFormItemProps) => JSX.Element;
 interface UseHideUpItemModal extends Omit<HItemProps, "name"> {
     form: HFormInstance;

package/es/Form/hooks/useHForm.js

@@ -198,6 +198,8 @@ var useHForm = (function () {
         keys.forEach(function (key) {
           newVale[key] = undefined;
         });
+        console.log(newVale);
+        console.log(_objectSpread(_objectSpread(_objectSpread({}, newVale), initSaveValue), values));
         form.setFieldsValue(_objectSpread(_objectSpread(_objectSpread({}, newVale), initSaveValue), values));
       },
       resetFieldsValues: function resetFieldsValues() {

package/lib/DialogForm/ModalForm.js

@@ -101,7 +101,7 @@ var Index = function Index(_ref) {
   }();
   var footerOnOk = function footerOnOk() {
     if (modalFormData) {
-      dialogForm === null || dialogForm === void 0 || dialogForm.submit();
+      currentForm === null || currentForm === void 0 || currentForm.submit();
       return;
     }
     finish({}, formParams);
@@ -117,18 +117,19 @@ var Index = function Index(_ref) {
     infoRequest: infoRequest
   }));
   var defaultFooter = hooks.useFooterRender({
-    dialogForm: dialogForm,
+    dialogForm: currentForm,
     footer: footer,
     confirmLoading: loading,
     params: formParams,
-    onOk: footerOnOk
+    onOk: footerOnOk,
+    onCancel: cancel
   });
   var selfAfterClose = function selfAfterClose() {
     if (autoClear) {
-      dialogForm === null || dialogForm === void 0 || dialogForm.clear();
+      currentForm === null || currentForm === void 0 || currentForm.clear();
       return;
     }
-    dialogForm === null || dialogForm === void 0 || dialogForm.resetFormStatus();
+    currentForm === null || currentForm === void 0 || currentForm.resetFormStatus();
   };
   return jsxRuntime.jsx(antd.Modal, _objectSpread(_objectSpread({
     title: modalTitle,
@@ -141,7 +142,6 @@ var Index = function Index(_ref) {
       setLoading(false);
     }
   }, props), {}, {
-    onOk: currentForm.submit,
     destroyOnClose: destroyOnClose,
     footer: defaultFooter,
     children: jsxRuntime.jsx(FormConfigProvider.default, _objectSpread(_objectSpread({}, providerConfig), {}, {

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

@@ -2,7 +2,7 @@ import type React from "react";
 import type { HFormInstance, HFormItemProps, HItemProps } from "../modal";
 import type { LabelAlignModal } from "../modal";
 import type { HelperModal } from "../modal";
-import { Rule } from "rc-field-form/lib/interface";
+import type { Rule } from "rc-field-form/lib/interface";
 export declare const useFormItemDomControl: ({ shouldUpdate, hide, dependencies, hidden, }: HItemProps) => ({ shouldUpdate, dependencies, hide, itemSpan, hidden, ...props }: HFormItemProps) => JSX.Element;
 interface UseHideUpItemModal extends Omit<HItemProps, "name"> {
     form: HFormInstance;

package/lib/Form/hooks/useHForm.js

@@ -201,6 +201,8 @@ var useHForm = (function () {
         keys.forEach(function (key) {
           newVale[key] = undefined;
         });
+        console.log(newVale);
+        console.log(_objectSpread(_objectSpread(_objectSpread({}, newVale), initSaveValue), values));
         form.setFieldsValue(_objectSpread(_objectSpread(_objectSpread({}, newVale), initSaveValue), values));
       },
       resetFieldsValues: function resetFieldsValues() {

package/package.json

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

package/src/components/DialogForm/ModalForm.tsx

@@ -9,7 +9,7 @@ import {
   useFooterRender,
   useModifyProps,
   useSub,
-} from "@/components/DialogForm/hooks";
+} from "./hooks";
 import ChildComponent from "./ChildComponent";
 import React from "react";
 
@@ -72,7 +72,7 @@ const Index: React.FC<DialogFormProps> = ({
   };
   const footerOnOk = () => {
     if (modalFormData) {
-      dialogForm?.submit();
+      currentForm?.submit();
       return;
     }
     finish({}, formParams);
@@ -90,18 +90,19 @@ const Index: React.FC<DialogFormProps> = ({
     />
   );
   const defaultFooter = useFooterRender({
-    dialogForm,
+    dialogForm:currentForm,
     footer,
     confirmLoading: loading,
     params: formParams,
     onOk: footerOnOk,
+    onCancel: cancel,
   });
   const selfAfterClose = () => {
     if (autoClear) {
-      dialogForm?.clear();
+      currentForm?.clear();
       return;
     }
-    dialogForm?.resetFormStatus();
+    currentForm?.resetFormStatus();
   };
   return (
     <Modal
@@ -115,7 +116,6 @@ const Index: React.FC<DialogFormProps> = ({
         setLoading(false);
       }}
       {...props}
-      onOk={currentForm.submit}
       destroyOnClose={destroyOnClose}
       footer={defaultFooter}
     >

package/src/components/Form/FormItem/hooks.tsx

@@ -6,7 +6,7 @@ import type { HFormInstance, HFormItemProps, HItemProps } from "../modal";
 import type { LabelAlignModal } from "../modal";
 import { useClassName } from "../../hooks";
 import type { HelperModal } from "../modal";
-import { Rule } from "rc-field-form/lib/interface";
+import type { Rule } from "rc-field-form/lib/interface";
 
 export const useFormItemDomControl = ({
   shouldUpdate,

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

@@ -183,6 +183,12 @@ export default () => {
         keys.forEach((key) => {
           newVale[key] = undefined;
         });
+        console.log(newVale);
+        console.log({
+          ...newVale,
+          ...initSaveValue,
+          ...values,
+        })
         form.setFieldsValue({
           ...newVale,
           ...initSaveValue,

package/src/pages/DrawerForm/index.tsx

@@ -2,7 +2,7 @@ import { Button } from "antd";
 import { HDrawerForm, useHDialogForm } from "../../components";
 import { MediaTypeEnum } from "../../components/Upload/enums";
 import FormItem from "../../components/Form/FormItem";
-import { useEffect } from "react";
+import {useEffect, useState} from "react";
 const Test = () => {
   return <FormItem name="input" label="你好" />;
 };
@@ -42,37 +42,19 @@ const Test1 = ({ formNode, dialogForm, params }) => {
 };
 export default () => {
   const modalForm = useHDialogForm();
+    const [visible,setVisible]=useState(false);
   return (
     <>
       <Button
         onClick={() => {
-          num++;
-          modalForm.show({
-            initialValues: {
-              checkboxGroup: 1,
-              urlUpload: [
-                {
-                  name: "https://yzimage.52youzai.net/eeff9ae7fded45b7bdca95c6fc72ba3c.mp4",
-                  response: {
-                    url: "https://yzimage.52youzai.net/eeff9ae7fded45b7bdca95c6fc72ba3c.mp4",
-                  },
-                  status: "done",
-                  uid: `init-${num}`,
-                },
-              ],
-            },
-          });
+            setVisible(true);
         }}
       >
         显示
       </Button>
       <Button
         onClick={() => {
-          modalForm.show({
-            initialValues: {
-              input: "12312",
-            },
-          });
+            setVisible(true);
         }}
       >
         打开
@@ -81,8 +63,11 @@ export default () => {
         configData={data}
         labelWidth={88}
         labelAlign={"left"}
-        dialogForm={modalForm}
+        visible={visible}
         autoClear={false}
+        onCancel={()=>{
+            setVisible(false);
+        }}
         request={(values) => {
           return Promise.resolve();
         }}

package/src/pages/Form/index.tsx

@@ -1,10 +1,10 @@
 import {
-  HForm,
-  HFormConfigProvider,
-  useHForm,
-  HSelect,
-  HBasicForm,
-  HRangePicker,
+    HForm,
+    HFormConfigProvider,
+    useHForm,
+    HSelect,
+    HBasicForm,
+    HRangePicker, HSelectInput,
 } from "../../components";
 import { useEffect, useState } from "react";
 import { Button, Col, Form, Input, Row, Space } from "antd";
@@ -74,7 +74,6 @@ const Basic = () => {
 
 const TestItem = ({ value, onChange }) => {
   const { select, time } = value || {};
-  console.log(value);
   return (
     <HRangePicker
       addonBeforeStyle={{
@@ -116,6 +115,31 @@ const TestItem = ({ value, onChange }) => {
   );
 };
 
+
+const TestItem1 = ({ value, onChange }) => {
+    const { select, input="" } = value || {};
+    console.log(value,"vvvvvv")
+    return (
+        <HSelectInput
+            value={{
+                select,
+                input
+            }}
+            onChange={(val)=>{
+                onChange({
+                    ...val
+                })
+            }}
+          selectProps={{
+              options: [{
+                  value: "test2",
+                  key:"1"
+              }]
+          }}
+        />
+    );
+};
+
 export default () => {
   const form = useHForm();
   const [id, setId] = useState(1);
@@ -197,6 +221,13 @@ export default () => {
                   return <TestItem />;
                 },
               },
+                {
+                    name: "selectInput",
+                    label: "selectInput",
+                    render: () => {
+                        return <TestItem1 />;
+                    },
+                },
             ]}
             dismissOnPressEnter={false}
             form={form}
@@ -209,6 +240,10 @@ export default () => {
                   StartTime: null,
                 },
               },
+             selectInput: {
+                  select: "1",
+                 input:""
+             }
             }}
             labelAlign={"top"}
             onValuesChange={(val) => {

package/src/pages/ModalForm/index.tsx

@@ -1,9 +1,10 @@
-import { Button } from "antd";
+import {Button} from "antd";
 import {
   HModalForm,
   useHDialogForm,
   HFormConfigProvider,
 } from "../../components";
+import {useState} from "react";
 
 const data = [
   { label: "name", name: "name", hover: "1312" },
@@ -23,6 +24,7 @@ const data = [
   },
 ];
 
+
 const time = async () => {
   return new Promise((resolve, reject) => {
     return setTimeout(() => {
@@ -30,15 +32,16 @@ const time = async () => {
     }, 3000);
   });
 };
+
 export default () => {
   const modalForm = useHDialogForm();
+  const [visible,setVisible]=useState(false);
+  const [loading,setLoading]=useState(false)
   return (
     <>
       <Button
         onClick={() => {
-          modalForm.show({
-            params: { id: "231231" },
-          });
+            setVisible(true);
         }}
       >
         打开
@@ -46,6 +49,7 @@ export default () => {
       <Button
         onClick={() => {
           modalForm.show({
+              title:"好的",
             initialValues: {
               name: "name",
             },
@@ -65,11 +69,14 @@ export default () => {
       >
         <HModalForm
           configData={data}
+          visible={visible}
+          onCancel={()=>{
+              setVisible(false);
+          }}
           formItemStyle={{
             marginBottom: 100,
           }}
           labelAlign={"left"}
-          dialogForm={modalForm}
           request={async () => {
             console.log("fff");
             await time();