@hw-component/form 1.9.20 → 1.9.22

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,3 +1,3 @@
1
1
  import type { HFormProps } from "@/components/Form/modal";
2
- declare const _default: ({ configData, gutter, dismissOnPressEnter, }: HFormProps) => JSX.Element;
2
+ declare const _default: ({ configData, gutter, dismissOnPressEnter, itemSpan, }: HFormProps) => JSX.Element;
3
3
  export default _default;
package/es/Form/Basic.js CHANGED
@@ -13,11 +13,12 @@ var Basic = (function (_ref) {
13
13
  var configData = _ref.configData,
14
14
  gutter = _ref.gutter,
15
15
  _ref$dismissOnPressEn = _ref.dismissOnPressEnter,
16
- dismissOnPressEnter = _ref$dismissOnPressEn === void 0 ? true : _ref$dismissOnPressEn;
16
+ dismissOnPressEnter = _ref$dismissOnPressEn === void 0 ? true : _ref$dismissOnPressEn,
17
+ itemSpan = _ref.itemSpan;
17
18
  var _useFormContext = useFormContext(),
18
19
  form = _useFormContext.form,
19
20
  formItemProps = _useFormContext.itemProps,
20
- itemSpan = _useFormContext.itemSpan,
21
+ formItemSpan = _useFormContext.itemSpan,
21
22
  formColon = _useFormContext.colon,
22
23
  setData = _useFormContext.setData;
23
24
  var _useInitConfigData = useInitConfigData({
@@ -55,7 +56,7 @@ var Basic = (function (_ref) {
55
56
  style: style,
56
57
  itemProps: defaultItemProps,
57
58
  hideLabel: hideLabel,
58
- itemSpan: itemSpan,
59
+ itemSpan: itemSpan || formItemSpan,
59
60
  labelWidth: itemLabelWidth,
60
61
  colon: typeof itemColon === "undefined" ? formColon : itemColon
61
62
  }));
@@ -1,4 +1,3 @@
1
- import React from "react";
2
1
  import type { HFormItemProps } from "../modal";
3
- declare const Index: React.FC<HFormItemProps>;
4
- export default Index;
2
+ declare const _default: (props: HFormItemProps) => JSX.Element;
3
+ export default _default;
@@ -3,7 +3,7 @@ import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
3
3
  import _objectWithoutProperties from '@babel/runtime-corejs3/helpers/objectWithoutProperties';
4
4
  import { jsx, jsxs } from 'react/jsx-runtime';
5
5
  import Index$1 from '../Label.js';
6
- import { Col, Form, Space } from 'antd';
6
+ import { Row, Col, Form, Space } from 'antd';
7
7
  import React from 'react';
8
8
  import Index$2 from './Helper.js';
9
9
  import { useClassName } from '../../hooks/index.js';
@@ -13,8 +13,9 @@ import { useDefaultRender } from '../hooks/useDefaultRender.js';
13
13
  import { useDefaultComponents } from '../hooks/index.js';
14
14
  import { useFormConfigContext } from '../Context/FormConfigProvider.js';
15
15
 
16
- var _excluded = ["hover", "labelWidth", "required", "colon", "label", "itemProps", "children", "helper", "hide", "render", "itemSpan", "hideLabel", "labelAlign", "style", "className", "noStyle", "hidden"],
17
- _excluded2 = ["labelAlign", "itemProps"];
16
+ var _excluded = ["hover", "labelWidth", "required", "colon", "label", "itemProps", "children", "helper", "hide", "render", "itemSpan", "hideLabel", "labelAlign", "style", "className", "noStyle", "hidden", "rowWrapper"],
17
+ _excluded2 = ["labelAlign", "itemProps"],
18
+ _excluded3 = ["rowWrapper"];
18
19
  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; }
19
20
  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; }
20
21
  var Content = function Content(_ref) {
@@ -64,8 +65,9 @@ var Index = function Index(props) {
64
65
  colClassName = props.className,
65
66
  _props$noStyle = props.noStyle,
66
67
  noStyle = _props$noStyle === void 0 ? false : _props$noStyle,
67
- hidden = props.hidden,
68
- oProps = _objectWithoutProperties(props, _excluded);
68
+ hidden = props.hidden;
69
+ props.rowWrapper;
70
+ var oProps = _objectWithoutProperties(props, _excluded);
69
71
  var _props$labelAlign = props.labelAlign,
70
72
  align = _props$labelAlign === void 0 ? "right" : _props$labelAlign,
71
73
  itemProps = props.itemProps,
@@ -122,6 +124,19 @@ var Index = function Index(props) {
122
124
  }))
123
125
  }));
