@kdcloudjs/kdesign 1.7.48-usePopper.1 → 1.7.48-usePopper.2

package/lib/date-picker/range-picker.js

@@ -240,16 +240,8 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
   var _onTextChange = function onTextChange(newText, index) {
     var inputTempDate;
     if (newText === '') {
-      if (index === 0 && selectedValue && selectedValue.length === 2) {
-        inputTempDate = selectedValue[1];
-      } else if (index === 1 && selectedValue && selectedValue.length === 2) {
-        inputTempDate = selectedValue[0];
-      }
-      if (inputTempDate) {
-        triggerChange((0, _utils2.updateValues)(selectedValue, inputTempDate, index), index);
-        setViewDate(inputTempDate, index);
-      }
-    } else if (newText && newText.length === _format.length) {
+      triggerChange((0, _utils2.updateValues)(selectedValue, null, index), index);
+    } else if (newText && newText.length >= _format.length) {
       inputTempDate = (0, _dateFns.parseDate)(newText, _format);
       var disabledFunc = index === 0 ? disabledStartDate : disabledEndDate;
       if (inputTempDate && (!disabledFunc || !disabledFunc(inputTempDate))) {
@@ -403,28 +395,26 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
     var canEndValueTrigger = canValueTrigger(endValue, 1, mergedDisabled, allowEmpty);
     var canTrigger = values === null || canStartValueTrigger && canEndValueTrigger;
     if (canTrigger) {
-      setInnerValue(values);
+      if (typeof value === 'undefined') {
+        setInnerValue(values);
+      }
       if (onChange && (!(0, _dateFns.isEqual)((0, _utils2.getValue)(dateValue, 0), startValue) || !(0, _dateFns.isEqual)((0, _utils2.getValue)(dateValue, 1), endValue))) {
         onChange(values, [startStr, endStr]);
       }
     }
+    var curValue = (0, _utils2.getValue)(values, sourceIndex);
     var nextOpenIndex = null;
     if (sourceIndex === 0 && !mergedDisabled[1]) {
       nextOpenIndex = 1;
     } else if (sourceIndex === 1 && !mergedDisabled[0]) {
       nextOpenIndex = 0;
     }
-    if (nextOpenIndex !== null && nextOpenIndex !== mergedActivePickerIndex && (!openRecordsRef.current[nextOpenIndex] || !(0, _utils2.getValue)(values, nextOpenIndex)) && (0, _utils2.getValue)(values, sourceIndex)) {
+    if (nextOpenIndex !== null && nextOpenIndex !== mergedActivePickerIndex && (!openRecordsRef.current[nextOpenIndex] || !(0, _utils2.getValue)(values, nextOpenIndex)) && curValue) {
       triggerOpenAndFocus(nextOpenIndex);
-    } else {
+    } else if (curValue) {
       triggerOpen(false, sourceIndex);
     }
   };
-  // useOnClickOutside([popperRef, inputDivRef], () => {
-  //   setViewDate(null, 0)
-  //   setViewDate(null, 1)
-  //   setHoverRangedValue([null, null])
-  // })
   var onSelect = function onSelect(date, type) {
     var values = (0, _utils2.updateValues)(selectedValue, date, mergedActivePickerIndex);
     if (type === 'inner') {
@@ -465,14 +455,10 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
   (0, _react.useEffect)(function () {
     if (!mergedOpen) {
       setSelectedValue(dateValue);
-      if (!startValueTexts.length || startValueTexts[0] === '') {
-        triggerStartTextChange('');
-      }
-      if (!endValueTexts.length || endValueTexts[0] === '') {
-        triggerEndTextChange('');
-      }
       setViewDate(null, 0);
       setViewDate(null, 1);
+      resetStartText();
+      resetEndText();
       setHoverRangedValue([null, null]);
     } else {
       setInnerPicker(undefined);

package/lib/date-picker/utils/date-fns.js

@@ -477,10 +477,12 @@ var setYearOrMonthOfDate = function setYearOrMonthOfDate(date1, date2) {
   var type = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'year';
   var d1 = new Date(date1 || 0);
   var d2 = new Date(date2 || 0);
-  if (type === 'year') {
+  if (type === 'year' && d1.getFullYear() !== d2.getFullYear()) {
+    d1.setDate(1);
     d1.setFullYear(d2.getFullYear());
   }
-  if (type === 'month') {
+  if (type === 'month' && d1.getMonth() !== d2.getMonth()) {
+    d1.setDate(1);
     d1.setMonth(d2.getMonth());
   }
   return d1;

package/lib/filter/filter.js

@@ -8,8 +8,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _keys = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/keys"));
 var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
+var _keys = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/keys"));
 var _find = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/find"));
 var _filter = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/filter"));
 var _extends2 = _interopRequireDefault(require("@babel/runtime-corejs3/helpers/extends"));
@@ -51,7 +51,7 @@ var Filter = function Filter(props) {
     customPrefixcls = _getCompProps.prefixCls;
   // className前缀
   var prefixCls = getPrefixCls(pkgPrefixCls, 'filter', customPrefixcls);
-  var _React$useRef = React.useRef(props.value || props.defaultValue || {}),
+  var _React$useRef = React.useRef(typeof props.value === 'undefined' ? props.defaultValue || {} : props.value || {}),
     defaultValue = _React$useRef.current;
   var _React$useState = React.useState(defaultValue),
     _React$useState2 = (0, _slicedToArray2.default)(_React$useState, 2),
@@ -64,7 +64,6 @@ var Filter = function Filter(props) {
     _React$useState4 = (0, _slicedToArray2.default)(_React$useState3, 2),
     tab = _React$useState4[0],
     setTab = _React$useState4[1];
-  var conditionValue = (0, _keys.default)(value).length < 1 || (0, _keys.default)(value).length === 1 && value.scheme ? defaultValue : value;
   var onConditionChange = function onConditionChange(nextValue, condition, option) {
     props.value === undefined && setValue(nextValue);
     onChange && onChange(nextValue, condition, option);
@@ -72,7 +71,7 @@ var Filter = function Filter(props) {
   var onConditionRemove = function onConditionRemove(key, e) {
     e.preventDefault();
     if (key) {
-      var nextValue = (0, _extends2.default)({}, conditionValue);
+      var nextValue = (0, _extends2.default)({}, value);
       delete nextValue[key];
       onConditionChange(nextValue);
     }
@@ -189,7 +188,7 @@ var Filter = function Filter(props) {
     FilterLangMsg: FilterLangMsg,
     onConditionChange: onConditionChange,
     onConditionRemove: onConditionRemove,
-    value: conditionValue
+    value: value
   })), /*#__PURE__*/React.createElement(_scheme.default, (0, _extends2.default)({}, {
     tab: tab,
     fields: fields,

package/lib/grid/col.js

@@ -53,12 +53,23 @@ var Col = function Col(props) {
   var rowGroup = (0, _react.useContext)(_row.GapContext);
   var mergedWinWidth = rowGroup.winWidth;
   var gap = rowGroup.gap;
-  // 浏览器名称
-  var isSogouOrIE = (0, _testBrowserType.testBrowserType)(/^sogou/i, 0) || /Trident|MSIE/.test(navigator.userAgent);
+  // 判断当前浏览器是否支持row-gap，如果不支持则使用margin负值模拟
+  var notSupportRowGap = function notSupportRowGap() {
+    // 判断是否是搜狗浏览器
+    if ((0, _testBrowserType.testBrowserType)(/^sogou/i, 0)) return true;
+    // 判断是否是IE浏览器
+    if (/Trident|MSIE/.test(navigator.userAgent)) return true;
+    // 判断是否是chrome浏览器，chrome浏览器版本号小于69
+    if (/Chrome/.test(navigator.userAgent) && !/Chromium/.test(navigator.userAgent)) {
+      var version = navigator.userAgent.split('Chrome/')[1].split('.');
+      if (version[0] && parseInt(version[0]) <= 69) return true;
+    }
+    return false;
+  };
   var colGapStyle = {
     padding: "0 ".concat(gap.h / 2, "px")
   };
-  if (isSogouOrIE && gap.v) colGapStyle.marginBottom = gap.v;
+  if (notSupportRowGap() && gap.v) colGapStyle.marginBottom = gap.v;
   // className前缀
   var prefixCls = getPrefixCls(pkgPrefixCls, 'col', customPrefixcls);
   var columns = 24;

package/lib/grid/row.js

@@ -55,8 +55,19 @@ var Row = function Row(props) {
     align = _getCompProps.align,
     justify = _getCompProps.justify,
     customPrefixcls = _getCompProps.prefixCls;
-  // 浏览器名称
-  var isSogouOrIe = (0, _testBrowserType.testBrowserType)(/^sogou/i, 0) || /Trident|MSIE/.test(navigator.userAgent);
+  // 判断当前浏览器是否支持row-gap，如果不支持则使用margin负值模拟
+  var notSupportRowGap = function notSupportRowGap() {
+    // 判断是否是搜狗浏览器
+    if ((0, _testBrowserType.testBrowserType)(/^sogou/i, 0)) return true;
+    // 判断是否是IE浏览器
+    if (/Trident|MSIE/.test(navigator.userAgent)) return true;
+    // 判断是否是chrome浏览器，chrome浏览器版本号小于69
+    if (/Chrome/.test(navigator.userAgent) && !/Chromium/.test(navigator.userAgent)) {
+      var version = navigator.userAgent.split('Chrome/')[1].split('.');
+      if (version[0] && parseInt(version[0]) <= 69) return true;
+    }
+    return false;
+  };
   // className前缀
   var prefixCls = getPrefixCls(pkgPrefixCls, 'row', customPrefixcls);
   var _React$useState = _react.default.useState(window.innerWidth),
@@ -88,10 +99,10 @@ var Row = function Row(props) {
     }
   }
   var rowStyle = {
-    'row-gap': "".concat(gap.v, "px"),
+    rowGap: "".concat(gap.v, "px"),
     margin: "0 ".concat(-1 * gap.h / 2, "px")
   };
-  if (gap.v && isSogouOrIe) rowStyle['margin-bottom'] = "".concat(-1 * gap.v, "px");
+  if (gap.v && notSupportRowGap()) rowStyle.marginBottom = "".concat(-1 * gap.v, "px");
   var toalign = {
     top: 'flex-start',
     middle: 'center',

package/lib/input/ClearableLabeledInput.js

@@ -69,11 +69,11 @@ var ClearableInput = function ClearableInput(props) {
       return null;
     }
     var needClear = !disabled && value && isMouseEnter;
-    var clearIconclasses = (0, _classnames.default)((_classNames = {}, (0, _defineProperty2.default)(_classNames, "".concat(prefixCls, "-textarea-clear-icon"), inputType === ClearableInputType[1]), (0, _defineProperty2.default)(_classNames, "".concat(prefixCls, "-clear-icon"), inputType === ClearableInputType[0]), (0, _defineProperty2.default)(_classNames, "".concat(prefixCls, "-clear-icon-hidden"), !needClear), (0, _defineProperty2.default)(_classNames, "".concat(prefixCls, "-clear-icon-rightSpace"), suffix), _classNames));
+    var clearIconCls = (0, _classnames.default)((_classNames = {}, (0, _defineProperty2.default)(_classNames, "".concat(prefixCls, "-textarea-clear-icon"), inputType === ClearableInputType[1]), (0, _defineProperty2.default)(_classNames, "".concat(prefixCls, "-clear-icon"), inputType === ClearableInputType[0]), (0, _defineProperty2.default)(_classNames, "".concat(prefixCls, "-clear-icon-hidden"), !needClear), (0, _defineProperty2.default)(_classNames, "".concat(prefixCls, "-clear-icon-rightSpace"), suffix), _classNames));
     return /*#__PURE__*/_react.default.createElement("span", {
       onMouseDown: mouseDownHandle,
       onClick: handleReset,
-      className: clearIconclasses
+      className: clearIconCls
     }, typeof allowClear === 'boolean' ? /*#__PURE__*/_react.default.createElement(_index.Icon, {
       type: "close-solid"
     }) : allowClear);

package/lib/input/TextArea.js

@@ -106,8 +106,7 @@ var InternalTextarea = function InternalTextarea(props, ref) {
   }, [autoSize, textareaRef, style]);
   (0, _hooks.useResizeObserver)(textareaRef.current, resizeTextarea);
   var handleChange = function handleChange(e) {
-    if (value === undefined) return;
-    setValue(e.target.value);
+    propsValue === undefined && setValue(e.target.value);
     onChange && onChange(e);
   };
   var handleFocus = function handleFocus(e) {
@@ -152,11 +151,6 @@ var InternalTextarea = function InternalTextarea(props, ref) {
       setNumberMarkError(false);
     }
   }, [value]);
-  (0, _react.useEffect)(function () {
-    if (propsValue !== undefined) {
-      setValue(propsValue);
-    }
-  }, [propsValue, setValue]);
   (0, _react.useEffect)(function () {
     if (focused && !showNumberMark) {
       setShowNumberMark(true);

package/lib/input-number/inputNumber.js

@@ -74,6 +74,10 @@ var InternalInputNumber = function InternalInputNumber(props, ref) {
     _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
     forceUpdate = _useState4[0],
     setForceUpdate = _useState4[1];
+  var _useState5 = (0, _react.useState)(''),
+    _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
+    compositionValue = _useState6[0],
+    setCompositionValue = _useState6[1];
   var inputStatus = (0, _react.useRef)({
     isHandleChange: false,
     inputFocused: false
@@ -83,6 +87,7 @@ var InternalInputNumber = function InternalInputNumber(props, ref) {
   var inputNumberRef = ref || thisInputNumberRef;
   var stepMouseDownDelayTimer = (0, _react.useRef)(null);
   var stepMouseDownIntervalTimer = (0, _react.useRef)(null);
+  var refIszComposition = (0, _react.useRef)(false);
   var isScopeValid = function isScopeValid(value) {
     if (value === '') return true;
     var numberValue = parseFloat(value) || 0;
@@ -124,14 +129,20 @@ var InternalInputNumber = function InternalInputNumber(props, ref) {
   };
   var handleChange = function handleChange(event) {
     inputStatus.current.isHandleChange = true;
-    var legalNumber = verifiValue(event.target.value);
-    updateSelectionRangePosition(event);
-    if (legalNumber === false) {
-      setForceUpdate(forceUpdate + 1);
-      return false;
+    var newValue = event.target.value;
+    if (!refIszComposition.current) {
+      compositionValue && setCompositionValue('');
+      var legalNumber = verifiValue(newValue);
+      if (legalNumber === false) {
+        setForceUpdate(forceUpdate + 1);
+        return false;
+      }
+      value === undefined && setInputValue(legalNumber);
+      onChange && onChange(handleEventAttachValue(event, numberMode ? Number(legalNumber) : legalNumber));
+      updateSelectionRangePosition(event);
+    } else {
+      setCompositionValue(newValue);
     }
-    value === undefined && setInputValue(legalNumber);
-    onChange && onChange(handleEventAttachValue(event, numberMode ? Number(legalNumber) : legalNumber));
   };
   var handleFocus = function handleFocus(event) {
     inputStatus.current.inputFocused = true;
@@ -330,9 +341,19 @@ var InternalInputNumber = function InternalInputNumber(props, ref) {
     inputValue: displayedInputValue,
     forceUpdate: forceUpdate
   });
+  var handleComposition = function handleComposition(e) {
+    refIszComposition.current = e.type !== 'compositionend';
+    if (!refIszComposition.current) {
+      setCompositionValue('');
+      handleChange(e);
+    }
+  };
   return /*#__PURE__*/_react.default.createElement(_input.default, (0, _extends2.default)({}, others, {
+    onCompositionStart: handleComposition,
+    onCompositionUpdate: handleComposition,
+    onCompositionEnd: handleComposition,
     ref: inputNumberRef,
-    value: displayedInputValue,
+    value: compositionValue || displayedInputValue,
     prefix: prefix,
     suffix: suffix,
     onChange: handleChange,

package/lib/pagination/style/index.css

@@ -388,6 +388,7 @@
 }
 .kd-pagination.simple .kd-pagination-action-item .kd-pagination-total {
   margin-right: 0;
+  margin-left: 2px;
 }
 .kd-pagination.simple .kd-pagination-action-item.bordered > button {
   border: none;

package/lib/pagination/style/index.less

@@ -244,6 +244,7 @@
 
         .@{pagination-prefix-cls}-total {
           margin-right: 0;
+          margin-left: 2px;
         }
 
         &.bordered > button {

package/lib/popper/index.d.ts

@@ -4,7 +4,7 @@ export declare type PlacementType = typeof Placements[number];
 export declare const Triggers: ["hover", "focus", "click", "contextMenu"];
 export declare type TriggerType = typeof Triggers[number];
 export declare type RenderFunction = () => React.ReactNode;
-export interface PopperProps {
+export declare type PopperProps = {
     gap?: number;
     arrow?: boolean;
     visible?: boolean;
@@ -32,6 +32,9 @@ export interface PopperProps {
     onTransitionEnd?: (e: React.TransitionEvent) => void;
     onAnimationEnd?: (e: React.AnimationEvent) => void;
     children?: React.ReactNode;
+};
+export interface TriggerContextProps {
+    registerSubPopup: (id: string, node: any) => void;
 }
 export declare const popperPlacementMap: {
     top: string;