@kdcloudjs/kdesign 1.7.54 → 1.7.56

package/dist/kdesign.js

@@ -1,6 +1,6 @@
 /*!
  * 
- *   @kdcloudjs/kdesign v1.7.53
+ *   @kdcloudjs/kdesign v1.7.55
  * 
  *   Copyright 2020-present, Kingdee, Inc.
  *   All rights reserved.
@@ -9615,7 +9615,7 @@ var ColorPickerPanel = function ColorPickerPanel(props) {
       setColTypeArr(formatArr);
     }
     setClickedColorIndex(index);
-    onChange && onChange(formatValue, colTypeArr);
+    onChange && onChange(formatValue, formatArr);
   };
   var handleTypeChange = function handleTypeChange(selectValue, option) {
     setCurrentColorType(option.label);
@@ -14263,15 +14263,7 @@ 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(Object(_utils__WEBPACK_IMPORTED_MODULE_20__["updateValues"])(selectedValue, inputTempDate, index), index);
-        setViewDate(inputTempDate, index);
-      }
+      triggerChange(Object(_utils__WEBPACK_IMPORTED_MODULE_20__["updateValues"])(selectedValue, null, index), index);
     } else if (newText && newText.length === _format.length) {
       inputTempDate = Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_23__["parseDate"])(newText, _format);
       var disabledFunc = index === 0 ? disabledStartDate : disabledEndDate;
@@ -14428,30 +14420,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 && (!Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_23__["isEqual"])(Object(_utils__WEBPACK_IMPORTED_MODULE_20__["getValue"])(dateValue, 0), startValue) || !Object(_utils_date_fns__WEBPACK_IMPORTED_MODULE_23__["isEqual"])(Object(_utils__WEBPACK_IMPORTED_MODULE_20__["getValue"])(dateValue, 1), endValue))) {
         onChange(values, [startStr, endStr]);
       }
     }
+    var curValue = Object(_utils__WEBPACK_IMPORTED_MODULE_20__["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] || !Object(_utils__WEBPACK_IMPORTED_MODULE_20__["getValue"])(values, nextOpenIndex)) && Object(_utils__WEBPACK_IMPORTED_MODULE_20__["getValue"])(values, sourceIndex)) {
+    if (nextOpenIndex !== null && nextOpenIndex !== mergedActivePickerIndex && (!openRecordsRef.current[nextOpenIndex] || !Object(_utils__WEBPACK_IMPORTED_MODULE_20__["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 = Object(_utils__WEBPACK_IMPORTED_MODULE_20__["updateValues"])(selectedValue, date, mergedActivePickerIndex);
     if (type === 'inner') {
@@ -14492,12 +14480,6 @@ var InternalRangePicker = function InternalRangePicker(props, ref) {
   Object(react__WEBPACK_IMPORTED_MODULE_12__["useEffect"])(function () {
     if (!mergedOpen) {
       setSelectedValue(dateValue);
-      if (!startValueTexts.length || startValueTexts[0] === '') {
-        triggerStartTextChange('');
-      }
-      if (!endValueTexts.length || endValueTexts[0] === '') {
-        triggerEndTextChange('');
-      }
       setViewDate(null, 0);
       setViewDate(null, 1);
       setHoverRangedValue([null, null]);
@@ -19865,12 +19847,25 @@ var Col = function Col(props) {
   var mergedWinWidth = rowGroup.winWidth;
   var gap = rowGroup.gap;
 
-  // 浏览器名称
-  var isSogouOrIE = Object(_utils_testBrowserType__WEBPACK_IMPORTED_MODULE_17__["testBrowserType"])(/^sogou/i, 0) || /Trident|MSIE/.test(navigator.userAgent);
+  // 判断当前浏览器是否支持row-gap，如果不支持则使用margin负值模拟
+  var notSupportRowGap = function notSupportRowGap() {
+    // 判断是否是搜狗浏览器
+    if (Object(_utils_testBrowserType__WEBPACK_IMPORTED_MODULE_17__["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);
@@ -20053,8 +20048,21 @@ var Row = function Row(props) {
     justify = _getCompProps.justify,
     customPrefixcls = _getCompProps.prefixCls;
 
-  // 浏览器名称
-  var isSogouOrIe = Object(_utils_testBrowserType__WEBPACK_IMPORTED_MODULE_16__["testBrowserType"])(/^sogou/i, 0) || /Trident|MSIE/.test(navigator.userAgent);
+  // 判断当前浏览器是否支持row-gap，如果不支持则使用margin负值模拟
+  var notSupportRowGap = function notSupportRowGap() {
+    // 判断是否是搜狗浏览器
+    if (Object(_utils_testBrowserType__WEBPACK_IMPORTED_MODULE_16__["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);
@@ -20090,7 +20098,7 @@ var Row = function Row(props) {
     rowGap: "".concat(gap.v, "px"),
     margin: "0 ".concat(-1 * gap.h / 2, "px")
   };
-  if (gap.v && isSogouOrIe) rowStyle.marginBottom = "".concat(-1 * gap.v, "px");
+  if (gap.v && notSupportRowGap()) rowStyle.marginBottom = "".concat(-1 * gap.v, "px");
   var toalign = {
     top: 'flex-start',
     middle: 'center',
@@ -22268,11 +22276,11 @@ var ClearableInput = function ClearableInput(props) {
       return null;
     }
     var needClear = !disabled && value && isMouseEnter;
-    var clearIconclasses = classnames__WEBPACK_IMPORTED_MODULE_5___default()((_classNames = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames, "".concat(prefixCls, "-textarea-clear-icon"), inputType === ClearableInputType[1]), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames, "".concat(prefixCls, "-clear-icon"), inputType === ClearableInputType[0]), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames, "".concat(prefixCls, "-clear-icon-hidden"), !needClear), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames, "".concat(prefixCls, "-clear-icon-rightSpace"), suffix), _classNames));
+    var clearIconCls = classnames__WEBPACK_IMPORTED_MODULE_5___default()((_classNames = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames, "".concat(prefixCls, "-textarea-clear-icon"), inputType === ClearableInputType[1]), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames, "".concat(prefixCls, "-clear-icon"), inputType === ClearableInputType[0]), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames, "".concat(prefixCls, "-clear-icon-hidden"), !needClear), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames, "".concat(prefixCls, "-clear-icon-rightSpace"), suffix), _classNames));
     return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement("span", {
       onMouseDown: mouseDownHandle,
       onClick: handleReset,
-      className: clearIconclasses
+      className: clearIconCls
     }, typeof allowClear === 'boolean' ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default.a.createElement(_index__WEBPACK_IMPORTED_MODULE_4__["Icon"], {
       type: "close-solid"
     }) : allowClear);
@@ -28432,7 +28440,7 @@ var InternalRadio = function InternalRadio(props, ref) {
       className: classString,
       style: style,
       ref: mergedRef
-    }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5___default.a.createElement("input", _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_0___default()({
+    }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5___default.a.createElement("input", _babel_runtime_helpers_extends__WEBPACK_IMPORTED_MODULE_0___default()({}, restProps, {
       type: "radio",
       className: "".concat(radioPrefixCls, "-input"),
       checked: isChecked,
@@ -28440,7 +28448,7 @@ var InternalRadio = function InternalRadio(props, ref) {
       value: value,
       name: context === null || context === void 0 ? void 0 : context.name,
       disabled: mergedDisabled
-    }, restProps)), children !== undefined ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5___default.a.createElement("span", {
+    })), children !== undefined ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_5___default.a.createElement("span", {
       className: "".concat(radioPrefixCls, "-text")
     }, children) : null)
   );