@hw-component/form 0.0.7-beta-v3 → 0.0.7-beta-v4
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.
- package/es/Form/FormItem/BasicItem.js +22 -18
- package/es/Form/FormItem/RegularFormItem.js +3 -1
- package/es/Form/FormItem/UpFormItem.d.ts +1 -1
- package/es/Form/FormItem/UpFormItem.js +4 -2
- package/es/Form/index.d.ts +1 -1
- package/es/Form/index.js +12 -8
- package/es/Form/modal.d.ts +4 -0
- package/lib/Form/FormItem/BasicItem.js +21 -17
- package/lib/Form/FormItem/RegularFormItem.js +3 -1
- package/lib/Form/FormItem/UpFormItem.d.ts +1 -1
- package/lib/Form/FormItem/UpFormItem.js +4 -2
- package/lib/Form/index.d.ts +1 -1
- package/lib/Form/index.js +11 -7
- package/lib/Form/modal.d.ts +4 -0
- package/package.json +1 -1
- package/src/components/Cascader/index.tsx +2 -2
- package/src/components/Form/FormItem/BasicItem.tsx +21 -18
- package/src/components/Form/FormItem/RegularFormItem.tsx +2 -2
- package/src/components/Form/FormItem/UpFormItem.tsx +2 -1
- package/src/components/Form/index.tsx +15 -11
- package/src/components/Form/modal.ts +4 -0
- package/src/components/Input/index.tsx +19 -14
- package/src/components/Input/modal.ts +1 -1
- package/src/pages/Form/index.tsx +1 -0
|
@@ -10,7 +10,7 @@ import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
|
|
|
10
10
|
import _objectWithoutProperties from '@babel/runtime-corejs3/helpers/objectWithoutProperties';
|
|
11
11
|
import { jsx, jsxs } from 'react/jsx-runtime';
|
|
12
12
|
import Index$1 from '../Label.js';
|
|
13
|
-
import { Form, Space } from 'antd';
|
|
13
|
+
import { Col, Form, Space } from 'antd';
|
|
14
14
|
import React from 'react';
|
|
15
15
|
import Index$2 from './Helper.js';
|
|
16
16
|
import { useClassName } from '../../hooks/index.js';
|
|
@@ -19,7 +19,7 @@ import { useFormContext } from '../Context/index.js';
|
|
|
19
19
|
import { useDefaultRender } from '../hooks/useDefaultRender.js';
|
|
20
20
|
import { useDefaultComponents } from '../hooks/index.js';
|
|
21
21
|
|
|
22
|
-
var _excluded = ["hover", "labelWidth", "required", "colon", "label", "itemProps", "children", "helper", "hide", "render"];
|
|
22
|
+
var _excluded = ["hover", "labelWidth", "required", "colon", "label", "itemProps", "children", "helper", "hide", "render", "itemSpan"];
|
|
23
23
|
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
24
24
|
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
25
25
|
var Content = function Content(_ref) {
|
|
@@ -58,7 +58,9 @@ var Index = function Index(props) {
|
|
|
58
58
|
var helper = props.helper,
|
|
59
59
|
hide = props.hide;
|
|
60
60
|
props.render;
|
|
61
|
-
var
|
|
61
|
+
var _props$itemSpan = props.itemSpan,
|
|
62
|
+
itemSpan = _props$itemSpan === void 0 ? {} : _props$itemSpan,
|
|
63
|
+
oProps = _objectWithoutProperties(props, _excluded);
|
|
62
64
|
var _useFormContext = useFormContext(),
|
|
63
65
|
form = _useFormContext.form;
|
|
64
66
|
var defaultComponent = useDefaultComponents();
|
|
@@ -70,21 +72,23 @@ var Index = function Index(props) {
|
|
|
70
72
|
if (hideItem) {
|
|
71
73
|
return null;
|
|
72
74
|
}
|
|
73
|
-
return jsx(
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
75
|
+
return jsx(Col, _objectSpread(_objectSpread({}, itemSpan), {}, {
|
|
76
|
+
children: jsx(Form.Item, _objectSpread(_objectSpread({
|
|
77
|
+
label: jsx(Index$1, {
|
|
78
|
+
hover: hover,
|
|
79
|
+
labelWidth: labelWidth,
|
|
80
|
+
required: required,
|
|
81
|
+
colon: colon,
|
|
82
|
+
children: label
|
|
83
|
+
})
|
|
84
|
+
}, oProps), {}, {
|
|
85
|
+
colon: false,
|
|
86
|
+
required: false,
|
|
87
|
+
children: jsx(Content, {
|
|
88
|
+
helper: helper,
|
|
89
|
+
children: defaultRender(form)
|
|
90
|
+
})
|
|
91
|
+
}))
|
|
88
92
|
}));
|
|
89
93
|
};
|
|
90
94
|
|
|
@@ -14,8 +14,10 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
|
|
|
14
14
|
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
15
15
|
var RegularFormItem = (function (props) {
|
|
16
16
|
var type = props.type,
|
|
17
|
-
colon = props.colon
|
|
17
|
+
colon = props.colon,
|
|
18
|
+
itemSpan = props.itemSpan;
|
|
18
19
|
return jsx(Index, _objectSpread(_objectSpread({}, props), {}, {
|
|
20
|
+
itemSpan: itemSpan,
|
|
19
21
|
colon: type === "submit" ? false : colon
|
|
20
22
|
}));
|
|
21
23
|
});
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import type { HFormItemProps } from "../modal";
|
|
2
|
-
declare const _default: ({ shouldUpdate, dependencies, hide, ...props }: HFormItemProps) => JSX.Element;
|
|
2
|
+
declare const _default: ({ shouldUpdate, dependencies, hide, itemSpan, ...props }: HFormItemProps) => JSX.Element;
|
|
3
3
|
export default _default;
|
|
@@ -13,7 +13,7 @@ import { Form } from 'antd';
|
|
|
13
13
|
import Index from './BasicItem.js';
|
|
14
14
|
import { useShouldUpdate } from './hooks.js';
|
|
15
15
|
|
|
16
|
-
var _excluded = ["shouldUpdate", "dependencies", "hide"];
|
|
16
|
+
var _excluded = ["shouldUpdate", "dependencies", "hide", "itemSpan"];
|
|
17
17
|
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
18
18
|
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
19
19
|
var Item = Form.Item;
|
|
@@ -21,6 +21,7 @@ var UpFormItem = (function (_ref) {
|
|
|
21
21
|
var shouldUpdate = _ref.shouldUpdate,
|
|
22
22
|
dependencies = _ref.dependencies,
|
|
23
23
|
hide = _ref.hide,
|
|
24
|
+
itemSpan = _ref.itemSpan,
|
|
24
25
|
props = _objectWithoutProperties(_ref, _excluded);
|
|
25
26
|
var resultShouldUpdate = useShouldUpdate({
|
|
26
27
|
shouldUpdate: shouldUpdate,
|
|
@@ -32,7 +33,8 @@ var UpFormItem = (function (_ref) {
|
|
|
32
33
|
noStyle: true,
|
|
33
34
|
children: function children() {
|
|
34
35
|
return jsx(Index, _objectSpread({
|
|
35
|
-
hide: hide
|
|
36
|
+
hide: hide,
|
|
37
|
+
itemSpan: itemSpan
|
|
36
38
|
}, props));
|
|
37
39
|
}
|
|
38
40
|
});
|
package/es/Form/index.d.ts
CHANGED
|
@@ -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, ...props }: HFormProps) => JSX.Element;
|
|
2
|
+
declare const _default: ({ configData, labelWidth, form, request, onFinish, infoRequest, valueType, initialValues, params, onValuesChange, itemSpan, ...props }: HFormProps) => JSX.Element;
|
|
3
3
|
export default _default;
|
package/es/Form/index.js
CHANGED
|
@@ -11,7 +11,7 @@ import _objectWithoutProperties from '@babel/runtime-corejs3/helpers/objectWitho
|
|
|
11
11
|
import 'core-js/modules/es.array.map.js';
|
|
12
12
|
import { jsx, jsxs } from 'react/jsx-runtime';
|
|
13
13
|
import { useEffect, createElement } from 'react';
|
|
14
|
-
import { Form } from 'antd';
|
|
14
|
+
import { Form, Row } from 'antd';
|
|
15
15
|
import Item from './FormItem/index.js';
|
|
16
16
|
import { useCurrentForm, useInfoReq, useValuesChange } from './hooks/index.js';
|
|
17
17
|
import { FormContext } from './Context/index.js';
|
|
@@ -19,7 +19,7 @@ import Index from '../PageHandler/index.js';
|
|
|
19
19
|
import useInitConfigData from './hooks/useInitConfigData.js';
|
|
20
20
|
import InitSet from './InitSet.js';
|
|
21
21
|
|
|
22
|
-
var _excluded = ["configData", "labelWidth", "form", "request", "onFinish", "infoRequest", "valueType", "initialValues", "params", "onValuesChange"];
|
|
22
|
+
var _excluded = ["configData", "labelWidth", "form", "request", "onFinish", "infoRequest", "valueType", "initialValues", "params", "onValuesChange", "itemSpan"];
|
|
23
23
|
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
24
24
|
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
25
25
|
var HForm = (function (_ref) {
|
|
@@ -35,6 +35,7 @@ var HForm = (function (_ref) {
|
|
|
35
35
|
_ref$params = _ref.params,
|
|
36
36
|
params = _ref$params === void 0 ? {} : _ref$params,
|
|
37
37
|
onValuesChange = _ref.onValuesChange,
|
|
38
|
+
itemSpan = _ref.itemSpan,
|
|
38
39
|
props = _objectWithoutProperties(_ref, _excluded);
|
|
39
40
|
var hForm = useCurrentForm(form);
|
|
40
41
|
var _useInitConfigData = useInitConfigData({
|
|
@@ -86,12 +87,15 @@ var HForm = (function (_ref) {
|
|
|
86
87
|
onFinish: run,
|
|
87
88
|
onValuesChange: valuesChange
|
|
88
89
|
}, props), {}, {
|
|
89
|
-
children: [
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
90
|
+
children: [jsx(Row, {
|
|
91
|
+
children: newConfigData.map(function (itemData, index) {
|
|
92
|
+
var itemLabelWidth = itemData.labelWidth;
|
|
93
|
+
return /*#__PURE__*/createElement(Item, _objectSpread(_objectSpread({}, itemData), {}, {
|
|
94
|
+
key: index,
|
|
95
|
+
itemSpan: itemSpan,
|
|
96
|
+
labelWidth: itemLabelWidth || labelWidth
|
|
97
|
+
}));
|
|
98
|
+
})
|
|
95
99
|
}), jsx(InitSet, {})]
|
|
96
100
|
}))
|
|
97
101
|
})
|
package/es/Form/modal.d.ts
CHANGED
|
@@ -14,6 +14,7 @@ import type { RangePickerProps } from "antd/es/date-picker";
|
|
|
14
14
|
import type { PromiseFnResult, ValueCheckMapModal, ValueSwitchMapModal, DateRangePickerValueMapModal } from "../modal";
|
|
15
15
|
import type { ForwardedRef } from "react";
|
|
16
16
|
import type { DataFnProvider } from "../modal";
|
|
17
|
+
import { ColProps } from "antd/lib/grid/col";
|
|
17
18
|
type RenderFun = (props: HItemProps, node: React.ReactNode, form: FormInstance) => React.ReactNode;
|
|
18
19
|
type ItemPropsType = HCheckboxProps | HInputProps | HSelectInputProps | HButtonProps | HRadioGroupProps | HSelectProps | ButtonProps | HSwitchProps | HDatePickerProps | HRangePickerProps | HTimePickerProps | TextAreaProps | IUpLoadProps | CascaderProps<any>;
|
|
19
20
|
export interface HoverModal {
|
|
@@ -41,6 +42,7 @@ export interface HItemProps extends Omit<FormItemProps, "name"> {
|
|
|
41
42
|
placeholder?: string | string[];
|
|
42
43
|
name?: string;
|
|
43
44
|
dispatch?: DispatchModal;
|
|
45
|
+
itemSpan?: ColProps;
|
|
44
46
|
}
|
|
45
47
|
export interface HFormProps<T = any, R = any> extends Omit<FormProps, "form" | "onFinish"> {
|
|
46
48
|
configData: HItemProps[];
|
|
@@ -51,11 +53,13 @@ export interface HFormProps<T = any, R = any> extends Omit<FormProps, "form" | "
|
|
|
51
53
|
form?: HFormInstance;
|
|
52
54
|
params?: any;
|
|
53
55
|
onFinish?: (values: T, params?: any) => void;
|
|
56
|
+
itemSpan?: ColProps;
|
|
54
57
|
}
|
|
55
58
|
export interface HFormItemProps extends HItemProps {
|
|
56
59
|
required?: boolean;
|
|
57
60
|
value?: any;
|
|
58
61
|
onChange?: (val: any, item: any) => void;
|
|
62
|
+
itemSpan?: ColProps;
|
|
59
63
|
}
|
|
60
64
|
export type argsFn = (...args: any[]) => void;
|
|
61
65
|
export interface FormContextProps {
|
|
@@ -22,7 +22,7 @@ var index = require('../Context/index.js');
|
|
|
22
22
|
var useDefaultRender = require('../hooks/useDefaultRender.js');
|
|
23
23
|
var index$1 = require('../hooks/index.js');
|
|
24
24
|
|
|
25
|
-
var _excluded = ["hover", "labelWidth", "required", "colon", "label", "itemProps", "children", "helper", "hide", "render"];
|
|
25
|
+
var _excluded = ["hover", "labelWidth", "required", "colon", "label", "itemProps", "children", "helper", "hide", "render", "itemSpan"];
|
|
26
26
|
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
27
27
|
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
28
28
|
var Content = function Content(_ref) {
|
|
@@ -61,7 +61,9 @@ var Index = function Index(props) {
|
|
|
61
61
|
var helper = props.helper,
|
|
62
62
|
hide = props.hide;
|
|
63
63
|
props.render;
|
|
64
|
-
var
|
|
64
|
+
var _props$itemSpan = props.itemSpan,
|
|
65
|
+
itemSpan = _props$itemSpan === void 0 ? {} : _props$itemSpan,
|
|
66
|
+
oProps = _objectWithoutProperties(props, _excluded);
|
|
65
67
|
var _useFormContext = index.useFormContext(),
|
|
66
68
|
form = _useFormContext.form;
|
|
67
69
|
var defaultComponent = index$1.useDefaultComponents();
|
|
@@ -73,21 +75,23 @@ var Index = function Index(props) {
|
|
|
73
75
|
if (hideItem) {
|
|
74
76
|
return null;
|
|
75
77
|
}
|
|
76
|
-
return jsxRuntime.jsx(antd.
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
78
|
+
return jsxRuntime.jsx(antd.Col, _objectSpread(_objectSpread({}, itemSpan), {}, {
|
|
79
|
+
children: jsxRuntime.jsx(antd.Form.Item, _objectSpread(_objectSpread({
|
|
80
|
+
label: jsxRuntime.jsx(Label.default, {
|
|
81
|
+
hover: hover,
|
|
82
|
+
labelWidth: labelWidth,
|
|
83
|
+
required: required,
|
|
84
|
+
colon: colon,
|
|
85
|
+
children: label
|
|
86
|
+
})
|
|
87
|
+
}, oProps), {}, {
|
|
88
|
+
colon: false,
|
|
89
|
+
required: false,
|
|
90
|
+
children: jsxRuntime.jsx(Content, {
|
|
91
|
+
helper: helper,
|
|
92
|
+
children: defaultRender(form)
|
|
93
|
+
})
|
|
94
|
+
}))
|
|
91
95
|
}));
|
|
92
96
|
};
|
|
93
97
|
|
|
@@ -17,8 +17,10 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
|
|
|
17
17
|
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
18
18
|
var RegularFormItem = (function (props) {
|
|
19
19
|
var type = props.type,
|
|
20
|
-
colon = props.colon
|
|
20
|
+
colon = props.colon,
|
|
21
|
+
itemSpan = props.itemSpan;
|
|
21
22
|
return jsxRuntime.jsx(BasicItem.default, _objectSpread(_objectSpread({}, props), {}, {
|
|
23
|
+
itemSpan: itemSpan,
|
|
22
24
|
colon: type === "submit" ? false : colon
|
|
23
25
|
}));
|
|
24
26
|
});
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import type { HFormItemProps } from "../modal";
|
|
2
|
-
declare const _default: ({ shouldUpdate, dependencies, hide, ...props }: HFormItemProps) => JSX.Element;
|
|
2
|
+
declare const _default: ({ shouldUpdate, dependencies, hide, itemSpan, ...props }: HFormItemProps) => JSX.Element;
|
|
3
3
|
export default _default;
|
|
@@ -16,7 +16,7 @@ var antd = require('antd');
|
|
|
16
16
|
var BasicItem = require('./BasicItem.js');
|
|
17
17
|
var hooks = require('./hooks.js');
|
|
18
18
|
|
|
19
|
-
var _excluded = ["shouldUpdate", "dependencies", "hide"];
|
|
19
|
+
var _excluded = ["shouldUpdate", "dependencies", "hide", "itemSpan"];
|
|
20
20
|
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
21
21
|
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
22
22
|
var Item = antd.Form.Item;
|
|
@@ -24,6 +24,7 @@ var UpFormItem = (function (_ref) {
|
|
|
24
24
|
var shouldUpdate = _ref.shouldUpdate,
|
|
25
25
|
dependencies = _ref.dependencies,
|
|
26
26
|
hide = _ref.hide,
|
|
27
|
+
itemSpan = _ref.itemSpan,
|
|
27
28
|
props = _objectWithoutProperties(_ref, _excluded);
|
|
28
29
|
var resultShouldUpdate = hooks.useShouldUpdate({
|
|
29
30
|
shouldUpdate: shouldUpdate,
|
|
@@ -35,7 +36,8 @@ var UpFormItem = (function (_ref) {
|
|
|
35
36
|
noStyle: true,
|
|
36
37
|
children: function children() {
|
|
37
38
|
return jsxRuntime.jsx(BasicItem.default, _objectSpread({
|
|
38
|
-
hide: hide
|
|
39
|
+
hide: hide,
|
|
40
|
+
itemSpan: itemSpan
|
|
39
41
|
}, props));
|
|
40
42
|
}
|
|
41
43
|
});
|
package/lib/Form/index.d.ts
CHANGED
|
@@ -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, ...props }: HFormProps) => JSX.Element;
|
|
2
|
+
declare const _default: ({ configData, labelWidth, form, request, onFinish, infoRequest, valueType, initialValues, params, onValuesChange, itemSpan, ...props }: HFormProps) => JSX.Element;
|
|
3
3
|
export default _default;
|
package/lib/Form/index.js
CHANGED
|
@@ -22,7 +22,7 @@ var index$1 = require('../PageHandler/index.js');
|
|
|
22
22
|
var useInitConfigData = require('./hooks/useInitConfigData.js');
|
|
23
23
|
var InitSet = require('./InitSet.js');
|
|
24
24
|
|
|
25
|
-
var _excluded = ["configData", "labelWidth", "form", "request", "onFinish", "infoRequest", "valueType", "initialValues", "params", "onValuesChange"];
|
|
25
|
+
var _excluded = ["configData", "labelWidth", "form", "request", "onFinish", "infoRequest", "valueType", "initialValues", "params", "onValuesChange", "itemSpan"];
|
|
26
26
|
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
27
27
|
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
28
28
|
var HForm = (function (_ref) {
|
|
@@ -38,6 +38,7 @@ var HForm = (function (_ref) {
|
|
|
38
38
|
_ref$params = _ref.params,
|
|
39
39
|
params = _ref$params === void 0 ? {} : _ref$params,
|
|
40
40
|
onValuesChange = _ref.onValuesChange,
|
|
41
|
+
itemSpan = _ref.itemSpan,
|
|
41
42
|
props = _objectWithoutProperties(_ref, _excluded);
|
|
42
43
|
var hForm = index.useCurrentForm(form);
|
|
43
44
|
var _useInitConfigData = useInitConfigData.default({
|
|
@@ -89,12 +90,15 @@ var HForm = (function (_ref) {
|
|
|
89
90
|
onFinish: run,
|
|
90
91
|
onValuesChange: valuesChange
|
|
91
92
|
}, props), {}, {
|
|
92
|
-
children: [
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
93
|
+
children: [jsxRuntime.jsx(antd.Row, {
|
|
94
|
+
children: newConfigData.map(function (itemData, index) {
|
|
95
|
+
var itemLabelWidth = itemData.labelWidth;
|
|
96
|
+
return /*#__PURE__*/React.createElement(index$3.default, _objectSpread(_objectSpread({}, itemData), {}, {
|
|
97
|
+
key: index,
|
|
98
|
+
itemSpan: itemSpan,
|
|
99
|
+
labelWidth: itemLabelWidth || labelWidth
|
|
100
|
+
}));
|
|
101
|
+
})
|
|
98
102
|
}), jsxRuntime.jsx(InitSet.default, {})]
|
|
99
103
|
}))
|
|
100
104
|
})
|
package/lib/Form/modal.d.ts
CHANGED
|
@@ -14,6 +14,7 @@ import type { RangePickerProps } from "antd/es/date-picker";
|
|
|
14
14
|
import type { PromiseFnResult, ValueCheckMapModal, ValueSwitchMapModal, DateRangePickerValueMapModal } from "../modal";
|
|
15
15
|
import type { ForwardedRef } from "react";
|
|
16
16
|
import type { DataFnProvider } from "../modal";
|
|
17
|
+
import { ColProps } from "antd/lib/grid/col";
|
|
17
18
|
type RenderFun = (props: HItemProps, node: React.ReactNode, form: FormInstance) => React.ReactNode;
|
|
18
19
|
type ItemPropsType = HCheckboxProps | HInputProps | HSelectInputProps | HButtonProps | HRadioGroupProps | HSelectProps | ButtonProps | HSwitchProps | HDatePickerProps | HRangePickerProps | HTimePickerProps | TextAreaProps | IUpLoadProps | CascaderProps<any>;
|
|
19
20
|
export interface HoverModal {
|
|
@@ -41,6 +42,7 @@ export interface HItemProps extends Omit<FormItemProps, "name"> {
|
|
|
41
42
|
placeholder?: string | string[];
|
|
42
43
|
name?: string;
|
|
43
44
|
dispatch?: DispatchModal;
|
|
45
|
+
itemSpan?: ColProps;
|
|
44
46
|
}
|
|
45
47
|
export interface HFormProps<T = any, R = any> extends Omit<FormProps, "form" | "onFinish"> {
|
|
46
48
|
configData: HItemProps[];
|
|
@@ -51,11 +53,13 @@ export interface HFormProps<T = any, R = any> extends Omit<FormProps, "form" | "
|
|
|
51
53
|
form?: HFormInstance;
|
|
52
54
|
params?: any;
|
|
53
55
|
onFinish?: (values: T, params?: any) => void;
|
|
56
|
+
itemSpan?: ColProps;
|
|
54
57
|
}
|
|
55
58
|
export interface HFormItemProps extends HItemProps {
|
|
56
59
|
required?: boolean;
|
|
57
60
|
value?: any;
|
|
58
61
|
onChange?: (val: any, item: any) => void;
|
|
62
|
+
itemSpan?: ColProps;
|
|
59
63
|
}
|
|
60
64
|
export type argsFn = (...args: any[]) => void;
|
|
61
65
|
export interface FormContextProps {
|
package/package.json
CHANGED
|
@@ -3,9 +3,9 @@ import { Cascader } from "antd";
|
|
|
3
3
|
import { useRequest } from "ahooks";
|
|
4
4
|
import { useMatchConfigProps } from "../hooks";
|
|
5
5
|
import type { PromiseFnResult } from "../modal";
|
|
6
|
-
export type HCascaderProps={
|
|
6
|
+
export type HCascaderProps = {
|
|
7
7
|
request?: PromiseFnResult<any>;
|
|
8
|
-
}&CascaderProps<any
|
|
8
|
+
} & CascaderProps<any>;
|
|
9
9
|
|
|
10
10
|
export default ({
|
|
11
11
|
request,
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import Label from "../Label";
|
|
2
|
-
import { Form, Space } from "antd";
|
|
2
|
+
import { Form, Space ,Col} from "antd";
|
|
3
3
|
import React from "react";
|
|
4
4
|
import Helper from "./Helper";
|
|
5
5
|
import { useClassName } from "../../hooks";
|
|
@@ -43,6 +43,7 @@ const Index: React.FC<HFormItemProps> = (props) => {
|
|
|
43
43
|
helper,
|
|
44
44
|
hide,
|
|
45
45
|
render,
|
|
46
|
+
itemSpan={},
|
|
46
47
|
...oProps
|
|
47
48
|
} = props;
|
|
48
49
|
const { form } = useFormContext();
|
|
@@ -53,23 +54,25 @@ const Index: React.FC<HFormItemProps> = (props) => {
|
|
|
53
54
|
return null;
|
|
54
55
|
}
|
|
55
56
|
return (
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
57
|
+
<Col {...itemSpan}>
|
|
58
|
+
<Form.Item
|
|
59
|
+
label={
|
|
60
|
+
<Label
|
|
61
|
+
hover={hover}
|
|
62
|
+
labelWidth={labelWidth}
|
|
63
|
+
required={required}
|
|
64
|
+
colon={colon}
|
|
65
|
+
>
|
|
66
|
+
{label}
|
|
67
|
+
</Label>
|
|
68
|
+
}
|
|
69
|
+
{...oProps}
|
|
70
|
+
colon={false}
|
|
71
|
+
required={false}
|
|
72
|
+
>
|
|
73
|
+
<Content helper={helper}>{defaultRender(form)}</Content>
|
|
74
|
+
</Form.Item>
|
|
75
|
+
</Col>
|
|
73
76
|
);
|
|
74
77
|
};
|
|
75
78
|
|
|
@@ -2,6 +2,6 @@ import BasicItem from "./BasicItem";
|
|
|
2
2
|
import type { HItemProps } from "../modal";
|
|
3
3
|
|
|
4
4
|
export default (props: HItemProps) => {
|
|
5
|
-
const { type, colon
|
|
6
|
-
return <BasicItem {...props} colon={type === "submit" ? false : colon} />;
|
|
5
|
+
const { type, colon,itemSpan} = props;
|
|
6
|
+
return <BasicItem {...props} itemSpan={itemSpan} colon={type === "submit" ? false : colon} />;
|
|
7
7
|
};
|
|
@@ -7,13 +7,14 @@ export default ({
|
|
|
7
7
|
shouldUpdate,
|
|
8
8
|
dependencies,
|
|
9
9
|
hide,
|
|
10
|
+
itemSpan,
|
|
10
11
|
...props
|
|
11
12
|
}: HFormItemProps) => {
|
|
12
13
|
const resultShouldUpdate = useShouldUpdate({ shouldUpdate, hide });
|
|
13
14
|
return (
|
|
14
15
|
<Item shouldUpdate={resultShouldUpdate} dependencies={dependencies} noStyle>
|
|
15
16
|
{() => {
|
|
16
|
-
return <BasicItem hide={hide} {...props} />;
|
|
17
|
+
return <BasicItem hide={hide} itemSpan={itemSpan} {...props} />;
|
|
17
18
|
}}
|
|
18
19
|
</Item>
|
|
19
20
|
);
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Form } from "antd";
|
|
1
|
+
import { Form ,Row} from "antd";
|
|
2
2
|
import type { HFormProps, HItemProps } from "./modal";
|
|
3
3
|
import Item from "./FormItem";
|
|
4
4
|
import { useCurrentForm, useInfoReq, useValuesChange } from "./hooks";
|
|
@@ -19,6 +19,7 @@ export default ({
|
|
|
19
19
|
initialValues,
|
|
20
20
|
params = {},
|
|
21
21
|
onValuesChange,
|
|
22
|
+
itemSpan,
|
|
22
23
|
...props
|
|
23
24
|
}: HFormProps) => {
|
|
24
25
|
const hForm = useCurrentForm(form);
|
|
@@ -67,16 +68,19 @@ export default ({
|
|
|
67
68
|
onValuesChange={valuesChange}
|
|
68
69
|
{...props}
|
|
69
70
|
>
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
71
|
+
<Row>
|
|
72
|
+
{newConfigData.map((itemData: HItemProps, index) => {
|
|
73
|
+
const { labelWidth: itemLabelWidth } = itemData;
|
|
74
|
+
return (
|
|
75
|
+
<Item
|
|
76
|
+
{...itemData}
|
|
77
|
+
key={index}
|
|
78
|
+
itemSpan={itemSpan}
|
|
79
|
+
labelWidth={itemLabelWidth || labelWidth}
|
|
80
|
+
/>
|
|
81
|
+
);
|
|
82
|
+
})}
|
|
83
|
+
</Row>
|
|
80
84
|
<InitSet />
|
|
81
85
|
</Form>
|
|
82
86
|
</FormContext.Provider>
|
|
@@ -32,6 +32,7 @@ import type {
|
|
|
32
32
|
} from "../modal";
|
|
33
33
|
import type { ForwardedRef } from "react";
|
|
34
34
|
import type { DataFnProvider } from "../modal";
|
|
35
|
+
import {ColProps} from "antd/lib/grid/col";
|
|
35
36
|
|
|
36
37
|
type RenderFun = (
|
|
37
38
|
props: HItemProps,
|
|
@@ -86,6 +87,7 @@ export interface HItemProps extends Omit<FormItemProps, "name"> {
|
|
|
86
87
|
// formatKeys?: string[];
|
|
87
88
|
name?: string;
|
|
88
89
|
dispatch?: DispatchModal;
|
|
90
|
+
itemSpan?:ColProps
|
|
89
91
|
}
|
|
90
92
|
|
|
91
93
|
export interface HFormProps<T = any, R = any>
|
|
@@ -98,11 +100,13 @@ export interface HFormProps<T = any, R = any>
|
|
|
98
100
|
form?: HFormInstance;
|
|
99
101
|
params?: any;
|
|
100
102
|
onFinish?: (values: T, params?: any) => void;
|
|
103
|
+
itemSpan?:ColProps
|
|
101
104
|
}
|
|
102
105
|
export interface HFormItemProps extends HItemProps {
|
|
103
106
|
required?: boolean;
|
|
104
107
|
value?: any;
|
|
105
108
|
onChange?: (val: any, item: any) => void;
|
|
109
|
+
itemSpan?:ColProps
|
|
106
110
|
}
|
|
107
111
|
export type argsFn = (...args: any[]) => void;
|
|
108
112
|
export interface FormContextProps {
|
|
@@ -1,21 +1,26 @@
|
|
|
1
|
-
import { Input
|
|
1
|
+
import { Input, message } from "antd";
|
|
2
2
|
import type { HInputProps } from "./modal";
|
|
3
|
-
import {CopyOutlined} from
|
|
3
|
+
import { CopyOutlined } from "@ant-design/icons";
|
|
4
4
|
// @ts-ignore
|
|
5
|
-
import { CopyToClipboard } from
|
|
6
|
-
const CopyDom=({value}:HInputProps)=>{
|
|
7
|
-
return
|
|
5
|
+
import { CopyToClipboard } from "react-copy-to-clipboard";
|
|
6
|
+
const CopyDom = ({ value }: HInputProps) => {
|
|
7
|
+
return (
|
|
8
|
+
<CopyToClipboard
|
|
8
9
|
text={value}
|
|
9
10
|
onCopy={() => {
|
|
10
11
|
message.success("复制成功!");
|
|
11
12
|
}}
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
return
|
|
19
|
-
|
|
20
|
-
|
|
13
|
+
>
|
|
14
|
+
<CopyOutlined />
|
|
15
|
+
</CopyToClipboard>
|
|
16
|
+
);
|
|
17
|
+
};
|
|
18
|
+
export default ({ copy, value, addonAfter, ...props }: HInputProps) => {
|
|
19
|
+
return (
|
|
20
|
+
<Input
|
|
21
|
+
{...props}
|
|
22
|
+
value={value}
|
|
23
|
+
addonAfter={copy ? <CopyDom value={value} /> : addonAfter}
|
|
24
|
+
/>
|
|
25
|
+
);
|
|
21
26
|
};
|