@hw-component/form 1.10.22 → 1.10.24
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/.eslintcache +1 -1
- package/es/Form/hooks/index.d.ts +0 -5
- package/es/Form/hooks/index.js +5 -118
- package/es/Form/hooks/useReqControl.d.ts +12 -0
- package/es/Form/hooks/useReqControl.js +171 -0
- package/es/Form/index.d.ts +1 -1
- package/es/Form/index.js +8 -16
- package/es/Form/modal.d.ts +3 -0
- package/lib/Form/hooks/index.d.ts +0 -5
- package/lib/Form/hooks/index.js +4 -118
- package/lib/Form/hooks/useReqControl.d.ts +12 -0
- package/lib/Form/hooks/useReqControl.js +172 -0
- package/lib/Form/index.d.ts +1 -1
- package/lib/Form/index.js +7 -15
- package/lib/Form/modal.d.ts +3 -0
- package/package.json +1 -1
- package/src/components/Form/hooks/index.ts +0 -70
- package/src/components/Form/hooks/useReqControl.ts +129 -0
- package/src/components/Form/index.tsx +6 -13
- package/src/components/Form/modal.ts +3 -0
- package/src/components/Select/hooks/norHooks.ts +6 -6
- package/src/pages/Select/index.tsx +0 -1
package/es/Form/hooks/index.js
CHANGED
|
@@ -1,128 +1,15 @@
|
|
|
1
1
|
// welcome to hoo hoo hoo
|
|
2
2
|
import _defineProperty from '@babel/runtime-corejs3/helpers/defineProperty';
|
|
3
|
-
import _asyncToGenerator from '@babel/runtime-corejs3/helpers/asyncToGenerator';
|
|
4
|
-
import _objectWithoutProperties from '@babel/runtime-corejs3/helpers/objectWithoutProperties';
|
|
5
|
-
import _typeof from '@babel/runtime-corejs3/helpers/typeof';
|
|
6
|
-
import _regeneratorRuntime from '@babel/runtime-corejs3/regenerator';
|
|
7
|
-
import { useRequest } from 'ahooks';
|
|
8
3
|
import useHForm from './useHForm.js';
|
|
9
|
-
import { useMemo, useEffect } from 'react';
|
|
10
4
|
import componentConfig from '../config.js';
|
|
11
5
|
import { useFormConfigContext } from '../Context/FormConfigProvider.js';
|
|
12
6
|
|
|
13
|
-
var _excluded = ["request"];
|
|
14
7
|
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; }
|
|
15
8
|
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; }
|
|
16
9
|
var useCurrentForm = function useCurrentForm(form) {
|
|
17
10
|
var selfForm = useHForm();
|
|
18
11
|
return form || selfForm;
|
|
19
12
|
};
|
|
20
|
-
var useInfoReq = function useInfoReq(_ref) {
|
|
21
|
-
var initialValues = _ref.initialValues,
|
|
22
|
-
infoRequest = _ref.infoRequest,
|
|
23
|
-
form = _ref.form,
|
|
24
|
-
params = _ref.params,
|
|
25
|
-
request = _ref.request,
|
|
26
|
-
onFinish = _ref.onFinish,
|
|
27
|
-
preserve = _ref.preserve;
|
|
28
|
-
var reqData = useMemo(function () {
|
|
29
|
-
var saveParams = params || {};
|
|
30
|
-
return {
|
|
31
|
-
params: saveParams
|
|
32
|
-
};
|
|
33
|
-
}, [params]);
|
|
34
|
-
var _useMemo = useMemo(function () {
|
|
35
|
-
if (_typeof(infoRequest) === "object") {
|
|
36
|
-
var infoReq = infoRequest.request,
|
|
37
|
-
op = _objectWithoutProperties(infoRequest, _excluded);
|
|
38
|
-
return {
|
|
39
|
-
infoReq: infoReq,
|
|
40
|
-
options: op
|
|
41
|
-
};
|
|
42
|
-
}
|
|
43
|
-
return {
|
|
44
|
-
infoReq: infoRequest,
|
|
45
|
-
options: {}
|
|
46
|
-
};
|
|
47
|
-
}, [infoRequest]),
|
|
48
|
-
initReq = _useMemo.infoReq,
|
|
49
|
-
options = _useMemo.options;
|
|
50
|
-
var subControl = useRequest(/*#__PURE__*/function () {
|
|
51
|
-
var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(value) {
|
|
52
|
-
var subVal;
|
|
53
|
-
return _regeneratorRuntime.wrap(function _callee$(_context) {
|
|
54
|
-
while (1) switch (_context.prev = _context.next) {
|
|
55
|
-
case 0:
|
|
56
|
-
subVal = form === null || form === void 0 ? void 0 : form.outputValues(value, preserve);
|
|
57
|
-
if (!request) {
|
|
58
|
-
_context.next = 4;
|
|
59
|
-
break;
|
|
60
|
-
}
|
|
61
|
-
_context.next = 4;
|
|
62
|
-
return request(subVal, reqData.params);
|
|
63
|
-
case 4:
|
|
64
|
-
onFinish === null || onFinish === void 0 || onFinish(subVal, reqData.params);
|
|
65
|
-
case 5:
|
|
66
|
-
case "end":
|
|
67
|
-
return _context.stop();
|
|
68
|
-
}
|
|
69
|
-
}, _callee);
|
|
70
|
-
}));
|
|
71
|
-
return function (_x) {
|
|
72
|
-
return _ref2.apply(this, arguments);
|
|
73
|
-
};
|
|
74
|
-
}(), {
|
|
75
|
-
manual: true
|
|
76
|
-
});
|
|
77
|
-
var infoControl = useRequest(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
|
|
78
|
-
var reqParams,
|
|
79
|
-
result,
|
|
80
|
-
_args2 = arguments;
|
|
81
|
-
return _regeneratorRuntime.wrap(function _callee2$(_context2) {
|
|
82
|
-
while (1) switch (_context2.prev = _context2.next) {
|
|
83
|
-
case 0:
|
|
84
|
-
reqParams = _args2.length > 0 && _args2[0] !== undefined ? _args2[0] : reqData.params;
|
|
85
|
-
reqData.params = reqParams;
|
|
86
|
-
if (!initReq) {
|
|
87
|
-
_context2.next = 8;
|
|
88
|
-
break;
|
|
89
|
-
}
|
|
90
|
-
_context2.next = 5;
|
|
91
|
-
return initReq(reqParams);
|
|
92
|
-
case 5:
|
|
93
|
-
result = _context2.sent;
|
|
94
|
-
form === null || form === void 0 || form.setFieldsValue(result);
|
|
95
|
-
return _context2.abrupt("return", result || {});
|
|
96
|
-
case 8:
|
|
97
|
-
if (!(typeof initialValues === "undefined")) {
|
|
98
|
-
_context2.next = 10;
|
|
99
|
-
break;
|
|
100
|
-
}
|
|
101
|
-
return _context2.abrupt("return", {});
|
|
102
|
-
case 10:
|
|
103
|
-
form === null || form === void 0 || form.setFieldsValue(initialValues);
|
|
104
|
-
return _context2.abrupt("return", initialValues);
|
|
105
|
-
case 12:
|
|
106
|
-
case "end":
|
|
107
|
-
return _context2.stop();
|
|
108
|
-
}
|
|
109
|
-
}, _callee2);
|
|
110
|
-
})), options);
|
|
111
|
-
var run = infoControl.run,
|
|
112
|
-
mutate = infoControl.mutate;
|
|
113
|
-
useEffect(function () {
|
|
114
|
-
if (form) {
|
|
115
|
-
form.reload = function (reloadParams) {
|
|
116
|
-
mutate(undefined);
|
|
117
|
-
return run(reloadParams);
|
|
118
|
-
};
|
|
119
|
-
}
|
|
120
|
-
}, []);
|
|
121
|
-
return {
|
|
122
|
-
subControl: subControl,
|
|
123
|
-
infoControl: infoControl
|
|
124
|
-
};
|
|
125
|
-
};
|
|
126
13
|
var useDefaultComponents = function useDefaultComponents() {
|
|
127
14
|
var defaultComponent = useFormConfigContext("defaultComponent");
|
|
128
15
|
return _objectSpread(_objectSpread({}, componentConfig), defaultComponent);
|
|
@@ -152,10 +39,10 @@ var dispatchControl = function dispatchControl(form, params, dispatch) {
|
|
|
152
39
|
}, params);
|
|
153
40
|
});
|
|
154
41
|
};
|
|
155
|
-
var useValuesChange = function useValuesChange(
|
|
156
|
-
var onValuesChange =
|
|
157
|
-
dispatch =
|
|
158
|
-
form =
|
|
42
|
+
var useValuesChange = function useValuesChange(_ref) {
|
|
43
|
+
var onValuesChange = _ref.onValuesChange,
|
|
44
|
+
dispatch = _ref.dispatch,
|
|
45
|
+
form = _ref.form;
|
|
159
46
|
return function (changedValues, values) {
|
|
160
47
|
var changeKey = Object.keys(changedValues)[0];
|
|
161
48
|
var dispatchItem = dispatch[changeKey];
|
|
@@ -167,5 +54,5 @@ var useValuesChange = function useValuesChange(_ref4) {
|
|
|
167
54
|
};
|
|
168
55
|
};
|
|
169
56
|
|
|
170
|
-
export { useCurrentForm, useDefaultComponents,
|
|
57
|
+
export { useCurrentForm, useDefaultComponents, useValuesChange };
|
|
171
58
|
// powered by hdj
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { HFormProps } from "@/components/Form/modal";
|
|
2
|
+
type ParamsModal = Omit<HFormProps, "configData">;
|
|
3
|
+
export declare const useInfoReq: ({ initialValues, infoRequest, form, params, request, onFinish, preserve, loading, error, reload }: ParamsModal) => {
|
|
4
|
+
subControl: import("@ahooksjs/use-request/lib/types").BaseResult<void, [value: any]>;
|
|
5
|
+
infoControl: import("@ahooksjs/use-request/lib/types").BaseResult<any, [reqParams?: Record<string, any> | undefined]> | {
|
|
6
|
+
loading: boolean | undefined;
|
|
7
|
+
error: Error | undefined;
|
|
8
|
+
data: import("rc-field-form/lib/interface").Store | undefined;
|
|
9
|
+
run: VoidFunction | undefined;
|
|
10
|
+
};
|
|
11
|
+
};
|
|
12
|
+
export {};
|
|
@@ -0,0 +1,171 @@
|
|
|
1
|
+
// welcome to hoo hoo hoo
|
|
2
|
+
import _objectWithoutProperties from '@babel/runtime-corejs3/helpers/objectWithoutProperties';
|
|
3
|
+
import _typeof from '@babel/runtime-corejs3/helpers/typeof';
|
|
4
|
+
import _asyncToGenerator from '@babel/runtime-corejs3/helpers/asyncToGenerator';
|
|
5
|
+
import _regeneratorRuntime from '@babel/runtime-corejs3/regenerator';
|
|
6
|
+
import { useMemo, useEffect } from 'react';
|
|
7
|
+
import { useRequest } from 'ahooks';
|
|
8
|
+
|
|
9
|
+
var _excluded = ["request"];
|
|
10
|
+
var useSubRequest = function useSubRequest(_ref) {
|
|
11
|
+
var form = _ref.form,
|
|
12
|
+
preserve = _ref.preserve,
|
|
13
|
+
request = _ref.request,
|
|
14
|
+
onFinish = _ref.onFinish,
|
|
15
|
+
getSaveParams = _ref.getSaveParams;
|
|
16
|
+
return useRequest(/*#__PURE__*/function () {
|
|
17
|
+
var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(value) {
|
|
18
|
+
var subVal, params;
|
|
19
|
+
return _regeneratorRuntime.wrap(function _callee$(_context) {
|
|
20
|
+
while (1) switch (_context.prev = _context.next) {
|
|
21
|
+
case 0:
|
|
22
|
+
subVal = form === null || form === void 0 ? void 0 : form.outputValues(value, preserve);
|
|
23
|
+
params = getSaveParams();
|
|
24
|
+
if (!request) {
|
|
25
|
+
_context.next = 5;
|
|
26
|
+
break;
|
|
27
|
+
}
|
|
28
|
+
_context.next = 5;
|
|
29
|
+
return request(subVal, params);
|
|
30
|
+
case 5:
|
|
31
|
+
onFinish === null || onFinish === void 0 || onFinish(subVal, params);
|
|
32
|
+
case 6:
|
|
33
|
+
case "end":
|
|
34
|
+
return _context.stop();
|
|
35
|
+
}
|
|
36
|
+
}, _callee);
|
|
37
|
+
}));
|
|
38
|
+
return function (_x) {
|
|
39
|
+
return _ref2.apply(this, arguments);
|
|
40
|
+
};
|
|
41
|
+
}(), {
|
|
42
|
+
manual: true
|
|
43
|
+
});
|
|
44
|
+
};
|
|
45
|
+
var useInfoRequest = function useInfoRequest(_ref3) {
|
|
46
|
+
var infoRequest = _ref3.infoRequest,
|
|
47
|
+
form = _ref3.form,
|
|
48
|
+
initialValues = _ref3.initialValues,
|
|
49
|
+
getSaveParams = _ref3.getSaveParams,
|
|
50
|
+
setSaveParams = _ref3.setSaveParams;
|
|
51
|
+
var _useMemo = useMemo(function () {
|
|
52
|
+
if (_typeof(infoRequest) === "object") {
|
|
53
|
+
var infoReq = infoRequest.request,
|
|
54
|
+
op = _objectWithoutProperties(infoRequest, _excluded);
|
|
55
|
+
return {
|
|
56
|
+
infoReq: infoReq,
|
|
57
|
+
options: op
|
|
58
|
+
};
|
|
59
|
+
}
|
|
60
|
+
return {
|
|
61
|
+
infoReq: infoRequest,
|
|
62
|
+
options: {}
|
|
63
|
+
};
|
|
64
|
+
}, [infoRequest]),
|
|
65
|
+
initReq = _useMemo.infoReq,
|
|
66
|
+
options = _useMemo.options;
|
|
67
|
+
return useRequest(/*#__PURE__*/function () {
|
|
68
|
+
var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(reqParams) {
|
|
69
|
+
var relParams, result;
|
|
70
|
+
return _regeneratorRuntime.wrap(function _callee2$(_context2) {
|
|
71
|
+
while (1) switch (_context2.prev = _context2.next) {
|
|
72
|
+
case 0:
|
|
73
|
+
relParams = typeof reqParams === "undefined" ? getSaveParams() : reqParams;
|
|
74
|
+
setSaveParams(relParams);
|
|
75
|
+
if (!initReq) {
|
|
76
|
+
_context2.next = 8;
|
|
77
|
+
break;
|
|
78
|
+
}
|
|
79
|
+
_context2.next = 5;
|
|
80
|
+
return initReq(relParams);
|
|
81
|
+
case 5:
|
|
82
|
+
result = _context2.sent;
|
|
83
|
+
form === null || form === void 0 || form.setFieldsValue(result);
|
|
84
|
+
return _context2.abrupt("return", result || {});
|
|
85
|
+
case 8:
|
|
86
|
+
if (!(typeof initialValues === "undefined")) {
|
|
87
|
+
_context2.next = 10;
|
|
88
|
+
break;
|
|
89
|
+
}
|
|
90
|
+
return _context2.abrupt("return", {});
|
|
91
|
+
case 10:
|
|
92
|
+
form === null || form === void 0 || form.setFieldsValue(initialValues);
|
|
93
|
+
return _context2.abrupt("return", initialValues);
|
|
94
|
+
case 12:
|
|
95
|
+
case "end":
|
|
96
|
+
return _context2.stop();
|
|
97
|
+
}
|
|
98
|
+
}, _callee2);
|
|
99
|
+
}));
|
|
100
|
+
return function (_x2) {
|
|
101
|
+
return _ref4.apply(this, arguments);
|
|
102
|
+
};
|
|
103
|
+
}(), options);
|
|
104
|
+
};
|
|
105
|
+
var useInfoReq = function useInfoReq(_ref5) {
|
|
106
|
+
var initialValues = _ref5.initialValues,
|
|
107
|
+
infoRequest = _ref5.infoRequest,
|
|
108
|
+
form = _ref5.form,
|
|
109
|
+
_ref5$params = _ref5.params,
|
|
110
|
+
params = _ref5$params === void 0 ? {} : _ref5$params,
|
|
111
|
+
request = _ref5.request,
|
|
112
|
+
onFinish = _ref5.onFinish,
|
|
113
|
+
preserve = _ref5.preserve,
|
|
114
|
+
loading = _ref5.loading,
|
|
115
|
+
error = _ref5.error,
|
|
116
|
+
reload = _ref5.reload;
|
|
117
|
+
var reqData = useMemo(function () {
|
|
118
|
+
var saveParams = params || {};
|
|
119
|
+
return {
|
|
120
|
+
params: saveParams
|
|
121
|
+
};
|
|
122
|
+
}, [params]);
|
|
123
|
+
var getSaveParams = function getSaveParams() {
|
|
124
|
+
return reqData.params;
|
|
125
|
+
};
|
|
126
|
+
var setSaveParams = function setSaveParams(newParams) {
|
|
127
|
+
reqData.params = newParams;
|
|
128
|
+
};
|
|
129
|
+
var subControl = useSubRequest({
|
|
130
|
+
form: form,
|
|
131
|
+
preserve: preserve,
|
|
132
|
+
request: request,
|
|
133
|
+
onFinish: onFinish,
|
|
134
|
+
getSaveParams: getSaveParams
|
|
135
|
+
});
|
|
136
|
+
var infoControl = useInfoRequest({
|
|
137
|
+
infoRequest: infoRequest,
|
|
138
|
+
form: form,
|
|
139
|
+
initialValues: initialValues,
|
|
140
|
+
getSaveParams: getSaveParams,
|
|
141
|
+
setSaveParams: setSaveParams
|
|
142
|
+
});
|
|
143
|
+
var run = infoControl.run,
|
|
144
|
+
mutate = infoControl.mutate;
|
|
145
|
+
useEffect(function () {
|
|
146
|
+
if (form) {
|
|
147
|
+
form.reload = function (reloadParams) {
|
|
148
|
+
mutate(undefined);
|
|
149
|
+
return run(reloadParams);
|
|
150
|
+
};
|
|
151
|
+
}
|
|
152
|
+
}, []);
|
|
153
|
+
var resultInfoControl = function resultInfoControl() {
|
|
154
|
+
if (!infoRequest) {
|
|
155
|
+
return {
|
|
156
|
+
loading: loading,
|
|
157
|
+
error: error,
|
|
158
|
+
data: initialValues,
|
|
159
|
+
run: reload
|
|
160
|
+
};
|
|
161
|
+
}
|
|
162
|
+
return infoControl;
|
|
163
|
+
};
|
|
164
|
+
return {
|
|
165
|
+
subControl: subControl,
|
|
166
|
+
infoControl: resultInfoControl()
|
|
167
|
+
};
|
|
168
|
+
};
|
|
169
|
+
|
|
170
|
+
export { useInfoReq };
|
|
171
|
+
// powered by hdj
|
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,
|
|
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;
|
|
3
3
|
export default _default;
|
package/es/Form/index.js
CHANGED
|
@@ -4,28 +4,23 @@ import _slicedToArray from '@babel/runtime-corejs3/helpers/slicedToArray';
|
|
|
4
4
|
import _objectWithoutProperties from '@babel/runtime-corejs3/helpers/objectWithoutProperties';
|
|
5
5
|
import { jsx, jsxs } from 'react/jsx-runtime';
|
|
6
6
|
import { Form } from 'antd';
|
|
7
|
-
import { useCurrentForm,
|
|
7
|
+
import { useCurrentForm, useValuesChange } from './hooks/index.js';
|
|
8
8
|
import { FormContext } from './Context/index.js';
|
|
9
9
|
import Index from '../PageHandler/index.js';
|
|
10
10
|
import { useState, useEffect } from 'react';
|
|
11
11
|
import InitSet from './InitSet.js';
|
|
12
12
|
import Basic from './Basic.js';
|
|
13
|
+
import { useInfoReq } from './hooks/useReqControl.js';
|
|
13
14
|
|
|
14
|
-
var _excluded = ["configData", "labelWidth", "form", "
|
|
15
|
+
var _excluded = ["configData", "labelWidth", "form", "valueType", "onValuesChange", "itemSpan", "hideLabel", "gutter", "submitLoading", "labelAlign", "formItemStyle", "itemProps", "colon", "dismissOnPressEnter", "preserve", "rowWrapper", "requiredMode", "style"];
|
|
15
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; }
|
|
16
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; }
|
|
17
18
|
var HForm = (function (_ref) {
|
|
18
19
|
var configData = _ref.configData,
|
|
19
20
|
labelWidth = _ref.labelWidth,
|
|
20
21
|
form = _ref.form,
|
|
21
|
-
request = _ref.request,
|
|
22
|
-
onFinish = _ref.onFinish,
|
|
23
|
-
infoRequest = _ref.infoRequest,
|
|
24
22
|
_ref$valueType = _ref.valueType,
|
|
25
23
|
valueType = _ref$valueType === void 0 ? "float" : _ref$valueType,
|
|
26
|
-
initialValues = _ref.initialValues,
|
|
27
|
-
_ref$params = _ref.params,
|
|
28
|
-
params = _ref$params === void 0 ? {} : _ref$params,
|
|
29
24
|
onValuesChange = _ref.onValuesChange,
|
|
30
25
|
itemSpan = _ref.itemSpan,
|
|
31
26
|
_ref$hideLabel = _ref.hideLabel,
|
|
@@ -49,16 +44,11 @@ var HForm = (function (_ref) {
|
|
|
49
44
|
_useState2 = _slicedToArray(_useState, 2),
|
|
50
45
|
dispatchSourceData = _useState2[0],
|
|
51
46
|
setDispatchSourceData = _useState2[1];
|
|
52
|
-
var _useInfoReq = useInfoReq({
|
|
53
|
-
initialValues: initialValues,
|
|
54
|
-
request: request,
|
|
55
|
-
onFinish: onFinish,
|
|
47
|
+
var _useInfoReq = useInfoReq(_objectSpread({
|
|
56
48
|
valueType: valueType,
|
|
57
49
|
form: hForm,
|
|
58
|
-
infoRequest: infoRequest,
|
|
59
|
-
params: params,
|
|
60
50
|
preserve: preserve
|
|
61
|
-
}),
|
|
51
|
+
}, props)),
|
|
62
52
|
subControl = _useInfoReq.subControl,
|
|
63
53
|
infoControl = _useInfoReq.infoControl;
|
|
64
54
|
var valuesChange = useValuesChange({
|
|
@@ -86,7 +76,9 @@ var HForm = (function (_ref) {
|
|
|
86
76
|
loading: infoLoading,
|
|
87
77
|
error: infoErr,
|
|
88
78
|
data: infoData,
|
|
89
|
-
reload:
|
|
79
|
+
reload: function reload() {
|
|
80
|
+
infoRun === null || infoRun === void 0 || infoRun();
|
|
81
|
+
},
|
|
90
82
|
children: jsx(FormContext.Provider, {
|
|
91
83
|
value: {
|
|
92
84
|
loading: submitLoading || loading,
|
package/es/Form/modal.d.ts
CHANGED
|
@@ -80,6 +80,9 @@ export interface HFormProps<T = any, R = any> extends Omit<FormProps, "form" | "
|
|
|
80
80
|
rowWrapper?: boolean;
|
|
81
81
|
flexBox?: boolean;
|
|
82
82
|
requiredMode?: boolean;
|
|
83
|
+
loading?: boolean;
|
|
84
|
+
error?: Error;
|
|
85
|
+
reload?: VoidFunction;
|
|
83
86
|
}
|
|
84
87
|
export interface HFormItemProps extends HItemProps {
|
|
85
88
|
required?: boolean;
|
|
@@ -6,11 +6,6 @@ interface UseValuesChangeModal {
|
|
|
6
6
|
form: HFormInstance;
|
|
7
7
|
}
|
|
8
8
|
export declare const useCurrentForm: (form?: HFormInstance) => HFormInstance;
|
|
9
|
-
type ParamsModal = Omit<HFormProps, "configData">;
|
|
10
|
-
export declare const useInfoReq: ({ initialValues, infoRequest, form, params, request, onFinish, preserve, }: ParamsModal) => {
|
|
11
|
-
subControl: import("@ahooksjs/use-request/lib/types").BaseResult<void, [value: any]>;
|
|
12
|
-
infoControl: import("@ahooksjs/use-request/lib/types").BaseResult<any, [reqParams?: any]>;
|
|
13
|
-
};
|
|
14
9
|
export declare const useDefaultComponents: () => any;
|
|
15
10
|
export declare const useValuesChange: ({ onValuesChange, dispatch, form, }: UseValuesChangeModal) => (changedValues: any, values: any) => void;
|
|
16
11
|
export declare const useAddFormat: () => void;
|
package/lib/Form/hooks/index.js
CHANGED
|
@@ -1,129 +1,16 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
3
|
var _defineProperty = require('@babel/runtime-corejs3/helpers/defineProperty');
|
|
4
|
-
var _asyncToGenerator = require('@babel/runtime-corejs3/helpers/asyncToGenerator');
|
|
5
|
-
var _objectWithoutProperties = require('@babel/runtime-corejs3/helpers/objectWithoutProperties');
|
|
6
|
-
var _typeof = require('@babel/runtime-corejs3/helpers/typeof');
|
|
7
|
-
var _regeneratorRuntime = require('@babel/runtime-corejs3/regenerator');
|
|
8
|
-
var ahooks = require('ahooks');
|
|
9
4
|
var useHForm = require('./useHForm.js');
|
|
10
|
-
var React = require('react');
|
|
11
5
|
var config = require('../config.js');
|
|
12
6
|
var FormConfigProvider = require('../Context/FormConfigProvider.js');
|
|
13
7
|
|
|
14
|
-
var _excluded = ["request"];
|
|
15
8
|
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
9
|
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
10
|
var useCurrentForm = function useCurrentForm(form) {
|
|
18
11
|
var selfForm = useHForm.default();
|
|
19
12
|
return form || selfForm;
|
|
20
13
|
};
|
|
21
|
-
var useInfoReq = function useInfoReq(_ref) {
|
|
22
|
-
var initialValues = _ref.initialValues,
|
|
23
|
-
infoRequest = _ref.infoRequest,
|
|
24
|
-
form = _ref.form,
|
|
25
|
-
params = _ref.params,
|
|
26
|
-
request = _ref.request,
|
|
27
|
-
onFinish = _ref.onFinish,
|
|
28
|
-
preserve = _ref.preserve;
|
|
29
|
-
var reqData = React.useMemo(function () {
|
|
30
|
-
var saveParams = params || {};
|
|
31
|
-
return {
|
|
32
|
-
params: saveParams
|
|
33
|
-
};
|
|
34
|
-
}, [params]);
|
|
35
|
-
var _useMemo = React.useMemo(function () {
|
|
36
|
-
if (_typeof(infoRequest) === "object") {
|
|
37
|
-
var infoReq = infoRequest.request,
|
|
38
|
-
op = _objectWithoutProperties(infoRequest, _excluded);
|
|
39
|
-
return {
|
|
40
|
-
infoReq: infoReq,
|
|
41
|
-
options: op
|
|
42
|
-
};
|
|
43
|
-
}
|
|
44
|
-
return {
|
|
45
|
-
infoReq: infoRequest,
|
|
46
|
-
options: {}
|
|
47
|
-
};
|
|
48
|
-
}, [infoRequest]),
|
|
49
|
-
initReq = _useMemo.infoReq,
|
|
50
|
-
options = _useMemo.options;
|
|
51
|
-
var subControl = ahooks.useRequest(/*#__PURE__*/function () {
|
|
52
|
-
var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(value) {
|
|
53
|
-
var subVal;
|
|
54
|
-
return _regeneratorRuntime.wrap(function _callee$(_context) {
|
|
55
|
-
while (1) switch (_context.prev = _context.next) {
|
|
56
|
-
case 0:
|
|
57
|
-
subVal = form === null || form === void 0 ? void 0 : form.outputValues(value, preserve);
|
|
58
|
-
if (!request) {
|
|
59
|
-
_context.next = 4;
|
|
60
|
-
break;
|
|
61
|
-
}
|
|
62
|
-
_context.next = 4;
|
|
63
|
-
return request(subVal, reqData.params);
|
|
64
|
-
case 4:
|
|
65
|
-
onFinish === null || onFinish === void 0 || onFinish(subVal, reqData.params);
|
|
66
|
-
case 5:
|
|
67
|
-
case "end":
|
|
68
|
-
return _context.stop();
|
|
69
|
-
}
|
|
70
|
-
}, _callee);
|
|
71
|
-
}));
|
|
72
|
-
return function (_x) {
|
|
73
|
-
return _ref2.apply(this, arguments);
|
|
74
|
-
};
|
|
75
|
-
}(), {
|
|
76
|
-
manual: true
|
|
77
|
-
});
|
|
78
|
-
var infoControl = ahooks.useRequest(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
|
|
79
|
-
var reqParams,
|
|
80
|
-
result,
|
|
81
|
-
_args2 = arguments;
|
|
82
|
-
return _regeneratorRuntime.wrap(function _callee2$(_context2) {
|
|
83
|
-
while (1) switch (_context2.prev = _context2.next) {
|
|
84
|
-
case 0:
|
|
85
|
-
reqParams = _args2.length > 0 && _args2[0] !== undefined ? _args2[0] : reqData.params;
|
|
86
|
-
reqData.params = reqParams;
|
|
87
|
-
if (!initReq) {
|
|
88
|
-
_context2.next = 8;
|
|
89
|
-
break;
|
|
90
|
-
}
|
|
91
|
-
_context2.next = 5;
|
|
92
|
-
return initReq(reqParams);
|
|
93
|
-
case 5:
|
|
94
|
-
result = _context2.sent;
|
|
95
|
-
form === null || form === void 0 || form.setFieldsValue(result);
|
|
96
|
-
return _context2.abrupt("return", result || {});
|
|
97
|
-
case 8:
|
|
98
|
-
if (!(typeof initialValues === "undefined")) {
|
|
99
|
-
_context2.next = 10;
|
|
100
|
-
break;
|
|
101
|
-
}
|
|
102
|
-
return _context2.abrupt("return", {});
|
|
103
|
-
case 10:
|
|
104
|
-
form === null || form === void 0 || form.setFieldsValue(initialValues);
|
|
105
|
-
return _context2.abrupt("return", initialValues);
|
|
106
|
-
case 12:
|
|
107
|
-
case "end":
|
|
108
|
-
return _context2.stop();
|
|
109
|
-
}
|
|
110
|
-
}, _callee2);
|
|
111
|
-
})), options);
|
|
112
|
-
var run = infoControl.run,
|
|
113
|
-
mutate = infoControl.mutate;
|
|
114
|
-
React.useEffect(function () {
|
|
115
|
-
if (form) {
|
|
116
|
-
form.reload = function (reloadParams) {
|
|
117
|
-
mutate(undefined);
|
|
118
|
-
return run(reloadParams);
|
|
119
|
-
};
|
|
120
|
-
}
|
|
121
|
-
}, []);
|
|
122
|
-
return {
|
|
123
|
-
subControl: subControl,
|
|
124
|
-
infoControl: infoControl
|
|
125
|
-
};
|
|
126
|
-
};
|
|
127
14
|
var useDefaultComponents = function useDefaultComponents() {
|
|
128
15
|
var defaultComponent = FormConfigProvider.useFormConfigContext("defaultComponent");
|
|
129
16
|
return _objectSpread(_objectSpread({}, config.default), defaultComponent);
|
|
@@ -153,10 +40,10 @@ var dispatchControl = function dispatchControl(form, params, dispatch) {
|
|
|
153
40
|
}, params);
|
|
154
41
|
});
|
|
155
42
|
};
|
|
156
|
-
var useValuesChange = function useValuesChange(
|
|
157
|
-
var onValuesChange =
|
|
158
|
-
dispatch =
|
|
159
|
-
form =
|
|
43
|
+
var useValuesChange = function useValuesChange(_ref) {
|
|
44
|
+
var onValuesChange = _ref.onValuesChange,
|
|
45
|
+
dispatch = _ref.dispatch,
|
|
46
|
+
form = _ref.form;
|
|
160
47
|
return function (changedValues, values) {
|
|
161
48
|
var changeKey = Object.keys(changedValues)[0];
|
|
162
49
|
var dispatchItem = dispatch[changeKey];
|
|
@@ -170,6 +57,5 @@ var useValuesChange = function useValuesChange(_ref4) {
|
|
|
170
57
|
|
|
171
58
|
exports.useCurrentForm = useCurrentForm;
|
|
172
59
|
exports.useDefaultComponents = useDefaultComponents;
|
|
173
|
-
exports.useInfoReq = useInfoReq;
|
|
174
60
|
exports.useValuesChange = useValuesChange;
|
|
175
61
|
// powered by h
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { HFormProps } from "@/components/Form/modal";
|
|
2
|
+
type ParamsModal = Omit<HFormProps, "configData">;
|
|
3
|
+
export declare const useInfoReq: ({ initialValues, infoRequest, form, params, request, onFinish, preserve, loading, error, reload }: ParamsModal) => {
|
|
4
|
+
subControl: import("@ahooksjs/use-request/lib/types").BaseResult<void, [value: any]>;
|
|
5
|
+
infoControl: import("@ahooksjs/use-request/lib/types").BaseResult<any, [reqParams?: Record<string, any> | undefined]> | {
|
|
6
|
+
loading: boolean | undefined;
|
|
7
|
+
error: Error | undefined;
|
|
8
|
+
data: import("rc-field-form/lib/interface").Store | undefined;
|
|
9
|
+
run: VoidFunction | undefined;
|
|
10
|
+
};
|
|
11
|
+
};
|
|
12
|
+
export {};
|