@kdcloudjs/kdesign 1.7.51 → 1.7.53

package/es/color-picker/color-picker-panel.js

@@ -10,7 +10,7 @@ import { colorFormat, valOfCorrespondingType, strFixed, getColorObj, highlightPr
 import { defaultSystemColor } from './constant/defaultColor';
 import { validateColor } from './utils/validateColor';
 import { toLowerCase } from './utils/convertLetters';
-import Color from 'color-ie';
+import Color from 'color';
 import { ChromePicker } from 'react-color';
 import devWarning from '../_utils/devwarning';
 import { useOnClickOutside } from '../_utils/hooks';

package/es/color-picker/color-picker.js

@@ -11,7 +11,7 @@ import ColorPickerPanel from './color-picker-panel';
 import { colorFormat, strFixed, getColorObj, valOfCorrespondingType, highlightPresetColorIndex, presetColorToHEX } from './utils/colorFormat';
 import { toLowerCase } from './utils/convertLetters';
 import { defaultSystemColor } from './constant/defaultColor';
-import Color from 'color-ie';
+import Color from 'color';
 import { getCompProps } from '../_utils';
 import usePopper from '../_utils/usePopper';
 import { systemPresetColor } from './constant/systemPresetColor';

package/es/color-picker/utils/colorFormat.js

@@ -1,7 +1,7 @@
 import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/concat";
 import _findIndexInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/find-index";
 import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
-import Color from 'color-ie';
+import Color from 'color';
 import { validateColor } from './validateColor';
 import { toLowerCase } from './convertLetters';
 export var colorFormat = function colorFormat(colorStr) {

package/es/filter/filter.js

@@ -1,7 +1,7 @@
 import _extends from "@babel/runtime-corejs3/helpers/extends";
 import _slicedToArray from "@babel/runtime-corejs3/helpers/slicedToArray";
-import _Object$keys from "@babel/runtime-corejs3/core-js-stable/object/keys";
 import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
+import _Object$keys from "@babel/runtime-corejs3/core-js-stable/object/keys";
 import _findInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/find";
 import _filterInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/filter";
 import * as React from 'react';
@@ -39,7 +39,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 = _slicedToArray(_React$useState, 2),
@@ -52,7 +52,6 @@ var Filter = function Filter(props) {
     _React$useState4 = _slicedToArray(_React$useState3, 2),
     tab = _React$useState4[0],
     setTab = _React$useState4[1];
-  var conditionValue = _Object$keys(value).length < 1 || _Object$keys(value).length === 1 && value.scheme ? defaultValue : value;
   var onConditionChange = function onConditionChange(nextValue, condition, option) {
     props.value === undefined && setValue(nextValue);
     onChange && onChange(nextValue, condition, option);
@@ -60,7 +59,7 @@ var Filter = function Filter(props) {
   var onConditionRemove = function onConditionRemove(key, e) {
     e.preventDefault();
     if (key) {
-      var nextValue = _extends({}, conditionValue);
+      var nextValue = _extends({}, value);
       delete nextValue[key];
       onConditionChange(nextValue);
     }
@@ -177,7 +176,7 @@ var Filter = function Filter(props) {
     FilterLangMsg: FilterLangMsg,
     onConditionChange: onConditionChange,
     onConditionRemove: onConditionRemove,
-    value: conditionValue
+    value: value
   })), /*#__PURE__*/React.createElement(SchemeFilter, _extends({}, {
     tab: tab,
     fields: fields,

package/es/input/TextArea.js

@@ -94,8 +94,7 @@ var InternalTextarea = function InternalTextarea(props, ref) {
   }, [autoSize, textareaRef, style]);
   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) {
@@ -140,11 +139,6 @@ var InternalTextarea = function InternalTextarea(props, ref) {
       setNumberMarkError(false);
     }
   }, [value]);
-  useEffect(function () {
-    if (propsValue !== undefined) {
-      setValue(propsValue);
-    }
-  }, [propsValue, setValue]);
   useEffect(function () {
     if (focused && !showNumberMark) {
       setShowNumberMark(true);

package/es/tree/utils/treeUtils.js

@@ -616,7 +616,7 @@ export var getInitExpandedKeys = function getInitExpandedKeys(data, expandedKeys
   if (isSearching && searchStatus === 'SEARCH_START') {
     keys = _toConsumableArray(getAllFilterKeys(data, filterTreeNode, keysData, expandOnFilterNode).filterExpandKeys);
   }
-  return keys;
+  return _Array$from(new _Set(_toConsumableArray(keys)));
 };
 export var getExpandedKeys = function getExpandedKeys(expandedKeys) {
   var expandScrollkeys = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];

package/lib/color-picker/color-picker-panel.js

@@ -19,7 +19,7 @@ var _colorFormat = require("./utils/colorFormat");
 var _defaultColor = require("./constant/defaultColor");
 var _validateColor = require("./utils/validateColor");
 var _convertLetters = require("./utils/convertLetters");
-var _colorIe = _interopRequireDefault(require("color-ie"));
+var _color = _interopRequireDefault(require("color"));
 var _reactColor = require("react-color");
 var _devwarning = _interopRequireDefault(require("../_utils/devwarning"));
 var _hooks = require("../_utils/hooks");
@@ -152,7 +152,7 @@ var ColorPickerPanel = function ColorPickerPanel(props) {
           setIsFollow(switchValue);
           if (switchValue) {
             formatArr = (0, _colorFormat.colorFormat)(functionalColor, alpha);
-            setPanelState(formatArr, formatArr[(0, _colorFormat.valOfCorrespondingType)(currentColorType)].value, functionalColorName, (0, _colorFormat.strFixed)((0, _colorIe.default)((0, _colorFormat.getColorObj)(functionalColor)).alpha(), 2), (0, _colorFormat.strFixed)((0, _colorIe.default)((0, _colorFormat.getColorObj)(functionalColor)).alpha(), 2) * 100 + '%');
+            setPanelState(formatArr, formatArr[(0, _colorFormat.valOfCorrespondingType)(currentColorType)].value, functionalColorName, (0, _colorFormat.strFixed)((0, _color.default)((0, _colorFormat.getColorObj)(functionalColor)).alpha(), 2), (0, _colorFormat.strFixed)((0, _color.default)((0, _colorFormat.getColorObj)(functionalColor)).alpha(), 2) * 100 + '%');
             setClickedColorIndex((0, _colorFormat.highlightPresetColorIndex)(formatArr[0].value, (0, _colorFormat.presetColorToHEX)(presetColor || _systemPresetColor.systemPresetColor)));
           } else {
             formatArr = (0, _colorFormat.colorFormat)(_defaultColor.defaultSystemColor, 1, 'all', true);

package/lib/color-picker/color-picker.js

@@ -21,7 +21,7 @@ var _colorPickerPanel = _interopRequireDefault(require("./color-picker-panel"));
 var _colorFormat = require("./utils/colorFormat");
 var _convertLetters = require("./utils/convertLetters");
 var _defaultColor = require("./constant/defaultColor");
-var _colorIe = _interopRequireDefault(require("color-ie"));
+var _color = _interopRequireDefault(require("color"));
 var _utils = require("../_utils");
 var _usePopper = _interopRequireDefault(require("../_utils/usePopper"));
 var _systemPresetColor = require("./constant/systemPresetColor");
@@ -105,8 +105,8 @@ var ColorPicker = function ColorPicker(props) {
       setAlphaNoVerifyVal(alphaStr);
     };
     if (inputValType) {
-      var formatArr = (0, _colorFormat.colorFormat)(inpValue, (0, _colorFormat.strFixed)((0, _colorIe.default)((0, _colorFormat.getColorObj)(inpValue)).alpha(), 2));
-      setState(formatArr, formatArr[(0, _colorFormat.valOfCorrespondingType)(currentColorType)].value, (0, _colorIe.default)((0, _colorFormat.getColorObj)(inpValue)).alpha(), ((0, _colorFormat.strFixed)((0, _colorIe.default)((0, _colorFormat.getColorObj)(inpValue)).alpha(), 2) * 100).toFixed() + '%');
+      var formatArr = (0, _colorFormat.colorFormat)(inpValue, (0, _colorFormat.strFixed)((0, _color.default)((0, _colorFormat.getColorObj)(inpValue)).alpha(), 2));
+      setState(formatArr, formatArr[(0, _colorFormat.valOfCorrespondingType)(currentColorType)].value, (0, _color.default)((0, _colorFormat.getColorObj)(inpValue)).alpha(), ((0, _colorFormat.strFixed)((0, _color.default)((0, _colorFormat.getColorObj)(inpValue)).alpha(), 2) * 100).toFixed() + '%');
       setClickedColorIndex((0, _colorFormat.highlightPresetColorIndex)(formatArr[0].value, (0, _colorFormat.presetColorToHEX)(presetColor || _systemPresetColor.systemPresetColor)));
     } else {
       var _formatArr = (0, _colorFormat.colorFormat)(_defaultColor.defaultSystemColor);

package/lib/color-picker/utils/colorFormat.js

@@ -8,14 +8,14 @@ exports.valOfCorrespondingType = exports.strFixed = exports.presetColorToHEX = e
 var _concat = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/concat"));
 var _findIndex = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/find-index"));
 var _map = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/map"));
-var _colorIe = _interopRequireDefault(require("color-ie"));
+var _color = _interopRequireDefault(require("color"));
 var _validateColor = require("./validateColor");
 var _convertLetters = require("./convertLetters");
 var colorFormat = function colorFormat(colorStr) {
   var alpha = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : 1;
   var outType = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'all';
   var formatHex = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
-  var ColorTools = (0, _colorIe.default)(getColorObj(colorStr)).alpha(alpha);
+  var ColorTools = (0, _color.default)(getColorObj(colorStr)).alpha(alpha);
   var toHex = function toHex() {
     if (/^#([0-9a-fA-F]{8})$/.test(colorStr)) {
       if (formatHex) {

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/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/tree/utils/treeUtils.js

@@ -650,7 +650,7 @@ var getInitExpandedKeys = function getInitExpandedKeys(data, expandedKeys, defau
   if (isSearching && searchStatus === 'SEARCH_START') {
     keys = (0, _toConsumableArray2.default)(getAllFilterKeys(data, filterTreeNode, keysData, expandOnFilterNode).filterExpandKeys);
   }
-  return keys;
+  return (0, _from.default)(new _set.default((0, _toConsumableArray2.default)(keys)));
 };
 exports.getInitExpandedKeys = getInitExpandedKeys;
 var getExpandedKeys = function getExpandedKeys(expandedKeys) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kdcloudjs/kdesign",
-  "version": "1.7.51",
+  "version": "1.7.53",
   "description": "KDesign 金蝶前端react 组件库",
   "title": "kdesign",
   "keywords": [
@@ -85,7 +85,7 @@
     "axios": "^0.21.1",
     "big.js": "^6.0.2",
     "classnames": "^2.2.6",
-    "color-ie": "^4.2.5",
+    "color": "^4.2.3",
     "copy-to-clipboard": "^3.3.1",
     "cropperjs": "^1.5.12",
     "css-vars-ponyfill": "^2.4.8",