@hw-component/form 1.9.21 → 1.9.23

package/es/Form/Basic.d.ts

@@ -1,3 +1,3 @@
 import type { HFormProps } from "@/components/Form/modal";
-declare const _default: ({ configData, gutter, dismissOnPressEnter, }: HFormProps) => JSX.Element;
+declare const _default: ({ configData, gutter, dismissOnPressEnter, itemSpan, labelWidth, }: HFormProps) => JSX.Element;
 export default _default;

package/es/Form/Basic.js

@@ -13,11 +13,13 @@ var Basic = (function (_ref) {
   var configData = _ref.configData,
     gutter = _ref.gutter,
     _ref$dismissOnPressEn = _ref.dismissOnPressEnter,
-    dismissOnPressEnter = _ref$dismissOnPressEn === void 0 ? true : _ref$dismissOnPressEn;
+    dismissOnPressEnter = _ref$dismissOnPressEn === void 0 ? true : _ref$dismissOnPressEn,
+    itemSpan = _ref.itemSpan,
+    labelWidth = _ref.labelWidth;
   var _useFormContext = useFormContext(),
     form = _useFormContext.form,
     formItemProps = _useFormContext.itemProps,
-    itemSpan = _useFormContext.itemSpan,
+    formItemSpan = _useFormContext.itemSpan,
     formColon = _useFormContext.colon,
     setData = _useFormContext.setData;
   var _useInitConfigData = useInitConfigData({
@@ -38,7 +40,8 @@ var Basic = (function (_ref) {
       width: "100%"
     },
     children: newConfigData.map(function (itemData, index) {
-      var itemLabelWidth = itemData.labelWidth,
+      var _itemData$labelWidth = itemData.labelWidth,
+        itemLabelWidth = _itemData$labelWidth === void 0 ? labelWidth : _itemData$labelWidth,
         hideLabel = itemData.hideLabel,
         labelAlign = itemData.labelAlign,
         name = itemData.name,
@@ -55,7 +58,7 @@ var Basic = (function (_ref) {
         style: style,
         itemProps: defaultItemProps,
         hideLabel: hideLabel,
-        itemSpan: itemSpan,
+        itemSpan: itemSpan || formItemSpan,
         labelWidth: itemLabelWidth,
         colon: typeof itemColon === "undefined" ? formColon : itemColon
       }));

package/lib/Form/Basic.d.ts

@@ -1,3 +1,3 @@
 import type { HFormProps } from "@/components/Form/modal";
-declare const _default: ({ configData, gutter, dismissOnPressEnter, }: HFormProps) => JSX.Element;
+declare const _default: ({ configData, gutter, dismissOnPressEnter, itemSpan, labelWidth, }: HFormProps) => JSX.Element;
 export default _default;

package/lib/Form/Basic.js

@@ -16,11 +16,13 @@ var Basic = (function (_ref) {
   var configData = _ref.configData,
     gutter = _ref.gutter,
     _ref$dismissOnPressEn = _ref.dismissOnPressEnter,
-    dismissOnPressEnter = _ref$dismissOnPressEn === void 0 ? true : _ref$dismissOnPressEn;
+    dismissOnPressEnter = _ref$dismissOnPressEn === void 0 ? true : _ref$dismissOnPressEn,
+    itemSpan = _ref.itemSpan,
+    labelWidth = _ref.labelWidth;
   var _useFormContext = index.useFormContext(),
     form = _useFormContext.form,
     formItemProps = _useFormContext.itemProps,
-    itemSpan = _useFormContext.itemSpan,
+    formItemSpan = _useFormContext.itemSpan,
     formColon = _useFormContext.colon,
     setData = _useFormContext.setData;
   var _useInitConfigData = useInitConfigData.default({
@@ -41,7 +43,8 @@ var Basic = (function (_ref) {
       width: "100%"
     },
     children: newConfigData.map(function (itemData, index) {
-      var itemLabelWidth = itemData.labelWidth,
+      var _itemData$labelWidth = itemData.labelWidth,
+        itemLabelWidth = _itemData$labelWidth === void 0 ? labelWidth : _itemData$labelWidth,
         hideLabel = itemData.hideLabel,
         labelAlign = itemData.labelAlign,
         name = itemData.name,
@@ -58,7 +61,7 @@ var Basic = (function (_ref) {
         style: style,
         itemProps: defaultItemProps,
         hideLabel: hideLabel,
-        itemSpan: itemSpan,
+        itemSpan: itemSpan || formItemSpan,
         labelWidth: itemLabelWidth,
         colon: typeof itemColon === "undefined" ? formColon : itemColon
       }));

package/package.json

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

package/src/components/Form/Basic.tsx

@@ -13,11 +13,13 @@ export default ({
   configData,
   gutter,
   dismissOnPressEnter = true,
+  itemSpan,
+  labelWidth,
 }: HFormProps) => {
   const {
     form,
     itemProps: formItemProps,
-    itemSpan,
+    itemSpan:formItemSpan,
     colon: formColon,
     setData,
   } = useFormContext();
@@ -35,7 +37,7 @@ export default ({
     <Row gutter={gutter} style={{ width: "100%" }}>
       {newConfigData.map((itemData: HItemProps, index) => {
         const {
-          labelWidth: itemLabelWidth,
+          labelWidth: itemLabelWidth=labelWidth,
           hideLabel,
           labelAlign,
           name,
@@ -57,7 +59,7 @@ export default ({
             style={style}
             itemProps={defaultItemProps as ItemPropsType}
             hideLabel={hideLabel}
-            itemSpan={itemSpan}
+            itemSpan={itemSpan||formItemSpan}
             labelWidth={itemLabelWidth}
             colon={typeof itemColon === "undefined" ? formColon : itemColon}
           />

package/src/pages/Form/index.tsx

@@ -8,6 +8,7 @@ import {
 } from "../../components";
 import { useState } from "react";
 import { Button, DatePicker, Form, Input, Row, Space } from "antd";
+import Basic from "@/components/Form/Basic";
 const Test2 = () => {
   return <Row style={{ background: "red" }} />;
 };
@@ -88,6 +89,19 @@ const formData = (options) => {
             }
         }
     },
+      {
+          nameKey: "name1",
+          label: "输入框",
+          render:()=>{
+              return <Basic
+               configData={[{
+                   label:"1"
+               },{
+                   label:"2"
+               }]}
+              />
+          }
+      },
     {
       label: "输入框",
       type: "checkboxGroup",