@kdcloudjs/kdesign 1.6.13 → 1.6.15

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (104) hide show
  1. package/CHANGELOG.md +26 -0
  2. package/dist/kdesign-complete.less +326 -249
  3. package/dist/kdesign.css +88 -17
  4. package/dist/kdesign.css.map +1 -1
  5. package/dist/kdesign.js +732 -399
  6. package/dist/kdesign.js.map +1 -1
  7. package/dist/kdesign.min.css +4 -4
  8. package/dist/kdesign.min.js +5 -5
  9. package/dist/kdesign.min.js.map +1 -1
  10. package/es/_utils/usePopper.d.ts +1 -0
  11. package/es/_utils/usePopper.js +3 -1
  12. package/es/button/button.js +1 -1
  13. package/es/button/style/index.css +3 -0
  14. package/es/button/style/index.less +4 -0
  15. package/es/button/style/token.less +1 -0
  16. package/es/carousel/carousel.d.ts +1 -0
  17. package/es/carousel/carousel.js +66 -3
  18. package/es/carousel/style/index.css +39 -0
  19. package/es/carousel/style/index.less +40 -0
  20. package/es/carousel/style/token.less +2 -0
  21. package/es/config-provider/compDefaultProps.d.ts +2 -0
  22. package/es/config-provider/compDefaultProps.js +4 -2
  23. package/es/date-picker/range-picker.js +6 -17
  24. package/es/date-picker/style/index.css +9 -9
  25. package/es/date-picker/style/index.less +1 -1
  26. package/es/date-picker/style/token.less +1 -1
  27. package/es/form/Field.js +67 -33
  28. package/es/form/FieldContext.js +1 -1
  29. package/es/form/hooks/useForm.js +29 -42
  30. package/es/form/interface.d.ts +7 -3
  31. package/es/icon/icon.js +23 -4
  32. package/es/image/preview.d.ts +1 -0
  33. package/es/image/preview.js +31 -6
  34. package/es/input/style/index.css +4 -3
  35. package/es/input/style/index.less +230 -227
  36. package/es/input/style/token.less +11 -12
  37. package/es/modal/modal.js +4 -8
  38. package/es/modal/style/index.css +7 -0
  39. package/es/modal/style/index.less +8 -0
  40. package/es/select/select.js +11 -8
  41. package/es/select/style/index.css +6 -3
  42. package/es/select/style/index.less +9 -3
  43. package/es/select/style/token.less +10 -5
  44. package/es/style/core/motion/other.less +9 -0
  45. package/es/style/icon/kdicon.css +3 -1
  46. package/es/style/icon/kdicon.woff +0 -0
  47. package/es/style/index.css +16 -0
  48. package/es/table/interface.d.ts +1 -0
  49. package/es/tooltip/tooltip.d.ts +1 -1
  50. package/es/tooltip/tooltip.js +9 -2
  51. package/es/tree/tree.d.ts +8 -0
  52. package/es/tree/tree.js +32 -17
  53. package/es/tree/treeHooks.d.ts +3 -3
  54. package/es/tree/treeHooks.js +7 -7
  55. package/es/tree/utils/treeUtils.d.ts +19 -6
  56. package/es/tree/utils/treeUtils.js +183 -33
  57. package/lib/_utils/usePopper.d.ts +1 -0
  58. package/lib/_utils/usePopper.js +3 -1
  59. package/lib/button/button.js +1 -1
  60. package/lib/button/style/index.css +3 -0
  61. package/lib/button/style/index.less +4 -0
  62. package/lib/button/style/token.less +1 -0
  63. package/lib/carousel/carousel.d.ts +1 -0
  64. package/lib/carousel/carousel.js +69 -2
  65. package/lib/carousel/style/index.css +39 -0
  66. package/lib/carousel/style/index.less +40 -0
  67. package/lib/carousel/style/token.less +2 -0
  68. package/lib/config-provider/compDefaultProps.d.ts +2 -0
  69. package/lib/config-provider/compDefaultProps.js +4 -2
  70. package/lib/date-picker/range-picker.js +6 -17
  71. package/lib/date-picker/style/index.css +9 -9
  72. package/lib/date-picker/style/index.less +1 -1
  73. package/lib/date-picker/style/token.less +1 -1
  74. package/lib/form/Field.js +68 -33
  75. package/lib/form/FieldContext.js +1 -1
  76. package/lib/form/hooks/useForm.js +28 -42
  77. package/lib/form/interface.d.ts +7 -3
  78. package/lib/icon/icon.js +22 -4
  79. package/lib/image/preview.d.ts +1 -0
  80. package/lib/image/preview.js +31 -6
  81. package/lib/input/style/index.css +4 -3
  82. package/lib/input/style/index.less +230 -227
  83. package/lib/input/style/token.less +11 -12
  84. package/lib/modal/modal.js +4 -8
  85. package/lib/modal/style/index.css +7 -0
  86. package/lib/modal/style/index.less +8 -0
  87. package/lib/select/select.js +11 -11
  88. package/lib/select/style/index.css +6 -3
  89. package/lib/select/style/index.less +9 -3
  90. package/lib/select/style/token.less +10 -5
  91. package/lib/style/core/motion/other.less +9 -0
  92. package/lib/style/icon/kdicon.css +3 -1
  93. package/lib/style/icon/kdicon.woff +0 -0
  94. package/lib/style/index.css +16 -0
  95. package/lib/table/interface.d.ts +1 -0
  96. package/lib/tooltip/tooltip.d.ts +1 -1
  97. package/lib/tooltip/tooltip.js +15 -5
  98. package/lib/tree/tree.d.ts +8 -0
  99. package/lib/tree/tree.js +30 -16
  100. package/lib/tree/treeHooks.d.ts +3 -3
  101. package/lib/tree/treeHooks.js +6 -6
  102. package/lib/tree/utils/treeUtils.d.ts +19 -6
  103. package/lib/tree/utils/treeUtils.js +193 -33
  104. package/package.json +1 -1
