@kdcloudjs/kdesign 1.5.1 → 1.5.4

package/es/tree/utils/treeUtils.d.ts

@@ -7,13 +7,16 @@ import { TreeNodeData } from '../tree';
  * @param level
  * @param pos
  */
-export declare const flattenAll: (treeData: any[], newTreeData?: TreeNodeData[], level?: number, pos?: string | undefined) => TreeNodeData[];
+export declare const flattenAll: (treeData: any[], newTreeData?: TreeNodeData[], level?: number, pos?: string | undefined) => {
+    flattenAllData: TreeNodeData[];
+    maxLevel: number;
+};
 export declare const getExpand: (expandedKeys: string[], key: string) => boolean;
 export declare const getChecked: (checkedKeys: string[], key: string) => boolean;
 export declare const getSelected: (selectedKeys: string[], key: string) => boolean;
 export declare const getHalfChecked: (halfCheckedKeys: string[], key: string) => boolean;
 export declare const getAllFilterKeys: (data: any[], filterTreeNode: FunctionConstructor) => any[];
-export declare const getFilterData: (data: any[], filterTreeNode: FunctionConstructor, filterValue: string) => any[];
+export declare const getFilterData: (data: any[], filterTreeNode: FunctionConstructor, isSearching: boolean) => any[];
 export declare const getMaxLevel: (data: any[]) => number;
 /**
  *计算node的属性后返回新的 treedata
@@ -43,6 +46,6 @@ export declare const getDataCheckededStateStrictly: (checkedKeys: string[]) => {
 };
 export declare const delKey: (prevKeys: string[], delKeys: string[]) => never[] & string[];
 export declare const getAllNodeKeys: (data: any[]) => string[];
-export declare const getInitExpandedKeys: (data: any[], expandedKeys: string[], defaultExpandedKeys: string[], defaultExpandAll: boolean, defaultExpandRoot: boolean, defaultExpandParent: boolean, expandScrollkeys: string[] | undefined, filterTreeNode: FunctionConstructor, filterValue: string) => string[];
+export declare const getInitExpandedKeys: (data: any[], expandedKeys: string[], defaultExpandedKeys: string[], defaultExpandAll: boolean, defaultExpandRoot: boolean, defaultExpandParent: boolean, expandScrollkeys: string[] | undefined, filterTreeNode: FunctionConstructor, isSearching: boolean) => string[];
 export declare const getExpandedKeys: (expandedKeys: string[], expandScrollkeys?: string[]) => string[];
 export declare const calcDropPosition: (event: React.MouseEvent, dropNode: HTMLElement) => 0 | 1 | -1;

package/es/tree/utils/treeUtils.js

@@ -5,7 +5,6 @@ import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/insta
 import _includesInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/includes";
 import _findInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/find";
 import _filterInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/filter";
-import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
 import _Set from "@babel/runtime-corejs3/core-js-stable/set";
 import _startsWithInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/starts-with";
 import _Array$from from "@babel/runtime-corejs3/core-js-stable/array/from";
@@ -24,7 +23,7 @@ var __rest = this && this.__rest || function (s, e) {
   return t;
 };
 
-var DRAG_OFFSET = 0.4;
+var DRAG_OFFSET = 0.3;
 /**
  * 打平所有数组，并添加pos位置信息，
  * 方便根据expandKeys等计算节点的expand，checkedKeys计算节点checked状态
@@ -38,29 +37,54 @@ export var flattenAll = function flattenAll(treeData) {
   var newTreeData = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
   var level = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
   var pos = arguments.length > 3 ? arguments[3] : undefined;
-  treeData && treeData.forEach(function (item, index) {
-    var _context;
+  var maxLevel = 0;
 
-    var children = item.children,
-        title = item.title,
-        key = item.key,
-        others = __rest(item, ["children", "title", "key"]);
+  var fn = function fn(treeData) {
+    var newTreeData = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+    var level = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
+    var pos = arguments.length > 3 ? arguments[3] : undefined;
+    var parent = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : null;
+    treeData && treeData.forEach(function (item, index) {
+      var _context;
 
-    var _pos = pos ? _concatInstanceProperty(_context = "".concat(pos, "-")).call(_context, index) : "".concat(index);
+      var children = item.children,
+          title = item.title,
+          key = item.key,
+          others = __rest(item, ["children", "title", "key"]);
 
-    var hasChildNode = children && children instanceof Array && children.length > 0;
-    newTreeData.push(_extends({
-      title: title,
-      key: key,
-      pos: _pos,
-      hasChildNode: hasChildNode,
-      level: level
-    }, others));
-    var _level = level;
-    _level++;
-    flattenAll(children, newTreeData, _level, _pos);
-  });
-  return newTreeData;
+      item.parent = parent;
+
+      var _pos = pos ? _concatInstanceProperty(_context = "".concat(pos, "-")).call(_context, index) : "".concat(index);
+
+      var hasChildNode = children && children instanceof Array && children.length > 0;
+
+      var flattenNode = _extends({
+        title: title,
+        key: key,
+        pos: _pos,
+        hasChildNode: hasChildNode,
+        level: level,
+        parent: parent
+      }, others);
+
+      newTreeData.push(flattenNode);
+      var _level = level;
+
+      if (maxLevel < level) {
+        maxLevel = level;
+      }
+
+      _level++;
+      fn(children, newTreeData, _level, _pos, flattenNode);
+    });
+    return newTreeData;
+  };
+
+  var flattenAllData = fn(treeData, newTreeData, level, pos);
+  return {
+    flattenAllData: flattenAllData,
+    maxLevel: maxLevel
+  };
 };
 export var getExpand = function getExpand(expandedKeys, key) {
   return expandedKeys === null || expandedKeys === void 0 ? void 0 : _includesInstanceProperty(expandedKeys).call(expandedKeys, key);
@@ -97,29 +121,29 @@ var isAllParentExpand = function isAllParentExpand(data, pos) {
 };
 
 export var getAllFilterKeys = function getAllFilterKeys(data, filterTreeNode) {
-  var filterData = _filterInstanceProperty(data).call(data, function (item) {
-    return filterTreeNode === null || filterTreeNode === void 0 ? void 0 : filterTreeNode(item);
-  });
-
-  var filterKeys = getAllNodeKeys(filterData);
   var allFilterKeys = [];
 
-  _mapInstanceProperty(filterKeys).call(filterKeys, function (key) {
-    var _context2;
+  _filterInstanceProperty(data).call(data, function (item) {
+    return filterTreeNode === null || filterTreeNode === void 0 ? void 0 : filterTreeNode(item);
+  }).forEach(function (item) {
+    var node = _extends({}, item);
 
-    return allFilterKeys.push.apply(allFilterKeys, _concatInstanceProperty(_context2 = _toConsumableArray(getAllParentKeys(data, key))).call(_context2, [key]));
+    while (node) {
+      allFilterKeys.push(node.key);
+      node = node.parent;
+    }
   });
 
   return _toConsumableArray(new _Set(allFilterKeys));
 };
-export var getFilterData = function getFilterData(data, filterTreeNode, filterValue) {
+export var getFilterData = function getFilterData(data, filterTreeNode, isSearching) {
   var filterData = data;
+  var allFilterKeys = null;
 
-  if (typeof filterTreeNode === 'function' && filterValue) {
+  if (isSearching) {
+    allFilterKeys = getAllFilterKeys(filterData, filterTreeNode);
     filterData = _filterInstanceProperty(filterData).call(filterData, function (item) {
-      var _context3;
-
-      return _includesInstanceProperty(_context3 = getAllFilterKeys(filterData, filterTreeNode)).call(_context3, item.key);
+      return _includesInstanceProperty(allFilterKeys).call(allFilterKeys, item.key);
     });
   }
 
@@ -258,11 +282,11 @@ export var getSpreadAttrData = function getSpreadAttrData(treeData, expandedKeys
   return newTreeData;
 };
 export var addKeys = function addKeys() {
-  var _context4;
+  var _context2;
 
   var prevKeys = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   var newKeys = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
-  return _Array$from(new _Set(_concatInstanceProperty(_context4 = []).call(_context4, _toConsumableArray(prevKeys), _toConsumableArray(newKeys))));
+  return _Array$from(new _Set(_concatInstanceProperty(_context2 = []).call(_context2, _toConsumableArray(prevKeys), _toConsumableArray(newKeys))));
 };
 export var getAllParentKeys = function getAllParentKeys(data) {
   var pos = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
@@ -315,14 +339,14 @@ export var getPos = function getPos(data, key) {
   return node === null || node === void 0 ? void 0 : node.pos;
 };
 export var getInitCheckedKeys = function getInitCheckedKeys(data, keys) {
-  var _context5;
+  var _context3;
 
   var checkedKeys = [];
   keys.forEach(function (item) {
     var pos = getPos(data, item);
     checkedKeys.push.apply(checkedKeys, _toConsumableArray(getAllChildKeys(data, pos)));
   });
-  return _Array$from(new _Set(_concatInstanceProperty(_context5 = []).call(_context5, checkedKeys, _toConsumableArray(keys))));
+  return _Array$from(new _Set(_concatInstanceProperty(_context3 = []).call(_context3, checkedKeys, _toConsumableArray(keys))));
 };
 export var getInitCheckededState = function getInitCheckededState(data) {
   var checkedKeys = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
@@ -497,7 +521,7 @@ var getRootKeys = function getRootKeys(data) {
 export var getInitExpandedKeys = function getInitExpandedKeys(data, expandedKeys, defaultExpandedKeys, defaultExpandAll, defaultExpandRoot, defaultExpandParent) {
   var expandScrollkeys = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : [];
   var filterTreeNode = arguments.length > 7 ? arguments[7] : undefined;
-  var filterValue = arguments.length > 8 ? arguments[8] : undefined;
+  var isSearching = arguments.length > 8 ? arguments[8] : undefined;
   var keys = (expandedKeys === null || expandedKeys === void 0 ? void 0 : _concatInstanceProperty(expandedKeys).call(expandedKeys, expandScrollkeys)) || (defaultExpandedKeys === null || defaultExpandedKeys === void 0 ? void 0 : _concatInstanceProperty(defaultExpandedKeys).call(defaultExpandedKeys, expandScrollkeys)) || [];
 
   if (defaultExpandAll) {
@@ -520,10 +544,10 @@ export var getInitExpandedKeys = function getInitExpandedKeys(data, expandedKeys
     }
   }
 
-  if (typeof filterTreeNode === 'function' && filterValue) {
-    var _context6;
+  if (isSearching) {
+    var _context4;
 
-    keys = _concatInstanceProperty(_context6 = []).call(_context6, _toConsumableArray(keys), _toConsumableArray(getAllFilterKeys(data, filterTreeNode)));
+    keys = _concatInstanceProperty(_context4 = []).call(_context4, _toConsumableArray(keys), _toConsumableArray(getAllFilterKeys(data, filterTreeNode)));
   }
 
   return _Array$from(new _Set(_toConsumableArray(keys)));

package/lib/anchor/anchor-link.js

@@ -65,12 +65,6 @@ var AnchorLink = function AnchorLink(props) {
   }, [href, registerLink, prevHref]);
 
   var handleClick = function handleClick(e) {
-    var anchorElement = document.getElementById(href.replace('#', ''));
-
-    if (anchorElement) {
-      anchorElement.scrollIntoView();
-    }
-
     onClick === null || onClick === void 0 ? void 0 : onClick(e, {
       title: title,
       href: href

package/lib/anchor/anchor.js

@@ -82,6 +82,85 @@ function getOffsetTop(element, container) {
   return rect.top;
 }
 
+function isWindow(obj) {
+  return obj !== null && obj !== undefined && obj === obj.window;
+}
+
+function getScroll(target, top) {
+  var _a;
+
+  if (typeof window === 'undefined') {
+    return 0;
+  }
+
+  var method = top ? 'scrollTop' : 'scrollLeft';
+  var result = 0;
+
+  if (isWindow(target)) {
+    result = target[top ? 'pageYOffset' : 'pageXOffset'];
+  } else if (target instanceof Document) {
+    result = target.documentElement[method];
+  } else if (target) {
+    result = target[method];
+  }
+
+  if (target && !isWindow(target) && typeof result !== 'number') {
+    result = (_a = (target.ownerDocument || target).documentElement) === null || _a === void 0 ? void 0 : _a[method];
+  }
+
+  return result;
+}
+
+function easeInOutCubic(t, b, c, d) {
+  var cc = c - b;
+  t /= d / 2;
+
+  if (t < 1) {
+    return cc / 2 * t * t * t + b;
+  }
+
+  return cc / 2 * ((t -= 2) * t * t + 2) + b;
+}
+
+function scrollTo(y) {
+  var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var _options$getContainer = options.getContainer,
+      getContainer = _options$getContainer === void 0 ? function () {
+    return window;
+  } : _options$getContainer,
+      callback = options.callback,
+      _options$duration = options.duration,
+      duration = _options$duration === void 0 ? 450 : _options$duration;
+  var container = getContainer();
+  var scrollTop = getScroll(container, true);
+  var startTime = Date.now();
+
+  var frameFunc = function frameFunc() {
+    var timestamp = Date.now();
+    var time = timestamp - startTime;
+    var nextScrollTop = easeInOutCubic(time > duration ? duration : time, scrollTop, y, duration);
+
+    if (isWindow(container)) {
+      ;
+      container.scrollTo(window.pageXOffset, nextScrollTop);
+    } else if (container instanceof HTMLDocument || container.constructor.name === 'HTMLDocument') {
+      ;
+      container.documentElement.scrollTop = nextScrollTop;
+    } else {
+      ;
+      container.scrollTop = nextScrollTop;
+    }
+
+    if (time < duration) {
+      window.requestAnimationFrame(frameFunc);
+    } else if (typeof callback === 'function') {
+      callback();
+    }
+  };
+
+  window.requestAnimationFrame(frameFunc);
+}
+
 var InternalAnchor = function InternalAnchor(props, ref) {
   var _a;
 
@@ -100,6 +179,7 @@ var InternalAnchor = function InternalAnchor(props, ref) {
       getCurrentAnchor = anchorProps.getCurrentAnchor,
       _anchorProps$offsetTo = anchorProps.offsetTop,
       offsetTop = _anchorProps$offsetTo === void 0 ? 0 : _anchorProps$offsetTo,
+      targetOffset = anchorProps.targetOffset,
       getContainer = anchorProps.getContainer,
       _anchorProps$bounds = anchorProps.bounds,
       bounds = _anchorProps$bounds === void 0 ? 5 : _anchorProps$bounds,
@@ -312,6 +392,26 @@ var InternalAnchor = function InternalAnchor(props, ref) {
 
   var handleScrollTo = function handleScrollTo(link) {
     setCurrentActiveLink(link);
+    var container = getScrollContainer();
+    var scrollTop = getScroll(container, true);
+    var sharpLinkMatch = sharpMatcherRegx.exec(link);
+
+    if (!sharpLinkMatch) {
+      return;
+    }
+
+    var targetElement = document.getElementById(sharpLinkMatch[1]);
+
+    if (!targetElement) {
+      return;
+    }
+
+    var eleOffsetTop = getOffsetTop(targetElement, container);
+    var y = scrollTop + eleOffsetTop;
+    y -= targetOffset !== undefined ? targetOffset : offsetTop || 0;
+    scrollTo(y, {
+      getContainer: getScrollContainer
+    });
   };
 
   var setCurrentActiveLink = (0, _react.useCallback)(function (link) {
@@ -336,9 +436,9 @@ var InternalAnchor = function InternalAnchor(props, ref) {
       }
     }
 
-    var currentActiveLink = getAnchor(offsetTop || 0, bounds);
+    var currentActiveLink = getAnchor(targetOffset !== undefined ? targetOffset : offsetTop || 0, bounds);
     currentActiveLink && setCurrentActiveLink(currentActiveLink);
-  }, [affix, setFixedTop, offsetTop, bounds, getAnchor, setCurrentActiveLink, type, getScrollContainer, anchorRef]);
+  }, [affix, setFixedTop, offsetTop, bounds, getAnchor, setCurrentActiveLink, type, getScrollContainer, anchorRef, targetOffset]);
   (0, _react.useEffect)(function () {
     getScrollContainer().addEventListener('scroll', handleScroll);
     handleScroll();

package/lib/avatar/avatar.js

@@ -64,7 +64,8 @@ var InternalAvatar = function InternalAvatar(props, ref) {
       alt = avatarProps.alt,
       children = avatarProps.children,
       gap = avatarProps.gap,
-      disabled = avatarProps.disabled;
+      disabled = avatarProps.disabled,
+      srcSet = avatarProps.srcSet;
   (0, _devwarning.default)(AvatarSizes.indexOf(size) === -1 && typeof size !== 'number', 'avatar', "cannot found avatar type '".concat(size, "'"));
   (0, _devwarning.default)(AvatarShapes.indexOf(shape) === -1, 'avatar', "cannot found avatar shape '".concat(shape, "'"));
 
@@ -145,6 +146,7 @@ var InternalAvatar = function InternalAvatar(props, ref) {
   if (typeof src === 'string' && isImgExist) {
     childrenToRender = /*#__PURE__*/_react.default.createElement("img", {
       src: src,
+      srcSet: srcSet,
       draggable: draggable,
       onError: handleImgLoadError,
       alt: alt

package/lib/drawer/drawer.js

@@ -241,6 +241,7 @@ var InternalDrawer = function InternalDrawer(props, ref) {
     width: width,
     transform: transform
   } : {
+    height: height,
     transform: transform
   });
 

package/lib/dropdown/dropdown.js

@@ -35,6 +35,16 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof _WeakMap !== "functi
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && _Object$getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? _Object$getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+var findItem = function findItem(element) {
+  var isItem = element.className === 'kd-dropdown-menu-item';
+
+  if (isItem) {
+    return element;
+  } else {
+    return element.parentNode ? findItem(element.parentNode) : null;
+  }
+};
+
 var Dropdown = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var _a, _b, _c;
 
@@ -65,7 +75,7 @@ var Dropdown = /*#__PURE__*/React.forwardRef(function (props, ref) {
     setVisible(!!props.visible);
   }, [props.visible]);
   var child = /*#__PURE__*/React.cloneElement(React.Children.only(children), {
-    ref: ref,
+    ref: children.ref || ref,
     className: (0, _classnames.default)("".concat(prefixCls, "-trigger"), children.props.className, {
       disabled: disabled
     })
@@ -83,13 +93,12 @@ var Dropdown = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var menuSelectable = ((_b = menu.props) === null || _b === void 0 ? void 0 : _b.selectable) === undefined ? selectable : (_c = menu.props) === null || _c === void 0 ? void 0 : _c.selectable;
 
   var handleItemClick = function handleItemClick(e) {
-    var _a, _b;
+    var _a;
 
-    var currentTarget = e.target;
-    var parentTarget = currentTarget.parentNode;
-    var key = ((_a = currentTarget.dataset) === null || _a === void 0 ? void 0 : _a.key) || ((_b = currentTarget.parentNode.dataset) === null || _b === void 0 ? void 0 : _b.key);
+    var item = findItem(e.target);
+    var key = (_a = item === null || item === void 0 ? void 0 : item.dataset) === null || _a === void 0 ? void 0 : _a.key;
 
-    if (currentTarget.className.indexOf('disabled') === -1 && parentTarget.className.indexOf('disabled') === -1 && key) {
+    if ((item === null || item === void 0 ? void 0 : item.className.indexOf('disabled')) === -1 && key) {
       if (isMenu && menu.props.onClick) {
         menu.props.onClick(key);
       } else if (onItemClick) {

package/lib/input/ClearableLabeledInput.js

@@ -63,13 +63,13 @@ var ClearableInput = function ClearableInput(props) {
   };
 
   var renderSuffix = function renderSuffix() {
-    if (!suffix && !allowClear) {
-      return null;
+    if (suffix || !disabled && allowClear) {
+      return /*#__PURE__*/_react.default.createElement("span", {
+        className: "".concat(prefixCls, "-suffix")
+      }, renderClearIcon(), suffix);
     }
 
-    return /*#__PURE__*/_react.default.createElement("span", {
-      className: "".concat(prefixCls, "-suffix")
-    }, renderClearIcon(), suffix);
+    return null;
   };
 
   var renderInputWithFixNode = function renderInputWithFixNode(originElement) {
@@ -93,7 +93,7 @@ var ClearableInput = function ClearableInput(props) {
   };
 
   var renderInputWithLabel = function renderInputWithLabel(originElement) {
-    var _classNames4, _context2, _classNames5, _context3;
+    var _classNames4, _context2, _classNames5;
 
     if (!addonBefore && !addonAfter) {
       return originElement;
@@ -113,8 +113,7 @@ var ClearableInput = function ClearableInput(props) {
       className: inputGroupClasses,
       style: style
     }, addonBeforeNode, /*#__PURE__*/_react.default.cloneElement(originElement, {
-      style: null,
-      className: (0, _concat.default)(_context3 = "".concat(originElement.props.className || '', " ")).call(_context3, prefixCls, "-wrapper")
+      style: null
     }), addonAfterNode));
   };
 

package/lib/input/style/index.css

@@ -360,6 +360,15 @@ textarea {
 .kd-input-wrapper-focused .kd-input-textarea-clear-icon {
   color: var(--kd-c-input-color-border-focused, var(--kd-g-color-theme, #5582f3));
 }
+.kd-input-wrapper-disabled {
+  background-color: var(--kd-c-input-color-background-disabled, var(--kd-g-color-background-contain-disabled, #f5f5f5));
+  border-color: var(--kd-c-input-color-border-disabled, var(--kd-g-color-border-strong, #d9d9d9));
+  cursor: not-allowed;
+}
+.kd-input-wrapper-disabled .kd-input-suffix,
+.kd-input-wrapper-disabled .kd-input-prefix {
+  color: var(--kd-c-input-color-disabled, var(--kd-g-color-disabled, #b2b2b2));
+}
 .kd-input-wrapper-textarea {
   width: 100%;
   min-width: 0;
@@ -503,6 +512,7 @@ textarea {
 .kd-input-group-wrapper .kd-input-group .kd-input-group-addon-disabled {
   background-color: var(--kd-c-input-color-background-disabled, var(--kd-g-color-background-contain-disabled, #f5f5f5));
   border-color: var(--kd-c-input-color-border-disabled, var(--kd-g-color-border-strong, #d9d9d9));
+  color: var(--kd-c-input-color-disabled, var(--kd-g-color-disabled, #b2b2b2));
   cursor: not-allowed;
 }
 .kd-input-group-wrapper .kd-input-group-size-small .kd-input-group-addon {

package/lib/input/style/index.less

@@ -126,6 +126,16 @@ textarea {
         color: @input-border-color-focused;
       }
 		}
+
+    &-disabled {
+      background-color: @input-background-color-disabled-inner;
+      border-color: @input-border-color-disabled-inner;
+      cursor: not-allowed;
+
+      .@{input-prefix-cls}-suffix, .@{input-prefix-cls}-prefix {
+        color: @input-color-disabled-inner;
+      }
+    }
 	}
 	&-wrapper-textarea {
 		.input(@input-prefix-cls);
@@ -219,6 +229,7 @@ textarea {
 					&-disabled {
 						background-color: @input-background-color-disabled-inner;
 						border-color: @input-border-color-disabled-inner;
+            color: @input-color-disabled-inner;
 						cursor: not-allowed;
 					}
 				}

package/lib/radio/style/index.css

@@ -407,7 +407,7 @@
 .kd-radio-button-checked:hover {
   color: var(--kd-c-radio-color-background, var(--kd-g-color-white, #fff));
 }
-.kd-radio-button-checked::before {
+.kd-radio-button-checked:not(.kd-radio-button-disabled)::before {
   background-color: var(--kd-c-radio-color-theme, var(--kd-g-color-theme, #5582f3));
 }
 .kd-radio-button-checked:first-child {

package/lib/radio/style/index.less

@@ -312,7 +312,7 @@
       color: @radio-color-background;
     }
 
-    &::before {
+    &:not(.@{radio-button-prefix-cls}-disabled)::before {
       background-color: @radio-color-theme;
     }
 

package/lib/select/select.js

@@ -476,7 +476,7 @@ var InternalSelect = function InternalSelect(props, ref) {
     var selectedVal = multipleRef.current.selectedVal; // 选择器下拉icon样式
 
     var arrowIconCls = (0, _classnames.default)((_classNames8 = {}, (0, _defineProperty2.default)(_classNames8, "".concat(selectPrefixCls, "-icon-arrow"), true), (0, _defineProperty2.default)(_classNames8, "".concat(selectPrefixCls, "-icon-arrow-up"), optionShow), (0, _defineProperty2.default)(_classNames8, "".concat(selectPrefixCls, "-icon-arrow-down"), !optionShow), (0, _defineProperty2.default)(_classNames8, "".concat(selectPrefixCls, "-icon-arrow-focus"), optionShow), _classNames8));
-    var iconShow = allowClear && (isMultiple ? mulOptions.length > 0 : selectedVal);
+    var iconShow = allowClear && !disabled && (isMultiple ? mulOptions.length > 0 : (selectedVal !== null && selectedVal !== void 0 ? selectedVal : '') !== '');
     var clearIconCls = (0, _classnames.default)((0, _defineProperty2.default)({}, "".concat(selectPrefixCls, "-icon-clear"), true));
     return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, iconShow && /*#__PURE__*/_react.default.createElement("span", {
       onClick: handleReset,

package/lib/select/style/index.css

@@ -428,7 +428,7 @@
 .kd-select-item-option-disabled {
   color: var(--kd-c-select-item-color-text-disabled, var(--kd-g-color-disabled, #b2b2b2));
   cursor: not-allowed;
-  background-color: var(--kd-c-select-item-color-background-disabled, var(--kd-g-color-background-contain-disabled, #f5f5f5));
+  background-color: var(--kd-c-select-item-color-background-disabled, #fff);
 }
 .kd-select-size-small {
   min-height: var(--kd-c-select-sizing-height-small, 24px);
@@ -472,7 +472,7 @@
 }
 .kd-select-single-disabled {
   background-color: var(--kd-c-select-color-background-disabled, #f5f5f5);
-  color: var(--kd-c-select-color-text-disabled, #212121);
+  color: var(--kd-c-select-color-text-disabled, var(--kd-g-color-disabled, #b2b2b2));
 }
 .kd-select-single-disabled:hover {
   cursor: not-allowed;
@@ -484,13 +484,13 @@
   opacity: 1;
 }
 .kd-select-single-text {
-  color: #666;
+  color: var(--kd-c-select-single-color-text, var(--kd-g-color-text-primary, #212121));
   overflow: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;
 }
 .kd-select-single-disabled-text {
-  color: var(--kd-c-select-color-text-disabled, #212121);
+  color: var(--kd-c-select-color-text-disabled, var(--kd-g-color-disabled, #b2b2b2));
 }
 .kd-select .kd-select-selection-item {
   display: -webkit-inline-box;
@@ -564,7 +564,7 @@
 .kd-select-multiple-disabled {
   cursor: not-allowed;
   background-color: var(--kd-c-select-color-background-disabled, #f5f5f5);
-  color: var(--kd-c-select-color-text-disabled, #212121);
+  color: var(--kd-c-select-color-text-disabled, var(--kd-g-color-disabled, #b2b2b2));
 }
 .kd-select-multiple-disabled .kd-select-suffix {
   color: var(--kd-c-select-arrow-icon-color-text-disabled, #b2b2b2);

package/lib/select/style/index.less

@@ -234,7 +234,7 @@
       opacity: 1;
     }
     &-text {
-      color: #666;
+      color: @select-single-color-text;
       .over();
     }
     &-disabled-text {

package/lib/select/style/token.less

@@ -5,7 +5,7 @@
 
 // color
 @select-dropdown-bg: var(~'@{select-custom-prefix}-dropdown-color-background', @color-background);
-@select-disabled-option-bg: var(~'@{select-custom-prefix}-item-color-background-disabled', @color-background-contain-disabled);
+@select-disabled-option-bg: var(~'@{select-custom-prefix}-item-color-background-disabled', #fff);
 @select-item-active-bg: var(~'@{select-custom-prefix}-color-background', #f5f5f5);
 @select-item-selected-bg: var(~'@{select-custom-prefix}-color-background-selected', @color-theme-3);
 @select-g-color-border: var(~'@{select-custom-prefix}-color-border', @color-input);
@@ -18,8 +18,9 @@
 @select-footer-g-text-color-selected: var(~'@{select-custom-prefix}-footer-color-text-selected', #0e5fd8);
 @select-g-item-text-color-disabled: var(~'@{select-custom-prefix}-item-color-text-disabled', @color-disabled);
 @select-color-background-disabled: var(~'@{select-custom-prefix}-color-background-disabled', #f5f5f5);
-@select-color-text-disabled: var(~'@{select-custom-prefix}-color-text-disabled', #212121);
+@select-color-text-disabled: var(~'@{select-custom-prefix}-color-text-disabled', @color-disabled);
 @select-arrow-icon-color-text-disabled: var(~'@{select-custom-prefix}-arrow-icon-color-text-disabled', #b2b2b2);
+@select-single-color-text: var(~'@{select-custom-prefix}-single-color-text', @color-text-primary);
 
 // font
 @select-list-font-size: var(~'@{select-custom-prefix}-dropdown-font-size', 12px); // 下拉列表文字大小