@hw-component/form 1.5.0 → 1.5.3

package/es/DialogForm/DrawerForm/index.js

@@ -140,7 +140,7 @@ var DrawerForm = (function (_ref) {
     destroyOnClose: true,
     footer: footerComponent(),
     children: jsx(Index, _objectSpread(_objectSpread({}, providerConfig), {}, {
-      children: contentRender ? contentRender(node, currentForm) : node
+      children: contentRender ? contentRender(node, currentForm, params) : node
     }))
   }));
 });

package/es/DialogForm/ModalForm.js

@@ -127,7 +127,7 @@ var ModalForm = (function (_ref) {
     destroyOnClose: true,
     footer: defaultFooter,
     children: jsx(Index, _objectSpread(_objectSpread({}, providerConfig), {}, {
-      children: contentRender ? contentRender === null || contentRender === void 0 ? void 0 : contentRender(node, currentForm) : node
+      children: contentRender ? contentRender === null || contentRender === void 0 ? void 0 : contentRender(node, currentForm, params) : node
     }))
   }));
 });

package/es/DialogForm/modal.d.ts

@@ -34,7 +34,7 @@ export interface DialogFormProps<P = any, T = any> extends Omit<RootProps, "onFi
     onOk?: (data: T, params: P) => boolean | void;
     infoRequest?: (params: P) => Promise<T>;
     autoClear?: boolean;
-    contentRender?: (dom: React.ReactNode, form: HDialogFormInstance) => React.ReactNode;
+    contentRender?: (dom: React.ReactNode, form: HDialogFormInstance, params: P) => React.ReactNode;
     title?: React.ReactNode;
     footer?: React.ReactNode | false | null | FooterRender;
 }

package/es/Form/index.js

@@ -82,6 +82,9 @@ var HForm = (function (_ref) {
       hForm.removeDispatchListener();
     };
   }, []);
+  var defaultOnPressEnter = function defaultOnPressEnter() {
+    hForm.submit();
+  };
   return jsx(Index, {
     loading: infoLoading,
     error: infoErr,
@@ -112,7 +115,9 @@ var HForm = (function (_ref) {
               _itemData$itemProps = itemData.itemProps,
               itemProps = _itemData$itemProps === void 0 ? {} : _itemData$itemProps,
               itemColon = itemData.colon;
-            var defaultItemProps = _objectSpread(_objectSpread({}, formItemProps), itemProps);
+            var defaultItemProps = _objectSpread(_objectSpread({
+              onPressEnter: defaultOnPressEnter
+            }, formItemProps), itemProps);
             return /*#__PURE__*/createElement(Item, _objectSpread(_objectSpread({}, itemData), {}, {
               labelAlign: labelAlign,
               key: name || index,

package/lib/DialogForm/DrawerForm/index.js

@@ -143,7 +143,7 @@ var DrawerForm = (function (_ref) {
     destroyOnClose: true,
     footer: footerComponent(),
     children: jsxRuntime.jsx(FormConfigProvider.default, _objectSpread(_objectSpread({}, providerConfig), {}, {
-      children: contentRender ? contentRender(node, currentForm) : node
+      children: contentRender ? contentRender(node, currentForm, params) : node
     }))
   }));
 });

package/lib/DialogForm/ModalForm.js

@@ -130,7 +130,7 @@ var ModalForm = (function (_ref) {
     destroyOnClose: true,
     footer: defaultFooter,
     children: jsxRuntime.jsx(FormConfigProvider.default, _objectSpread(_objectSpread({}, providerConfig), {}, {
-      children: contentRender ? contentRender === null || contentRender === void 0 ? void 0 : contentRender(node, currentForm) : node
+      children: contentRender ? contentRender === null || contentRender === void 0 ? void 0 : contentRender(node, currentForm, params) : node
     }))
   }));
 });

package/lib/DialogForm/modal.d.ts

@@ -34,7 +34,7 @@ export interface DialogFormProps<P = any, T = any> extends Omit<RootProps, "onFi
     onOk?: (data: T, params: P) => boolean | void;
     infoRequest?: (params: P) => Promise<T>;
     autoClear?: boolean;
-    contentRender?: (dom: React.ReactNode, form: HDialogFormInstance) => React.ReactNode;
+    contentRender?: (dom: React.ReactNode, form: HDialogFormInstance, params: P) => React.ReactNode;
     title?: React.ReactNode;
     footer?: React.ReactNode | false | null | FooterRender;
 }