@@ -141,6 +141,7 @@ declare const compDefaultProps: {
141
141
  };
142
142
  Image: {
143
143
  preview: boolean;
144
+ scales: number[];
144
145
  };
145
146
  InputNumber: {
146
147
  type: string;
@@ -318,6 +319,7 @@ declare const compDefaultProps: {
318
319
  ToolTip: {
319
320
  placement: string;
320
321
  trigger: string;
322
+ arrow: boolean;
321
323
  };
322
324
  Tabs: {
323
325
  type: string;
@@ -164,7 +164,8 @@ var compDefaultProps = {
164
164
  optionFilterProp: 'label'
165
165
  },
166
166
  Image: {
167
- preview: true
167
+ preview: true,
168
+ scales: [25, 50, 75, 100, 125, 150, 200]
168
169
  },
169
170
  InputNumber: {
170
171
  type: 'text',
@@ -350,7 +351,8 @@ var compDefaultProps = {
350
351
  TreeNode: {},
351
352
  ToolTip: {
352
353
  placement: 'top',
353
- trigger: 'hover'
354
+ trigger: 'hover',
355
+ arrow: true
354
356
  },
355
357
  Tabs: {
356
358
  type: 'line',
@@ -458,33 +458,27 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
458
458
  var triggerChange = function triggerChange(newValue, sourceIndex) {
459
459
  var values = newValue;
460
460
  var startValue = (0, _utils2.getValue)(values, 0);
461
- var endValue = (0, _utils2.getValue)(values, 1); // >>>>> Format start & end values
461
+ var endValue = (0, _utils2.getValue)(values, 1);
462
462
 
463
463
  if (startValue && endValue && (0, _dateFns.isAfter)(startValue, endValue)) {
464
- if ( // WeekPicker only compare week
465
- picker === 'week' && !(0, _isSameWeek.default)(startValue, endValue) || // QuotaPicker only compare week
466
- picker === 'quarter' && !(0, _dateFns.isSameQuarter)(startValue, endValue) || // Other non-TimePicker compare date
467
- picker !== 'week' && picker !== 'quarter' && picker !== 'time' && !(0, _dateFns.isSameDay)(startValue, endValue)) {
468
- // Clean up end date when start date is after end date
464
+ if (picker === 'week' && !(0, _isSameWeek.default)(startValue, endValue) || picker === 'quarter' && !(0, _dateFns.isSameQuarter)(startValue, endValue) || picker !== 'week' && picker !== 'quarter' && picker !== 'time' && !(0, _dateFns.isSameDay)(startValue, endValue)) {
469
465
  if (sourceIndex === 0) {
470
466
  values = [startValue, null];
471
467
  endValue = null;
472
468
  } else {
473
469
  startValue = null;
474
470
  values = [null, endValue];
475
- } // Clean up cache since invalidate
476
-
471
+ }
477
472
 
478
473
  openRecordsRef.current = (0, _defineProperty2.default)({}, sourceIndex, true);
479
474
  } else if (picker === 'time' && order === true) {
480
- // Reorder when in same date
481
475
  values = reorderValues(values);
482
476
  }
483
477
  }
484
478
 
485
479
  setSelectedValue(values);
486
480
  var startStr = values && values[0] ? (0, _dateFns.formatDate)(values[0], _format) : '';
487
- var endStr = values && values[1] ? (0, _dateFns.formatDate)(values[1], _format) : ''; // 外部回调
481
+ var endStr = values && values[1] ? (0, _dateFns.formatDate)(values[1], _format) : '';
488
482
 
489
483
  if (onCalendarChange) {
490
484
  var info = {
@@ -498,15 +492,12 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
498
492
  var canTrigger = values === null || canStartValueTrigger && canEndValueTrigger;
499
493
 
500
494
  if (canTrigger) {
501
- // Trigger onChange only when value is validate
502
495
  setInnerValue(values);
503
496
 
504
- if (onChange && (!(0, _dateFns.isEqual)((0, _utils2.getValue)(selectedValue, 0), startValue) || !(0, _dateFns.isEqual)((0, _utils2.getValue)(selectedValue, 1), endValue))) {
497
+ if (onChange && (!(0, _dateFns.isEqual)((0, _utils2.getValue)(dateValue, 0), startValue) || !(0, _dateFns.isEqual)((0, _utils2.getValue)(dateValue, 1), endValue))) {
505
498
  onChange(values, [startStr, endStr]);
506
499
  }
507
- } // >>>>> Open picker when
508
- // Always open another picker if possible
509
-
500
+ }
510
501
 
511
502
  var nextOpenIndex = null;
512
503
 
@@ -517,7 +508,6 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
517
508
  }
518
509
 
519
510
  if (nextOpenIndex !== null && nextOpenIndex !== mergedActivePickerIndex && (!openRecordsRef.current[nextOpenIndex] || !(0, _utils2.getValue)(values, nextOpenIndex)) && (0, _utils2.getValue)(values, sourceIndex)) {
520
- // Delay to focus to avoid input blur trigger expired selectedValues
521
511
  triggerOpenAndFocus(nextOpenIndex);
522
512
  } else {
523
513
  triggerOpen(false, sourceIndex);
@@ -818,7 +808,6 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
818
808
  trigger: 'click',
819
809
  prefixCls: "".concat(datePickerPrefixCls, "-panel"),
820
810
  arrow: false,
821
- popperClassName: className,
822
811
  popperStyle: style,
823
812
  visible: mergedOpen,
824
813
  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, var(--kd-g-color-text-secondary, #666));
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, var(--kd-g-color-text-secondary, #666));
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, var(--kd-g-color-text-secondary, #666));
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-disabled, var(--kd-g-color-disabled, #b2b2b2));
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-disabled, var(--kd-g-color-disabled, #b2b2b2));
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-disabled, var(--kd-g-color-disabled, #b2b2b2));
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-disabled, var(--kd-g-color-disabled, #b2b2b2));
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-disabled, var(--kd-g-color-disabled, #b2b2b2));
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, var(--kd-g-color-text-secondary, #666));
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;
@@ -63,7 +63,7 @@
63
63
  }
64
64
 
65
65
  &::placeholder {
66
- color: @date-input-color-disabled;
66
+ color: @date-input-color-placeholder;
67
67
  }
68
68
  }
69
69
 
@@ -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', @color-text-secondary);
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/lib/form/Field.js CHANGED
@@ -17,6 +17,8 @@ var _extends5 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/e
17
17
 
18
18
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
19
19
 
20
+ var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/toConsumableArray"));
21
+
20
22
  var _typeof2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/typeof"));
21
23
 
22
24
  var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/slicedToArray"));
@@ -138,13 +140,13 @@ var Field = function Field(props) {
138
140
  vertical = fieldContext.vertical,
139
141
  getDefaultValue = fieldContext.getDefaultValue,
140
142
  local = fieldContext.local,
141
- setRules = fieldContext.setRules,
142
143
  formDisabled = fieldContext.disabled;
143
144
 
144
145
  var _getInternalHooks = getInternalHooks(_useForm.INTERNAL_HOOK_KEY),
145
146
  registerField = _getInternalHooks.registerField,
146
147
  dispatch = _getInternalHooks.dispatch,
147
- setDefaultValues = _getInternalHooks.setDefaultValues;
148
+ setDefaultValues = _getInternalHooks.setDefaultValues,
149
+ deleteField = _getInternalHooks.deleteField;
148
150
 
149
151
  var name = props.name,
150
152
  customizeHtmlFor = props.htmlFor,
@@ -157,8 +159,7 @@ var Field = function Field(props) {
157
159
  labelWidth = props.labelWidth,
158
160
  labelAlign = props.labelAlign,
159
161
  required = props.required,
160
- _props$rules = props.rules,
161
- rules = _props$rules === void 0 ? [] : _props$rules,
162
+ rules = props.rules,
162
163
  wrapperWidth = props.wrapperWidth,
163
164
  validateTrigger = props.validateTrigger,
164
165
  defaultValue = props.defaultValue,
@@ -202,7 +203,7 @@ var Field = function Field(props) {
202
203
  }
203
204
  };
204
205
 
205
- var rulesRequired = rules.some(function (rule) {
206
+ var mergedRequired = required || (rules === null || rules === void 0 ? void 0 : rules.some(function (rule) {
206
207
  if (rule && (0, _typeof2.default)(rule) === 'object' && rule.required) {
207
208
  return true;
208
209
  }
@@ -213,51 +214,59 @@ var Field = function Field(props) {
213
214
  }
214
215
 
215
216
  return false;
216
- });
217
- var mergedRequired = required || rulesRequired;
217
+ }));
218
218
 
219
- if (Array.isArray(rules) && !rules.some(function (rule) {
220
- return Object.prototype.hasOwnProperty.call(rule, 'required');
221
- }) && required) {
222
- var _context2;
219
+ var mergeRule = function mergeRule() {
220
+ var mergeRules = Array.isArray(rules) ? (0, _toConsumableArray2.default)(rules) : [];
223
221
 
224
- rules.push({
225
- required: true,
226
- message: (0, _concat.default)(_context2 = "".concat(local && local.requiredMessage)).call(_context2, label)
227
- });
228
- }
222
+ if (!mergeRules.some(function (rule) {
223
+ return Object.prototype.hasOwnProperty.call(rule, 'required');
224
+ }) && required) {
225
+ var _context2;
229
226
 
230
- var mergeRules = rules;
227
+ mergeRules.push({
228
+ required: true,
229
+ message: (0, _concat.default)(_context2 = "".concat(local && local.requiredMessage)).call(_context2, label)
230
+ });
231
+ }
231
232
 
232
- if (mergeRules.length) {
233
- mergeRules = (0, _map.default)(rules).call(rules, function (r) {
234
- if (typeof r === 'function') {
235
- return r(fieldContext);
236
- }
233
+ if (mergeRules.length) {
234
+ mergeRules = (0, _map.default)(mergeRules).call(mergeRules, function (r) {
235
+ if (typeof r === 'function') {
236
+ return r(fieldContext);
237
+ }
237
238
 
238
- return r;
239
- });
240
- }
239
+ return r;
240
+ });
241
+ }
242
+
243
+ return mergeRules;
244
+ };
241
245
 
242
- var itemRef = _react.default.useRef({
246
+ var item = {
243
247
  onStoreChange: onStoreChange,
244
248
  meta: {
245
- rules: mergeRules,
249
+ rules: mergeRule(),
246
250
  name: name,
247
251
  trigger: validateTrigger
248
252
  }
249
- });
253
+ };
254
+
255
+ var itemRef = _react.default.useRef(item);
250
256
 
257
+ itemRef.current = item;
251
258
  (0, _react.useEffect)(function () {
252
- registerField(name, itemRef.current);
259
+ registerField(name, itemRef);
253
260
 
254
261
  if (defaultValue !== undefined) {
255
262
  setDefaultValues((0, _defineProperty2.default)({}, name, defaultValue));
256
263
  }
257
264
  }, [name, registerField]);
258
265
  (0, _react.useEffect)(function () {
259
- setRules(name, mergeRules);
260
- }, [mergedRequired, name, mergeRules]);
266
+ return function () {
267
+ deleteField(name);
268
+ };
269
+ }, []);
261
270
  var formPrefixCls = getPrefixCls === null || getPrefixCls === void 0 ? void 0 : getPrefixCls(prefixCls, 'form', customizePrefixcls);
262
271
  var formItemClassName = (0, _classnames2.default)((_classnames = {}, (0, _defineProperty2.default)(_classnames, "".concat(formPrefixCls), true), (0, _defineProperty2.default)(_classnames, "".concat(formPrefixCls, "-field"), true), (0, _defineProperty2.default)(_classnames, "".concat(formPrefixCls, "-field-hidden"), hidden), (0, _defineProperty2.default)(_classnames, "".concat(formPrefixCls, "-field-vertical"), vertical), _classnames), className);
263
272
  var value = getFieldValue(name);
@@ -304,7 +313,7 @@ var Field = function Field(props) {
304
313
 
305
314
  var faChange = fa.onChange,
306
315
  faDisabled = fa.disabled,
307
- rest = __rest(fa, ["onChange", "disabled"]);
316
+ faRest = __rest(fa, ["onChange", "disabled"]);
308
317
 
309
318
  var _ch$props = ch.props,
310
319
  chChange = _ch$props.onChange,
@@ -337,10 +346,36 @@ var Field = function Field(props) {
337
346
  forceUpdate();
338
347
  }
339
348
 
340
- return (0, _extends5.default)((0, _extends5.default)({}, rest), (_extends3 = {
349
+ var mergeResult = (0, _extends5.default)((0, _extends5.default)({}, faRest), (_extends3 = {
341
350
  onChange: onChange,
342
351
  defaultValue: defaultValue
343
352
  }, (0, _defineProperty2.default)(_extends3, innerValuePropName, fieldValue), (0, _defineProperty2.default)(_extends3, "disabled", chDisabled !== undefined ? chDisabled : faDisabled !== undefined ? faDisabled : formDisabled), _extends3));
353
+ var mergeEventArray = [];
354
+
355
+ if (validateTrigger) {
356
+ if (Array.isArray(validateTrigger)) {
357
+ mergeEventArray.push.apply(mergeEventArray, (0, _toConsumableArray2.default)((0, _filter.default)(validateTrigger).call(validateTrigger, function (v) {
358
+ return v !== DEFAULT_TRIGGER;
359
+ })));
360
+ } else if (validateTrigger !== DEFAULT_TRIGGER) {
361
+ mergeEventArray.push(validateTrigger);
362
+ }
363
+ }
364
+
365
+ mergeEventArray.forEach(function (eventName) {
366
+ mergeResult[eventName] = function () {
367
+ var _a;
368
+
369
+ if ((fa === null || fa === void 0 ? void 0 : fa[eventName]) && typeof fa[eventName] === 'function') {
370
+ fa[eventName]();
371
+ }
372
+
373
+ if (((_a = ch.props) === null || _a === void 0 ? void 0 : _a[eventName]) && typeof ch.props[eventName] === 'function') {
374
+ ch.props[eventName]();
375
+ }
376
+ };
377
+ });
378
+ return mergeResult;
344
379
  };
345
380
 
346
381
  return /*#__PURE__*/_react.default.createElement("div", {
@@ -24,7 +24,6 @@ var context = /*#__PURE__*/_react.default.createContext({
24
24
  resetFields: warningFunc,
25
25
  setFieldsValue: warningFunc,
26
26
  setFieldValue: warningFunc,
27
- setRules: warningFunc,
28
27
  submit: warningFunc,
29
28
  validateFields: warningFunc,
30
29
  getInternalHooks: function getInternalHooks() {
@@ -33,6 +32,7 @@ var context = /*#__PURE__*/_react.default.createContext({
33
32
  dispatch: warningFunc,
34
33
  setDefaultValues: warningFunc,
35
34
  registerField: warningFunc,
35
+ deleteField: warningFunc,
36
36
  setCallbacks: warningFunc
37
37
  };
38
38
  }
@@ -37,23 +37,18 @@ var _set = _interopRequireDefault(require("lodash/set"));
37
37
 
38
38
  var _devwarning = _interopRequireDefault(require("../../_utils/devwarning"));
39
39
 
40
- // import useForceUpdate from './useForceUpdate'
41
40
  var INTERNAL_HOOK_KEY = '__KD_INTERNAL_FORM_HOOK__';
42
41
  exports.INTERNAL_HOOK_KEY = INTERNAL_HOOK_KEY;
43
42
  var FormStore = /*#__PURE__*/(0, _createClass2.default)(function FormStore() {
44
43
  var _this = this;
45
44
 
46
45
  (0, _classCallCheck2.default)(this, FormStore);
47
- this.isMounted = false; // private forceRootUpdate:() => void
48
-
46
+ this.isMounted = false;
49
47
  this.defaultValues = {};
50
48
  this.store = {};
51
49
  this.fields = {};
52
- this.rules = {};
53
50
  this.errorMessages = {};
54
- this.callbacks = {}; // constructor (forceRootUpdate: () => void) {
55
- // this.forceRootUpdate = forceRootUpdate
56
- // }
51
+ this.callbacks = {};
57
52
 
58
53
  this.getForm = function () {
59
54
  return {
@@ -65,7 +60,6 @@ var FormStore = /*#__PURE__*/(0, _createClass2.default)(function FormStore() {
65
60
  resetFields: _this.resetFields,
66
61
  setFieldValue: _this.setFieldValue,
67
62
  setFieldsValue: _this.setFieldsValue,
68
- setRules: _this.setRules,
69
63
  validateFields: _this.validateFields,
70
64
  submit: _this.submit,
71
65
  getInternalHooks: _this.getInternalHooks
@@ -83,7 +77,8 @@ var FormStore = /*#__PURE__*/(0, _createClass2.default)(function FormStore() {
83
77
  dispatch: _this.dispatch,
84
78
  setDefaultValues: _this.setDefaultValues,
85
79
  setCallbacks: _this.setCallbacks,
86
- registerField: _this.registerField
80
+ registerField: _this.registerField,
81
+ deleteField: _this.deleteField
87
82
  };
88
83
  };
89
84
 
@@ -192,25 +187,25 @@ var FormStore = /*#__PURE__*/(0, _createClass2.default)(function FormStore() {
192
187
  this.getRules = function (namePathList) {
193
188
  _this.warningUnhooked();
194
189
 
195
- if (!namePathList) {
196
- return _this.rules;
190
+ var list = (0, _cloneDeep.default)(namePathList);
191
+
192
+ if (!list) {
193
+ list = (0, _keys.default)(_this.fields);
197
194
  }
198
195
 
199
196
  var rules = {};
200
- namePathList.forEach(function (name) {
201
- if (_this.rules[name]) {
202
- rules[name] = (0, _cloneDeep.default)(_this.rules[name]);
197
+ list.forEach(function (name) {
198
+ var _a, _b;
199
+
200
+ var current = _this.fields[name].current;
201
+
202
+ if ((_a = current === null || current === void 0 ? void 0 : current.meta) === null || _a === void 0 ? void 0 : _a.rules) {
203
+ rules[name] = (0, _cloneDeep.default)((_b = current === null || current === void 0 ? void 0 : current.meta) === null || _b === void 0 ? void 0 : _b.rules);
203
204
  }
204
205
  });
205
206
  return (0, _keys.default)(rules).length === 0 ? null : rules;
206
207
  };
207
208
 
208
- this.setRules = function (name, rules) {
209
- _this.warningUnhooked();
210
-
211
- (0, _set.default)(_this.rules, name, rules);
212
- };
213
-
214
209
  this.setCallbacks = function (callbacks) {
215
210
  _this.warningUnhooked();
216
211
 
@@ -254,27 +249,19 @@ var FormStore = /*#__PURE__*/(0, _createClass2.default)(function FormStore() {
254
249
  onValuesChange((0, _defineProperty2.default)({}, name, value), (0, _cloneDeep.default)(_this.store));
255
250
  }
256
251
  };
257
- /**
258
- * 注册 Field
259
- * Field 如果带有验证规则的话,则注册时进行校验
260
- * @param name Field 名称
261
- * @param field Field 实例
262
- */
263
-
264
252
 
265
253
  this.registerField = function (name, field) {
266
254
  _this.warningUnhooked();
267
255
 
268
256
  _this.fields[name] = field;
269
- var meta = field.meta;
257
+ };
270
258
 
271
- if (meta.rules !== undefined) {
272
- _this.setRules(name, meta.rules); // TODO: 初始化的时候是否需要校验??
273
- // this.validateFields([name]).catch(({ errorInfos }) => {
274
- // this.validateFieldFaild(errorInfos, 'internal')
275
- // })
259
+ this.deleteField = function (name) {
260
+ _this.warningUnhooked();
276
261
 
277
- }
262
+ Object.hasOwnProperty.call(_this.fields, name) && delete _this.fields[name];
263
+ Object.hasOwnProperty.call(_this.errorMessages, name) && delete _this.errorMessages[name];
264
+ Object.hasOwnProperty.call(_this.store, name) && delete _this.store[name];
278
265
  };
279
266
 
280
267
  this.validateFields = function (namePathList) {
@@ -319,7 +306,11 @@ var FormStore = /*#__PURE__*/(0, _createClass2.default)(function FormStore() {
319
306
  _this.notifyObservers(_this.store, namePathList || [], 'validateFinish');
320
307
  }).catch(function (_ref2) {
321
308
  var errorInfos = _ref2.errorInfos;
322
- _this.errorMessages = {};
309
+
310
+ if (!namePathList) {
311
+ _this.errorMessages = {};
312
+ }
313
+
323
314
  var _errorInfos$fields = errorInfos.fields,
324
315
  fields = _errorInfos$fields === void 0 ? {} : _errorInfos$fields;
325
316
  (0, _keys.default)(fields).forEach(function (name) {
@@ -358,7 +349,7 @@ var FormStore = /*#__PURE__*/(0, _createClass2.default)(function FormStore() {
358
349
  _this.warningUnhooked();
359
350
 
360
351
  (0, _values.default)(_this.fields).forEach(function (_ref4) {
361
- var onStoreChange = _ref4.onStoreChange;
352
+ var onStoreChange = _ref4.current.onStoreChange;
362
353
  var stores = {
363
354
  prev: prevStore,
364
355
  curr: _this.store
@@ -369,17 +360,12 @@ var FormStore = /*#__PURE__*/(0, _createClass2.default)(function FormStore() {
369
360
  });
370
361
 
371
362
  function useForm(form) {
372
- var formRef = _react.default.useRef(); // const forceUpdate = useForceUpdate()
373
-
363
+ var formRef = _react.default.useRef();
374
364
 
375
365
  if (!formRef.current) {
376
366
  if (form) {
377
367
  formRef.current = form;
378
368
  } else {
379
- // Create a new FormStore if not provided
380
- // const forceReRender = () => {
381
- // forceUpdate()
382
- // }
383
369
  var formStore = new FormStore();
384
370
  formRef.current = formStore.getForm();
385
371
  }
@@ -10,7 +10,9 @@ export interface FieldError {
10
10
  [name: string]: string;
11
11
  }
12
12
  export interface Fields {
13
- [name: string]: FieldInstance;
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,10 @@ 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: FieldInstance) => void;
75
+ registerField: (name: NamePath, field: {
76
+ current: FieldInstance;
77
+ }) => void;
78
+ deleteField: (name: NamePath) => void;
75
79
  }
76
80
  export declare type NotifySource = 'externalUpdateValue' | 'updateValue' | 'reset' | 'validateField' | 'validateFinish';
77
81
  export interface ValidateErrorEntity<Values = any> {
package/lib/icon/icon.js CHANGED
@@ -17,6 +17,8 @@ var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/e
17
17
 
18
18
  var _defineProperty2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/defineProperty"));
19
19
 
20
+ var _getOwnPropertySymbols = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/get-own-property-symbols"));
21
+
20
22
  var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/concat"));
21
23
 
22
24
  var _react = _interopRequireWildcard(require("react"));
@@ -31,6 +33,19 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof _WeakMap !== "functi
31
33
 
32
34
  function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && _Object$getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? _Object$getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
33
35
 
36
+ var __rest = void 0 && (void 0).__rest || function (s, e) {
37
+ var t = {};
38
+
39
+ for (var p in s) {
40
+ if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
41
+ }
42
+
43
+ if (s != null && typeof _getOwnPropertySymbols.default === "function") for (var i = 0, p = (0, _getOwnPropertySymbols.default)(s); i < p.length; i++) {
44
+ if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
45
+ }
46
+ return t;
47
+ };
48
+
34
49
  var InternalIcon = function InternalIcon(props, ref) {
35
50
  var _context, _classNames;
36
51
 
@@ -38,6 +53,7 @@ var InternalIcon = function InternalIcon(props, ref) {
38
53
  userDefaultProps = _useContext.compDefaultProps;
39
54
 
40
55
  var iconProps = (0, _utils.getCompProps)('Icon', userDefaultProps, props);
56
+
41
57
  var type = iconProps.type,
42
58
  spin = iconProps.spin,
43
59
  style = iconProps.style,
@@ -46,7 +62,8 @@ var InternalIcon = function InternalIcon(props, ref) {
46
62
  rotate = iconProps.rotate,
47
63
  onClick = iconProps.onClick,
48
64
  onMouseEnter = iconProps.onMouseEnter,
49
- onMouseLeave = iconProps.onMouseLeave;
65
+ onMouseLeave = iconProps.onMouseLeave,
66
+ others = __rest(iconProps, ["type", "spin", "style", "prefix", "className", "rotate", "onClick", "onMouseEnter", "onMouseLeave"]);
50
67
 
51
68
  var innerRef = _react.default.useRef();
52
69
 
@@ -72,14 +89,15 @@ var InternalIcon = function InternalIcon(props, ref) {
72
89
  iconStyle.transform = "rotate(".concat(rotate, "deg)");
73
90
  }
74
91
 
75
- return /*#__PURE__*/_react.default.createElement("i", {
92
+ return /*#__PURE__*/_react.default.createElement("i", (0, _extends2.default)({
76
93
  className: iconClass,
77
94
  onClick: handleClick,
78
95
  onMouseEnter: handleMouseEnter,
79
96
  onMouseLeave: handleMouseLeave,
80
- style: iconStyle,
97
+ style: iconStyle
98
+ }, others, {
81
99
  ref: iconRef
82
- });
100
+ }));
83
101
  };
84
102
 
85
103
  var Icon = /*#__PURE__*/_react.default.forwardRef(InternalIcon);
@@ -5,6 +5,7 @@ export interface PreviewProps {
5
5
  alt?: string;
6
6
  name?: string;
7
7
  size?: string;
8
+ scales?: Array<number>;
8
9
  visible: boolean;
9
10
  type?: PreviewType;
10
11
  className?: string;