@kdcloudjs/kdesign 1.8.23 → 1.8.25

package/dist/kdesign.js

@@ -1,6 +1,6 @@
 /*!
  * 
- *   @kdcloudjs/kdesign v1.8.23
+ *   @kdcloudjs/kdesign v1.8.25
  * 
  *   Copyright 2020-present, Kingdee, Inc.
  *   All rights reserved.
@@ -9899,7 +9899,8 @@ var ColorPickerPanel = function ColorPickerPanel(props) {
   };
   var handleClearClick = function handleClearClick() {
     var formatArr = Object(_utils_colorFormat__WEBPACK_IMPORTED_MODULE_23__["colorFormat"])(_constant_defaultColor__WEBPACK_IMPORTED_MODULE_24__["defaultSystemColor"], 0);
-    setPanelState(formatArr, _constant_defaultColor__WEBPACK_IMPORTED_MODULE_24__["defaultSystemColor"], '', 0, '0%');
+    var defaultColor = Object(_utils_colorFormat__WEBPACK_IMPORTED_MODULE_23__["colorFormat"])(_constant_defaultColor__WEBPACK_IMPORTED_MODULE_24__["defaultSystemColor"], 1, currentColorType, true);
+    setPanelState(formatArr, defaultColor, '', 0, '0%');
     setClickColorIndex(-1);
     onChange === null || onChange === void 0 ? void 0 : onChange('', formatArr);
   };
@@ -9936,13 +9937,14 @@ var ColorPickerPanel = function ColorPickerPanel(props) {
     onChange === null || onChange === void 0 ? void 0 : onChange(formatInputValue, formatArr);
   };
   var handleTypeChange = function handleTypeChange(selectValue) {
+    var _colTypeArr$find;
     setCurrentColorType(selectValue);
+    var colorStr = (_colTypeArr$find = colTypeArr.find(function (item) {
+      return item.type === selectValue;
+    })) === null || _colTypeArr$find === void 0 ? void 0 : _colTypeArr$find.value;
+    setCorrectColorValue(Object(_utils_colorFormat__WEBPACK_IMPORTED_MODULE_23__["colorFormat"])(colorStr, 1, selectValue, true));
     if (inputCorrectColorValue) {
-      var _colTypeArr$find, _colTypeArr$find2, _colTypeArr$find3;
-      var colorStr = (_colTypeArr$find = colTypeArr.find(function (item) {
-        return item.type === selectValue;
-      })) === null || _colTypeArr$find === void 0 ? void 0 : _colTypeArr$find.value;
-      setCorrectColorValue(Object(_utils_colorFormat__WEBPACK_IMPORTED_MODULE_23__["colorFormat"])(colorStr, 1, selectValue, true));
+      var _colTypeArr$find2, _colTypeArr$find3;
       setInputColorValue((_colTypeArr$find2 = colTypeArr.find(function (item) {
         return item.type === format;
       })) === null || _colTypeArr$find2 === void 0 ? void 0 : _colTypeArr$find2.value);
@@ -10023,7 +10025,7 @@ var ColorPickerPanel = function ColorPickerPanel(props) {
       if (!inputCorrectColorValue) {
         var _formatArr$find;
         var _formatArr = Object(_utils_colorFormat__WEBPACK_IMPORTED_MODULE_23__["colorFormat"])(correctColor, 1, 'all', true);
-        setPanelState(_formatArr, Object(_utils_removeTransparency__WEBPACK_IMPORTED_MODULE_32__["removeTransparency"])(correctColor, currentColorType), correctColor, 1, '100%');
+        setPanelState(_formatArr, Object(_utils_removeTransparency__WEBPACK_IMPORTED_MODULE_32__["removeTransparency"])(correctColor, currentColorType), Object(_utils_removeTransparency__WEBPACK_IMPORTED_MODULE_32__["removeTransparency"])(correctColor, format), 1, '100%');
         onChange === null || onChange === void 0 ? void 0 : onChange((_formatArr$find = _formatArr.find(function (item) {
           return item.type === format;
         })) === null || _formatArr$find === void 0 ? void 0 : _formatArr$find.value, _formatArr);
@@ -10578,7 +10580,7 @@ var InternalColorPicker = function InternalColorPicker(props, ref) {
     var _classNames2;
     var afterIconContainerCls = classnames__WEBPACK_IMPORTED_MODULE_13___default()("".concat(colorPickerPrefixCls, "-icon"), (_classNames2 = {}, _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames2, "".concat(colorPickerPrefixCls, "-icon-underline"), borderType === 'underline'), _babel_runtime_helpers_defineProperty__WEBPACK_IMPORTED_MODULE_0___default()(_classNames2, "".concat(colorPickerPrefixCls, "-icon-bordered"), borderType === 'bordered'), _classNames2));
     var getBgc = function getBgc() {
-      return inputCorrectColorValue ? colTypeArr[2].value : Object(_utils_removeTransparency__WEBPACK_IMPORTED_MODULE_25__["removeTransparency"])(colTypeArr[2].value, currentColorType);
+      return inputCorrectColorValue ? colTypeArr[2].value : Object(_utils_removeTransparency__WEBPACK_IMPORTED_MODULE_25__["removeTransparency"])(colTypeArr[2].value, 'RGB');
     };
     var noneLineCls = "".concat(colorPickerPrefixCls, "-icon-no-color-line");
     return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_12___default.a.createElement("div", {
@@ -10589,7 +10591,7 @@ var InternalColorPicker = function InternalColorPicker(props, ref) {
     }, !Object(_utils_validateColor__WEBPACK_IMPORTED_MODULE_16__["validateColor"])(value) && !inputCorrectColorValue && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_12___default.a.createElement("div", {
       className: noneLineCls
     }));
-  }, [borderType, colTypeArr, colorPickerPrefixCls, currentColorType, inputCorrectColorValue, value]);
+  }, [borderType, colTypeArr, colorPickerPrefixCls, inputCorrectColorValue, value]);
   var colorInputEle = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_12___default.a.createElement("div", {
     className: containerCls,
     ref: inputRef,