124
126
  };
127
+ var BasicItem = (function (props) {
128
+ var rowWrapper = props.rowWrapper,
129
+ oProps = _objectWithoutProperties(props, _excluded3);
130
+ if (rowWrapper) {
131
+ return jsx(Row, {
132
+ style: {
133
+ width: "100%"
134
+ },
135
+ children: jsx(Index, _objectSpread({}, oProps))
136
+ });
137
+ }
138
+ return jsx(Index, _objectSpread({}, oProps));
139
+ });
125
140
 
126
- export { Index as default };
141
+ export { BasicItem as default };
127
142
  // powered by hdj
@@ -1,7 +1,7 @@
1
1
  // welcome to hoo hoo hoo
2
2
  import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
3
3
  import { jsx } from 'react/jsx-runtime';
4
- import Index from './BasicItem.js';
4
+ import BasicItem from './BasicItem.js';
5
5
 
6
6
  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; }
7
7
  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; }
@@ -9,7 +9,7 @@ var RegularFormItem = (function (props) {
9
9
  var type = props.type,
10
10
  colon = props.colon,
11
11
  itemSpan = props.itemSpan;
12
- return jsx(Index, _objectSpread(_objectSpread({}, props), {}, {
12
+ return jsx(BasicItem, _objectSpread(_objectSpread({}, props), {}, {
13
13
  itemSpan: itemSpan,
14
14
  colon: type === "submit" ? false : colon
15
15
  }));
@@ -3,7 +3,7 @@ import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
3
3
  import _objectWithoutProperties from '@babel/runtime-corejs3/helpers/objectWithoutProperties';
4
4
  import { jsx } from 'react/jsx-runtime';
5
5
  import { Form } from 'antd';
6
- import Index from './BasicItem.js';
6
+ import BasicItem from './BasicItem.js';
7
7
  import { useShouldUpdate } from './hooks.js';
8
8
 
9
9
  var _excluded = ["shouldUpdate", "dependencies", "hide", "itemSpan", "hidden"];
@@ -27,7 +27,7 @@ var UpFormItem = (function (_ref) {
27
27
  dependencies: dependencies,
28
28
  noStyle: true,
29
29
  children: function children() {
30
- return jsx(Index, _objectSpread({
30
+ return jsx(BasicItem, _objectSpread({
31
31
  hide: hide,
32
32
  itemSpan: itemSpan,
33
33
  hidden: hidden
@@ -12,7 +12,8 @@ var Item = (function (props) {
12
12
  formLabelAlign = _useFormContext.labelAlign,
13
13
  formLabelHide = _useFormContext.hideLabel,
14
14
  formItemStyle = _useFormContext.formItemStyle,
15
- formColon = _useFormContext.colon;
15
+ formColon = _useFormContext.colon,
16
+ formRowWrapper = _useFormContext.rowWrapper;
16
17
  var _props$labelWidth = props.labelWidth,
17
18
  labelWidth = _props$labelWidth === void 0 ? formLabelWidth : _props$labelWidth,
18
19
  _props$labelAlign = props.labelAlign,
@@ -21,12 +22,15 @@ var Item = (function (props) {
21
22
  hideLabel = _props$hideLabel === void 0 ? formLabelHide : _props$hideLabel,
22
23
  _props$style = props.style,
23
24
  style = _props$style === void 0 ? formItemStyle : _props$style,
24
- colon = props.colon;
25
+ colon = props.colon,
26
+ _props$rowWrapper = props.rowWrapper,
27
+ rowWrapper = _props$rowWrapper === void 0 ? formRowWrapper : _props$rowWrapper;
25
28
  var Component = useFormItemDomControl(props);
26
29
  return jsx(Component, _objectSpread(_objectSpread({}, props), {}, {
27
30
  labelAlign: labelAlign,
28
31
  labelWidth: labelWidth,
29
32
  hideLabel: hideLabel,
33
+ rowWrapper: rowWrapper,
30
34
  style: style,
31
35
  colon: typeof colon !== "undefined" ? colon : formColon
32
36
  }));
@@ -1,3 +1,3 @@
1
1
  import type { HFormProps } from "./modal";
2
- declare const _default: ({ configData, labelWidth, form, request, onFinish, infoRequest, valueType, initialValues, params, onValuesChange, itemSpan, hideLabel: formHideLabel, gutter, submitLoading, labelAlign: formLabelAlign, formItemStyle, itemProps: formItemProps, colon, dismissOnPressEnter, preserve, ...props }: HFormProps) => JSX.Element;
2
+ declare const _default: ({ configData, labelWidth, form, request, onFinish, infoRequest, valueType, initialValues, params, onValuesChange, itemSpan, hideLabel: formHideLabel, gutter, submitLoading, labelAlign: formLabelAlign, formItemStyle, itemProps: formItemProps, colon, dismissOnPressEnter, preserve, rowWrapper, ...props }: HFormProps) => JSX.Element;
3
3
  export default _default;
package/es/Form/index.js CHANGED
@@ -11,7 +11,7 @@ import { useState, useEffect } from 'react';
11
11
  import InitSet from './InitSet.js';
12
12
  import Basic from './Basic.js';
13
13
 
14
- var _excluded = ["configData", "labelWidth", "form", "request", "onFinish", "infoRequest", "valueType", "initialValues", "params", "onValuesChange", "itemSpan", "hideLabel", "gutter", "submitLoading", "labelAlign", "formItemStyle", "itemProps", "colon", "dismissOnPressEnter", "preserve"];
14
+ var _excluded = ["configData", "labelWidth", "form", "request", "onFinish", "infoRequest", "valueType", "initialValues", "params", "onValuesChange", "itemSpan", "hideLabel", "gutter", "submitLoading", "labelAlign", "formItemStyle", "itemProps", "colon", "dismissOnPressEnter", "preserve", "rowWrapper"];
15
15
  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; }
16
16
  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; }
17
17
  var HForm = (function (_ref) {
@@ -40,6 +40,7 @@ var HForm = (function (_ref) {
40
40
  colon = _ref$colon === void 0 ? true : _ref$colon,
41
41
  dismissOnPressEnter = _ref.dismissOnPressEnter,
42
42
  preserve = _ref.preserve,
43
+ rowWrapper = _ref.rowWrapper,
43
44
  props = _objectWithoutProperties(_ref, _excluded);
44
45
  var hForm = useCurrentForm(form);
45
46
  var _useState = useState({}),
@@ -96,7 +97,8 @@ var HForm = (function (_ref) {
96
97
  colon: colon,
97
98
  itemProps: formItemProps,
98
99
  itemSpan: itemSpan,
99
- setData: setData
100
+ setData: setData,
101
+ rowWrapper: rowWrapper
100
102
  },
101
103
  children: jsxs(Form, _objectSpread(_objectSpread({
102
104
  form: hForm,
@@ -51,6 +51,7 @@ export interface HItemProps extends Omit<FormItemProps, "name" | "labelAlign" |
51
51
  labelAlign?: LabelAlignModal;
52
52
  label?: React.ReactNode | HelperModal;
53
53
  hidden?: boolean | HideModal;
54
+ rowWrapper?: boolean;
54
55
  }
55
56
  export interface HFormProps<T = any, R = any> extends Omit<FormProps, "form" | "onFinish" | "labelAlign"> {
56
57
  configData: HItemProps[];
@@ -69,6 +70,7 @@ export interface HFormProps<T = any, R = any> extends Omit<FormProps, "form" | "
69
70
  formItemStyle?: React.CSSProperties;
70
71
  itemProps?: ItemPropsType;
71
72
  dismissOnPressEnter?: boolean;
73
+ rowWrapper?: boolean;
72
74
  }
73
75
  export interface HFormItemProps extends HItemProps {
74
76
  required?: boolean;
@@ -92,6 +94,7 @@ export interface FormContextProps {
92
94
  itemProps?: ItemPropsType;
93
95
  itemSpan?: ColProps;
94
96
  setData?: (newData: any) => void;
97
+ rowWrapper?: boolean;
95
98
  }
96
99
  interface ConfigUploadProps {
97
100
  exFiles?: string[];
@@ -1,3 +1,3 @@
1
1
  import type { HFormProps } from "@/components/Form/modal";
2
- declare const _default: ({ configData, gutter, dismissOnPressEnter, }: HFormProps) => JSX.Element;
2
+ declare const _default: ({ configData, gutter, dismissOnPressEnter, itemSpan, }: HFormProps) => JSX.Element;
3
3
  export default _default;
package/lib/Form/Basic.js CHANGED
@@ -16,11 +16,12 @@ var Basic = (function (_ref) {
16
16
  var configData = _ref.configData,
17
17
  gutter = _ref.gutter,
18
18
  _ref$dismissOnPressEn = _ref.dismissOnPressEnter,
19
- dismissOnPressEnter = _ref$dismissOnPressEn === void 0 ? true : _ref$dismissOnPressEn;
19
+ dismissOnPressEnter = _ref$dismissOnPressEn === void 0 ? true : _ref$dismissOnPressEn,
20
+ itemSpan = _ref.itemSpan;
20
21
  var _useFormContext = index.useFormContext(),
21
22
  form = _useFormContext.form,
22
23
  formItemProps = _useFormContext.itemProps,
23
- itemSpan = _useFormContext.itemSpan,
24
+ formItemSpan = _useFormContext.itemSpan,
24
25
  formColon = _useFormContext.colon,
25
26
  setData = _useFormContext.setData;
26
27
  var _useInitConfigData = useInitConfigData.default({
@@ -58,7 +59,7 @@ var Basic = (function (_ref) {
58
59
  style: style,
59
60
  itemProps: defaultItemProps,
60
61
  hideLabel: hideLabel,
61
- itemSpan: itemSpan,
62
+ itemSpan: itemSpan || formItemSpan,
62
63
  labelWidth: itemLabelWidth,
63
64
  colon: typeof itemColon === "undefined" ? formColon : itemColon
64
65
  }));
@@ -1,4 +1,3 @@
1
- import React from "react";
2
1
  import type { HFormItemProps } from "../modal";
3
- declare const Index: React.FC<HFormItemProps>;
4
- export default Index;
2
+ declare const _default: (props: HFormItemProps) => JSX.Element;
3
+ export default _default;
@@ -16,8 +16,9 @@ var useDefaultRender = require('../hooks/useDefaultRender.js');
16
16
  var index$1 = require('../hooks/index.js');
17
17
  var FormConfigProvider = require('../Context/FormConfigProvider.js');
18
18
 
19
- var _excluded = ["hover", "labelWidth", "required", "colon", "label", "itemProps", "children", "helper", "hide", "render", "itemSpan", "hideLabel", "labelAlign", "style", "className", "noStyle", "hidden"],
20
- _excluded2 = ["labelAlign", "itemProps"];
19
+ var _excluded = ["hover", "labelWidth", "required", "colon", "label", "itemProps", "children", "helper", "hide", "render", "itemSpan", "hideLabel", "labelAlign", "style", "className", "noStyle", "hidden", "rowWrapper"],
20
+ _excluded2 = ["labelAlign", "itemProps"],
21
+ _excluded3 = ["rowWrapper"];
21
22
  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; }
22
23
  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; }
23
24
  var Content = function Content(_ref) {
@@ -67,8 +68,9 @@ var Index = function Index(props) {
67
68
  colClassName = props.className,
68
69
  _props$noStyle = props.noStyle,
69
70
  noStyle = _props$noStyle === void 0 ? false : _props$noStyle,
70
- hidden = props.hidden,
71
- oProps = _objectWithoutProperties(props, _excluded);
71
+ hidden = props.hidden;
72
+ props.rowWrapper;
73
+ var oProps = _objectWithoutProperties(props, _excluded);
72
74
  var _props$labelAlign = props.labelAlign,
73
75
  align = _props$labelAlign === void 0 ? "right" : _props$labelAlign,
74
76
  itemProps = props.itemProps,
@@ -125,6 +127,19 @@ var Index = function Index(props) {
125
127
  }))
126
128
  }));
127
129
  };
130
+ var BasicItem = (function (props) {
131
+ var rowWrapper = props.rowWrapper,
132
+ oProps = _objectWithoutProperties(props, _excluded3);
133
+ if (rowWrapper) {
134
+ return jsxRuntime.jsx(antd.Row, {
135
+ style: {
136
+ width: "100%"
137
+ },
138
+ children: jsxRuntime.jsx(Index, _objectSpread({}, oProps))
139
+ });
140
+ }
141
+ return jsxRuntime.jsx(Index, _objectSpread({}, oProps));
142
+ });
128
143
 
129
- exports.default = Index;
144
+ exports.default = BasicItem;
130
145
  // powered by h
@@ -15,7 +15,8 @@ var Item = (function (props) {
15
15
  formLabelAlign = _useFormContext.labelAlign,
16
16
  formLabelHide = _useFormContext.hideLabel,
17
17
  formItemStyle = _useFormContext.formItemStyle,
18
- formColon = _useFormContext.colon;
18
+ formColon = _useFormContext.colon,
19
+ formRowWrapper = _useFormContext.rowWrapper;
19
20
  var _props$labelWidth = props.labelWidth,
20
21
  labelWidth = _props$labelWidth === void 0 ? formLabelWidth : _props$labelWidth,
21
22
  _props$labelAlign = props.labelAlign,
@@ -24,12 +25,15 @@ var Item = (function (props) {
24
25
  hideLabel = _props$hideLabel === void 0 ? formLabelHide : _props$hideLabel,
25
26
  _props$style = props.style,
26
27
  style = _props$style === void 0 ? formItemStyle : _props$style,
27
- colon = props.colon;
28
+ colon = props.colon,
29
+ _props$rowWrapper = props.rowWrapper,
30
+ rowWrapper = _props$rowWrapper === void 0 ? formRowWrapper : _props$rowWrapper;
28
31
  var Component = hooks.useFormItemDomControl(props);
29
32
  return jsxRuntime.jsx(Component, _objectSpread(_objectSpread({}, props), {}, {
30
33
  labelAlign: labelAlign,
31
34
  labelWidth: labelWidth,
32
35
  hideLabel: hideLabel,
36
+ rowWrapper: rowWrapper,
33
37
  style: style,
34
38
  colon: typeof colon !== "undefined" ? colon : formColon
35
39
  }));
@@ -1,3 +1,3 @@
1
1
  import type { HFormProps } from "./modal";
2
- declare const _default: ({ configData, labelWidth, form, request, onFinish, infoRequest, valueType, initialValues, params, onValuesChange, itemSpan, hideLabel: formHideLabel, gutter, submitLoading, labelAlign: formLabelAlign, formItemStyle, itemProps: formItemProps, colon, dismissOnPressEnter, preserve, ...props }: HFormProps) => JSX.Element;
2
+ declare const _default: ({ configData, labelWidth, form, request, onFinish, infoRequest, valueType, initialValues, params, onValuesChange, itemSpan, hideLabel: formHideLabel, gutter, submitLoading, labelAlign: formLabelAlign, formItemStyle, itemProps: formItemProps, colon, dismissOnPressEnter, preserve, rowWrapper, ...props }: HFormProps) => JSX.Element;
3
3
  export default _default;
package/lib/Form/index.js CHANGED
@@ -14,7 +14,7 @@ var React = require('react');
14
14
  var InitSet = require('./InitSet.js');
15
15
  var Basic = require('./Basic.js');
16
16
 
17
- var _excluded = ["configData", "labelWidth", "form", "request", "onFinish", "infoRequest", "valueType", "initialValues", "params", "onValuesChange", "itemSpan", "hideLabel", "gutter", "submitLoading", "labelAlign", "formItemStyle", "itemProps", "colon", "dismissOnPressEnter", "preserve"];
17
+ var _excluded = ["configData", "labelWidth", "form", "request", "onFinish", "infoRequest", "valueType", "initialValues", "params", "onValuesChange", "itemSpan", "hideLabel", "gutter", "submitLoading", "labelAlign", "formItemStyle", "itemProps", "colon", "dismissOnPressEnter", "preserve", "rowWrapper"];
18
18
  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; }
19
19
  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; }
20
20
  var HForm = (function (_ref) {
@@ -43,6 +43,7 @@ var HForm = (function (_ref) {
43
43
  colon = _ref$colon === void 0 ? true : _ref$colon,
44
44
  dismissOnPressEnter = _ref.dismissOnPressEnter,
45
45
  preserve = _ref.preserve,
46
+ rowWrapper = _ref.rowWrapper,
46
47
  props = _objectWithoutProperties(_ref, _excluded);
47
48
  var hForm = index.useCurrentForm(form);
48
49
  var _useState = React.useState({}),
@@ -99,7 +100,8 @@ var HForm = (function (_ref) {
99
100
  colon: colon,
100
101
  itemProps: formItemProps,
101
102
  itemSpan: itemSpan,
102
- setData: setData
103
+ setData: setData,
104
+ rowWrapper: rowWrapper
103
105
  },
104
106
  children: jsxRuntime.jsxs(antd.Form, _objectSpread(_objectSpread({
105
107
  form: hForm,
@@ -51,6 +51,7 @@ export interface HItemProps extends Omit<FormItemProps, "name" | "labelAlign" |
51
51
  labelAlign?: LabelAlignModal;
52
52
  label?: React.ReactNode | HelperModal;
53
53
  hidden?: boolean | HideModal;
54
+ rowWrapper?: boolean;
54
55
  }
55
56
  export interface HFormProps<T = any, R = any> extends Omit<FormProps, "form" | "onFinish" | "labelAlign"> {
56
57
  configData: HItemProps[];
@@ -69,6 +70,7 @@ export interface HFormProps<T = any, R = any> extends Omit<FormProps, "form" | "
69
70
  formItemStyle?: React.CSSProperties;
70
71
  itemProps?: ItemPropsType;
71
72
  dismissOnPressEnter?: boolean;
73
+ rowWrapper?: boolean;
72
74
  }
73
75
  export interface HFormItemProps extends HItemProps {
74
76
  required?: boolean;
@@ -92,6 +94,7 @@ export interface FormContextProps {
92
94
  itemProps?: ItemPropsType;
93
95
  itemSpan?: ColProps;
94
96
  setData?: (newData: any) => void;
97
+ rowWrapper?: boolean;
95
98
  }
96
99
  interface ConfigUploadProps {
97
100
  exFiles?: string[];
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@hw-component/form",
3
- "version": "1.9.20",
3
+ "version": "1.9.22",
4
4
  "description": "基于antd二次开发",
5
5
  "repository": {
6
6
  "type": "git",
@@ -13,11 +13,12 @@ export default ({
13
13
  configData,
14
14
  gutter,
15
15
  dismissOnPressEnter = true,
16
+ itemSpan,
16
17
  }: HFormProps) => {
17
18
  const {
18
19
  form,
19
20
  itemProps: formItemProps,
20
- itemSpan,
21
+ itemSpan:formItemSpan,
21
22
  colon: formColon,
22
23
  setData,
23
24
  } = useFormContext();
@@ -57,7 +58,7 @@ export default ({
57
58
  style={style}
58
59
  itemProps={defaultItemProps as ItemPropsType}
59
60
  hideLabel={hideLabel}
60
- itemSpan={itemSpan}
61
+ itemSpan={itemSpan||formItemSpan}
61
62
  labelWidth={itemLabelWidth}
62
63
  colon={typeof itemColon === "undefined" ? formColon : itemColon}
63
64
  />
@@ -1,5 +1,5 @@
1
1
  import Label from "../Label";
2
- import { Form, Space, Col } from "antd";
2
+ import {Form, Space, Col, Row} from "antd";
3
3
  import React from "react";
4
4
  import Helper from "./Helper";
5
5
  import { useClassName } from "../../hooks";
@@ -55,6 +55,7 @@ const Index: React.FC<HFormItemProps> = (props) => {
55
55
  className: colClassName,
56
56
  noStyle = false,
57
57
  hidden,
58
+ rowWrapper,
58
59
  ...oProps
59
60
  } = props;
60
61
  const { labelAlign: align = "right", itemProps, ...inProps } = props;
@@ -80,6 +81,7 @@ const Index: React.FC<HFormItemProps> = (props) => {
80
81
  return null;
81
82
  }
82
83
  const colStyle = disHide ? { display: "none" } : {};
84
+
83
85
  return (
84
86
  <Col
85
87
  {...itemSpan}
@@ -117,4 +119,12 @@ const Index: React.FC<HFormItemProps> = (props) => {
117
119
  );
118
120
  };
119
121
 
120
- export default Index;
122
+ export default (props:HFormItemProps)=>{
123
+ const {rowWrapper,...oProps}=props;
124
+ if (rowWrapper){
125
+ return <Row style={{width:"100%"}}>
126
+ <Index {...oProps}/>
127
+ </Row>
128
+ }
129
+ return <Index {...oProps}/>;
130
+ };
@@ -10,6 +10,7 @@ export default (props: HItemProps) => {
10
10
  hideLabel: formLabelHide,
11
11
  formItemStyle,
12
12
  colon: formColon,
13
+ rowWrapper:formRowWrapper,
13
14
  } = useFormContext();
14
15
  const {
15
16
  labelWidth = formLabelWidth,
@@ -17,6 +18,7 @@ export default (props: HItemProps) => {
17
18
  hideLabel = formLabelHide,
18
19
  style = formItemStyle,
19
20
  colon,
21
+ rowWrapper=formRowWrapper
20
22
  } = props;
21
23
  const Component = useFormItemDomControl(props);
22
24
  return (
@@ -25,6 +27,7 @@ export default (props: HItemProps) => {
25
27
  labelAlign={labelAlign}
26
28
  labelWidth={labelWidth}
27
29
  hideLabel={hideLabel}
30
+ rowWrapper={rowWrapper}
28
31
  style={style}
29
32
  colon={typeof colon !== "undefined" ? colon : formColon}
30
33
  />
@@ -28,6 +28,7 @@ export default ({
28
28
  colon = true,
29
29
  dismissOnPressEnter,
30
30
  preserve,
31
+ rowWrapper,
31
32
  ...props
32
33
  }: HFormProps) => {
33
34
  const hForm = useCurrentForm(form);
@@ -89,6 +90,7 @@ export default ({
89
90
  itemProps: formItemProps,
90
91
  itemSpan,
91
92
  setData,
93
+ rowWrapper
92
94
  }}
93
95
  >
94
96
  <Form
@@ -88,11 +88,9 @@ export interface HItemProps
88
88
  render?: RenderFun;
89
89
  helper?: HelperModal | React.ReactNode;
90
90
  hover?: string | HoverModal | HoverFn;
91
- // formItems?: HItemProps[]; 保留感觉没必要
92
91
  labelWidth?: number;
93
92
  hide?: boolean | HideModal;
94
93
  placeholder?: string | string[];
95
- // formatKeys?: string[];
96
94
  name?: string;
97
95
  dispatch?: DispatchModal;
98
96
  itemSpan?: ColProps;
@@ -100,6 +98,7 @@ export interface HItemProps
100
98
  labelAlign?: LabelAlignModal;
101
99
  label?: React.ReactNode | HelperModal;
102
100
  hidden?: boolean | HideModal;
101
+ rowWrapper?:boolean;
103
102
  }
104
103
  export interface HFormProps<T = any, R = any>
105
104
  extends Omit<FormProps, "form" | "onFinish" | "labelAlign"> {
@@ -119,6 +118,7 @@ export interface HFormProps<T = any, R = any>
119
118
  formItemStyle?: React.CSSProperties;
120
119
  itemProps?: ItemPropsType;
121
120
  dismissOnPressEnter?: boolean;
121
+ rowWrapper?:boolean;
122
122
  }
123
123
  export interface HFormItemProps extends HItemProps {
124
124
  required?: boolean;
@@ -142,6 +142,7 @@ export interface FormContextProps {
142
142
  itemProps?: ItemPropsType;
143
143
  itemSpan?: ColProps;
144
144
  setData?: (newData: any) => void;
145
+ rowWrapper?:boolean;
145
146
  }
146
147
  interface ConfigUploadProps {
147
148
  exFiles?: string[];
@@ -8,6 +8,7 @@ import {
8
8
  } from "../../components";
9
9
  import { useState } from "react";
10
10
  import { Button, DatePicker, Form, Input, Row, Space } from "antd";
11
+ import Basic from "@/components/Form/Basic";
11
12
  const Test2 = () => {
12
13
  return <Row style={{ background: "red" }} />;
13
14
  };
@@ -77,6 +78,7 @@ const formData = (options) => {
77
78
  name: "url",
78
79
  type: "urlUpload",
79
80
  label: "文本",
81
+ hideLabel:true,
80
82
  itemProps: {
81
83
  initValueProvider:(props,val)=>{
82
84
  console.log(props,val,"fff")
@@ -87,6 +89,19 @@ const formData = (options) => {
87
89
  }
88
90
  }
89
91
  },
92
+ {
93
+ nameKey: "name1",
94
+ label: "输入框",
95
+ render:()=>{
96
+ return <Basic
97
+ configData={[{
98
+ label:"1"
99
+ },{
100
+ label:"2"
101
+ }]}
102
+ />
103
+ }
104
+ },
90
105
  {
91
106
  label: "输入框",
92
107
  type: "checkboxGroup",
@@ -143,6 +158,10 @@ export default () => {
143
158
  <HForm
144
159
  configData={formData(options)}
145
160
  dismissOnPressEnter={false}
161
+ labelWidth={88}
162
+ itemSpan={{
163
+ span:12
164
+ }}
146
165
  form={form}
147
166
  labelAlign={"left"}
148
167
  onFinish={(value) => {