@hw-component/form 1.10.88 → 1.10.89

package/es/DialogForm/ModalForm.js

@@ -118,7 +118,8 @@ var Index = function Index(_ref) {
     footer: footer,
     confirmLoading: loading,
     params: formParams,
-    onOk: footerOnOk
+    onOk: footerOnOk,
+    onCancel: cancel
   });
   var selfAfterClose = function selfAfterClose() {
     if (autoClear) {

package/lib/DialogForm/ModalForm.js

@@ -121,7 +121,8 @@ var Index = function Index(_ref) {
     footer: footer,
     confirmLoading: loading,
     params: formParams,
-    onOk: footerOnOk
+    onOk: footerOnOk,
+    onCancel: cancel
   });
   var selfAfterClose = function selfAfterClose() {
     if (autoClear) {

package/package.json

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

package/src/components/DialogForm/ModalForm.tsx

@@ -95,6 +95,7 @@ const Index: React.FC<DialogFormProps> = ({
     confirmLoading: loading,
     params: formParams,
     onOk: footerOnOk,
+    onCancel: cancel,
   });
   const selfAfterClose = () => {
     if (autoClear) {

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/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" },
@@ -32,13 +33,13 @@ const time = async () => {
 };
 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 +47,7 @@ export default () => {
       <Button
         onClick={() => {
           modalForm.show({
+              title:"好的",
             initialValues: {
               name: "name",
             },
@@ -65,11 +67,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();