@hw-component/form 1.10.25 → 1.10.27

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.
@@ -20,16 +20,17 @@ var useSubRequest = function useSubRequest(_ref) {
20
20
  while (1) switch (_context.prev = _context.next) {
21
21
  case 0:
22
22
  subVal = form === null || form === void 0 ? void 0 : form.outputValues(value, preserve);
23
+ console.log(subVal, "sss");
23
24
  params = getSaveParams();
24
25
  if (!request) {
25
- _context.next = 5;
26
+ _context.next = 6;
26
27
  break;
27
28
  }
28
- _context.next = 5;
29
+ _context.next = 6;
29
30
  return request(subVal, params);
30
- case 5:
31
- onFinish === null || onFinish === void 0 || onFinish(subVal, params);
32
31
  case 6:
32
+ onFinish === null || onFinish === void 0 || onFinish(subVal, params);
33
+ case 7:
33
34
  case "end":
34
35
  return _context.stop();
35
36
  }
@@ -1,3 +1,3 @@
1
1
  import type { HFormProps } from "./modal";
2
- declare const _default: ({ configData, labelWidth, form, valueType, onValuesChange, itemSpan, hideLabel: formHideLabel, gutter, submitLoading, labelAlign: formLabelAlign, formItemStyle, itemProps: formItemProps, colon, dismissOnPressEnter, preserve, rowWrapper, requiredMode, style, ...props }: HFormProps) => JSX.Element;
2
+ declare const _default: ({ configData, labelWidth, form, valueType, onValuesChange, itemSpan, hideLabel: formHideLabel, gutter, submitLoading, labelAlign: formLabelAlign, formItemStyle, itemProps: formItemProps, colon, dismissOnPressEnter, preserve, rowWrapper, requiredMode, style, onFinish, initialValues, request, params, infoRequest, ...props }: HFormProps) => JSX.Element;
3
3
  export default _default;
package/es/Form/index.js CHANGED
@@ -12,7 +12,7 @@ import InitSet from './InitSet.js';
12
12
  import Basic from './Basic.js';
13
13
  import { useInfoReq } from './hooks/useReqControl.js';
14
14
 
15
- var _excluded = ["configData", "labelWidth", "form", "valueType", "onValuesChange", "itemSpan", "hideLabel", "gutter", "submitLoading", "labelAlign", "formItemStyle", "itemProps", "colon", "dismissOnPressEnter", "preserve", "rowWrapper", "requiredMode", "style"];
15
+ var _excluded = ["configData", "labelWidth", "form", "valueType", "onValuesChange", "itemSpan", "hideLabel", "gutter", "submitLoading", "labelAlign", "formItemStyle", "itemProps", "colon", "dismissOnPressEnter", "preserve", "rowWrapper", "requiredMode", "style", "onFinish", "initialValues", "request", "params", "infoRequest"];
16
16
  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; }
17
17
  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
