@kdcloudjs/kdesign 1.6.12 → 1.6.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.
- package/CHANGELOG.md +20 -0
- package/dist/kdesign-complete.less +21 -10
- package/dist/kdesign.css +16 -13
- package/dist/kdesign.css.map +1 -1
- package/dist/kdesign.js +209 -179
- package/dist/kdesign.js.map +1 -1
- package/dist/kdesign.min.css +3 -3
- package/dist/kdesign.min.js +8 -8
- package/dist/kdesign.min.js.map +1 -1
- package/es/button/group.d.ts +9 -7
- package/es/button/group.js +6 -1
- package/es/config-provider/compDefaultProps.d.ts +2 -0
- package/es/config-provider/compDefaultProps.js +4 -2
- package/es/date-picker/range-picker.js +6 -17
- package/es/date-picker/style/index.css +9 -9
- package/es/date-picker/style/index.less +1 -1
- package/es/date-picker/style/token.less +1 -1
- package/es/form/Field.js +61 -33
- package/es/form/FieldContext.js +0 -1
- package/es/form/hooks/useForm.js +17 -24
- package/es/form/interface.d.ts +6 -3
- package/es/icon/icon.js +23 -4
- package/es/select/style/index.css +6 -3
- package/es/select/style/index.less +9 -3
- package/es/select/style/token.less +10 -5
- package/es/tooltip/tooltip.js +1 -2
- package/lib/button/group.d.ts +9 -7
- package/lib/button/group.js +6 -1
- package/lib/config-provider/compDefaultProps.d.ts +2 -0
- package/lib/config-provider/compDefaultProps.js +4 -2
- package/lib/date-picker/range-picker.js +6 -17
- package/lib/date-picker/style/index.css +9 -9
- package/lib/date-picker/style/index.less +1 -1
- package/lib/date-picker/style/token.less +1 -1
- package/lib/form/Field.js +62 -33
- package/lib/form/FieldContext.js +0 -1
- package/lib/form/hooks/useForm.js +17 -24
- package/lib/form/interface.d.ts +6 -3
- package/lib/icon/icon.js +22 -4
- package/lib/select/style/index.css +6 -3
- package/lib/select/style/index.less +9 -3
- package/lib/select/style/token.less +10 -5
- package/lib/tooltip/tooltip.js +1 -2
- package/package.json +3 -2
package/es/button/group.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import React, { CSSProperties, ReactNode } from 'react';
|
|
2
|
-
import { ButtonType } from './button';
|
|
2
|
+
import { ButtonType, ButtonSize } from './button';
|
|
3
3
|
export declare const ButtonGroupTypes: ["basic", "similar"];
|
|
4
4
|
export declare type ButtonGroupType = typeof ButtonGroupTypes[number];
|
|
5
5
|
export interface OverlayType {
|
|
@@ -7,15 +7,17 @@ export interface OverlayType {
|
|
|
7
7
|
label?: React.ReactNode;
|
|
8
8
|
}
|
|
9
9
|
export interface ButtonGroupProps {
|
|
10
|
-
|
|
11
|
-
className?: string;
|
|
10
|
+
buttonType?: ButtonType;
|
|
12
11
|
children?: ReactNode;
|
|
13
|
-
|
|
14
|
-
|
|
12
|
+
className?: string;
|
|
13
|
+
disabled?: boolean;
|
|
15
14
|
icon?: [ReactNode, ReactNode];
|
|
15
|
+
overlay?: Array<OverlayType>;
|
|
16
|
+
size?: ButtonSize;
|
|
17
|
+
style?: CSSProperties;
|
|
16
18
|
type?: ButtonGroupType;
|
|
17
|
-
|
|
18
|
-
|
|
19
|
+
onClick?: () => void;
|
|
20
|
+
onItemClick?: (data: OverlayType) => void;
|
|
19
21
|
}
|
|
20
22
|
declare const ButtonGroup: React.ForwardRefExoticComponent<ButtonGroupProps & React.RefAttributes<HTMLDivElement>>;
|
|
21
23
|
export default ButtonGroup;
|
package/es/button/group.js
CHANGED
|
@@ -31,6 +31,7 @@ var InternalButtonGroup = function InternalButtonGroup(props, ref) {
|
|
|
31
31
|
overlay = buttonGoupProps.overlay,
|
|
32
32
|
icon = buttonGoupProps.icon,
|
|
33
33
|
type = buttonGoupProps.type,
|
|
34
|
+
size = buttonGoupProps.size,
|
|
34
35
|
buttonType = buttonGoupProps.buttonType,
|
|
35
36
|
disabled = buttonGoupProps.disabled,
|
|
36
37
|
onVisibleChange = buttonGoupProps.onVisibleChange;
|
|
@@ -64,11 +65,13 @@ var InternalButtonGroup = function InternalButtonGroup(props, ref) {
|
|
|
64
65
|
ref: refBtnGroup
|
|
65
66
|
}, isBsicType && /*#__PURE__*/React.createElement(Button, {
|
|
66
67
|
type: buttonType,
|
|
68
|
+
size: size,
|
|
67
69
|
disabled: disabled
|
|
68
70
|
}, children, /*#__PURE__*/React.createElement("span", {
|
|
69
71
|
className: "".concat(btnGroupPrefixCls, "-basic-icon")
|
|
70
72
|
}, optionShow ? iconUp : iconDown)), !isBsicType && /*#__PURE__*/React.createElement(Button, {
|
|
71
73
|
type: buttonType,
|
|
74
|
+
size: size,
|
|
72
75
|
disabled: disabled,
|
|
73
76
|
onClick: onClick
|
|
74
77
|
}, children), !isBsicType && /*#__PURE__*/React.createElement("span", {
|
|
@@ -77,13 +80,15 @@ var InternalButtonGroup = function InternalButtonGroup(props, ref) {
|
|
|
77
80
|
}, optionShow ? /*#__PURE__*/React.createElement(Button, {
|
|
78
81
|
icon: iconUp,
|
|
79
82
|
type: buttonType,
|
|
83
|
+
size: size,
|
|
80
84
|
disabled: disabled
|
|
81
85
|
}) : /*#__PURE__*/React.createElement(Button, {
|
|
82
86
|
icon: iconDown,
|
|
83
87
|
type: buttonType,
|
|
88
|
+
size: size,
|
|
84
89
|
disabled: disabled
|
|
85
90
|
})));
|
|
86
|
-
}, [icon, btnGroupPrefixCls, style, btnGroupClasses, refBtnGroup, isBsicType, buttonType, disabled, children, optionShow, onClick]);
|
|
91
|
+
}, [icon, btnGroupPrefixCls, style, btnGroupClasses, refBtnGroup, isBsicType, buttonType, disabled, children, optionShow, onClick, size]);
|
|
87
92
|
var handleItemClick = useCallback(function (data) {
|
|
88
93
|
onItemClick === null || onItemClick === void 0 ? void 0 : onItemClick(data);
|
|
89
94
|
setOptionShow(false);
|
|
@@ -23,6 +23,7 @@ declare const compDefaultProps: {
|
|
|
23
23
|
ButtonGroup: {
|
|
24
24
|
buttonType: string;
|
|
25
25
|
type: string;
|
|
26
|
+
size: string;
|
|
26
27
|
};
|
|
27
28
|
Card: {
|
|
28
29
|
hoverable: boolean;
|
|
@@ -317,6 +318,7 @@ declare const compDefaultProps: {
|
|
|
317
318
|
ToolTip: {
|
|
318
319
|
placement: string;
|
|
319
320
|
trigger: string;
|
|
321
|
+
arrow: boolean;
|
|
320
322
|
};
|
|
321
323
|
Tabs: {
|
|
322
324
|
type: string;
|
|
@@ -24,7 +24,8 @@ var compDefaultProps = {
|
|
|
24
24
|
},
|
|
25
25
|
ButtonGroup: {
|
|
26
26
|
buttonType: 'primary',
|
|
27
|
-
type: 'basic'
|
|
27
|
+
type: 'basic',
|
|
28
|
+
size: 'middle'
|
|
28
29
|
},
|
|
29
30
|
Card: {
|
|
30
31
|
hoverable: false,
|
|
@@ -331,7 +332,8 @@ var compDefaultProps = {
|
|
|
331
332
|
TreeNode: {},
|
|
332
333
|
ToolTip: {
|
|
333
334
|
placement: 'top',
|
|
334
|
-
trigger: 'hover'
|
|
335
|
+
trigger: 'hover',
|
|
336
|
+
arrow: true
|
|
335
337
|
},
|
|
336
338
|
Tabs: {
|
|
337
339
|
type: 'line',
|
|
@@ -407,33 +407,27 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
|
|
|
407
407
|
var triggerChange = function triggerChange(newValue, sourceIndex) {
|
|
408
408
|
var values = newValue;
|
|
409
409
|
var startValue = getValue(values, 0);
|
|
410
|
-
var endValue = getValue(values, 1);
|
|
410
|
+
var endValue = getValue(values, 1);
|
|
411
411
|
|
|
412
412
|
if (startValue && endValue && isAfter(startValue, endValue)) {
|
|
413
|
-
if (
|
|
414
|
-
picker === 'week' && !isSameWeek(startValue, endValue) || // QuotaPicker only compare week
|
|
415
|
-
picker === 'quarter' && !isSameQuarter(startValue, endValue) || // Other non-TimePicker compare date
|
|
416
|
-
picker !== 'week' && picker !== 'quarter' && picker !== 'time' && !isSameDay(startValue, endValue)) {
|
|
417
|
-
// Clean up end date when start date is after end date
|
|
413
|
+
if (picker === 'week' && !isSameWeek(startValue, endValue) || picker === 'quarter' && !isSameQuarter(startValue, endValue) || picker !== 'week' && picker !== 'quarter' && picker !== 'time' && !isSameDay(startValue, endValue)) {
|
|
418
414
|
if (sourceIndex === 0) {
|
|
419
415
|
values = [startValue, null];
|
|
420
416
|
endValue = null;
|
|
421
417
|
} else {
|
|
422
418
|
startValue = null;
|
|
423
419
|
values = [null, endValue];
|
|
424
|
-
}
|
|
425
|
-
|
|
420
|
+
}
|
|
426
421
|
|
|
427
422
|
openRecordsRef.current = _defineProperty({}, sourceIndex, true);
|
|
428
423
|
} else if (picker === 'time' && order === true) {
|
|
429
|
-
// Reorder when in same date
|
|
430
424
|
values = reorderValues(values);
|
|
431
425
|
}
|
|
432
426
|
}
|
|
433
427
|
|
|
434
428
|
setSelectedValue(values);
|
|
435
429
|
var startStr = values && values[0] ? formatDate(values[0], _format) : '';
|
|
436
|
-
var endStr = values && values[1] ? formatDate(values[1], _format) : '';
|
|
430
|
+
var endStr = values && values[1] ? formatDate(values[1], _format) : '';
|
|
437
431
|
|
|
438
432
|
if (onCalendarChange) {
|
|
439
433
|
var info = {
|
|
@@ -447,15 +441,12 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
|
|
|
447
441
|
var canTrigger = values === null || canStartValueTrigger && canEndValueTrigger;
|
|
448
442
|
|
|
449
443
|
if (canTrigger) {
|
|
450
|
-
// Trigger onChange only when value is validate
|
|
451
444
|
setInnerValue(values);
|
|
452
445
|
|
|
453
|
-
if (onChange && (!isEqual(getValue(
|
|
446
|
+
if (onChange && (!isEqual(getValue(dateValue, 0), startValue) || !isEqual(getValue(dateValue, 1), endValue))) {
|
|
454
447
|
onChange(values, [startStr, endStr]);
|
|
455
448
|
}
|
|
456
|
-
}
|
|
457
|
-
// Always open another picker if possible
|
|
458
|
-
|
|
449
|
+
}
|
|
459
450
|
|
|
460
451
|
var nextOpenIndex = null;
|
|
461
452
|
|
|
@@ -466,7 +457,6 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
|
|
|
466
457
|
}
|
|
467
458
|
|
|
468
459
|
if (nextOpenIndex !== null && nextOpenIndex !== mergedActivePickerIndex && (!openRecordsRef.current[nextOpenIndex] || !getValue(values, nextOpenIndex)) && getValue(values, sourceIndex)) {
|
|
469
|
-
// Delay to focus to avoid input blur trigger expired selectedValues
|
|
470
460
|
triggerOpenAndFocus(nextOpenIndex);
|
|
471
461
|
} else {
|
|
472
462
|
triggerOpen(false, sourceIndex);
|
|
@@ -766,7 +756,6 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
|
|
|
766
756
|
trigger: 'click',
|
|
767
757
|
prefixCls: "".concat(datePickerPrefixCls, "-panel"),
|
|
768
758
|
arrow: false,
|
|
769
|
-
popperClassName: className,
|
|
770
759
|
popperStyle: style,
|
|
771
760
|
visible: mergedOpen,
|
|
772
761
|
placement: 'bottomLeft',
|
|
@@ -218,13 +218,13 @@
|
|
|
218
218
|
white-space: nowrap;
|
|
219
219
|
}
|
|
220
220
|
.kd-date-picker-input input::-webkit-input-placeholder {
|
|
221
|
-
color: var(--kd-c-date-picker-input-color-placeholder,
|
|
221
|
+
color: var(--kd-c-date-picker-input-color-placeholder, #f2f2f2);
|
|
222
222
|
}
|
|
223
223
|
.kd-date-picker-input input::-moz-input-placeholder {
|
|
224
|
-
color: var(--kd-c-date-picker-input-color-placeholder,
|
|
224
|
+
color: var(--kd-c-date-picker-input-color-placeholder, #f2f2f2);
|
|
225
225
|
}
|
|
226
226
|
.kd-date-picker-input input::-ms-input-placeholder {
|
|
227
|
-
color: var(--kd-c-date-picker-input-color-placeholder,
|
|
227
|
+
color: var(--kd-c-date-picker-input-color-placeholder, #f2f2f2);
|
|
228
228
|
}
|
|
229
229
|
.kd-date-picker-input input:focus {
|
|
230
230
|
-webkit-box-shadow: none;
|
|
@@ -236,22 +236,22 @@
|
|
|
236
236
|
background: transparent;
|
|
237
237
|
}
|
|
238
238
|
.kd-date-picker-input input::-webkit-input-placeholder {
|
|
239
|
-
color: var(--kd-c-date-picker-input-color-
|
|
239
|
+
color: var(--kd-c-date-picker-input-color-placeholder, #f2f2f2);
|
|
240
240
|
}
|
|
241
241
|
.kd-date-picker-input input::-moz-placeholder {
|
|
242
|
-
color: var(--kd-c-date-picker-input-color-
|
|
242
|
+
color: var(--kd-c-date-picker-input-color-placeholder, #f2f2f2);
|
|
243
243
|
}
|
|
244
244
|
.kd-date-picker-input input:-ms-input-placeholder {
|
|
245
|
-
color: var(--kd-c-date-picker-input-color-
|
|
245
|
+
color: var(--kd-c-date-picker-input-color-placeholder, #f2f2f2);
|
|
246
246
|
}
|
|
247
247
|
.kd-date-picker-input input::-ms-input-placeholder {
|
|
248
|
-
color: var(--kd-c-date-picker-input-color-
|
|
248
|
+
color: var(--kd-c-date-picker-input-color-placeholder, #f2f2f2);
|
|
249
249
|
}
|
|
250
250
|
.kd-date-picker-input input::placeholder {
|
|
251
|
-
color: var(--kd-c-date-picker-input-color-
|
|
251
|
+
color: var(--kd-c-date-picker-input-color-placeholder, #f2f2f2);
|
|
252
252
|
}
|
|
253
253
|
.kd-date-picker-input-placeholder > input {
|
|
254
|
-
color: var(--kd-c-date-picker-input-color-placeholder,
|
|
254
|
+
color: var(--kd-c-date-picker-input-color-placeholder, #f2f2f2);
|
|
255
255
|
}
|
|
256
256
|
.kd-date-picker-range {
|
|
257
257
|
display: -webkit-inline-box;
|
|
@@ -6,7 +6,7 @@
|
|
|
6
6
|
@date-color-background-checked: var(~'@{date-picker-custom-prefix}-color-background-checked', @color-theme);
|
|
7
7
|
@date-wrapper-color-background: var(~'@{date-picker-custom-prefix}-wrapper-color-background', @color-background);
|
|
8
8
|
@date-input-color: var(~'@{date-picker-custom-prefix}-input-color', @color-text-primary);
|
|
9
|
-
@date-input-color-placeholder: var(~'@{date-picker-custom-prefix}-input-color-placeholder',
|
|
9
|
+
@date-input-color-placeholder: var(~'@{date-picker-custom-prefix}-input-color-placeholder', #f2f2f2);
|
|
10
10
|
@date-input-underline-color: var(~'@{date-picker-custom-prefix}-input-underline-color', #999);
|
|
11
11
|
@date-input-color-border: var(~'@{date-picker-custom-prefix}-input-color-border', @color-border-strong);
|
|
12
12
|
@date-input-color-disabled: var(~'@{date-picker-custom-prefix}-input-color-disabled', @color-disabled);
|
package/es/form/Field.js
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import _extends from "@babel/runtime-corejs3/helpers/extends";
|
|
2
2
|
import _defineProperty from "@babel/runtime-corejs3/helpers/defineProperty";
|
|
3
|
+
import _toConsumableArray from "@babel/runtime-corejs3/helpers/toConsumableArray";
|
|
3
4
|
import _typeof from "@babel/runtime-corejs3/helpers/typeof";
|
|
4
5
|
import _slicedToArray from "@babel/runtime-corejs3/helpers/slicedToArray";
|
|
5
6
|
import _Object$getOwnPropertySymbols from "@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols";
|
|
@@ -99,7 +100,6 @@ var Field = function Field(props) {
|
|
|
99
100
|
vertical = fieldContext.vertical,
|
|
100
101
|
getDefaultValue = fieldContext.getDefaultValue,
|
|
101
102
|
local = fieldContext.local,
|
|
102
|
-
setRules = fieldContext.setRules,
|
|
103
103
|
formDisabled = fieldContext.disabled;
|
|
104
104
|
|
|
105
105
|
var _getInternalHooks = getInternalHooks(INTERNAL_HOOK_KEY),
|
|
@@ -118,8 +118,7 @@ var Field = function Field(props) {
|
|
|
118
118
|
labelWidth = props.labelWidth,
|
|
119
119
|
labelAlign = props.labelAlign,
|
|
120
120
|
required = props.required,
|
|
121
|
-
|
|
122
|
-
rules = _props$rules === void 0 ? [] : _props$rules,
|
|
121
|
+
rules = props.rules,
|
|
123
122
|
wrapperWidth = props.wrapperWidth,
|
|
124
123
|
validateTrigger = props.validateTrigger,
|
|
125
124
|
defaultValue = props.defaultValue,
|
|
@@ -163,7 +162,7 @@ var Field = function Field(props) {
|
|
|
163
162
|
}
|
|
164
163
|
};
|
|
165
164
|
|
|
166
|
-
var
|
|
165
|
+
var mergedRequired = required || (rules === null || rules === void 0 ? void 0 : rules.some(function (rule) {
|
|
167
166
|
if (rule && _typeof(rule) === 'object' && rule.required) {
|
|
168
167
|
return true;
|
|
169
168
|
}
|
|
@@ -174,50 +173,52 @@ var Field = function Field(props) {
|
|
|
174
173
|
}
|
|
175
174
|
|
|
176
175
|
return false;
|
|
177
|
-
});
|
|
178
|
-
var mergedRequired = required || rulesRequired;
|
|
176
|
+
}));
|
|
179
177
|
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
}) && required) {
|
|
183
|
-
var _context2;
|
|
178
|
+
var mergeRule = function mergeRule() {
|
|
179
|
+
var mergeRules = Array.isArray(rules) ? _toConsumableArray(rules) : [];
|
|
184
180
|
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
}
|
|
181
|
+
if (!mergeRules.some(function (rule) {
|
|
182
|
+
return Object.prototype.hasOwnProperty.call(rule, 'required');
|
|
183
|
+
}) && required) {
|
|
184
|
+
var _context2;
|
|
190
185
|
|
|
191
|
-
|
|
186
|
+
mergeRules.push({
|
|
187
|
+
required: true,
|
|
188
|
+
message: _concatInstanceProperty(_context2 = "".concat(local && local.requiredMessage)).call(_context2, label)
|
|
189
|
+
});
|
|
190
|
+
}
|
|
192
191
|
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
192
|
+
if (mergeRules.length) {
|
|
193
|
+
mergeRules = _mapInstanceProperty(mergeRules).call(mergeRules, function (r) {
|
|
194
|
+
if (typeof r === 'function') {
|
|
195
|
+
return r(fieldContext);
|
|
196
|
+
}
|
|
198
197
|
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
198
|
+
return r;
|
|
199
|
+
});
|
|
200
|
+
}
|
|
201
|
+
|
|
202
|
+
return mergeRules;
|
|
203
|
+
};
|
|
202
204
|
|
|
203
|
-
var
|
|
205
|
+
var item = {
|
|
204
206
|
onStoreChange: onStoreChange,
|
|
205
207
|
meta: {
|
|
206
|
-
rules:
|
|
208
|
+
rules: mergeRule(),
|
|
207
209
|
name: name,
|
|
208
210
|
trigger: validateTrigger
|
|
209
211
|
}
|
|
210
|
-
}
|
|
212
|
+
};
|
|
213
|
+
var itemRef = React.useRef(item);
|
|
214
|
+
itemRef.current = item;
|
|
211
215
|
useEffect(function () {
|
|
212
|
-
registerField(name, itemRef
|
|
216
|
+
registerField(name, itemRef);
|
|
213
217
|
|
|
214
218
|
if (defaultValue !== undefined) {
|
|
215
219
|
setDefaultValues(_defineProperty({}, name, defaultValue));
|
|
216
220
|
}
|
|
217
221
|
}, [name, registerField]);
|
|
218
|
-
useEffect(function () {
|
|
219
|
-
setRules(name, mergeRules);
|
|
220
|
-
}, [mergedRequired, name, mergeRules]);
|
|
221
222
|
var formPrefixCls = getPrefixCls === null || getPrefixCls === void 0 ? void 0 : getPrefixCls(prefixCls, 'form', customizePrefixcls);
|
|
222
223
|
var formItemClassName = classnames((_classnames = {}, _defineProperty(_classnames, "".concat(formPrefixCls), true), _defineProperty(_classnames, "".concat(formPrefixCls, "-field"), true), _defineProperty(_classnames, "".concat(formPrefixCls, "-field-hidden"), hidden), _defineProperty(_classnames, "".concat(formPrefixCls, "-field-vertical"), vertical), _classnames), className);
|
|
223
224
|
var value = getFieldValue(name);
|
|
@@ -263,7 +264,7 @@ var Field = function Field(props) {
|
|
|
263
264
|
|
|
264
265
|
var faChange = fa.onChange,
|
|
265
266
|
faDisabled = fa.disabled,
|
|
266
|
-
|
|
267
|
+
faRest = __rest(fa, ["onChange", "disabled"]);
|
|
267
268
|
|
|
268
269
|
var _ch$props = ch.props,
|
|
269
270
|
chChange = _ch$props.onChange,
|
|
@@ -296,10 +297,37 @@ var Field = function Field(props) {
|
|
|
296
297
|
forceUpdate();
|
|
297
298
|
}
|
|
298
299
|
|
|
299
|
-
|
|
300
|
+
var mergeResult = _extends(_extends({}, faRest), (_extends3 = {
|
|
300
301
|
onChange: onChange,
|
|
301
302
|
defaultValue: defaultValue
|
|
302
303
|
}, _defineProperty(_extends3, innerValuePropName, fieldValue), _defineProperty(_extends3, "disabled", chDisabled !== undefined ? chDisabled : faDisabled !== undefined ? faDisabled : formDisabled), _extends3));
|
|
304
|
+
|
|
305
|
+
var mergeEventArray = [];
|
|
306
|
+
|
|
307
|
+
if (validateTrigger) {
|
|
308
|
+
if (Array.isArray(validateTrigger)) {
|
|
309
|
+
mergeEventArray.push.apply(mergeEventArray, _toConsumableArray(_filterInstanceProperty(validateTrigger).call(validateTrigger, function (v) {
|
|
310
|
+
return v !== DEFAULT_TRIGGER;
|
|
311
|
+
})));
|
|
312
|
+
} else if (validateTrigger !== DEFAULT_TRIGGER) {
|
|
313
|
+
mergeEventArray.push(validateTrigger);
|
|
314
|
+
}
|
|
315
|
+
}
|
|
316
|
+
|
|
317
|
+
mergeEventArray.forEach(function (eventName) {
|
|
318
|
+
mergeResult[eventName] = function () {
|
|
319
|
+
var _a;
|
|
320
|
+
|
|
321
|
+
if ((fa === null || fa === void 0 ? void 0 : fa[eventName]) && typeof fa[eventName] === 'function') {
|
|
322
|
+
fa[eventName]();
|
|
323
|
+
}
|
|
324
|
+
|
|
325
|
+
if (((_a = ch.props) === null || _a === void 0 ? void 0 : _a[eventName]) && typeof ch.props[eventName] === 'function') {
|
|
326
|
+
ch.props[eventName]();
|
|
327
|
+
}
|
|
328
|
+
};
|
|
329
|
+
});
|
|
330
|
+
return mergeResult;
|
|
303
331
|
};
|
|
304
332
|
|
|
305
333
|
return /*#__PURE__*/React.createElement("div", {
|
package/es/form/FieldContext.js
CHANGED
|
@@ -14,7 +14,6 @@ var context = /*#__PURE__*/React.createContext({
|
|
|
14
14
|
resetFields: warningFunc,
|
|
15
15
|
setFieldsValue: warningFunc,
|
|
16
16
|
setFieldValue: warningFunc,
|
|
17
|
-
setRules: warningFunc,
|
|
18
17
|
submit: warningFunc,
|
|
19
18
|
validateFields: warningFunc,
|
|
20
19
|
getInternalHooks: function getInternalHooks() {
|
package/es/form/hooks/useForm.js
CHANGED
|
@@ -26,7 +26,6 @@ var FormStore = /*#__PURE__*/_createClass(function FormStore() {
|
|
|
26
26
|
this.defaultValues = {};
|
|
27
27
|
this.store = {};
|
|
28
28
|
this.fields = {};
|
|
29
|
-
this.rules = {};
|
|
30
29
|
this.errorMessages = {};
|
|
31
30
|
this.callbacks = {}; // constructor (forceRootUpdate: () => void) {
|
|
32
31
|
// this.forceRootUpdate = forceRootUpdate
|
|
@@ -42,7 +41,6 @@ var FormStore = /*#__PURE__*/_createClass(function FormStore() {
|
|
|
42
41
|
resetFields: _this.resetFields,
|
|
43
42
|
setFieldValue: _this.setFieldValue,
|
|
44
43
|
setFieldsValue: _this.setFieldsValue,
|
|
45
|
-
setRules: _this.setRules,
|
|
46
44
|
validateFields: _this.validateFields,
|
|
47
45
|
submit: _this.submit,
|
|
48
46
|
getInternalHooks: _this.getInternalHooks
|
|
@@ -169,25 +167,25 @@ var FormStore = /*#__PURE__*/_createClass(function FormStore() {
|
|
|
169
167
|
this.getRules = function (namePathList) {
|
|
170
168
|
_this.warningUnhooked();
|
|
171
169
|
|
|
172
|
-
|
|
173
|
-
|
|
170
|
+
var list = cloneDeep(namePathList);
|
|
171
|
+
|
|
172
|
+
if (!list) {
|
|
173
|
+
list = _Object$keys(_this.fields);
|
|
174
174
|
}
|
|
175
175
|
|
|
176
176
|
var rules = {};
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
177
|
+
list.forEach(function (name) {
|
|
178
|
+
var _a, _b;
|
|
179
|
+
|
|
180
|
+
var current = _this.fields[name].current;
|
|
181
|
+
|
|
182
|
+
if ((_a = current === null || current === void 0 ? void 0 : current.meta) === null || _a === void 0 ? void 0 : _a.rules) {
|
|
183
|
+
rules[name] = cloneDeep((_b = current === null || current === void 0 ? void 0 : current.meta) === null || _b === void 0 ? void 0 : _b.rules);
|
|
180
184
|
}
|
|
181
185
|
});
|
|
182
186
|
return _Object$keys(rules).length === 0 ? null : rules;
|
|
183
187
|
};
|
|
184
188
|
|
|
185
|
-
this.setRules = function (name, rules) {
|
|
186
|
-
_this.warningUnhooked();
|
|
187
|
-
|
|
188
|
-
set(_this.rules, name, rules);
|
|
189
|
-
};
|
|
190
|
-
|
|
191
189
|
this.setCallbacks = function (callbacks) {
|
|
192
190
|
_this.warningUnhooked();
|
|
193
191
|
|
|
@@ -243,15 +241,6 @@ var FormStore = /*#__PURE__*/_createClass(function FormStore() {
|
|
|
243
241
|
_this.warningUnhooked();
|
|
244
242
|
|
|
245
243
|
_this.fields[name] = field;
|
|
246
|
-
var meta = field.meta;
|
|
247
|
-
|
|
248
|
-
if (meta.rules !== undefined) {
|
|
249
|
-
_this.setRules(name, meta.rules); // TODO: 初始化的时候是否需要校验??
|
|
250
|
-
// this.validateFields([name]).catch(({ errorInfos }) => {
|
|
251
|
-
// this.validateFieldFaild(errorInfos, 'internal')
|
|
252
|
-
// })
|
|
253
|
-
|
|
254
|
-
}
|
|
255
244
|
};
|
|
256
245
|
|
|
257
246
|
this.validateFields = function (namePathList) {
|
|
@@ -296,7 +285,11 @@ var FormStore = /*#__PURE__*/_createClass(function FormStore() {
|
|
|
296
285
|
_this.notifyObservers(_this.store, namePathList || [], 'validateFinish');
|
|
297
286
|
}).catch(function (_ref2) {
|
|
298
287
|
var errorInfos = _ref2.errorInfos;
|
|
299
|
-
|
|
288
|
+
|
|
289
|
+
if (!namePathList) {
|
|
290
|
+
_this.errorMessages = {};
|
|
291
|
+
}
|
|
292
|
+
|
|
300
293
|
var _errorInfos$fields = errorInfos.fields,
|
|
301
294
|
fields = _errorInfos$fields === void 0 ? {} : _errorInfos$fields;
|
|
302
295
|
|
|
@@ -336,7 +329,7 @@ var FormStore = /*#__PURE__*/_createClass(function FormStore() {
|
|
|
336
329
|
_this.warningUnhooked();
|
|
337
330
|
|
|
338
331
|
_Object$values(_this.fields).forEach(function (_ref4) {
|
|
339
|
-
var onStoreChange = _ref4.onStoreChange;
|
|
332
|
+
var onStoreChange = _ref4.current.onStoreChange;
|
|
340
333
|
var stores = {
|
|
341
334
|
prev: prevStore,
|
|
342
335
|
curr: _this.store
|
package/es/form/interface.d.ts
CHANGED
|
@@ -10,7 +10,9 @@ export interface FieldError {
|
|
|
10
10
|
[name: string]: string;
|
|
11
11
|
}
|
|
12
12
|
export interface Fields {
|
|
13
|
-
[name: string]:
|
|
13
|
+
[name: string]: {
|
|
14
|
+
current: FieldInstance;
|
|
15
|
+
};
|
|
14
16
|
}
|
|
15
17
|
export interface FormInstance<Values = any> {
|
|
16
18
|
getFieldError: (name: NamePath) => string | undefined;
|
|
@@ -21,7 +23,6 @@ export interface FormInstance<Values = any> {
|
|
|
21
23
|
resetFields: (fields?: NamePath[]) => void;
|
|
22
24
|
setFieldsValue: (value: Values) => void;
|
|
23
25
|
setFieldValue: (name: NamePath, value: Values) => void;
|
|
24
|
-
setRules: (name: NamePath, rules: any) => void;
|
|
25
26
|
validateFields: (namePathList?: NamePath[]) => Promise<Values>;
|
|
26
27
|
submit: () => void;
|
|
27
28
|
getInternalHooks: (secret: string) => InternalHooks | null;
|
|
@@ -71,7 +72,9 @@ export interface InternalHooks {
|
|
|
71
72
|
dispatch: (action: ReducerAction) => void;
|
|
72
73
|
setDefaultValues: (values: Store) => void;
|
|
73
74
|
setCallbacks: (callbacks: Callbacks) => void;
|
|
74
|
-
registerField: (name: NamePath, field:
|
|
75
|
+
registerField: (name: NamePath, field: {
|
|
76
|
+
current: FieldInstance;
|
|
77
|
+
}) => void;
|
|
75
78
|
}
|
|
76
79
|
export declare type NotifySource = 'externalUpdateValue' | 'updateValue' | 'reset' | 'validateField' | 'validateFinish';
|
|
77
80
|
export interface ValidateErrorEntity<Values = any> {
|
package/es/icon/icon.js
CHANGED
|
@@ -1,6 +1,21 @@
|
|
|
1
1
|
import _extends from "@babel/runtime-corejs3/helpers/extends";
|
|
2
2
|
import _defineProperty from "@babel/runtime-corejs3/helpers/defineProperty";
|
|
3
|
+
import _Object$getOwnPropertySymbols from "@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols";
|
|
3
4
|
import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/concat";
|
|
5
|
+
|
|
6
|
+
var __rest = this && this.__rest || function (s, e) {
|
|
7
|
+
var t = {};
|
|
8
|
+
|
|
9
|
+
for (var p in s) {
|
|
10
|
+
if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
|
|
11
|
+
}
|
|
12
|
+
|
|
13
|
+
if (s != null && typeof _Object$getOwnPropertySymbols === "function") for (var i = 0, p = _Object$getOwnPropertySymbols(s); i < p.length; i++) {
|
|
14
|
+
if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
|
|
15
|
+
}
|
|
16
|
+
return t;
|
|
17
|
+
};
|
|
18
|
+
|
|
4
19
|
import React, { useContext } from 'react';
|
|
5
20
|
import classNames from 'classnames';
|
|
6
21
|
import ConfigContext from '../config-provider/ConfigContext';
|
|
@@ -13,6 +28,7 @@ var InternalIcon = function InternalIcon(props, ref) {
|
|
|
13
28
|
userDefaultProps = _useContext.compDefaultProps;
|
|
14
29
|
|
|
15
30
|
var iconProps = getCompProps('Icon', userDefaultProps, props);
|
|
31
|
+
|
|
16
32
|
var type = iconProps.type,
|
|
17
33
|
spin = iconProps.spin,
|
|
18
34
|
style = iconProps.style,
|
|
@@ -21,7 +37,9 @@ var InternalIcon = function InternalIcon(props, ref) {
|
|
|
21
37
|
rotate = iconProps.rotate,
|
|
22
38
|
onClick = iconProps.onClick,
|
|
23
39
|
onMouseEnter = iconProps.onMouseEnter,
|
|
24
|
-
onMouseLeave = iconProps.onMouseLeave
|
|
40
|
+
onMouseLeave = iconProps.onMouseLeave,
|
|
41
|
+
others = __rest(iconProps, ["type", "spin", "style", "prefix", "className", "rotate", "onClick", "onMouseEnter", "onMouseLeave"]);
|
|
42
|
+
|
|
25
43
|
var innerRef = React.useRef();
|
|
26
44
|
var iconRef = ref || innerRef;
|
|
27
45
|
var iconPrefix = prefix || iconProps.iconPrefix;
|
|
@@ -45,14 +63,15 @@ var InternalIcon = function InternalIcon(props, ref) {
|
|
|
45
63
|
iconStyle.transform = "rotate(".concat(rotate, "deg)");
|
|
46
64
|
}
|
|
47
65
|
|
|
48
|
-
return /*#__PURE__*/React.createElement("i", {
|
|
66
|
+
return /*#__PURE__*/React.createElement("i", _extends({
|
|
49
67
|
className: iconClass,
|
|
50
68
|
onClick: handleClick,
|
|
51
69
|
onMouseEnter: handleMouseEnter,
|
|
52
70
|
onMouseLeave: handleMouseLeave,
|
|
53
|
-
style: iconStyle
|
|
71
|
+
style: iconStyle
|
|
72
|
+
}, others, {
|
|
54
73
|
ref: iconRef
|
|
55
|
-
});
|
|
74
|
+
}));
|
|
56
75
|
};
|
|
57
76
|
|
|
58
77
|
var Icon = /*#__PURE__*/React.forwardRef(InternalIcon);
|
|
@@ -311,8 +311,8 @@
|
|
|
311
311
|
}
|
|
312
312
|
.kd-select-bordered {
|
|
313
313
|
border: 1px solid var(--kd-c-select-border-color-border, var(--kd-g-color-border-strong, #d9d9d9));
|
|
314
|
-
padding-left: 8px !important;
|
|
315
|
-
border-radius: 2px;
|
|
314
|
+
padding-left: var(--kd-c-select-bordered-spacing-padding-left, 8px) !important;
|
|
315
|
+
border-radius: var(--kd-c-select-bordered-radius-border, 2px);
|
|
316
316
|
}
|
|
317
317
|
.kd-select-bordered:hover:not(.kd-select-multiple-disabled):not(.kd-select-single-disabled) {
|
|
318
318
|
border: 1px solid var(--kd-c-select-color-border-hover, var(--kd-g-color-theme, #5582f3));
|
|
@@ -320,10 +320,13 @@
|
|
|
320
320
|
.kd-select-bordered .kd-select-suffix {
|
|
321
321
|
padding-right: 8px;
|
|
322
322
|
}
|
|
323
|
+
.kd-select-bordered.kd-select-single .kd-select-selection-search {
|
|
324
|
+
left: var(--kd-c-select-bordered-spacing-padding-left, 8px);
|
|
325
|
+
}
|
|
323
326
|
.kd-select-wrapper {
|
|
324
327
|
-webkit-transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
|
|
325
328
|
transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
|
|
326
|
-
padding: 1px 28px 1px 0;
|
|
329
|
+
padding: var(--kd-c-select-wrapper-spacing-padding, 1px 28px 1px 0);
|
|
327
330
|
max-width: 100%;
|
|
328
331
|
color: #212121;
|
|
329
332
|
display: -webkit-box;
|
|
@@ -83,8 +83,8 @@
|
|
|
83
83
|
|
|
84
84
|
&-bordered {
|
|
85
85
|
border: 1px solid @select-border-g-color-border;
|
|
86
|
-
padding-left:
|
|
87
|
-
border-radius:
|
|
86
|
+
padding-left: @select-bordered !important;
|
|
87
|
+
border-radius: @select-border-radius-border;
|
|
88
88
|
&:hover:not(.@{select-prefix-cls}-multiple-disabled):not(.@{select-prefix-cls}-single-disabled) {
|
|
89
89
|
border: 1px solid @select-g-color-border-hover;
|
|
90
90
|
}
|
|
@@ -92,11 +92,17 @@
|
|
|
92
92
|
.@{select-prefix-cls}-suffix {
|
|
93
93
|
padding-right: 8px;
|
|
94
94
|
}
|
|
95
|
+
|
|
96
|
+
&.@{select-prefix-cls}-single {
|
|
97
|
+
.@{select-prefix-cls}-selection-search {
|
|
98
|
+
left: @select-bordered;
|
|
99
|
+
}
|
|
100
|
+
}
|
|
95
101
|
}
|
|
96
102
|
|
|
97
103
|
&-wrapper {
|
|
98
104
|
transition: all 0.3s cubic-bezier(0.645, 0.045, 0.355, 1);
|
|
99
|
-
padding:
|
|
105
|
+
padding: @select-wrapper-padding;
|
|
100
106
|
max-width: 100%;
|
|
101
107
|
color: #212121;
|
|
102
108
|
display: flex;
|