@kdcloudjs/kdesign 1.7.55 → 1.7.56

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.
@@ -76,7 +76,7 @@ var ColorPickerPanel = function ColorPickerPanel(props) {
76
76
  setColTypeArr(formatArr);
77
77
  }
78
78
  setClickedColorIndex(index);
79
- onChange && onChange(formatValue, colTypeArr);
79
+ onChange && onChange(formatValue, formatArr);
80
80
  };
81
81
  var handleTypeChange = function handleTypeChange(selectValue, option) {
82
82
  setCurrentColorType(option.label);
@@ -228,15 +228,7 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
228
228
  var _onTextChange = function onTextChange(newText, index) {
229
229
  var inputTempDate;
230
230
  if (newText === '') {
231
- if (index === 0 && selectedValue && selectedValue.length === 2) {
232
- inputTempDate = selectedValue[1];
233
- } else if (index === 1 && selectedValue && selectedValue.length === 2) {
234
- inputTempDate = selectedValue[0];
235
- }
236
- if (inputTempDate) {
237
- triggerChange(updateValues(selectedValue, inputTempDate, index), index);
238
- setViewDate(inputTempDate, index);
239
- }
231
+ triggerChange(updateValues(selectedValue, null, index), index);
240
232
  } else if (newText && newText.length === _format.length) {
241
233
  inputTempDate = parseDate(newText, _format);
242
234
  var disabledFunc = index === 0 ? disabledStartDate : disabledEndDate;
@@ -391,28 +383,26 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
391
383
  var canEndValueTrigger = canValueTrigger(endValue, 1, mergedDisabled, allowEmpty);
392
384
  var canTrigger = values === null || canStartValueTrigger && canEndValueTrigger;
393
385
  if (canTrigger) {
394
- setInnerValue(values);
386
+ if (typeof value === 'undefined') {
387
+ setInnerValue(values);
388
+ }
395
389
  if (onChange && (!isEqual(getValue(dateValue, 0), startValue) || !isEqual(getValue(dateValue, 1), endValue))) {
396
390
  onChange(values, [startStr, endStr]);
397
391
  }
398
392
  }
393
+ var curValue = getValue(values, sourceIndex);
399
394
  var nextOpenIndex = null;
400
395
  if (sourceIndex === 0 && !mergedDisabled[1]) {
401
396
  nextOpenIndex = 1;
402
397
  } else if (sourceIndex === 1 && !mergedDisabled[0]) {
403
398
  nextOpenIndex = 0;
404
399
  }
405
- if (nextOpenIndex !== null && nextOpenIndex !== mergedActivePickerIndex && (!openRecordsRef.current[nextOpenIndex] || !getValue(values, nextOpenIndex)) && getValue(values, sourceIndex)) {
400
+ if (nextOpenIndex !== null && nextOpenIndex !== mergedActivePickerIndex && (!openRecordsRef.current[nextOpenIndex] || !getValue(values, nextOpenIndex)) && curValue) {
406
401
  triggerOpenAndFocus(nextOpenIndex);
407
- } else {
402
+ } else if (curValue) {
408
403
  triggerOpen(false, sourceIndex);
409
404
  }
410
405
  };
411
- // useOnClickOutside([popperRef, inputDivRef], () => {
412
- // setViewDate(null, 0)
413
- // setViewDate(null, 1)
414
- // setHoverRangedValue([null, null])
415
- // })
416
406
  var onSelect = function onSelect(date, type) {
417
407
  var values = updateValues(selectedValue, date, mergedActivePickerIndex);
418
408
  if (type === 'inner') {
@@ -453,12 +443,6 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
453
443
  useEffect(function () {
454
444
  if (!mergedOpen) {
455
445
  setSelectedValue(dateValue);
456
- if (!startValueTexts.length || startValueTexts[0] === '') {
457
- triggerStartTextChange('');
458
- }
459
- if (!endValueTexts.length || endValueTexts[0] === '') {
460
- triggerEndTextChange('');
461
- }
462
446
  setViewDate(null, 0);
463
447
  setViewDate(null, 1);
464
448
  setHoverRangedValue([null, null]);
package/es/radio/radio.js CHANGED
@@ -91,7 +91,7 @@ var InternalRadio = function InternalRadio(props, ref) {
91
91
  className: classString,
92
92
  style: style,
93
93
  ref: mergedRef
94
- }, /*#__PURE__*/React.createElement("input", _extends({
94
+ }, /*#__PURE__*/React.createElement("input", _extends({}, restProps, {
95
95
  type: "radio",
96
96
  className: "".concat(radioPrefixCls, "-input"),
97
97
  checked: isChecked,
@@ -99,7 +99,7 @@ var InternalRadio = function InternalRadio(props, ref) {
99
99
  value: value,
100
100
  name: context === null || context === void 0 ? void 0 : context.name,
101
101
  disabled: mergedDisabled
102
- }, restProps)), children !== undefined ? /*#__PURE__*/React.createElement("span", {
102
+ })), children !== undefined ? /*#__PURE__*/React.createElement("span", {
103
103
  className: "".concat(radioPrefixCls, "-text")
104
104
  }, children) : null)
105
105
  );
@@ -126,7 +126,6 @@
126
126
  color: var(--kd-c-radio-color-font, var(--kd-g-color-text-primary, #212121));
127
127
  font-size: var(--kd-c-radio-font-size, var(--kd-g-font-size-small, 12px));
128
128
  max-width: var(--kd-c-radio-default-label-max-width);
129
- overflow: hidden;
130
129
  min-height: var(--kd-c-radio-square-sizing-width-height, 14px);
131
130
  }
132
131
  .kd-radio::before {
@@ -23,7 +23,7 @@
23
23
  color: @radio-font-color;
24
24
  font-size: @radio-font-size;
25
25
  max-width: @radio-default-label-max-width;
26
- overflow: hidden;
26
+ // overflow: hidden;
27
27
  min-height: @radio-circle-size;
28
28
 
29
29
  &::before {
@@ -89,7 +89,7 @@ var ColorPickerPanel = function ColorPickerPanel(props) {
89
89
  setColTypeArr(formatArr);
90
90
  }
91
91
  setClickedColorIndex(index);
92
- onChange && onChange(formatValue, colTypeArr);
92
+ onChange && onChange(formatValue, formatArr);
93
93
  };
94
94
  var handleTypeChange = function handleTypeChange(selectValue, option) {
95
95
  setCurrentColorType(option.label);
@@ -240,15 +240,7 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
240
240
  var _onTextChange = function onTextChange(newText, index) {
241
241
  var inputTempDate;
242
242
  if (newText === '') {
243
- if (index === 0 && selectedValue && selectedValue.length === 2) {
244
- inputTempDate = selectedValue[1];
245
- } else if (index === 1 && selectedValue && selectedValue.length === 2) {
246
- inputTempDate = selectedValue[0];
247
- }
248
- if (inputTempDate) {
249
- triggerChange((0, _utils2.updateValues)(selectedValue, inputTempDate, index), index);
250
- setViewDate(inputTempDate, index);
251
- }
243
+ triggerChange((0, _utils2.updateValues)(selectedValue, null, index), index);
252
244
  } else if (newText && newText.length === _format.length) {
253
245
  inputTempDate = (0, _dateFns.parseDate)(newText, _format);
254
246
  var disabledFunc = index === 0 ? disabledStartDate : disabledEndDate;
@@ -403,28 +395,26 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
403
395
  var canEndValueTrigger = canValueTrigger(endValue, 1, mergedDisabled, allowEmpty);
404
396
  var canTrigger = values === null || canStartValueTrigger && canEndValueTrigger;
405
397
  if (canTrigger) {
406
- setInnerValue(values);
398
+ if (typeof value === 'undefined') {
399
+ setInnerValue(values);
400
+ }
407
401
  if (onChange && (!(0, _dateFns.isEqual)((0, _utils2.getValue)(dateValue, 0), startValue) || !(0, _dateFns.isEqual)((0, _utils2.getValue)(dateValue, 1), endValue))) {
408
402
  onChange(values, [startStr, endStr]);
409
403
  }
410
404
  }
405
+ var curValue = (0, _utils2.getValue)(values, sourceIndex);
411
406
  var nextOpenIndex = null;
412
407
  if (sourceIndex === 0 && !mergedDisabled[1]) {
413
408
  nextOpenIndex = 1;
414
409
  } else if (sourceIndex === 1 && !mergedDisabled[0]) {
415
410
  nextOpenIndex = 0;
416
411
  }
417
- if (nextOpenIndex !== null && nextOpenIndex !== mergedActivePickerIndex && (!openRecordsRef.current[nextOpenIndex] || !(0, _utils2.getValue)(values, nextOpenIndex)) && (0, _utils2.getValue)(values, sourceIndex)) {
412
+ if (nextOpenIndex !== null && nextOpenIndex !== mergedActivePickerIndex && (!openRecordsRef.current[nextOpenIndex] || !(0, _utils2.getValue)(values, nextOpenIndex)) && curValue) {
418
413
  triggerOpenAndFocus(nextOpenIndex);
419
- } else {
414
+ } else if (curValue) {
420
415
  triggerOpen(false, sourceIndex);
421
416
  }
422
417
  };
423
- // useOnClickOutside([popperRef, inputDivRef], () => {
424
- // setViewDate(null, 0)
425
- // setViewDate(null, 1)
426
- // setHoverRangedValue([null, null])
427
- // })
428
418
  var onSelect = function onSelect(date, type) {
429
419
  var values = (0, _utils2.updateValues)(selectedValue, date, mergedActivePickerIndex);
430
420
  if (type === 'inner') {
@@ -465,12 +455,6 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
465
455
  (0, _react.useEffect)(function () {
466
456
  if (!mergedOpen) {
467
457
  setSelectedValue(dateValue);
468
- if (!startValueTexts.length || startValueTexts[0] === '') {
469
- triggerStartTextChange('');
470
- }
471
- if (!endValueTexts.length || endValueTexts[0] === '') {
472
- triggerEndTextChange('');
473
- }
474
458
  setViewDate(null, 0);
475
459
  setViewDate(null, 1);
476
460
  setHoverRangedValue([null, null]);
@@ -103,7 +103,7 @@ var InternalRadio = function InternalRadio(props, ref) {
103
103
  className: classString,
104
104
  style: style,
105
105
  ref: mergedRef
106
- }, /*#__PURE__*/_react.default.createElement("input", (0, _extends2.default)({
106
+ }, /*#__PURE__*/_react.default.createElement("input", (0, _extends2.default)({}, restProps, {
107
107
  type: "radio",
108
108
  className: "".concat(radioPrefixCls, "-input"),
109
109
  checked: isChecked,
@@ -111,7 +111,7 @@ var InternalRadio = function InternalRadio(props, ref) {
111
111
  value: value,
112
112
  name: context === null || context === void 0 ? void 0 : context.name,
113
113
  disabled: mergedDisabled
114
- }, restProps)), children !== undefined ? /*#__PURE__*/_react.default.createElement("span", {
114
+ })), children !== undefined ? /*#__PURE__*/_react.default.createElement("span", {
115
115
  className: "".concat(radioPrefixCls, "-text")
116
116
  }, children) : null)
117
117
  );
@@ -126,7 +126,6 @@
126
126
  color: var(--kd-c-radio-color-font, var(--kd-g-color-text-primary, #212121));
127
127
  font-size: var(--kd-c-radio-font-size, var(--kd-g-font-size-small, 12px));
128
128
  max-width: var(--kd-c-radio-default-label-max-width);
129
- overflow: hidden;
130
129
  min-height: var(--kd-c-radio-square-sizing-width-height, 14px);
131
130
  }
132
131
  .kd-radio::before {
@@ -23,7 +23,7 @@
23
23
  color: @radio-font-color;
24
24
  font-size: @radio-font-size;
25
25
  max-width: @radio-default-label-max-width;
26
- overflow: hidden;
26
+ // overflow: hidden;
27
27
  min-height: @radio-circle-size;
28
28
 
29
29
  &::before {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@kdcloudjs/kdesign",
3
- "version": "1.7.55",
3
+ "version": "1.7.56",
4
4
  "description": "KDesign 金蝶前端react 组件库",
5
5
  "title": "kdesign",
6
6
  "keywords": [