@hw-component/form 0.0.8-beta-v2 → 0.0.8-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/CheckboxGroup/hooks.js +6 -1
- package/es/CheckboxGroup/index.js +3 -0
- package/es/DialogForm/DrawerForm/index.d.ts +1 -1
- package/es/DialogForm/DrawerForm/index.js +5 -2
- package/es/DialogForm/ModalForm.d.ts +1 -1
- package/es/DialogForm/ModalForm.js +6 -2
- package/es/DialogForm/hooks.d.ts +1 -1
- package/es/DialogForm/hooks.js +5 -2
- package/es/DialogForm/modal.d.ts +2 -0
- package/lib/CheckboxGroup/hooks.js +6 -1
- package/lib/CheckboxGroup/index.js +3 -0
- package/lib/DialogForm/DrawerForm/index.d.ts +1 -1
- package/lib/DialogForm/DrawerForm/index.js +5 -2
- package/lib/DialogForm/ModalForm.d.ts +1 -1
- package/lib/DialogForm/ModalForm.js +6 -2
- package/lib/DialogForm/hooks.d.ts +1 -1
- package/lib/DialogForm/hooks.js +5 -2
- package/lib/DialogForm/modal.d.ts +2 -0
- package/package.json +1 -1
- package/src/components/CheckboxGroup/hooks.ts +4 -1
- package/src/components/CheckboxGroup/index.tsx +5 -0
- package/src/components/DialogForm/DrawerForm/index.tsx +2 -0
- package/src/components/DialogForm/ModalForm.tsx +4 -1
- package/src/components/DialogForm/hooks.ts +4 -1
- package/src/components/DialogForm/modal.ts +2 -0
- package/src/components/Input/VerificationCodeInput.tsx +1 -1
- package/src/pages/Checkbox/index.tsx +7 -1
- package/src/pages/DrawerForm/index.tsx +1 -0
- package/src/pages/Form/index.tsx +3 -2
- package/src/pages/ModalForm/index.tsx +1 -0
|
@@ -73,7 +73,9 @@ var useValueProvider = function useValueProvider(_ref2) {
|
|
|
73
73
|
});
|
|
74
74
|
}, [valueMap]);
|
|
75
75
|
useEffect(function () {
|
|
76
|
-
var
|
|
76
|
+
var _oldValueCheckMap$val = oldValueCheckMap.valueMap,
|
|
77
|
+
checked = _oldValueCheckMap$val.checked,
|
|
78
|
+
noChecked = _oldValueCheckMap$val.noChecked;
|
|
77
79
|
if (!value) {
|
|
78
80
|
return;
|
|
79
81
|
}
|
|
@@ -83,6 +85,9 @@ var useValueProvider = function useValueProvider(_ref2) {
|
|
|
83
85
|
}
|
|
84
86
|
setVal(function (oldVal) {
|
|
85
87
|
var newVal = _objectSpread({}, oldVal);
|
|
88
|
+
Object.keys(newVal).forEach(function (key) {
|
|
89
|
+
newVal[key] = noChecked;
|
|
90
|
+
});
|
|
86
91
|
value.forEach(function (itemVal) {
|
|
87
92
|
newVal[itemVal] = checked;
|
|
88
93
|
});
|
|
@@ -66,6 +66,9 @@ var Index = function Index(_ref) {
|
|
|
66
66
|
name = _item$name2 === void 0 ? "" : _item$name2;
|
|
67
67
|
var _outputValue$name = _outputValue[name],
|
|
68
68
|
itemVal = _outputValue$name === void 0 ? {} : _outputValue$name;
|
|
69
|
+
if (Array.isArray(itemVal)) {
|
|
70
|
+
return _defineProperty({}, name, itemVal);
|
|
71
|
+
}
|
|
69
72
|
return _objectSpread({}, itemVal);
|
|
70
73
|
}
|
|
71
74
|
}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import type { DialogFormProps } from "../modal";
|
|
2
|
-
declare const _default: ({ visible, title, onCancel, configData, infoRequest, request, afterClose, dialogForm, closable, initialValues, labelWidth, onOk, onFinish, size, form, footer, params, onValuesChange, ...props }: DialogFormProps) => JSX.Element;
|
|
2
|
+
declare const _default: ({ visible, title, onCancel, configData, infoRequest, request, afterClose, dialogForm, closable, initialValues, labelWidth, onOk, onFinish, size, form, footer, params, onValuesChange, autoClear, ...props }: DialogFormProps) => JSX.Element;
|
|
3
3
|
export default _default;
|
|
@@ -18,7 +18,7 @@ import Title from './Title.js';
|
|
|
18
18
|
import Footer from './Footer.js';
|
|
19
19
|
import Index, { useFormConfigContext } from '../../Form/Context/FormConfigProvider.js';
|
|
20
20
|
|
|
21
|
-
var _excluded = ["visible", "title", "onCancel", "configData", "infoRequest", "request", "afterClose", "dialogForm", "closable", "initialValues", "labelWidth", "onOk", "onFinish", "size", "form", "footer", "params", "onValuesChange"];
|
|
21
|
+
var _excluded = ["visible", "title", "onCancel", "configData", "infoRequest", "request", "afterClose", "dialogForm", "closable", "initialValues", "labelWidth", "onOk", "onFinish", "size", "form", "footer", "params", "onValuesChange", "autoClear"];
|
|
22
22
|
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; }
|
|
23
23
|
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; }
|
|
24
24
|
var DrawerForm = (function (_ref) {
|
|
@@ -41,6 +41,8 @@ var DrawerForm = (function (_ref) {
|
|
|
41
41
|
var footer = _ref.footer,
|
|
42
42
|
params = _ref.params,
|
|
43
43
|
onValuesChange = _ref.onValuesChange,
|
|
44
|
+
_ref$autoClear = _ref.autoClear,
|
|
45
|
+
autoClear = _ref$autoClear === void 0 ? true : _ref$autoClear,
|
|
44
46
|
props = _objectWithoutProperties(_ref, _excluded);
|
|
45
47
|
var currentForm = useCurrentForm(dialogForm);
|
|
46
48
|
var providerConfig = useFormConfigContext();
|
|
@@ -51,7 +53,8 @@ var DrawerForm = (function (_ref) {
|
|
|
51
53
|
dialogForm: currentForm,
|
|
52
54
|
params: params,
|
|
53
55
|
title: title,
|
|
54
|
-
onCancel: onCancel
|
|
56
|
+
onCancel: onCancel,
|
|
57
|
+
autoClear: autoClear
|
|
55
58
|
}),
|
|
56
59
|
modalVisible = _useModifyProps.modalVisible,
|
|
57
60
|
modalFormData = _useModifyProps.modalFormData,
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import type { DialogFormProps } from "./modal";
|
|
2
|
-
declare const _default: ({ visible, title, onCancel, configData, infoRequest, request, afterClose, dialogForm, initialValues, onFinish, params, onOk, onValuesChange, ...props }: DialogFormProps) => JSX.Element;
|
|
2
|
+
declare const _default: ({ visible, title, onCancel, configData, infoRequest, request, afterClose, dialogForm, initialValues, onFinish, params, onOk, onValuesChange, autoClear, ...props }: DialogFormProps) => JSX.Element;
|
|
3
3
|
export default _default;
|
|
@@ -16,7 +16,7 @@ import HForm from '../Form/index.js';
|
|
|
16
16
|
import Index, { useFormConfigContext } from '../Form/Context/FormConfigProvider.js';
|
|
17
17
|
import { useCurrentForm, useModifyProps, useSub } from './hooks.js';
|
|
18
18
|
|
|
19
|
-
var _excluded = ["visible", "title", "onCancel", "configData", "infoRequest", "request", "afterClose", "dialogForm", "initialValues", "onFinish", "params", "onOk", "onValuesChange"];
|
|
19
|
+
var _excluded = ["visible", "title", "onCancel", "configData", "infoRequest", "request", "afterClose", "dialogForm", "initialValues", "onFinish", "params", "onOk", "onValuesChange", "autoClear"];
|
|
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 ModalForm = (function (_ref) {
|
|
@@ -33,6 +33,8 @@ var ModalForm = (function (_ref) {
|
|
|
33
33
|
params = _ref.params,
|
|
34
34
|
onOk = _ref.onOk,
|
|
35
35
|
onValuesChange = _ref.onValuesChange,
|
|
36
|
+
_ref$autoClear = _ref.autoClear,
|
|
37
|
+
autoClear = _ref$autoClear === void 0 ? true : _ref$autoClear,
|
|
36
38
|
props = _objectWithoutProperties(_ref, _excluded);
|
|
37
39
|
var currentForm = useCurrentForm(dialogForm);
|
|
38
40
|
var providerConfig = useFormConfigContext();
|
|
@@ -69,7 +71,9 @@ var ModalForm = (function (_ref) {
|
|
|
69
71
|
onCancel: cancel,
|
|
70
72
|
confirmLoading: loading,
|
|
71
73
|
afterClose: function afterClose() {
|
|
72
|
-
|
|
74
|
+
if (autoClear) {
|
|
75
|
+
currentForm.clear();
|
|
76
|
+
}
|
|
73
77
|
_afterClose === null || _afterClose === void 0 || _afterClose();
|
|
74
78
|
}
|
|
75
79
|
}, props), {}, {
|
package/es/DialogForm/hooks.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/// <reference types="react" />
|
|
2
2
|
import type { DialogFormProps, HDialogFormInstance, ModifyPropsModal } from "./modal";
|
|
3
|
-
export declare const useModifyProps: ({ visible, configData, initialValues, dialogForm, afterClose, params, title, onCancel, }: ModifyPropsModal) => {
|
|
3
|
+
export declare const useModifyProps: ({ visible, configData, initialValues, dialogForm, afterClose, params, title, onCancel, autoClear, }: ModifyPropsModal) => {
|
|
4
4
|
modalFormData: import("../Form/modal").HItemProps[];
|
|
5
5
|
modalVisible: boolean | undefined;
|
|
6
6
|
setModalVisible: import("react").Dispatch<import("react").SetStateAction<boolean | undefined>>;
|
package/es/DialogForm/hooks.js
CHANGED
|
@@ -24,7 +24,8 @@ var useModifyProps = function useModifyProps(_ref) {
|
|
|
24
24
|
afterClose = _ref.afterClose,
|
|
25
25
|
params = _ref.params,
|
|
26
26
|
title = _ref.title,
|
|
27
|
-
onCancel = _ref.onCancel
|
|
27
|
+
onCancel = _ref.onCancel,
|
|
28
|
+
autoClear = _ref.autoClear;
|
|
28
29
|
var _useState = useState(visible),
|
|
29
30
|
_useState2 = _slicedToArray(_useState, 2),
|
|
30
31
|
modalVisible = _useState2[0],
|
|
@@ -48,7 +49,9 @@ var useModifyProps = function useModifyProps(_ref) {
|
|
|
48
49
|
var onAfterClose = function onAfterClose() {
|
|
49
50
|
onCancel === null || onCancel === void 0 || onCancel();
|
|
50
51
|
setTimeout(function () {
|
|
51
|
-
|
|
52
|
+
if (autoClear) {
|
|
53
|
+
dialogForm.clear();
|
|
54
|
+
}
|
|
52
55
|
afterClose === null || afterClose === void 0 || afterClose();
|
|
53
56
|
}, 100);
|
|
54
57
|
};
|
package/es/DialogForm/modal.d.ts
CHANGED
|
@@ -11,6 +11,7 @@ export interface ModifyPropsModal<P = any> {
|
|
|
11
11
|
params?: P;
|
|
12
12
|
title?: DialogFormProps["title"];
|
|
13
13
|
onCancel?: VoidFunction;
|
|
14
|
+
autoClear?: boolean;
|
|
14
15
|
}
|
|
15
16
|
export interface ShowParamsModal<P = any, T = any> {
|
|
16
17
|
configData?: HItemProps[];
|
|
@@ -30,5 +31,6 @@ export interface DialogFormProps<P = any, T = any> extends Omit<RootProps, "onFi
|
|
|
30
31
|
onCancel?: VoidFunction;
|
|
31
32
|
onOk?: (data: T, params: P) => boolean | void;
|
|
32
33
|
infoRequest?: (params: P) => Promise<T>;
|
|
34
|
+
autoClear?: boolean;
|
|
33
35
|
}
|
|
34
36
|
export {};
|
|
@@ -74,7 +74,9 @@ var useValueProvider = function useValueProvider(_ref2) {
|
|
|
74
74
|
});
|
|
75
75
|
}, [valueMap]);
|
|
76
76
|
React.useEffect(function () {
|
|
77
|
-
var
|
|
77
|
+
var _oldValueCheckMap$val = oldValueCheckMap.valueMap,
|
|
78
|
+
checked = _oldValueCheckMap$val.checked,
|
|
79
|
+
noChecked = _oldValueCheckMap$val.noChecked;
|
|
78
80
|
if (!value) {
|
|
79
81
|
return;
|
|
80
82
|
}
|
|
@@ -84,6 +86,9 @@ var useValueProvider = function useValueProvider(_ref2) {
|
|
|
84
86
|
}
|
|
85
87
|
setVal(function (oldVal) {
|
|
86
88
|
var newVal = _objectSpread({}, oldVal);
|
|
89
|
+
Object.keys(newVal).forEach(function (key) {
|
|
90
|
+
newVal[key] = noChecked;
|
|
91
|
+
});
|
|
87
92
|
value.forEach(function (itemVal) {
|
|
88
93
|
newVal[itemVal] = checked;
|
|
89
94
|
});
|
|
@@ -69,6 +69,9 @@ var Index = function Index(_ref) {
|
|
|
69
69
|
name = _item$name2 === void 0 ? "" : _item$name2;
|
|
70
70
|
var _outputValue$name = _outputValue[name],
|
|
71
71
|
itemVal = _outputValue$name === void 0 ? {} : _outputValue$name;
|
|
72
|
+
if (Array.isArray(itemVal)) {
|
|
73
|
+
return _defineProperty({}, name, itemVal);
|
|
74
|
+
}
|
|
72
75
|
return _objectSpread({}, itemVal);
|
|
73
76
|
}
|
|
74
77
|
}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import type { DialogFormProps } from "../modal";
|
|
2
|
-
declare const _default: ({ visible, title, onCancel, configData, infoRequest, request, afterClose, dialogForm, closable, initialValues, labelWidth, onOk, onFinish, size, form, footer, params, onValuesChange, ...props }: DialogFormProps) => JSX.Element;
|
|
2
|
+
declare const _default: ({ visible, title, onCancel, configData, infoRequest, request, afterClose, dialogForm, closable, initialValues, labelWidth, onOk, onFinish, size, form, footer, params, onValuesChange, autoClear, ...props }: DialogFormProps) => JSX.Element;
|
|
3
3
|
export default _default;
|
|
@@ -21,7 +21,7 @@ var Title = require('./Title.js');
|
|
|
21
21
|
var Footer = require('./Footer.js');
|
|
22
22
|
var FormConfigProvider = require('../../Form/Context/FormConfigProvider.js');
|
|
23
23
|
|
|
24
|
-
var _excluded = ["visible", "title", "onCancel", "configData", "infoRequest", "request", "afterClose", "dialogForm", "closable", "initialValues", "labelWidth", "onOk", "onFinish", "size", "form", "footer", "params", "onValuesChange"];
|
|
24
|
+
var _excluded = ["visible", "title", "onCancel", "configData", "infoRequest", "request", "afterClose", "dialogForm", "closable", "initialValues", "labelWidth", "onOk", "onFinish", "size", "form", "footer", "params", "onValuesChange", "autoClear"];
|
|
25
25
|
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; }
|
|
26
26
|
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; }
|
|
27
27
|
var DrawerForm = (function (_ref) {
|
|
@@ -44,6 +44,8 @@ var DrawerForm = (function (_ref) {
|
|
|
44
44
|
var footer = _ref.footer,
|
|
45
45
|
params = _ref.params,
|
|
46
46
|
onValuesChange = _ref.onValuesChange,
|
|
47
|
+
_ref$autoClear = _ref.autoClear,
|
|
48
|
+
autoClear = _ref$autoClear === void 0 ? true : _ref$autoClear,
|
|
47
49
|
props = _objectWithoutProperties(_ref, _excluded);
|
|
48
50
|
var currentForm = hooks.useCurrentForm(dialogForm);
|
|
49
51
|
var providerConfig = FormConfigProvider.useFormConfigContext();
|
|
@@ -54,7 +56,8 @@ var DrawerForm = (function (_ref) {
|
|
|
54
56
|
dialogForm: currentForm,
|
|
55
57
|
params: params,
|
|
56
58
|
title: title,
|
|
57
|
-
onCancel: onCancel
|
|
59
|
+
onCancel: onCancel,
|
|
60
|
+
autoClear: autoClear
|
|
58
61
|
}),
|
|
59
62
|
modalVisible = _useModifyProps.modalVisible,
|
|
60
63
|
modalFormData = _useModifyProps.modalFormData,
|
|
@@ -1,3 +1,3 @@
|
|
|
1
1
|
import type { DialogFormProps } from "./modal";
|
|
2
|
-
declare const _default: ({ visible, title, onCancel, configData, infoRequest, request, afterClose, dialogForm, initialValues, onFinish, params, onOk, onValuesChange, ...props }: DialogFormProps) => JSX.Element;
|
|
2
|
+
declare const _default: ({ visible, title, onCancel, configData, infoRequest, request, afterClose, dialogForm, initialValues, onFinish, params, onOk, onValuesChange, autoClear, ...props }: DialogFormProps) => JSX.Element;
|
|
3
3
|
export default _default;
|
|
@@ -19,7 +19,7 @@ var index = require('../Form/index.js');
|
|
|
19
19
|
var FormConfigProvider = require('../Form/Context/FormConfigProvider.js');
|
|
20
20
|
var hooks = require('./hooks.js');
|
|
21
21
|
|
|
22
|
-
var _excluded = ["visible", "title", "onCancel", "configData", "infoRequest", "request", "afterClose", "dialogForm", "initialValues", "onFinish", "params", "onOk", "onValuesChange"];
|
|
22
|
+
var _excluded = ["visible", "title", "onCancel", "configData", "infoRequest", "request", "afterClose", "dialogForm", "initialValues", "onFinish", "params", "onOk", "onValuesChange", "autoClear"];
|
|
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 ModalForm = (function (_ref) {
|
|
@@ -36,6 +36,8 @@ var ModalForm = (function (_ref) {
|
|
|
36
36
|
params = _ref.params,
|
|
37
37
|
onOk = _ref.onOk,
|
|
38
38
|
onValuesChange = _ref.onValuesChange,
|
|
39
|
+
_ref$autoClear = _ref.autoClear,
|
|
40
|
+
autoClear = _ref$autoClear === void 0 ? true : _ref$autoClear,
|
|
39
41
|
props = _objectWithoutProperties(_ref, _excluded);
|
|
40
42
|
var currentForm = hooks.useCurrentForm(dialogForm);
|
|
41
43
|
var providerConfig = FormConfigProvider.useFormConfigContext();
|
|
@@ -72,7 +74,9 @@ var ModalForm = (function (_ref) {
|
|
|
72
74
|
onCancel: cancel,
|
|
73
75
|
confirmLoading: loading,
|
|
74
76
|
afterClose: function afterClose() {
|
|
75
|
-
|
|
77
|
+
if (autoClear) {
|
|
78
|
+
currentForm.clear();
|
|
79
|
+
}
|
|
76
80
|
_afterClose === null || _afterClose === void 0 || _afterClose();
|
|
77
81
|
}
|
|
78
82
|
}, props), {}, {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
/// <reference types="react" />
|
|
2
2
|
import type { DialogFormProps, HDialogFormInstance, ModifyPropsModal } from "./modal";
|
|
3
|
-
export declare const useModifyProps: ({ visible, configData, initialValues, dialogForm, afterClose, params, title, onCancel, }: ModifyPropsModal) => {
|
|
3
|
+
export declare const useModifyProps: ({ visible, configData, initialValues, dialogForm, afterClose, params, title, onCancel, autoClear, }: ModifyPropsModal) => {
|
|
4
4
|
modalFormData: import("../Form/modal").HItemProps[];
|
|
5
5
|
modalVisible: boolean | undefined;
|
|
6
6
|
setModalVisible: import("react").Dispatch<import("react").SetStateAction<boolean | undefined>>;
|
package/lib/DialogForm/hooks.js
CHANGED
|
@@ -25,7 +25,8 @@ var useModifyProps = function useModifyProps(_ref) {
|
|
|
25
25
|
afterClose = _ref.afterClose,
|
|
26
26
|
params = _ref.params,
|
|
27
27
|
title = _ref.title,
|
|
28
|
-
onCancel = _ref.onCancel
|
|
28
|
+
onCancel = _ref.onCancel,
|
|
29
|
+
autoClear = _ref.autoClear;
|
|
29
30
|
var _useState = React.useState(visible),
|
|
30
31
|
_useState2 = _slicedToArray(_useState, 2),
|
|
31
32
|
modalVisible = _useState2[0],
|
|
@@ -49,7 +50,9 @@ var useModifyProps = function useModifyProps(_ref) {
|
|
|
49
50
|
var onAfterClose = function onAfterClose() {
|
|
50
51
|
onCancel === null || onCancel === void 0 || onCancel();
|
|
51
52
|
setTimeout(function () {
|
|
52
|
-
|
|
53
|
+
if (autoClear) {
|
|
54
|
+
dialogForm.clear();
|
|
55
|
+
}
|
|
53
56
|
afterClose === null || afterClose === void 0 || afterClose();
|
|
54
57
|
}, 100);
|
|
55
58
|
};
|
|
@@ -11,6 +11,7 @@ export interface ModifyPropsModal<P = any> {
|
|
|
11
11
|
params?: P;
|
|
12
12
|
title?: DialogFormProps["title"];
|
|
13
13
|
onCancel?: VoidFunction;
|
|
14
|
+
autoClear?: boolean;
|
|
14
15
|
}
|
|
15
16
|
export interface ShowParamsModal<P = any, T = any> {
|
|
16
17
|
configData?: HItemProps[];
|
|
@@ -30,5 +31,6 @@ export interface DialogFormProps<P = any, T = any> extends Omit<RootProps, "onFi
|
|
|
30
31
|
onCancel?: VoidFunction;
|
|
31
32
|
onOk?: (data: T, params: P) => boolean | void;
|
|
32
33
|
infoRequest?: (params: P) => Promise<T>;
|
|
34
|
+
autoClear?: boolean;
|
|
33
35
|
}
|
|
34
36
|
export {};
|
package/package.json
CHANGED
|
@@ -58,7 +58,7 @@ export const useValueProvider = ({
|
|
|
58
58
|
}, [valueMap]);
|
|
59
59
|
|
|
60
60
|
useEffect(() => {
|
|
61
|
-
const { checked } = oldValueCheckMap.valueMap;
|
|
61
|
+
const { checked ,noChecked} = oldValueCheckMap.valueMap;
|
|
62
62
|
if (!value) {
|
|
63
63
|
return;
|
|
64
64
|
}
|
|
@@ -68,6 +68,9 @@ export const useValueProvider = ({
|
|
|
68
68
|
}
|
|
69
69
|
setVal((oldVal) => {
|
|
70
70
|
const newVal = { ...oldVal };
|
|
71
|
+
Object.keys(newVal).forEach((key)=>{
|
|
72
|
+
newVal[key]=noChecked
|
|
73
|
+
});
|
|
71
74
|
value.forEach((itemVal) => {
|
|
72
75
|
newVal[itemVal] = checked;
|
|
73
76
|
});
|
|
@@ -26,6 +26,7 @@ export default ({
|
|
|
26
26
|
footer,
|
|
27
27
|
params,
|
|
28
28
|
onValuesChange,
|
|
29
|
+
autoClear = true,
|
|
29
30
|
...props
|
|
30
31
|
}: DialogFormProps) => {
|
|
31
32
|
const currentForm = useCurrentForm(dialogForm);
|
|
@@ -46,6 +47,7 @@ export default ({
|
|
|
46
47
|
params,
|
|
47
48
|
title,
|
|
48
49
|
onCancel,
|
|
50
|
+
autoClear,
|
|
49
51
|
});
|
|
50
52
|
const cancel = () => {
|
|
51
53
|
onAfterClose();
|
|
@@ -19,6 +19,7 @@ export default ({
|
|
|
19
19
|
params,
|
|
20
20
|
onOk,
|
|
21
21
|
onValuesChange,
|
|
22
|
+
autoClear = true,
|
|
22
23
|
...props
|
|
23
24
|
}: DialogFormProps) => {
|
|
24
25
|
const currentForm = useCurrentForm(dialogForm);
|
|
@@ -53,7 +54,9 @@ export default ({
|
|
|
53
54
|
onCancel={cancel}
|
|
54
55
|
confirmLoading={loading}
|
|
55
56
|
afterClose={() => {
|
|
56
|
-
|
|
57
|
+
if (autoClear) {
|
|
58
|
+
currentForm.clear();
|
|
59
|
+
}
|
|
57
60
|
afterClose?.();
|
|
58
61
|
}}
|
|
59
62
|
{...props}
|
|
@@ -16,6 +16,7 @@ export const useModifyProps = ({
|
|
|
16
16
|
params,
|
|
17
17
|
title,
|
|
18
18
|
onCancel,
|
|
19
|
+
autoClear,
|
|
19
20
|
}: ModifyPropsModal) => {
|
|
20
21
|
const [modalVisible, setModalVisible] = useState(visible);
|
|
21
22
|
const [modalFormData, setModalFormData] = useState(configData);
|
|
@@ -25,7 +26,9 @@ export const useModifyProps = ({
|
|
|
25
26
|
const onAfterClose = () => {
|
|
26
27
|
onCancel?.();
|
|
27
28
|
setTimeout(() => {
|
|
28
|
-
|
|
29
|
+
if (autoClear) {
|
|
30
|
+
dialogForm.clear();
|
|
31
|
+
}
|
|
29
32
|
afterClose?.();
|
|
30
33
|
}, 100);
|
|
31
34
|
};
|
|
@@ -13,6 +13,7 @@ export interface ModifyPropsModal<P = any> {
|
|
|
13
13
|
params?: P;
|
|
14
14
|
title?: DialogFormProps["title"];
|
|
15
15
|
onCancel?: VoidFunction;
|
|
16
|
+
autoClear?: boolean;
|
|
16
17
|
}
|
|
17
18
|
export interface ShowParamsModal<P = any, T = any> {
|
|
18
19
|
configData?: HItemProps[];
|
|
@@ -34,4 +35,5 @@ export interface DialogFormProps<P = any, T = any>
|
|
|
34
35
|
onCancel?: VoidFunction;
|
|
35
36
|
onOk?: (data: T, params: P) => boolean | void;
|
|
36
37
|
infoRequest?: (params: P) => Promise<T>;
|
|
38
|
+
autoClear?: boolean;
|
|
37
39
|
}
|
|
@@ -15,7 +15,7 @@ export default ({
|
|
|
15
15
|
...props
|
|
16
16
|
}: IVerificationCodeInputProps) => {
|
|
17
17
|
const [countdown, setCountdown] = useState<number>(0);
|
|
18
|
-
const timer = useMemo<{ time:any }>(() => {
|
|
18
|
+
const timer = useMemo<{ time: any }>(() => {
|
|
19
19
|
return {
|
|
20
20
|
time: undefined,
|
|
21
21
|
};
|
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
import { Space } from "antd";
|
|
2
2
|
import { HCheckboxGroup } from "../../components";
|
|
3
|
+
import {useState} from "react";
|
|
3
4
|
export default () => {
|
|
5
|
+
const [val,setVal]=useState();
|
|
4
6
|
return (
|
|
5
7
|
<Space size={"large"} direction={"vertical"} style={{ width: "100%" }}>
|
|
6
8
|
<HCheckboxGroup
|
|
@@ -8,7 +10,11 @@ export default () => {
|
|
|
8
10
|
{ label: "测试", value: "uu" },
|
|
9
11
|
{ label: "测试1", value: "uu1" },
|
|
10
12
|
]}
|
|
11
|
-
value={
|
|
13
|
+
value={val}
|
|
14
|
+
|
|
15
|
+
onChange={(val)=>{
|
|
16
|
+
setVal(val)
|
|
17
|
+
}}
|
|
12
18
|
/>
|
|
13
19
|
</Space>
|
|
14
20
|
);
|
package/src/pages/Form/index.tsx
CHANGED
|
@@ -73,9 +73,10 @@ const formData = (options) => {
|
|
|
73
73
|
rules: [{ required: true }],
|
|
74
74
|
helper: "帮助我",
|
|
75
75
|
options: [
|
|
76
|
-
{
|
|
77
|
-
{
|
|
76
|
+
{ value: "选择1", key: "check1" },
|
|
77
|
+
{ value: "选择2", key: "check2" },
|
|
78
78
|
],
|
|
79
|
+
keyInValue:false
|
|
79
80
|
},
|
|
80
81
|
{
|
|
81
82
|
label: "开关",
|