@hw-component/form 1.9.13 → 1.9.14

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.
Files changed (5) hide show
  1. package/es/Input/InputNumberGroup.js +50 -33
  2. package/lib/Input/InputNumberGroup.js +49 -32
  3. package/package.json +1 -1
  4. package/src/components/Input/InputNumberGroup.tsx +16 -7
  5. package/src/pages/InputNumberGroup/index.tsx +7 -1
package/es/Input/InputNumberGroup.js CHANGED
@@ -3,7 +3,7 @@ import _typeof from '@babel/runtime-corejs3/helpers/typeof';
3
3
  import _objectWithoutProperties from '@babel/runtime-corejs3/helpers/objectWithoutProperties';
4
4
  import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
5
5
  import _slicedToArray from '@babel/runtime-corejs3/helpers/slicedToArray';
6
- import { jsxs, jsx } from 'react/jsx-runtime';
6
+ import { jsxs, jsx, Fragment } from 'react/jsx-runtime';
7
7
  import { Input, InputNumber } from 'antd';
8
8
  import { SwapRightOutlined } from '@ant-design/icons';
9
9
  import React, { useState, useMemo } from 'react';
@@ -22,25 +22,47 @@ var useArrayProps = function useArrayProps(props) {
22
22
  return [props, props];
23
23
  }, [props]);
24
24
  };
