@douyinfe/semi-foundation 2.46.2 → 2.47.0

package/datePicker/inputFoundation.ts

@@ -189,12 +189,14 @@ export default class InputFoundation extends BaseFoundation<DateInputAdapter> {
 
     handleInsetInputChange(options: InsetInputChangeFoundationProps) {
         const { value, valuePath, insetInputValue } = options;
-        const { format, type } = this._adapter.getProps();
+        const { format, type, rangeSeparator } = this._adapter.getProps();
         const insetFormatToken = getInsetInputFormatToken({ type, format });
-        let newInsetInputValue = set(cloneDeep(insetInputValue), valuePath, value);
-        newInsetInputValue = this._autoFillTimeToInsetInputValue({ insetInputValue: newInsetInputValue, valuePath, format: insetFormatToken });
-        const newInputValue = this.concatInsetInputValue({ insetInputValue: newInsetInputValue });
-        this._adapter.notifyInsetInputChange({ insetInputValue: newInsetInputValue, format: insetFormatToken, insetInputStr: newInputValue });
+        const newInsetInputValue = set(cloneDeep(insetInputValue), valuePath, value);
+        const insetInputStr = this.concatInsetInputValue({ insetInputValue: newInsetInputValue });
+        const parsedInsetInputValueFromInputStr = getInsetInputValueFromInsetInputStr({ inputValue: insetInputStr, type, rangeSeparator });
+        const filledTimeInsetInputValue = this._autoFillTimeToInsetInputValue({ insetInputValue: parsedInsetInputValueFromInputStr, valuePath, format: insetFormatToken });
+        const finalInsetInputStr = this.concatInsetInputValue({ insetInputValue: filledTimeInsetInputValue });
+        this._adapter.notifyInsetInputChange({ insetInputValue: filledTimeInsetInputValue, format: insetFormatToken, insetInputStr: finalInsetInputStr });
     }
 
     _autoFillTimeToInsetInputValue(options: { insetInputValue: InsetInputValue; format: string; valuePath: string}) {

package/lib/cjs/cascader/foundation.d.ts

@@ -239,10 +239,7 @@ export default class CascaderFoundation extends BaseFoundation<CascaderAdapter,
      * @param {boolean} curCheckedStatus checked status of node
      */
     calcCheckedKeys(key: string, curCheckedStatus: boolean): {
-        checkedKeys: Set<string>; /**
-         * When changeOnSelect is turned on, or the target option is a leaf option,
-         * the option is considered to be selected, even if the option is disabled
-         */
+        checkedKeys: Set<string>;
         halfCheckedKeys: Set<string>;
     };
     handleInputChange(sugInput: string): void;

package/lib/cjs/datePicker/inputFoundation.js

@@ -113,25 +113,34 @@ class InputFoundation extends _foundation.default {
     } = options;
     const {
       format,
-      type
+      type,
+      rangeSeparator
     } = this._adapter.getProps();
     const insetFormatToken = (0, _getInsetInputFormatToken.default)({
       type,
       format
     });
-    let newInsetInputValue = (0, _set2.default)((0, _cloneDeep2.default)(insetInputValue), valuePath, value);
-    newInsetInputValue = this._autoFillTimeToInsetInputValue({
-      insetInputValue: newInsetInputValue,
+    const newInsetInputValue = (0, _set2.default)((0, _cloneDeep2.default)(insetInputValue), valuePath, value);
+    const insetInputStr = this.concatInsetInputValue({
+      insetInputValue: newInsetInputValue
+    });
+    const parsedInsetInputValueFromInputStr = (0, _getInsetInputValueFromInsetInputStr.default)({
+      inputValue: insetInputStr,
+      type,
+      rangeSeparator
+    });
+    const filledTimeInsetInputValue = this._autoFillTimeToInsetInputValue({
+      insetInputValue: parsedInsetInputValueFromInputStr,
       valuePath,
       format: insetFormatToken
     });
-    const newInputValue = this.concatInsetInputValue({
-      insetInputValue: newInsetInputValue
+    const finalInsetInputStr = this.concatInsetInputValue({
+      insetInputValue: filledTimeInsetInputValue
     });
     this._adapter.notifyInsetInputChange({
-      insetInputValue: newInsetInputValue,
+      insetInputValue: filledTimeInsetInputValue,
       format: insetFormatToken,
-      insetInputStr: newInputValue
+      insetInputStr: finalInsetInputStr
     });
   }
   _autoFillTimeToInsetInputValue(options) {

package/lib/cjs/table/foundation.js

@@ -392,9 +392,9 @@ class TableFoundation extends _foundation.default {
       }, pagination);
       if (!this._pagerIsControlled()) {
         const total = (0, _get2.default)(propPagination, 'total', dataSource.length);
-        const pageSize = (0, _get2.default)(propPagination, 'pageSize', pagination.pageSize);
         const {
-          currentPage
+          currentPage,
+          pageSize
         } = pagination;
         const realTotalPage = Math.ceil(total / pageSize);
         pagination.total = total;

package/lib/cjs/tree/foundation.d.ts

@@ -3,6 +3,7 @@
  * https://github.com/react-component/tree
  */
 import BaseFoundation, { DefaultAdapter } from '../base/foundation';
+export { KeyMapProps } from './treeUtil';
 export interface BasicTreeNodeProps {
     [x: string]: any;
     expanded?: boolean;
@@ -24,7 +25,7 @@ export interface BasicTreeNodeProps {
 }
 export interface BasicTreeNodeData {
     [x: string]: any;
-    key: string;
+    key?: string;
     value?: number | string;
     label?: any;
     icon?: any;

package/lib/cjs/tree/foundation.js

@@ -129,7 +129,8 @@ class TreeFoundation extends _foundation.default {
     } = this.getStates();
     const {
       leafOnly,
-      checkRelation
+      checkRelation,
+      keyMaps
     } = this.getProps();
     let value;
     let keyList = [];
@@ -141,12 +142,15 @@ class TreeFoundation extends _foundation.default {
     if (this.getProp('onChangeWithObject')) {
       value = keyList.map(itemKey => keyEntities[itemKey].data);
     } else {
-      value = (0, _treeUtil.getValueOrKey)(keyList.map(itemKey => keyEntities[itemKey].data));
+      value = (0, _treeUtil.getValueOrKey)(keyList.map(itemKey => keyEntities[itemKey].data), keyMaps);
     }
     this._adapter.notifyChange(value);
   }
   notifyChange(key, e) {
     const isMultiple = this._isMultiple();
+    const {
+      keyMaps
+    } = this.getProps();
     const {
       keyEntities
     } = this.getStates();
@@ -162,7 +166,7 @@ class TreeFoundation extends _foundation.default {
         const {
           data
         } = (0, _get2.default)(keyEntities, key);
-        value = (0, _treeUtil.getValueOrKey)(data);
+        value = (0, _treeUtil.getValueOrKey)(data, keyMaps);
       }
       this._adapter.notifyChange(value);
     }
@@ -179,8 +183,10 @@ class TreeFoundation extends _foundation.default {
     const {
       showFilteredOnly,
       filterTreeNode,
-      treeNodeFilterProp
+      treeNodeFilterProp,
+      keyMaps
     } = this.getProps();
+    const realFilterProp = treeNodeFilterProp !== 'label' ? treeNodeFilterProp : (0, _get2.default)(keyMaps, 'label', 'label');
     let filteredOptsKeys = [];
     let expandedOptsKeys = [];
     let flattenNodes = [];
@@ -188,13 +194,13 @@ class TreeFoundation extends _foundation.default {
     if (!sugInput) {
       expandedOptsKeys = (0, _treeUtil.findAncestorKeys)(selectedKeys, keyEntities);
       expandedOptsKeys.forEach(item => expandedKeys.add(item));
-      flattenNodes = (0, _treeUtil.flattenTreeData)(treeData, expandedKeys);
+      flattenNodes = (0, _treeUtil.flattenTreeData)(treeData, expandedKeys, keyMaps);
     } else {
-      filteredOptsKeys = Object.values(keyEntities).filter(item => (0, _treeUtil.filter)(sugInput, item.data, filterTreeNode, treeNodeFilterProp)).map(item => item.key);
+      filteredOptsKeys = Object.values(keyEntities).filter(item => (0, _treeUtil.filter)(sugInput, item.data, filterTreeNode, realFilterProp)).map(item => item.key);
       expandedOptsKeys = (0, _treeUtil.findAncestorKeys)(filteredOptsKeys, keyEntities, false);
       const shownChildKeys = (0, _treeUtil.findDescendantKeys)(filteredOptsKeys, keyEntities, true);
       filteredShownKeys = new Set([...shownChildKeys, ...expandedOptsKeys]);
-      flattenNodes = (0, _treeUtil.flattenTreeData)(treeData, new Set(expandedOptsKeys), showFilteredOnly && filteredShownKeys);
+      flattenNodes = (0, _treeUtil.flattenTreeData)(treeData, new Set(expandedOptsKeys), keyMaps, showFilteredOnly && filteredShownKeys);
     }
     const newFilteredExpandedKeys = new Set(expandedOptsKeys);
     this._adapter.notifySearch(sugInput, Array.from(newFilteredExpandedKeys));
@@ -362,6 +368,9 @@ class TreeFoundation extends _foundation.default {
       filteredShownKeys,
       keyEntities
     } = this.getStates();
+    const {
+      keyMaps
+    } = this.getProps();
     const isSearching = Boolean(inputValue);
     const showFilteredOnly = this._showFilteredOnly();
     const expandedStateKey = isSearching ? 'filteredExpandedKeys' : 'expandedKeys';
@@ -380,7 +389,7 @@ class TreeFoundation extends _foundation.default {
     }
     this._adapter.cacheFlattenNodes(motionType === 'hide' && this._isAnimated());
     if (!this._isExpandControlled()) {
-      const flattenNodes = (0, _treeUtil.flattenTreeData)(treeData, expandedKeys, isSearching && showFilteredOnly && filteredShownKeys);
+      const flattenNodes = (0, _treeUtil.flattenTreeData)(treeData, expandedKeys, keyMaps, isSearching && showFilteredOnly && filteredShownKeys);
       const motionKeys = this._isAnimated() ? (0, _treeUtil.getMotionKeys)(eventKey, expandedKeys, keyEntities) : [];
       const newState = {
         [expandedStateKey]: expandedKeys,

package/lib/cjs/tree/treeUtil.d.ts

@@ -14,6 +14,15 @@ export interface NodeData {
     value: any;
     children?: any;
 }
+export interface KeyMapProps {
+    key?: string;
+    label?: string;
+    value?: string;
+    disabled?: string;
+    children?: string;
+    isLeaf?: string;
+    icon?: string;
+}
 /**
  * Flat nest tree data into flatten list. This is used for virtual list render.
  * @param treeNodeList Origin data node list
@@ -21,13 +30,13 @@ export interface NodeData {
  * @param filteredShownKeys
  * need expanded keys, provides `true` means all expanded
  */
-export declare function flattenTreeData(treeNodeList: any[], expandedKeys: Set<string>, filteredShownKeys?: boolean | Set<any>): any[];
+export declare function flattenTreeData(treeNodeList: any[], expandedKeys: Set<string>, keyMaps: KeyMapProps, filteredShownKeys?: boolean | Set<any>): any[];
 export declare function convertJsonToData(treeJson: TreeDataSimpleJson): any[];
 /**
  * Traverse all the data by `treeData`.
  */
-export declare function traverseDataNodes(treeNodes: any[], callback: (data: any) => void): void;
-export declare function convertDataToEntities(dataNodes: any[]): {
+export declare function traverseDataNodes(treeNodes: any[], callback: (data: any) => void, keyMaps: KeyMapProps): void;
+export declare function convertDataToEntities(dataNodes: any[], keyMaps?: KeyMapProps): {
     posEntities: {};
     keyEntities: {};
     valueEntities: {};
@@ -71,10 +80,10 @@ export declare function filterTreeData(info: any): {
     filteredExpandedKeys: Set<any>;
     filteredShownKeys: Set<any>;
 };
-export declare function getValueOrKey(data: any): any;
-export declare function normalizeValue(value: any, withObject: boolean): any;
+export declare function getValueOrKey(data: any, keyMaps?: KeyMapProps): any;
+export declare function normalizeValue(value: any, withObject: boolean, keyMaps?: KeyMapProps): any;
 export declare function updateKeys(keySet: Set<string> | string[], keyEntities: KeyEntities): string[];
-export declare function calcDisabledKeys(keyEntities: KeyEntities): Set<string>;
+export declare function calcDisabledKeys(keyEntities: KeyEntities, keyMaps?: KeyMapProps): Set<string>;
 export declare function calcDropRelativePosition(event: any, treeNode: any): 1 | -1 | 0;
 export declare function getDragNodesKeys(key: string, keyEntities: KeyEntities): string[];
 export declare function calcDropActualPosition(pos: string, relativeDropPos: any): any;

package/lib/cjs/tree/treeUtil.js

@@ -31,6 +31,7 @@ exports.normalizeValue = normalizeValue;
 exports.normalizedArr = normalizedArr;
 exports.traverseDataNodes = traverseDataNodes;
 exports.updateKeys = updateKeys;
+var _omit2 = _interopRequireDefault(require("lodash/omit"));
 var _get2 = _interopRequireDefault(require("lodash/get"));
 var _pick2 = _interopRequireDefault(require("lodash/pick"));
 var _isEmpty2 = _interopRequireDefault(require("lodash/isEmpty"));
@@ -60,17 +61,27 @@ function isValid(val) {
  * @param filteredShownKeys
  * need expanded keys, provides `true` means all expanded
  */
-function flattenTreeData(treeNodeList, expandedKeys) {
-  let filteredShownKeys = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
+function flattenTreeData(treeNodeList, expandedKeys, keyMaps) {
+  let filteredShownKeys = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
   const flattenList = [];
   const filterSearch = Boolean(filteredShownKeys);
+  const realKeyName = (0, _get2.default)(keyMaps, 'key', 'key');
+  const realChildrenName = (0, _get2.default)(keyMaps, 'children', 'children');
   function flatten(list) {
     let parent = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
     return list.map((treeNode, index) => {
       const pos = getPosition(parent ? parent.pos : '0', index);
-      const mergedKey = treeNode.key;
+      const mergedKey = treeNode[realKeyName];
+      const otherData = {};
+      if (keyMaps) {
+        Object.entries((0, _omit2.default)(keyMaps, 'children')).forEach(_ref => {
+          let [key, value] = _ref;
+          const result = treeNode[value];
+          !(0, _isUndefined2.default)(result) && (otherData[key] = result);
+        });
+      }
       // Add FlattenDataNode into list
-      const flattenNode = Object.assign(Object.assign({}, (0, _pick2.default)(treeNode, ['key', 'label', 'value', 'icon', 'disabled', 'isLeaf'])), {
+      const flattenNode = Object.assign(Object.assign(Object.assign({}, (0, _pick2.default)(treeNode, ['key', 'label', 'value', 'icon', 'disabled', 'isLeaf'])), otherData), {
         parent,
         pos,
         children: null,
@@ -83,7 +94,7 @@ function flattenTreeData(treeNodeList, expandedKeys) {
       }
       // Loop treeNode children
       if (expandedKeys.has(mergedKey) && (!filterSearch || !isBooleanFilteredShownKeys && filteredShownKeys.has(mergedKey))) {
-        flattenNode.children = flatten(treeNode.children || [], flattenNode);
+        flattenNode.children = flatten(treeNode[realChildrenName] || [], flattenNode);
       } else {
         flattenNode.children = [];
       }
@@ -118,17 +129,20 @@ function convertJsonToData(treeJson) {
 /**
  * Traverse all the data by `treeData`.
  */
-function traverseDataNodes(treeNodes, callback) {
+function traverseDataNodes(treeNodes, callback, keyMaps) {
+  const realKeyName = (0, _get2.default)(keyMaps, 'key', 'key');
+  const realChildrenName = (0, _get2.default)(keyMaps, 'children', 'children');
   const processNode = (node, ind, parent) => {
-    const children = node ? node.children : treeNodes;
+    const children = node ? node[realChildrenName] : treeNodes;
     const pos = node ? getPosition(parent.pos, ind) : '0';
     // Process node if is not root
     if (node) {
+      const nodeKey = (0, _get2.default)(node, realKeyName, null);
       const data = {
         data: Object.assign({}, node),
         ind,
         pos,
-        key: node.key !== null ? node.key : pos,
+        key: nodeKey !== null ? nodeKey : pos,
         parentPos: parent.node ? parent.pos : null,
         level: Number(parent.level) + 1
       };
@@ -148,7 +162,7 @@ function traverseDataNodes(treeNodes, callback) {
   processNode(null);
 }
 /* Convert data to entities map */
-function convertDataToEntities(dataNodes) {
+function convertDataToEntities(dataNodes, keyMaps) {
   const posEntities = {};
   const keyEntities = {};
   const valueEntities = {};
@@ -157,6 +171,7 @@ function convertDataToEntities(dataNodes) {
     keyEntities,
     valueEntities
   };
+  const realValueName = (0, _get2.default)(keyMaps, 'value', 'value');
   traverseDataNodes(dataNodes, data => {
     const {
       pos,
@@ -164,7 +179,7 @@ function convertDataToEntities(dataNodes) {
       parentPos
     } = data;
     const entity = Object.assign({}, data);
-    const value = (0, _get2.default)(entity, 'data.value', null);
+    const value = (0, _get2.default)(entity, `data.${realValueName}`, null);
     if (value !== null) {
       valueEntities[value] = key;
     }
@@ -176,7 +191,7 @@ function convertDataToEntities(dataNodes) {
       entity.parent.children = entity.parent.children || [];
       entity.parent.children.push(entity);
     }
-  });
+  }, keyMaps);
   return wrapper;
 }
 /* Get key by value */
@@ -574,7 +589,8 @@ function filterTreeData(info) {
     treeData,
     filterTreeNode,
     filterProps,
-    prevExpandedKeys
+    prevExpandedKeys,
+    keyMaps
   } = info;
   let filteredOptsKeys = [];
   filteredOptsKeys = Object.values(keyEntities).filter(item => filter(inputValue, item.data, filterTreeNode, filterProps)).map(item => item.key);
@@ -585,7 +601,7 @@ function filterTreeData(info) {
   }
   const shownChildKeys = findDescendantKeys(filteredOptsKeys, keyEntities, true);
   const filteredShownKeys = new Set([...shownChildKeys, ...expandedOptsKeys]);
-  const flattenNodes = flattenTreeData(treeData, new Set(expandedOptsKeys), showFilteredOnly && filteredShownKeys);
+  const flattenNodes = flattenTreeData(treeData, new Set(expandedOptsKeys), keyMaps, showFilteredOnly && filteredShownKeys);
   return {
     flattenNodes,
     filteredKeys: new Set(filteredOptsKeys),
@@ -594,16 +610,18 @@ function filterTreeData(info) {
   };
 }
 // return data.value if data.value exist else fall back to key
-function getValueOrKey(data) {
+function getValueOrKey(data, keyMaps) {
+  const valueName = (0, _get2.default)(keyMaps, 'value', 'value');
+  const keyName = (0, _get2.default)(keyMaps, 'key', 'key');
   if (Array.isArray(data)) {
-    return data.map(item => (0, _get2.default)(item, 'value', item.key));
+    return data.map(item => (0, _get2.default)(item, valueName, item[keyName]));
   }
-  return (0, _get2.default)(data, 'value', data.key);
+  return (0, _get2.default)(data, valueName, data[keyName]);
 }
 /* Convert value to string */
-function normalizeValue(value, withObject) {
+function normalizeValue(value, withObject, keyMaps) {
   if (withObject && isValid(value)) {
-    return getValueOrKey(value);
+    return getValueOrKey(value, keyMaps);
   } else {
     return value;
   }
@@ -612,8 +630,9 @@ function updateKeys(keySet, keyEntities) {
   const keyArr = [...keySet];
   return keyArr.filter(key => key in keyEntities);
 }
-function calcDisabledKeys(keyEntities) {
-  const disabledKeys = Object.keys(keyEntities).filter(key => keyEntities[key].data.disabled);
+function calcDisabledKeys(keyEntities, keyMaps) {
+  const disabledName = (0, _get2.default)(keyMaps, 'disabled', 'disabled');
+  const disabledKeys = Object.keys(keyEntities).filter(key => keyEntities[key].data[disabledName]);
   const {
     checkedKeys
   } = calcCheckedKeys(disabledKeys, keyEntities);

package/lib/cjs/treeSelect/foundation.d.ts

@@ -122,7 +122,6 @@ export default class TreeSelectFoundation<P = Record<string, any>, S = Record<st
     findDataForValue(findValue: string): any;
     constructDataForValue(value: string): {
         [x: number]: string;
-        key: string;
     };
     getDataForKeyNotInKeyEntities(value: string): any;
     getCopyFromState(items: string | string[]): BasicTreeInnerData;

package/lib/cjs/treeSelect/foundation.js

@@ -96,8 +96,11 @@ class TreeSelectFoundation extends _foundation.default {
   findDataForValue(findValue) {
     const {
       value,
-      defaultValue
+      defaultValue,
+      keyMaps
     } = this.getProps();
+    const realValueName = (0, _get2.default)(keyMaps, 'value', 'value');
+    const realKeyName = (0, _get2.default)(keyMaps, 'key', 'key');
     let valueArr = [];
     if (value) {
       valueArr = Array.isArray(value) ? value : [value];
@@ -105,16 +108,19 @@ class TreeSelectFoundation extends _foundation.default {
       valueArr = Array.isArray(defaultValue) ? defaultValue : [defaultValue];
     }
     return valueArr.find(item => {
-      return item.value === findValue || item.key === findValue;
+      return item[realValueName] === findValue || item[realKeyName] === findValue;
     });
   }
   constructDataForValue(value) {
     const {
-      treeNodeLabelProp
+      treeNodeLabelProp,
+      keyMaps
     } = this.getProps();
+    const keyName = (0, _get2.default)(keyMaps, 'key', 'key');
+    const labelName = (0, _get2.default)(keyMaps, 'label', treeNodeLabelProp);
     return {
-      key: value,
-      [treeNodeLabelProp]: value
+      [keyName]: value,
+      [labelName]: value
     };
   }
   getDataForKeyNotInKeyEntities(value) {
@@ -231,7 +237,8 @@ class TreeSelectFoundation extends _foundation.default {
     } = this.getStates();
     const {
       leafOnly,
-      checkRelation
+      checkRelation,
+      keyMaps
     } = this.getProps();
     let keyList = [];
     if (checkRelation === 'related') {
@@ -239,11 +246,11 @@ class TreeSelectFoundation extends _foundation.default {
     } else if (checkRelation === 'unRelated') {
       keyList = key;
     }
-    const nodes = keyList.map(key => keyEntities[key] && keyEntities[key].data.key === key ? keyEntities[key].data : this.getDataForKeyNotInKeyEntities(key));
+    const nodes = keyList.map(key => keyEntities[key] && keyEntities[key].key === key ? keyEntities[key].data : this.getDataForKeyNotInKeyEntities(key));
     if (this.getProp('onChangeWithObject')) {
       this._adapter.notifyChangeWithObject(nodes, e);
     } else {
-      const value = (0, _treeUtil.getValueOrKey)(nodes);
+      const value = (0, _treeUtil.getValueOrKey)(nodes, keyMaps);
       this._adapter.notifyChange(value, nodes, e);
     }
   }
@@ -251,11 +258,14 @@ class TreeSelectFoundation extends _foundation.default {
     const {
       keyEntities
     } = this.getStates();
+    const {
+      keyMaps
+    } = this.getProps();
     if (this._isMultiple() && Array.isArray(key)) {
       this._notifyMultipleChange(key, e);
     } else {
       const nodes = (0, _isUndefined2.default)(key) ? key : keyEntities[key].data;
-      const value = (0, _isUndefined2.default)(key) ? key : (0, _treeUtil.getValueOrKey)(nodes);
+      const value = (0, _isUndefined2.default)(key) ? key : (0, _treeUtil.getValueOrKey)(nodes, keyMaps);
       if (this.getProp('onChangeWithObject')) {
         this._adapter.notifyChangeWithObject(nodes, e);
       } else {
@@ -382,15 +392,17 @@ class TreeSelectFoundation extends _foundation.default {
   removeTag(eventKey) {
     const {
       disableStrictly,
-      checkRelation
+      checkRelation,
+      keyMaps
     } = this.getProps();
     const {
       keyEntities,
       disabledKeys,
       realCheckedKeys
     } = this.getStates();
-    const item = keyEntities[eventKey] && keyEntities[eventKey].data.key === eventKey ? keyEntities[eventKey].data : this.getDataForKeyNotInKeyEntities(eventKey);
-    if (item.disabled || disableStrictly && disabledKeys.has(eventKey)) {
+    const item = keyEntities[eventKey] && keyEntities[eventKey].key === eventKey ? keyEntities[eventKey].data : this.getDataForKeyNotInKeyEntities(eventKey);
+    const disabledName = (0, _get2.default)(keyMaps, 'disabled', 'disabled');
+    if (item[disabledName] || disableStrictly && disabledKeys.has(eventKey)) {
       return;
     }
     if (checkRelation === 'unRelated') {
@@ -429,11 +441,14 @@ class TreeSelectFoundation extends _foundation.default {
       keyEntities,
       treeData
     } = this.getStates();
+    const {
+      keyMaps
+    } = this.getProps();
     const newExpandedKeys = new Set(expandedKeys);
     const isExpandControlled = this._isExpandControlled();
     const expandedOptsKeys = (0, _treeUtil.findAncestorKeys)(selectedKeys, keyEntities);
     expandedOptsKeys.forEach(item => newExpandedKeys.add(item));
-    const newFlattenNodes = (0, _treeUtil.flattenTreeData)(treeData, newExpandedKeys);
+    const newFlattenNodes = (0, _treeUtil.flattenTreeData)(treeData, newExpandedKeys, keyMaps);
     this._adapter.updateState({
       expandedKeys: isExpandControlled ? expandedKeys : newExpandedKeys,
       flattenNodes: isExpandControlled ? flattenNodes : newFlattenNodes,
@@ -457,8 +472,10 @@ class TreeSelectFoundation extends _foundation.default {
     const {
       showFilteredOnly,
       filterTreeNode,
-      treeNodeFilterProp
+      treeNodeFilterProp,
+      keyMaps
     } = this.getProps();
+    const realFilterProp = treeNodeFilterProp !== 'label' ? treeNodeFilterProp : (0, _get2.default)(keyMaps, 'label', 'label');
     const newExpandedKeys = new Set(expandedKeys);
     let filteredOptsKeys = [];
     let expandedOptsKeys = [];
@@ -467,18 +484,18 @@ class TreeSelectFoundation extends _foundation.default {
     if (!sugInput) {
       expandedOptsKeys = (0, _treeUtil.findAncestorKeys)(selectedKeys, keyEntities);
       expandedOptsKeys.forEach(item => newExpandedKeys.add(item));
-      newFlattenNodes = (0, _treeUtil.flattenTreeData)(treeData, newExpandedKeys);
+      newFlattenNodes = (0, _treeUtil.flattenTreeData)(treeData, newExpandedKeys, keyMaps);
     } else {
       filteredOptsKeys = Object.values(keyEntities).filter(item => {
         const {
           data
         } = item;
-        return (0, _treeUtil.filter)(sugInput, data, filterTreeNode, treeNodeFilterProp);
+        return (0, _treeUtil.filter)(sugInput, data, filterTreeNode, realFilterProp);
       }).map(item => item.key);
       expandedOptsKeys = (0, _treeUtil.findAncestorKeys)(filteredOptsKeys, keyEntities, false);
       const shownChildKeys = (0, _treeUtil.findDescendantKeys)(filteredOptsKeys, keyEntities, true);
       filteredShownKeys = new Set([...shownChildKeys, ...expandedOptsKeys]);
-      newFlattenNodes = (0, _treeUtil.flattenTreeData)(treeData, new Set(expandedOptsKeys), showFilteredOnly && filteredShownKeys);
+      newFlattenNodes = (0, _treeUtil.flattenTreeData)(treeData, new Set(expandedOptsKeys), keyMaps, showFilteredOnly && filteredShownKeys);
     }
     const newFilteredExpandedKeys = new Set(expandedOptsKeys);
     this._adapter.notifySearch(sugInput, Array.from(newFilteredExpandedKeys));
@@ -612,7 +629,7 @@ class TreeSelectFoundation extends _foundation.default {
       return this.calcCheckedKeys(eventKey, targetStatus);
     }
     const nonDisabled = descendantKeys.filter(key => !disabledKeys.has(key));
-    const newCheckedKeys = targetStatus ? [...nonDisabled, ...checkedKeys] : (0, _difference2.default)((0, _treeUtil.normalizeKeyList)([...checkedKeys], keyEntities, true), nonDisabled);
+    const newCheckedKeys = targetStatus ? [...nonDisabled, ...checkedKeys] : (0, _difference2.default)((0, _treeUtil.normalizeKeyList)([...checkedKeys], keyEntities, true, true), nonDisabled);
     return (0, _treeUtil.calcCheckedKeys)(newCheckedKeys, keyEntities);
   }
   calcCheckedStatus(targetStatus, eventKey) {
@@ -637,7 +654,8 @@ class TreeSelectFoundation extends _foundation.default {
     const {
       treeData,
       filteredShownKeys,
-      keyEntities
+      keyEntities,
+      keyMaps
     } = this.getStates();
     const showFilteredOnly = this._showFilteredOnly();
     // clone otherwise will be modified unexpectedly
@@ -661,7 +679,7 @@ class TreeSelectFoundation extends _foundation.default {
     this._adapter.cacheFlattenNodes(motionType === 'hide' && this._isAnimated());
     if (!this._isExpandControlled()) {
       // debugger;
-      const flattenNodes = (0, _treeUtil.flattenTreeData)(treeData, filteredExpandedKeys, showFilteredOnly && filteredShownKeys);
+      const flattenNodes = (0, _treeUtil.flattenTreeData)(treeData, filteredExpandedKeys, keyMaps, showFilteredOnly && filteredShownKeys);
       const motionKeys = this._isAnimated() ? (0, _treeUtil.getMotionKeys)(eventKey, filteredExpandedKeys, keyEntities) : [];
       const newState = {
         filteredExpandedKeys,
@@ -679,7 +697,8 @@ class TreeSelectFoundation extends _foundation.default {
   handleNodeExpand(e, treeNode) {
     // debugger;
     const {
-      loadData
+      loadData,
+      keyMaps
     } = this.getProps();
     const {
       inputValue,
@@ -716,7 +735,7 @@ class TreeSelectFoundation extends _foundation.default {
     this._adapter.cacheFlattenNodes(motionType === 'hide' && this._isAnimated());
     if (!isExpandControlled) {
       // debugger;
-      const flattenNodes = (0, _treeUtil.flattenTreeData)(treeData, expandedKeys);
+      const flattenNodes = (0, _treeUtil.flattenTreeData)(treeData, expandedKeys, keyMaps);
       const motionKeys = this._isAnimated() ? (0, _treeUtil.getMotionKeys)(eventKey, expandedKeys, keyEntities) : [];
       const newState = {
         expandedKeys,
@@ -737,19 +756,21 @@ class TreeSelectFoundation extends _foundation.default {
   getRenderTextInSingle() {
     const {
       renderSelectedItem: propRenderSelectedItem,
-      treeNodeLabelProp
+      treeNodeLabelProp,
+      keyMaps
     } = this.getProps();
     const {
       selectedKeys,
       keyEntities
     } = this.getStates();
-    const renderSelectedItem = (0, _isFunction2.default)(propRenderSelectedItem) ? propRenderSelectedItem : item => (0, _get2.default)(item, treeNodeLabelProp, null);
+    const realLabelName = (0, _get2.default)(keyMaps, 'label', treeNodeLabelProp);
+    const renderSelectedItem = (0, _isFunction2.default)(propRenderSelectedItem) ? propRenderSelectedItem : item => (0, _get2.default)(item, realLabelName, null);
     let item;
     if (selectedKeys.length) {
       const key = selectedKeys[0];
-      item = keyEntities[key] && keyEntities[key].data.key === key ? keyEntities[key].data : this.getDataForKeyNotInKeyEntities(key);
+      item = keyEntities[key] && keyEntities[key].key === key ? keyEntities[key].data : this.getDataForKeyNotInKeyEntities(key);
     }
-    const renderText = item && treeNodeLabelProp in item ? renderSelectedItem(item) : null;
+    const renderText = item ? renderSelectedItem(item) : null;
     return renderText;
   }
   /**

package/lib/es/cascader/foundation.d.ts

@@ -239,10 +239,7 @@ export default class CascaderFoundation extends BaseFoundation<CascaderAdapter,
      * @param {boolean} curCheckedStatus checked status of node
      */
     calcCheckedKeys(key: string, curCheckedStatus: boolean): {
-        checkedKeys: Set<string>; /**
-         * When changeOnSelect is turned on, or the target option is a leaf option,
-         * the option is considered to be selected, even if the option is disabled
-         */
+        checkedKeys: Set<string>;
         halfCheckedKeys: Set<string>;
     };
     handleInputChange(sugInput: string): void;