@hw-component/form 1.10.89 → 1.10.91

package/es/DialogForm/ModalForm.js

@@ -55,6 +55,10 @@ var Index = function Index(_ref) {
     modalTitle = _useModifyProps.title,
     saveOldParams = _useModifyProps.saveOldParams;
   var cancel = function cancel() {
+    if (dialogForm) {
+      dialogForm.hide();
+      return;
+    }
     saveOldParams();
     if (onCancel) {
       return onCancel === null || onCancel === void 0 ? void 0 : onCancel();
@@ -98,7 +102,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,7 +118,7 @@ var Index = function Index(_ref) {
     infoRequest: infoRequest
   }));
   var defaultFooter = useFooterRender({
-    dialogForm: dialogForm,
+    dialogForm: currentForm,
     footer: footer,
     confirmLoading: loading,
     params: formParams,
@@ -123,10 +127,10 @@ var Index = function Index(_ref) {
   });
   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,
@@ -139,7 +143,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/DialogForm/hooks.js

@@ -196,7 +196,7 @@ var useFooterRender = function useFooterRender(_ref4) {
     dialogForm = _ref4.dialogForm,
     params = _ref4.params,
     onOk = _ref4.onOk,
-    _onCancel = _ref4.onCancel;
+    onCancel = _ref4.onCancel;
   if (footer === null) {
     return null;
   }
@@ -204,13 +204,7 @@ var useFooterRender = function useFooterRender(_ref4) {
     return footer(dialogForm, confirmLoading, params);
   }
   return footer || jsx(Footer, {
-    onCancel: function onCancel() {
-      if (dialogForm) {
-        dialogForm.hide();
-        return;
-      }
-      _onCancel === null || _onCancel === void 0 || _onCancel();
-    },
+    onCancel: onCancel,
     onOk: onOk,
     confirmLoading: confirmLoading
   });

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

@@ -58,6 +58,10 @@ var Index = function Index(_ref) {
     modalTitle = _useModifyProps.title,
     saveOldParams = _useModifyProps.saveOldParams;
   var cancel = function cancel() {
+    if (dialogForm) {
+      dialogForm.hide();
+      return;
+    }
     saveOldParams();
     if (onCancel) {
       return onCancel === null || onCancel === void 0 ? void 0 : onCancel();
@@ -101,7 +105,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,7 +121,7 @@ var Index = function Index(_ref) {
     infoRequest: infoRequest
   }));
   var defaultFooter = hooks.useFooterRender({
-    dialogForm: dialogForm,
+    dialogForm: currentForm,
     footer: footer,
     confirmLoading: loading,
     params: formParams,
@@ -126,10 +130,10 @@ var Index = function Index(_ref) {
   });
   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,
@@ -142,7 +146,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/DialogForm/hooks.js

@@ -197,7 +197,7 @@ var useFooterRender = function useFooterRender(_ref4) {
     dialogForm = _ref4.dialogForm,
     params = _ref4.params,
     onOk = _ref4.onOk,
-    _onCancel = _ref4.onCancel;
+    onCancel = _ref4.onCancel;
   if (footer === null) {
     return null;
   }
@@ -205,13 +205,7 @@ var useFooterRender = function useFooterRender(_ref4) {
     return footer(dialogForm, confirmLoading, params);
   }
   return footer || jsxRuntime.jsx(Footer.default, {
-    onCancel: function onCancel() {
-      if (dialogForm) {
-        dialogForm.hide();
-        return;
-      }
-      _onCancel === null || _onCancel === void 0 || _onCancel();
-    },
+    onCancel: onCancel,
     onOk: onOk,
     confirmLoading: confirmLoading
   });

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.89",
+  "version": "1.10.91",
   "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";
 
@@ -55,6 +55,10 @@ const Index: React.FC<DialogFormProps> = ({
     autoClear,
   });
   const cancel = () => {
+    if (dialogForm){
+      dialogForm.hide();
+      return ;
+    }
     saveOldParams();
     if (onCancel) {
       return onCancel?.();
@@ -72,7 +76,7 @@ const Index: React.FC<DialogFormProps> = ({
   };
   const footerOnOk = () => {
     if (modalFormData) {
-      dialogForm?.submit();
+      currentForm?.submit();
       return;
     }
     finish({}, formParams);
@@ -90,7 +94,7 @@ const Index: React.FC<DialogFormProps> = ({
     />
   );
   const defaultFooter = useFooterRender({
-    dialogForm,
+    dialogForm:currentForm,
     footer,
     confirmLoading: loading,
     params: formParams,
@@ -99,10 +103,10 @@ const Index: React.FC<DialogFormProps> = ({
   });
   const selfAfterClose = () => {
     if (autoClear) {
-      dialogForm?.clear();
+      currentForm?.clear();
       return;
     }
-    dialogForm?.resetFormStatus();
+    currentForm?.resetFormStatus();
   };
   return (
     <Modal
@@ -116,7 +120,6 @@ const Index: React.FC<DialogFormProps> = ({
         setLoading(false);
       }}
       {...props}
-      onOk={currentForm.submit}
       destroyOnClose={destroyOnClose}
       footer={defaultFooter}
     >

package/src/components/DialogForm/hooks.tsx

@@ -183,13 +183,7 @@ export const useFooterRender = ({
   return (
     footer || (
       <Footer
-        onCancel={() => {
-          if (dialogForm) {
-            dialogForm.hide();
-            return;
-          }
-          onCancel?.();
-        }}
+        onCancel={onCancel}
         onOk={onOk}
         confirmLoading={confirmLoading}
       />

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/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

@@ -24,6 +24,7 @@ const data = [
   },
 ];
 
+
 const time = async () => {
   return new Promise((resolve, reject) => {
     return setTimeout(() => {
@@ -31,6 +32,7 @@ const time = async () => {
     }, 3000);
   });
 };
+
 export default () => {
   const modalForm = useHDialogForm();
   const [visible,setVisible]=useState(false);
@@ -69,6 +71,7 @@ export default () => {
           configData={data}
           visible={visible}
           onCancel={()=>{
+              console.log("fffff")
               setVisible(false);
           }}
           formItemStyle={{