@hw-component/form 1.9.22 → 1.9.24

package/es/Form/Basic.d.ts

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

package/es/Form/Basic.js

@@ -14,7 +14,8 @@ var Basic = (function (_ref) {
     gutter = _ref.gutter,
     _ref$dismissOnPressEn = _ref.dismissOnPressEnter,
     dismissOnPressEnter = _ref$dismissOnPressEn === void 0 ? true : _ref$dismissOnPressEn,
-    itemSpan = _ref.itemSpan;
+    itemSpan = _ref.itemSpan,
+    labelWidth = _ref.labelWidth;
   var _useFormContext = useFormContext(),
     form = _useFormContext.form,
     formItemProps = _useFormContext.itemProps,
@@ -39,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,

package/es/Switch/index.js

@@ -65,15 +65,13 @@ var Index = function Index(_ref) {
     className: switchClassName,
     children: [jsx("span", {
       children: beforeText
-    }), jsx("div", {
+    }), jsx(Switch, _objectSpread({
+      checked: swChecked,
+      checkedChildren: checkedChildren,
+      unCheckedChildren: unCheckedChildren,
       className: switchBody,
-      children: jsx(Switch, _objectSpread({
-        checked: swChecked,
-        checkedChildren: checkedChildren,
-        unCheckedChildren: unCheckedChildren,
-        onChange: change
-      }, props))
-    }), jsx("span", {
+      onChange: change
+    }, props)), jsx("span", {
       children: children
     })]
   });

package/lib/Form/Basic.d.ts

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

package/lib/Form/Basic.js

@@ -17,7 +17,8 @@ var Basic = (function (_ref) {
     gutter = _ref.gutter,
     _ref$dismissOnPressEn = _ref.dismissOnPressEnter,
     dismissOnPressEnter = _ref$dismissOnPressEn === void 0 ? true : _ref$dismissOnPressEn,
-    itemSpan = _ref.itemSpan;
+    itemSpan = _ref.itemSpan,
+    labelWidth = _ref.labelWidth;
   var _useFormContext = index.useFormContext(),
     form = _useFormContext.form,
     formItemProps = _useFormContext.itemProps,
@@ -42,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,

package/lib/Switch/index.js

@@ -68,15 +68,13 @@ var Index = function Index(_ref) {
     className: switchClassName,
     children: [jsxRuntime.jsx("span", {
       children: beforeText
-    }), jsxRuntime.jsx("div", {
+    }), jsxRuntime.jsx(antd.Switch, _objectSpread({
+      checked: swChecked,
+      checkedChildren: checkedChildren,
+      unCheckedChildren: unCheckedChildren,
       className: switchBody,
-      children: jsxRuntime.jsx(antd.Switch, _objectSpread({
-        checked: swChecked,
-        checkedChildren: checkedChildren,
-        unCheckedChildren: unCheckedChildren,
-        onChange: change
-      }, props))
-    }), jsxRuntime.jsx("span", {
+      onChange: change
+    }, props)), jsxRuntime.jsx("span", {
       children: children
     })]
   });

package/package.json

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

package/src/components/Form/Basic.tsx

@@ -14,6 +14,7 @@ export default ({
   gutter,
   dismissOnPressEnter = true,
   itemSpan,
+  labelWidth,
 }: HFormProps) => {
   const {
     form,
@@ -36,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,

package/src/components/Switch/index.tsx

@@ -67,16 +67,15 @@ const Index: React.FC<HSwitchProps> = ({
       <span>
         {beforeText}
       </span>
-     <div className={switchBody}>
-       <Switch
-           checked={swChecked}
-           checkedChildren={checkedChildren}
-           unCheckedChildren={unCheckedChildren}
-           onChange={change}
-           {...props}
-       />
-     </div>
-      <span>{children}</span>
+      <Switch
+          checked={swChecked}
+          checkedChildren={checkedChildren}
+          unCheckedChildren={unCheckedChildren}
+          className={switchBody}
+          onChange={change}
+          {...props}
+      />
+      <span >{children}</span>
     </div>
   );
 };

package/src/pages/Switch/index.tsx

@@ -6,6 +6,7 @@ export default () => {
       <HSwitch
         value={1}
         beforeText="开关"
+        size="small"
         valueMap={{ open: 1, close: 0 }}
         onChange={(val) => {
           console.log(val);