18
  var HForm = (function (_ref) {
@@ -38,17 +38,28 @@ var HForm = (function (_ref) {
38
38
  rowWrapper = _ref.rowWrapper,
39
39
  requiredMode = _ref.requiredMode,
40
40
  style = _ref.style,
41
+ onFinish = _ref.onFinish,
42
+ initialValues = _ref.initialValues,
43
+ request = _ref.request,
44
+ _ref$params = _ref.params,
45
+ params = _ref$params === void 0 ? {} : _ref$params,
46
+ infoRequest = _ref.infoRequest,
41
47
  props = _objectWithoutProperties(_ref, _excluded);
42
48
  var hForm = useCurrentForm(form);
43
49
  var _useState = useState({}),
44
50
  _useState2 = _slicedToArray(_useState, 2),
45
51
  dispatchSourceData = _useState2[0],
46
52
  setDispatchSourceData = _useState2[1];
47
- var _useInfoReq = useInfoReq(_objectSpread({
53
+ var _useInfoReq = useInfoReq({
54
+ initialValues: initialValues,
55
+ request: request,
56
+ onFinish: onFinish,
48
57
  valueType: valueType,
49
58
  form: hForm,
59
+ infoRequest: infoRequest,
60
+ params: params,
50
61
  preserve: preserve
51
- }, props)),
62
+ }),
52
63
  subControl = _useInfoReq.subControl,
53
64
  infoControl = _useInfoReq.infoControl;
54
65
  var valuesChange = useValuesChange({
@@ -21,16 +21,17 @@ var useSubRequest = function useSubRequest(_ref) {
21
21
  while (1) switch (_context.prev = _context.next) {
22
22
  case 0:
23
23
  subVal = form === null || form === void 0 ? void 0 : form.outputValues(value, preserve);
24
+ console.log(subVal, "sss");
24
25
  params = getSaveParams();
25
26
  if (!request) {
26
- _context.next = 5;
27
+ _context.next = 6;
27
28
  break;
28
29
  }
29
- _context.next = 5;
30
+ _context.next = 6;
30
31
  return request(subVal, params);
31
- case 5:
32
- onFinish === null || onFinish === void 0 || onFinish(subVal, params);
33
32
  case 6:
33
+ onFinish === null || onFinish === void 0 || onFinish(subVal, params);
34
+ case 7:
34
35
  case "end":
35
36
  return _context.stop();
36
37
  }
@@ -1,3 +1,3 @@
1
1
  import type { HFormProps } from "./modal";
2
- declare const _default: ({ configData, labelWidth, form, valueType, onValuesChange, itemSpan, hideLabel: formHideLabel, gutter, submitLoading, labelAlign: formLabelAlign, formItemStyle, itemProps: formItemProps, colon, dismissOnPressEnter, preserve, rowWrapper, requiredMode, style, ...props }: HFormProps) => JSX.Element;
2
+ declare const _default: ({ configData, labelWidth, form, valueType, onValuesChange, itemSpan, hideLabel: formHideLabel, gutter, submitLoading, labelAlign: formLabelAlign, formItemStyle, itemProps: formItemProps, colon, dismissOnPressEnter, preserve, rowWrapper, requiredMode, style, onFinish, initialValues, request, params, infoRequest, ...props }: HFormProps) => JSX.Element;
3
3
  export default _default;
package/lib/Form/index.js CHANGED
@@ -15,7 +15,7 @@ var InitSet = require('./InitSet.js');
15
15
  var Basic = require('./Basic.js');
16
16
  var useReqControl = require('./hooks/useReqControl.js');
17
17
 
18
- var _excluded = ["configData", "labelWidth", "form", "valueType", "onValuesChange", "itemSpan", "hideLabel", "gutter", "submitLoading", "labelAlign", "formItemStyle", "itemProps", "colon", "dismissOnPressEnter", "preserve", "rowWrapper", "requiredMode", "style"];
18
+ var _excluded = ["configData", "labelWidth", "form", "valueType", "onValuesChange", "itemSpan", "hideLabel", "gutter", "submitLoading", "labelAlign", "formItemStyle", "itemProps", "colon", "dismissOnPressEnter", "preserve", "rowWrapper", "requiredMode", "style", "onFinish", "initialValues", "request", "params", "infoRequest"];
19
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; }
20
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; }
21
21
  var HForm = (function (_ref) {
@@ -41,17 +41,28 @@ var HForm = (function (_ref) {
41
41
  rowWrapper = _ref.rowWrapper,
42
42
  requiredMode = _ref.requiredMode,
43
43
  style = _ref.style,
44
+ onFinish = _ref.onFinish,
45
+ initialValues = _ref.initialValues,
46
+ request = _ref.request,
47
+ _ref$params = _ref.params,
48
+ params = _ref$params === void 0 ? {} : _ref$params,
49
+ infoRequest = _ref.infoRequest,
44
50
  props = _objectWithoutProperties(_ref, _excluded);
45
51
  var hForm = index.useCurrentForm(form);
46
52
  var _useState = React.useState({}),
47
53
  _useState2 = _slicedToArray(_useState, 2),
48
54
  dispatchSourceData = _useState2[0],
49
55
  setDispatchSourceData = _useState2[1];
50
- var _useInfoReq = useReqControl.useInfoReq(_objectSpread({
56
+ var _useInfoReq = useReqControl.useInfoReq({
57
+ initialValues: initialValues,
58
+ request: request,
59
+ onFinish: onFinish,
51
60
  valueType: valueType,
52
61
  form: hForm,
62
+ infoRequest: infoRequest,
63
+ params: params,
53
64
  preserve: preserve
54
- }, props)),
65
+ }),
55
66
  subControl = _useInfoReq.subControl,
56
67
  infoControl = _useInfoReq.infoControl;
57
68
  var valuesChange = index.useValuesChange({
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@hw-component/form",
3
- "version": "1.10.25",
3
+ "version": "1.10.27",
4
4
  "description": "基于antd二次开发",
5
5
  "repository": {
6
6
  "type": "git",
@@ -19,6 +19,7 @@ const useSubRequest = ({
19
19
  return useRequest(
20
20
  async (value) => {
21
21
  const subVal = form?.outputValues(value, preserve);
22
+ console.log(subVal,"sss")
22
23
  const params = getSaveParams();
23
24
  if (request) {
24
25
  await request(subVal, params);
@@ -26,15 +26,24 @@ export default ({
26
26
  rowWrapper,
27
27
  requiredMode,
28
28
  style,
29
+ onFinish,
30
+ initialValues,
31
+ request,
32
+ params={},
33
+ infoRequest,
29
34
  ...props
30
35
  }: HFormProps) => {
31
36
  const hForm = useCurrentForm(form);
32
37
  const [dispatchSourceData, setDispatchSourceData] = useState({});
33
38
  const { subControl, infoControl } = useInfoReq({
39
+ initialValues,
40
+ request,
41
+ onFinish,
34
42
  valueType,
35
43
  form: hForm,
44
+ infoRequest,
45
+ params,
36
46
  preserve,
37
- ...props,
38
47
  });
39
48
  const valuesChange = useValuesChange({
40
49
  onValuesChange,
@@ -43,6 +43,13 @@ const TestItem = () => {
43
43
  const Test = (props) => {
44
44
  return <div>ffff</div>;
45
45
  };
46
+ const Basic=()=>{
47
+ return <HBasicForm configData={[{
48
+ label: "你好",
49
+ type:"inputNumberGroup",
50
+ name:"jgTime"
51
+ }]}/>
52
+ }
46
53
  export default () => {
47
54
  const form = useHForm();
48
55
  const [id, setId] = useState(1);
@@ -76,160 +83,15 @@ export default () => {
76
83
  <div style={{ width: 1000 }}>
77
84
  <HForm
78
85
  configData={[
79
- // {
80
- // label: "tagSelect",
81
- // type: "tagSelect",
82
- // name: "wz",
83
- // dispatch: {
84
- // fnKey: "reload",
85
- // dependencies: ["wz1"],
86
- // },
87
- // itemProps: {
88
- // request: () => {
89
- // return new Promise((resolve, reject) => {
90
- // setTimeout(() => {
91
- // resolve([
92
- // {
93
- // value: "你好",
94
- // key: "1",
95
- // },
96
- // ]);
97
- // }, 3000);
98
- // });
99
- // },
100
- // },
101
- // },
102
- {
103
- label: "文字1",
104
- name: "wz1",
105
- type: "datePicker",
106
- rules: [{ required: true }],
107
- itemProps: {
108
- format: "HH:mm",
109
- addonAfter: "测试",
86
+ {
87
+ noStyle: true,
88
+ nameKey: 'sendSetting',
89
+ render: () => {
90
+ return (
91
+ <Basic/>
92
+ );
93
+ },
110
94
  },
111
- },
112
- // {
113
- // label: "inputSelect",
114
- // type: "richEditor",
115
- // name: "richEditor",
116
- // rules: [
117
- // {
118
- // validator: (rule, value, callback) => {
119
- // console.log(value);
120
- // return Promise.resolve();
121
- // },
122
- // },
123
- // ],
124
- // },
125
- {
126
- hideLabel: true,
127
- itemProps: {},
128
- render: () => {
129
- return <div>11</div>;
130
- },
131
- },
132
- // {
133
- // label: "运营商账号",
134
- // name: "mobile",
135
- // type: "buttonInput",
136
- // flexBox: true,
137
- // itemProps: {
138
- // children: "修改手机号",
139
- // disabled: true,
140
- // buttonProps: {
141
- // type: "primary",
142
- // ghost: true,
143
- // style: {
144
- // marginLeft: 8,
145
- // },
146
- // onClick: () => {},
147
- // },
148
- // },
149
- // },
150
- // {
151
- // label: "验证码",
152
- // name: "newCode",
153
- // type: "verificationCodeInput",
154
- // itemProps: {
155
- // request: async ({ newMobile }) => {
156
- // return Promise.resolve();
157
- // },
158
- // buttonProps: {
159
- // ghost: true,
160
- // },
161
- // },
162
- // },
163
- // {
164
- // label: "你好",
165
- // noStyle: true,
166
- // render: () => {
167
- // return (
168
- // <div
169
- // style={{
170
- // width: "100%",
171
- // backgroundColor: "red",
172
- // height: "100%",
173
- // }}
174
- // >
175
- // <div style={{ height: 200 }} />
176
- // </div>
177
- // );
178
- // },
179
- // },
180
- // {
181
- // label: "你好",
182
- // noStyle: true,
183
- // render: () => {
184
- // return (
185
- // <div
186
- // style={{
187
- // width: "100%",
188
- // backgroundColor: "black",
189
- // height: "100%",
190
- // }}
191
- // />
192
- // );
193
- // },
194
- // },
195
- // {
196
- // label: "数字输入框",
197
- // name: "yyy",
198
- // type: "inputNumberGroup",
199
- // rules: [{ required: true }],
200
- // itemProps: {
201
- // inputNumberProps: {
202
- // precision: 2,
203
- // },
204
- // },
205
- // },
206
- // {
207
- // label: "文字",
208
- // type: "text",
209
- // name: "text",
210
- // render: () => {
211
- // return <div>fff</div>;
212
- // },
213
- // itemProps: {
214
- // type: "danger",
215
- // addonBefore: (
216
- // <div style={{ height: 100, backgroundColor: "red" }}>
217
- // nihao
218
- // </div>
219
- // ),
220
- // addonAfter: (
221
- // <div style={{ height: 200, backgroundColor: "red" }}>
222
- // wohao
223
- // </div>
224
- // ),
225
- // initValueProvider: (...data) => {
226
- // console.log("initValueProvider");
227
- // return {
228
- // text: "你好",
229
- // };
230
- // },
231
- // },
232
- // },
233
95
  ]}
234
96
  dismissOnPressEnter={false}
235
97
  labelWidth={88}
@@ -240,14 +102,12 @@ export default () => {
240
102
  endTime: "14:00:00",
241
103
  }}
242
104
  labelAlign={"left"}
243
- onFinish={(value) => {
244
- console.log(value, "onFinish");
245
- }}
246
105
  onValuesChange={(val) => {
247
106
  console.log(val, "onValuesChange");
248
107
  }}
249
108
  requiredMode
250
109
  request={(params) => {
110
+ console.log(params,"ppppp")
251
111
  return new Promise<any>((resolve) => {
252
112
  setTimeout(() => {
253
113
  resolve(params);
@@ -24,101 +24,9 @@ const ITest = () => {
24
24
  const data = [
25
25
  {
26
26
  label: "输入框",
27
- name: "name",
28
- hideLabel: true,
29
- // render:()=>{
30
- // return <ITest/>
31
- // },
27
+ name: "inputNumberGroup",
28
+ type:"inputNumberGroup"
32
29
  },
33
- // {
34
- // label: "数字",
35
- // name: "sz",
36
- // type: "inputNumber",
37
- // rules: [{ required: true }],
38
- // },
39
- // {
40
- // label: "下拉输入框",
41
- // name: "selectInput",
42
- // type: "selectInput",
43
- // rules: [{ required: true }],
44
- // itemProps: {
45
- // valueName: {
46
- // select: "op",
47
- // input: "opInput",
48
- // },
49
- // selectProps: {
50
- // options: [{ label: "测试", value: 1 }],
51
- // },
52
- // },
53
- // },
54
- // {
55
- // label: "按钮输入框",
56
- // name: "buttonInput",
57
- // type: "buttonInput",
58
- // children: "点击",
59
- // rules: [{ required: true }],
60
- // },
61
- // {
62
- // label: "选择",
63
- // name: "checkboxGroup",
64
- // type: "checkboxGroup",
65
- // rules: [{ required: true }],
66
- // helper: "帮助我",
67
- // options: [
68
- // { label: "选择1", value: "check1" },
69
- // { label: "选择2", value: "check2" },
70
- // ],
71
- // },
72
- // {
73
- // label: "开关",
74
- // name: "switch",
75
- // type: "switch",
76
- // rules: [{ required: true }],
77
- // },
78
- // {
79
- // label: "时间",
80
- // name: "datePicker",
81
- // type: "datePicker",
82
- // hover: "时间选择",
83
- // helper: "帮助我",
84
- // rules: [{ required: true }],
85
- // },
86
- // {
87
- // label: "时间段",
88
- // name: "rangePicker",
89
- // type: "rangePicker",
90
- // helper: "帮助我",
91
- // rules: [{ required: true }],
92
- // itemProps: {
93
- // valueMap: {
94
- // start: "testStart",
95
- // end: "testEnd",
96
- // },
97
- // },
98
- // },
99
- // {
100
- // label: "时分秒",
101
- // name: "timePicker",
102
- // type: "timePicker",
103
- // rules: [{ required: true }],
104
- // itemProps: {
105
- // subProvider: () => {
106
- // console.log("fff");
107
- // },
108
- // },
109
- // },
110
- // {
111
- // label: "文件",
112
- // name: "upload",
113
- // type: "upload",
114
- // rules: [{ required: true }],
115
- // },
116
- //
117
- // {
118
- // label: "地址文件",
119
- // name: "urlUpload",
120
- // type: "urlUpload",
121
- // },
122
30
  {
123
31
  label: "文字",
124
32
  type: "text",
@@ -127,34 +35,6 @@ const data = [
127
35
  addonBefore: "元",
128
36
  },
129
37
  },
130
- // {
131
- // label: "下拉框",
132
- // name: "select",
133
- // type: "select",
134
- // dispatch: {
135
- // fnKey: "reload",
136
- // dependencies: ["selectInput", "sz"],
137
- // manual: false,
138
- // },
139
- // itemProps: {
140
- // request: (params = {}, values) => {
141
- // const { label = "123", value = 1 } = params;
142
- // return Promise.resolve([{ label, value }]);
143
- // },
144
- // showSearch: true,
145
- // },
146
- // rules: [{ required: true }],
147
- // },
148
- // {
149
- // label: "验证码",
150
- // type: "verificationCodeInput",
151
- // name: "verificationCodeInput",
152
- // itemProps: {
153
- // request: () => {
154
- // return Promise.resolve({ code: 200 });
155
- // },
156
- // },
157
- // },
158
38
  ];
159
39
  let num = 0;
160
40
  const Test1 = ({ formNode }) => {