25
- var InputNumberGroup = function InputNumberGroup(_ref) {
26
- var _ref$value = _ref.value,
27
- value = _ref$value === void 0 ? {} : _ref$value,
28
- _ref$valueMap = _ref.valueMap,
29
- valueMap = _ref$valueMap === void 0 ? {
25
+ var Addon = function Addon(_ref) {
26
+ var children = _ref.children,
27
+ value = _ref.value,
28
+ onChange = _ref.onChange;
29
+ var addonClassname = useClassName(["hw-input-group-addon"]);
30
+ if (!children) {
31
+ return jsx(Fragment, {});
32
+ }
33
+ if (/*#__PURE__*/React.isValidElement(children)) {
34
+ return jsx("div", {
35
+ className: addonClassname,
36
+ children: /*#__PURE__*/React.cloneElement(children, {
37
+ value: value,
38
+ onChange: onChange
39
+ })
40
+ });
41
+ }
42
+ return jsx("div", {
43
+ className: addonClassname,
44
+ children: children
45
+ });
46
+ };
47
+ var InputNumberGroup = function InputNumberGroup(_ref2) {
48
+ var _ref2$value = _ref2.value,
49
+ value = _ref2$value === void 0 ? {} : _ref2$value,
50
+ _ref2$valueMap = _ref2.valueMap,
51
+ valueMap = _ref2$valueMap === void 0 ? {
30
52
  min: "min",
31
53
  max: "max"
32
- } : _ref$valueMap,
33
- onChange = _ref.onChange,
34
- _ref$placeholder = _ref.placeholder,
35
- placeholder = _ref$placeholder === void 0 ? ["请输入", "请输入"] : _ref$placeholder,
36
- _ref$inputNumberProps = _ref.inputNumberProps,
37
- inputNumberProps = _ref$inputNumberProps === void 0 ? {} : _ref$inputNumberProps,
38
- addonAfter = _ref.addonAfter,
39
- _ref$noHandlerWrap = _ref.noHandlerWrap,
40
- noHandlerWrap = _ref$noHandlerWrap === void 0 ? true : _ref$noHandlerWrap,
41
- addFormat = _ref.addFormat,
42
- disabled = _ref.disabled,
43
- addonBefore = _ref.addonBefore;
54
+ } : _ref2$valueMap,
55
+ onChange = _ref2.onChange,
56
+ _ref2$placeholder = _ref2.placeholder,
57
+ placeholder = _ref2$placeholder === void 0 ? ["请输入", "请输入"] : _ref2$placeholder,
58
+ _ref2$inputNumberProp = _ref2.inputNumberProps,
59
+ inputNumberProps = _ref2$inputNumberProp === void 0 ? {} : _ref2$inputNumberProp,
60
+ addonAfter = _ref2.addonAfter,
61
+ _ref2$noHandlerWrap = _ref2.noHandlerWrap,
62
+ noHandlerWrap = _ref2$noHandlerWrap === void 0 ? true : _ref2$noHandlerWrap,
63
+ addFormat = _ref2.addFormat,
64
+ disabled = _ref2.disabled,
65
+ addonBefore = _ref2.addonBefore;
44
66
  var min = valueMap.min,
45
67
  max = valueMap.max;
46
68
  var minVal = value[min],
@@ -65,7 +87,6 @@ var InputNumberGroup = function InputNumberGroup(_ref) {
65
87
  var iconClassname = useClassName(["hw-input-group-icon"]);
66
88
  var disabledClassname = useClassName(["hw-input-group-disabled"]);
67
89
  var notDisabledClassname = useClassName(["hw-input-group-not-disabled"]);
68
- var addonClassname = useClassName(["hw-input-group-addon"]);
69
90
  var noHandlerWrapClassname = useClassName(["hw-input-group-no-handler-wrap"]);
70
91
  addFormat === null || addFormat === void 0 || addFormat({
71
92
  float: {
@@ -101,12 +122,10 @@ var InputNumberGroup = function InputNumberGroup(_ref) {
101
122
  return jsxs(Input.Group, {
102
123
  compact: true,
103
124
  className: contentClassname,
104
- children: [addonBefore && jsx("div", {
105
- className: addonClassname,
106
- children: /*#__PURE__*/React.cloneElement(addonBefore, {
107
- value: value,
108
- onChange: onChange
109
- })
125
+ children: [jsx(Addon, {
126
+ value: value,
127
+ onChange: onChange,
128
+ children: addonBefore
110
129
  }), jsxs("div", {
111
130
  className: "".concat(bodyClassname, " \n ").concat(focus ? activeClassname : "", " \n ").concat(noHandlerWrap ? noHandlerWrapClassname : "", "\n ").concat(disabled ? disabledClassname : notDisabledClassname, "\n "),
112
131
  children: [jsx("span", {
@@ -150,20 +169,18 @@ var InputNumberGroup = function InputNumberGroup(_ref) {
150
169
  }, edProps), {}, {
151
170
  disabled: disabled
152
171
  }))]
153
- }), addonAfter && jsx("div", {
154
- className: addonClassname,
155
- children: /*#__PURE__*/React.cloneElement(addonAfter, {
156
- value: value,
157
- onChange: onChange
158
- })
172
+ }), jsx(Addon, {
173
+ value: value,
174
+ onChange: onChange,
175
+ children: addonAfter
159
176
  })]
160
177
  });
161
178
  };
162
179
  var Index = HFormConnect(InputNumberGroup);
163
180
  var HInputNumberGroup = {
164
181
  Component: Index,
165
- placeholder: function placeholder(_ref4) {
166
- var label = _ref4.label;
182
+ placeholder: function placeholder(_ref5) {
183
+ var label = _ref5.label;
167
184
  return ["\u8BF7\u8F93\u5165".concat(label, "\u6700\u5C0F\u503C"), "\u8BF7\u8F93\u5165".concat(label, "\u6700\u5927\u503C")];
168
185
  }
169
186
  };
package/lib/Input/InputNumberGroup.js CHANGED
@@ -25,25 +25,47 @@ var useArrayProps = function useArrayProps(props) {
25
25
  return [props, props];
26
26
  }, [props]);
27
27
  };
28
- var InputNumberGroup = function InputNumberGroup(_ref) {
29
- var _ref$value = _ref.value,
30
- value = _ref$value === void 0 ? {} : _ref$value,
31
- _ref$valueMap = _ref.valueMap,
32
- valueMap = _ref$valueMap === void 0 ? {
28
+ var Addon = function Addon(_ref) {
29
+ var children = _ref.children,
30
+ value = _ref.value,
31
+ onChange = _ref.onChange;
32
+ var addonClassname = index.useClassName(["hw-input-group-addon"]);
33
+ if (!children) {
34
+ return jsxRuntime.jsx(jsxRuntime.Fragment, {});
35
+ }
36
+ if (/*#__PURE__*/React.isValidElement(children)) {
37
+ return jsxRuntime.jsx("div", {
38
+ className: addonClassname,
39
+ children: /*#__PURE__*/React.cloneElement(children, {
40
+ value: value,
41
+ onChange: onChange
42
+ })
43
+ });
44
+ }
45
+ return jsxRuntime.jsx("div", {
46
+ className: addonClassname,
47
+ children: children
48
+ });
49
+ };
50
+ var InputNumberGroup = function InputNumberGroup(_ref2) {
51
+ var _ref2$value = _ref2.value,
52
+ value = _ref2$value === void 0 ? {} : _ref2$value,
53
+ _ref2$valueMap = _ref2.valueMap,
54
+ valueMap = _ref2$valueMap === void 0 ? {
33
55
  min: "min",
34
56
  max: "max"
35
- } : _ref$valueMap,
36
- onChange = _ref.onChange,
37
- _ref$placeholder = _ref.placeholder,
38
- placeholder = _ref$placeholder === void 0 ? ["请输入", "请输入"] : _ref$placeholder,
39
- _ref$inputNumberProps = _ref.inputNumberProps,
40
- inputNumberProps = _ref$inputNumberProps === void 0 ? {} : _ref$inputNumberProps,
41
- addonAfter = _ref.addonAfter,
42
- _ref$noHandlerWrap = _ref.noHandlerWrap,
43
- noHandlerWrap = _ref$noHandlerWrap === void 0 ? true : _ref$noHandlerWrap,
44
- addFormat = _ref.addFormat,
45
- disabled = _ref.disabled,
46
- addonBefore = _ref.addonBefore;
57
+ } : _ref2$valueMap,
58
+ onChange = _ref2.onChange,
59
+ _ref2$placeholder = _ref2.placeholder,
60
+ placeholder = _ref2$placeholder === void 0 ? ["请输入", "请输入"] : _ref2$placeholder,
61
+ _ref2$inputNumberProp = _ref2.inputNumberProps,
62
+ inputNumberProps = _ref2$inputNumberProp === void 0 ? {} : _ref2$inputNumberProp,
63
+ addonAfter = _ref2.addonAfter,
64
+ _ref2$noHandlerWrap = _ref2.noHandlerWrap,
65
+ noHandlerWrap = _ref2$noHandlerWrap === void 0 ? true : _ref2$noHandlerWrap,
66
+ addFormat = _ref2.addFormat,
67
+ disabled = _ref2.disabled,
68
+ addonBefore = _ref2.addonBefore;
47
69
  var min = valueMap.min,
48
70
  max = valueMap.max;
49
71
  var minVal = value[min],
@@ -68,7 +90,6 @@ var InputNumberGroup = function InputNumberGroup(_ref) {
68
90
  var iconClassname = index.useClassName(["hw-input-group-icon"]);
69
91
  var disabledClassname = index.useClassName(["hw-input-group-disabled"]);
70
92
  var notDisabledClassname = index.useClassName(["hw-input-group-not-disabled"]);
71
- var addonClassname = index.useClassName(["hw-input-group-addon"]);
72
93
  var noHandlerWrapClassname = index.useClassName(["hw-input-group-no-handler-wrap"]);
73
94
  addFormat === null || addFormat === void 0 || addFormat({
74
95
  float: {
@@ -104,12 +125,10 @@ var InputNumberGroup = function InputNumberGroup(_ref) {
104
125
  return jsxRuntime.jsxs(antd.Input.Group, {
105
126
  compact: true,
106
127
  className: contentClassname,
107
- children: [addonBefore && jsxRuntime.jsx("div", {
108
- className: addonClassname,
109
- children: /*#__PURE__*/React.cloneElement(addonBefore, {
110
- value: value,
111
- onChange: onChange
112
- })
128
+ children: [jsxRuntime.jsx(Addon, {
129
+ value: value,
130
+ onChange: onChange,
131
+ children: addonBefore
113
132
  }), jsxRuntime.jsxs("div", {
114
133
  className: "".concat(bodyClassname, " \n ").concat(focus ? activeClassname : "", " \n ").concat(noHandlerWrap ? noHandlerWrapClassname : "", "\n ").concat(disabled ? disabledClassname : notDisabledClassname, "\n "),
115
134
  children: [jsxRuntime.jsx("span", {
@@ -153,20 +172,18 @@ var InputNumberGroup = function InputNumberGroup(_ref) {
153
172
  }, edProps), {}, {
154
173
  disabled: disabled
155
174
  }))]
156
- }), addonAfter && jsxRuntime.jsx("div", {
157
- className: addonClassname,
158
- children: /*#__PURE__*/React.cloneElement(addonAfter, {
159
- value: value,
160
- onChange: onChange
161
- })
175
+ }), jsxRuntime.jsx(Addon, {
176
+ value: value,
177
+ onChange: onChange,
178
+ children: addonAfter
162
179
  })]
163
180
  });
164
181
  };
165
182
  var Index = HFormConnect.default(InputNumberGroup);
166
183
  var HInputNumberGroup = {
167
184
  Component: Index,
168
- placeholder: function placeholder(_ref4) {
169
- var label = _ref4.label;
185
+ placeholder: function placeholder(_ref5) {
186
+ var label = _ref5.label;
170
187
  return ["\u8BF7\u8F93\u5165".concat(label, "\u6700\u5C0F\u503C"), "\u8BF7\u8F93\u5165".concat(label, "\u6700\u5927\u503C")];
171
188
  }
172
189
  };
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@hw-component/form",
3
- "version": "1.9.13",
3
+ "version": "1.9.14",
4
4
  "description": "基于antd二次开发",
5
5
  "repository": {
6
6
  "type": "git",
package/src/components/Input/InputNumberGroup.tsx CHANGED
@@ -29,6 +29,20 @@ const useArrayProps = (props: any) => {
29
29
  return [props, props];
30
30
  }, [props]);
31
31
  };
32
+ const Addon:React.FC<IProps>=({children,value,onChange})=>{
33
+ const addonClassname=useClassName(["hw-input-group-addon"])
34
+ if (!children){
35
+ return <></>
36
+ }
37
+ if (React.isValidElement(children)){
38
+ return <div className={addonClassname}>
39
+ { React.cloneElement(children as any, { value, onChange })}
40
+ </div>
41
+ }
42
+ return <div className={addonClassname}>
43
+ {children}
44
+ </div>
45
+ }
32
46
  const InputNumberGroup = ({
33
47
  value = {},
34
48
  valueMap = { min: "min", max: "max" },
@@ -54,7 +68,6 @@ const InputNumberGroup = ({
54
68
  const iconClassname = useClassName(["hw-input-group-icon"]);
55
69
  const disabledClassname = useClassName(["hw-input-group-disabled"]);
56
70
  const notDisabledClassname = useClassName(["hw-input-group-not-disabled"]);
57
- const addonClassname=useClassName(["hw-input-group-addon"])
58
71
  const noHandlerWrapClassname = useClassName([
59
72
  "hw-input-group-no-handler-wrap",
60
73
  ]);
@@ -98,9 +111,7 @@ const InputNumberGroup = ({
98
111
  };
99
112
  return (
100
113
  <Input.Group compact className={contentClassname}>
101
- {addonBefore&&<div className={addonClassname}>
102
- { React.cloneElement(addonBefore as any, { value, onChange })}
103
- </div>}
114
+ <Addon value={value} onChange={onChange}>{addonBefore}</Addon>
104
115
  <div
105
116
  className={`${bodyClassname}
106
117
  ${focus ? activeClassname : ""}
@@ -150,9 +161,7 @@ const InputNumberGroup = ({
150
161
  disabled={disabled}
151
162
  />
152
163
  </div>
153
- {addonAfter&&<div className={addonClassname}>
154
- { React.cloneElement(addonAfter as any, { value, onChange })}
155
- </div>}
164
+ <Addon value={value} onChange={onChange}>{addonAfter}</Addon>
156
165
  </Input.Group>
157
166
  );
158
167
  };
package/src/pages/InputNumberGroup/index.tsx CHANGED
@@ -1,9 +1,15 @@
1
1
  import {HInputNumberGroup} from '@/components';
2
2
  import {Col, Row} from 'antd';
3
+ const Test=({value,onChange})=>{
4
+ console.log(value)
5
+ return <div onClick={()=>{
6
+ onChange(1);
7
+ }}>1231</div>
8
+ }
3
9
  export default ()=>{
4
10
  return <Row style={{marginTop:20,marginLeft:20}}>
5
11
  <Col span={10}>
6
- <HInputNumberGroup />
12
+ <HInputNumberGroup addonBefore={<Test/>} />
7
13
  </Col>
8
14
  </Row>
9
15
  }