package/lib/Form/index.js

@@ -85,6 +85,9 @@ var HForm = (function (_ref) {
       hForm.removeDispatchListener();
     };
   }, []);
+  var defaultOnPressEnter = function defaultOnPressEnter() {
+    hForm.submit();
+  };
   return jsxRuntime.jsx(index$1.default, {
     loading: infoLoading,
     error: infoErr,
@@ -115,7 +118,9 @@ var HForm = (function (_ref) {
               _itemData$itemProps = itemData.itemProps,
               itemProps = _itemData$itemProps === void 0 ? {} : _itemData$itemProps,
               itemColon = itemData.colon;
-            var defaultItemProps = _objectSpread(_objectSpread({}, formItemProps), itemProps);
+            var defaultItemProps = _objectSpread(_objectSpread({
+              onPressEnter: defaultOnPressEnter
+            }, formItemProps), itemProps);
             return /*#__PURE__*/React.createElement(index$3.default, _objectSpread(_objectSpread({}, itemData), {}, {
               labelAlign: labelAlign,
               key: name || index,

package/package.json

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

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

@@ -104,7 +104,7 @@ export default ({
       footer={footerComponent()}
     >
       <FormConfigProvider {...providerConfig}>
-        {contentRender ? contentRender(node, currentForm) : node}
+        {contentRender ? contentRender(node, currentForm,params) : node}
       </FormConfigProvider>
     </Drawer>
   );

package/src/components/DialogForm/ModalForm.tsx

@@ -98,7 +98,7 @@ export default ({
       footer={defaultFooter}
     >
       <FormConfigProvider {...providerConfig}>
-        {contentRender ? contentRender?.(node, currentForm) : node}
+        {contentRender ? contentRender?.(node, currentForm,params) : node}
       </FormConfigProvider>
     </Modal>
   );

package/src/components/DialogForm/modal.ts

@@ -47,7 +47,8 @@ export interface DialogFormProps<P = any, T = any>
   autoClear?: boolean;
   contentRender?: (
     dom: React.ReactNode,
-    form: HDialogFormInstance
+    form: HDialogFormInstance,
+    params: P
   ) => React.ReactNode;
   title?: React.ReactNode;
   footer?: React.ReactNode | false | null | FooterRender;

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

@@ -30,7 +30,7 @@ export const useDefaultRender = (
       Component = (dom as ConfigComponentModal).Component;
     }
     const node = Component && (
-      <Component {...componentProps} {...itemProps} form={form} />
+      <Component {...componentProps} {...itemProps} form={form}/>
     );
     if (render) {
       const resultNode = render(props, node, form);

package/src/components/Form/index.tsx

@@ -1,4 +1,4 @@
-import { Form, Row } from "antd";
+import {Form, Input, Row} from "antd";
 import type { HFormProps, HItemProps } from "./modal";
 import Item from "./FormItem";
 import { useCurrentForm, useInfoReq, useValuesChange } from "./hooks";
@@ -62,6 +62,9 @@ export default ({
       hForm.removeDispatchListener();
     };
   }, []);
+  const defaultOnPressEnter=()=>{
+    hForm.submit();
+  }
   return (
     <PageHandler
       loading={infoLoading}
@@ -90,6 +93,7 @@ export default ({
                 colon: itemColon,
               } = itemData;
               const defaultItemProps = {
+                onPressEnter:defaultOnPressEnter,
                 ...formItemProps,
                 ...itemProps,
               };

package/src/pages/Form/index.tsx

@@ -47,9 +47,24 @@ const formData = (options) => {
     {
       label: "测试12312",
       className: "hdjd",
-      type: "colorInput",
-      name: "test",
+      type: "select",
+      name: "test321",
+        itemProps: {
+          options:[{
+              value:"选项1",
+              key:1
+          },{
+              value:"选项2",
+              key:2
+          }],
+            showSearch:true
+        }
     },
+      {
+          label: "测试12312",
+          className: "hdjd",
+          name: "test123",
+      },
   ];
 };
 function Ttta({ form }) {
@@ -100,7 +115,7 @@ export default () => {
           form={form}
           labelAlign={"right"}
           onFinish={(value) => {
-            console.log(value, "fff");
+            console.log(value, "onFinish");
           }}
           onValuesChange={(val) => {
             console.log(val, "onValuesChange");