@hw-component/form 1.9.68 → 1.9.69

package/es/Form/Basic.d.ts

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

package/es/Form/Basic.js

@@ -6,7 +6,6 @@ import Item from './FormItem/index.js';
 import { Row } from 'antd';
 import { useFormContext } from './Context/index.js';
 import useInitConfigData from './hooks/useInitConfigData.js';
-import { useClassName } from '../hooks/index.js';
 
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -18,7 +17,7 @@ var Basic = (function (_ref) {
     itemSpan = _ref.itemSpan,
     labelWidth = _ref.labelWidth,
     formItemStyle = _ref.formItemStyle,
-    flexBox = _ref.flexBox;
+    formFlexBox = _ref.flexBox;
   var _useFormContext = useFormContext(),
     form = _useFormContext.form,
     formItemProps = _useFormContext.itemProps,
@@ -31,7 +30,6 @@ var Basic = (function (_ref) {
     }),
     newConfigData = _useInitConfigData.newConfigData,
     dispatchSourceData = _useInitConfigData.dispatchSourceData;
-  var rowClassname = useClassName("hw-form-item-row");
   useEffect(function () {
     setData === null || setData === void 0 || setData(dispatchSourceData);
   }, []);
@@ -44,7 +42,6 @@ var Basic = (function (_ref) {
     style: {
       width: "100%"
     },
-    className: flexBox ? rowClassname : "",
     children: newConfigData.map(function (itemData, index) {
       var _itemData$labelWidth = itemData.labelWidth,
         itemLabelWidth = _itemData$labelWidth === void 0 ? labelWidth : _itemData$labelWidth,
@@ -56,7 +53,9 @@ var Basic = (function (_ref) {
         itemProps = _itemData$itemProps === void 0 ? {} : _itemData$itemProps,
         itemColon = itemData.colon,
         configItemSpan = itemData.itemSpan,
-        nameKey = itemData.nameKey;
+        nameKey = itemData.nameKey,
+        _itemData$flexBox = itemData.flexBox,
+        flexBox = _itemData$flexBox === void 0 ? formFlexBox : _itemData$flexBox;
       var defaultItemProps = _objectSpread(_objectSpread({
         onPressEnter: dismissOnPressEnter ? undefined : defaultOnPressEnter
       }, formItemProps), itemProps);
@@ -71,7 +70,8 @@ var Basic = (function (_ref) {
         hideLabel: hideLabel,
         itemSpan: configItemSpan || globalItemSpan,
         labelWidth: itemLabelWidth,
-        colon: typeof itemColon === "undefined" ? formColon : itemColon
+        colon: typeof itemColon === "undefined" ? formColon : itemColon,
+        flexBox: flexBox
       }));
     })
   });

package/es/Form/FormItem/BasicItem.js

@@ -13,7 +13,7 @@ import { useDefaultRender } from '../hooks/useDefaultRender.js';
 import { useDefaultComponents } from '../hooks/index.js';
 import { useFormConfigContext } from '../Context/FormConfigProvider.js';
 
-var _excluded = ["hover", "labelWidth", "required", "colon", "label", "itemProps", "children", "helper", "hide", "render", "itemSpan", "hideLabel", "labelAlign", "style", "className", "noStyle", "hidden", "rowWrapper"],
+var _excluded = ["hover", "labelWidth", "required", "colon", "label", "itemProps", "children", "helper", "hide", "render", "itemSpan", "hideLabel", "labelAlign", "style", "className", "noStyle", "hidden", "rowWrapper", "flexBox"],
   _excluded2 = ["labelAlign", "itemProps"],
   _excluded3 = ["rowWrapper"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -67,7 +67,8 @@ var Index = function Index(props) {
     noStyle = _props$noStyle === void 0 ? false : _props$noStyle,
     hidden = props.hidden;
     props.rowWrapper;
-    var oProps = _objectWithoutProperties(props, _excluded);
+    var flexBox = props.flexBox,
+    oProps = _objectWithoutProperties(props, _excluded);
   var _props$labelAlign = props.labelAlign,
     align = _props$labelAlign === void 0 ? "right" : _props$labelAlign,
     itemProps = props.itemProps,
@@ -82,6 +83,7 @@ var Index = function Index(props) {
   var defaultRender = useDefaultRender(_objectSpread(_objectSpread({}, inProps), {}, {
     itemProps: defaultItemProps
   }), defaultComponent);
+  var rowClassname = useClassName("hw-form-item-row");
   var className = usePositionClassName(align);
   var hideItem = useHide({
     hide: hide,
@@ -100,7 +102,7 @@ var Index = function Index(props) {
     display: "none"
   } : {};
   return jsx(Col, _objectSpread(_objectSpread({}, itemSpan), {}, {
-    className: "".concat(colClassName, " ").concat(itemClassName),
+    className: "".concat(colClassName, " ").concat(itemClassName, " ").concat(flexBox ? rowClassname : ""),
     style: colStyle,
     children: jsx(Form.Item, _objectSpread(_objectSpread({
       className: className,

package/es/Form/modal.d.ts

@@ -55,6 +55,7 @@ export interface HItemProps extends Omit<FormItemProps, "name" | "labelAlign" |
     hidden?: boolean | HideModal;
     rowWrapper?: boolean;
     nameKey?: string;
+    flexBox?: boolean;
 }
 interface InfoRequestOp extends BaseOptions<any, any> {
     request: PromiseFnResult;

package/lib/Form/Basic.d.ts

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

package/lib/Form/Basic.js

@@ -5,11 +5,10 @@ Object.defineProperty(exports, '__esModule', { value: true });
 var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
 var jsxRuntime = require('react/jsx-runtime');
 var React = require('react');
-var index$2 = require('./FormItem/index.js');
+var index$1 = require('./FormItem/index.js');
 var antd = require('antd');
 var index = require('./Context/index.js');
 var useInitConfigData = require('./hooks/useInitConfigData.js');
-var index$1 = require('../hooks/index.js');
 
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -21,7 +20,7 @@ var Basic = (function (_ref) {
     itemSpan = _ref.itemSpan,
     labelWidth = _ref.labelWidth,
     formItemStyle = _ref.formItemStyle,
-    flexBox = _ref.flexBox;
+    formFlexBox = _ref.flexBox;
   var _useFormContext = index.useFormContext(),
     form = _useFormContext.form,
     formItemProps = _useFormContext.itemProps,
@@ -34,7 +33,6 @@ var Basic = (function (_ref) {
     }),
     newConfigData = _useInitConfigData.newConfigData,
     dispatchSourceData = _useInitConfigData.dispatchSourceData;
-  var rowClassname = index$1.useClassName("hw-form-item-row");
   React.useEffect(function () {
     setData === null || setData === void 0 || setData(dispatchSourceData);
   }, []);
@@ -47,7 +45,6 @@ var Basic = (function (_ref) {
     style: {
       width: "100%"
     },
-    className: flexBox ? rowClassname : "",
     children: newConfigData.map(function (itemData, index) {
       var _itemData$labelWidth = itemData.labelWidth,
         itemLabelWidth = _itemData$labelWidth === void 0 ? labelWidth : _itemData$labelWidth,
@@ -59,14 +56,16 @@ var Basic = (function (_ref) {
         itemProps = _itemData$itemProps === void 0 ? {} : _itemData$itemProps,
         itemColon = itemData.colon,
         configItemSpan = itemData.itemSpan,
-        nameKey = itemData.nameKey;
+        nameKey = itemData.nameKey,
+        _itemData$flexBox = itemData.flexBox,
+        flexBox = _itemData$flexBox === void 0 ? formFlexBox : _itemData$flexBox;
       var defaultItemProps = _objectSpread(_objectSpread({
         onPressEnter: dismissOnPressEnter ? undefined : defaultOnPressEnter
       }, formItemProps), itemProps);
       var arrayName = Array.isArray(name) ? name.join(".") : name;
       var key = arrayName || nameKey;
       var itemStyle = style || formItemStyle;
-      return /*#__PURE__*/React.createElement(index$2.default, _objectSpread(_objectSpread({}, itemData), {}, {
+      return /*#__PURE__*/React.createElement(index$1.default, _objectSpread(_objectSpread({}, itemData), {}, {
         labelAlign: labelAlign,
         key: key || index,
         style: itemStyle,
@@ -74,7 +73,8 @@ var Basic = (function (_ref) {
         hideLabel: hideLabel,
         itemSpan: configItemSpan || globalItemSpan,
         labelWidth: itemLabelWidth,
-        colon: typeof itemColon === "undefined" ? formColon : itemColon
+        colon: typeof itemColon === "undefined" ? formColon : itemColon,
+        flexBox: flexBox
       }));
     })
   });

package/lib/Form/FormItem/BasicItem.js

@@ -16,7 +16,7 @@ var useDefaultRender = require('../hooks/useDefaultRender.js');
 var index$1 = require('../hooks/index.js');
 var FormConfigProvider = require('../Context/FormConfigProvider.js');
 
-var _excluded = ["hover", "labelWidth", "required", "colon", "label", "itemProps", "children", "helper", "hide", "render", "itemSpan", "hideLabel", "labelAlign", "style", "className", "noStyle", "hidden", "rowWrapper"],
+var _excluded = ["hover", "labelWidth", "required", "colon", "label", "itemProps", "children", "helper", "hide", "render", "itemSpan", "hideLabel", "labelAlign", "style", "className", "noStyle", "hidden", "rowWrapper", "flexBox"],
   _excluded2 = ["labelAlign", "itemProps"],
   _excluded3 = ["rowWrapper"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -70,7 +70,8 @@ var Index = function Index(props) {
     noStyle = _props$noStyle === void 0 ? false : _props$noStyle,
     hidden = props.hidden;
     props.rowWrapper;
-    var oProps = _objectWithoutProperties(props, _excluded);
+    var flexBox = props.flexBox,
+    oProps = _objectWithoutProperties(props, _excluded);
   var _props$labelAlign = props.labelAlign,
     align = _props$labelAlign === void 0 ? "right" : _props$labelAlign,
     itemProps = props.itemProps,
@@ -85,6 +86,7 @@ var Index = function Index(props) {
   var defaultRender = useDefaultRender.useDefaultRender(_objectSpread(_objectSpread({}, inProps), {}, {
     itemProps: defaultItemProps
   }), defaultComponent);
+  var rowClassname = index$2.useClassName("hw-form-item-row");
   var className = hooks.usePositionClassName(align);
   var hideItem = hooks.useHide({
     hide: hide,
@@ -103,7 +105,7 @@ var Index = function Index(props) {
     display: "none"
   } : {};
   return jsxRuntime.jsx(antd.Col, _objectSpread(_objectSpread({}, itemSpan), {}, {
-    className: "".concat(colClassName, " ").concat(itemClassName),
+    className: "".concat(colClassName, " ").concat(itemClassName, " ").concat(flexBox ? rowClassname : ""),
     style: colStyle,
     children: jsxRuntime.jsx(antd.Form.Item, _objectSpread(_objectSpread({
       className: className,

package/lib/Form/modal.d.ts

@@ -55,6 +55,7 @@ export interface HItemProps extends Omit<FormItemProps, "name" | "labelAlign" |
     hidden?: boolean | HideModal;
     rowWrapper?: boolean;
     nameKey?: string;
+    flexBox?: boolean;
 }
 interface InfoRequestOp extends BaseOptions<any, any> {
     request: PromiseFnResult;

package/package.json

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

package/src/components/Form/Basic.tsx

@@ -2,13 +2,12 @@ import type {
   HFormProps,
   HItemProps,
   ItemPropsType,
-} from "@/components/Form/modal";
+} from "./modal";
 import Item from "./FormItem";
 import { Row } from "antd";
 import { useFormContext } from "./Context";
 import useInitConfigData from "./hooks/useInitConfigData";
 import { useEffect } from "react";
-import {useClassName} from "../hooks";
 
 export default ({
   configData,
@@ -17,7 +16,7 @@ export default ({
   itemSpan,
   labelWidth,
                   formItemStyle,
-                  flexBox
+                  flexBox:formFlexBox
 }: HFormProps) => {
   const {
     form,
@@ -30,7 +29,6 @@ export default ({
     configData,
     form,
   });
-  const rowClassname=useClassName("hw-form-item-row");
   useEffect(() => {
     setData?.(dispatchSourceData);
   }, []);
@@ -39,7 +37,7 @@ export default ({
   };
   const globalItemSpan = itemSpan || formItemSpan;
   return (
-    <Row gutter={gutter} style={{ width: "100%" }} className={flexBox?rowClassname:""}>
+    <Row gutter={gutter} style={{ width: "100%" }}>
       {newConfigData.map((itemData: HItemProps, index) => {
         const {
           labelWidth: itemLabelWidth = labelWidth,
@@ -51,6 +49,7 @@ export default ({
           colon: itemColon,
           itemSpan: configItemSpan,
           nameKey,
+            flexBox=formFlexBox
         } = itemData;
         const defaultItemProps = {
           onPressEnter: dismissOnPressEnter ? undefined : defaultOnPressEnter,
@@ -71,6 +70,7 @@ export default ({
             itemSpan={configItemSpan || globalItemSpan}
             labelWidth={itemLabelWidth}
             colon={typeof itemColon === "undefined" ? formColon : itemColon}
+            flexBox={flexBox}
           />
         );
       })}

package/src/components/Form/FormItem/BasicItem.tsx

@@ -56,6 +56,7 @@ const Index: React.FC<HFormItemProps> = (props) => {
     noStyle = false,
     hidden,
     rowWrapper,
+      flexBox,
     ...oProps
   } = props;
   const { labelAlign: align = "right", itemProps, ...inProps } = props;
@@ -72,6 +73,7 @@ const Index: React.FC<HFormItemProps> = (props) => {
     { ...inProps, itemProps: defaultItemProps },
     defaultComponent
   );
+  const rowClassname=useClassName("hw-form-item-row");
   const className = usePositionClassName(align);
   const hideItem = useHide({ hide, form });
   const disHide = useHide({ hide: hidden, form });
@@ -85,7 +87,7 @@ const Index: React.FC<HFormItemProps> = (props) => {
   return (
     <Col
       {...itemSpan}
-      className={`${colClassName} ${itemClassName}`}
+      className={`${colClassName} ${itemClassName} ${flexBox?rowClassname:""}`}
       style={colStyle}
     >
       <Form.Item

package/src/components/Form/modal.ts

@@ -102,6 +102,7 @@ export interface HItemProps
   hidden?: boolean | HideModal;
   rowWrapper?: boolean;
   nameKey?: string;
+  flexBox?:boolean;
 }
 interface InfoRequestOp extends BaseOptions<any, any> {
   request: PromiseFnResult;

package/src/pages/Form/index.tsx

@@ -79,6 +79,7 @@ export default () => {
                 label: "运营商账号",
                 name: "mobile",
                 type: "buttonInput",
+                  flexBox:true,
                 itemProps: {
                   children: "修改手机号",
                   disabled: true,