@douyinfe/semi-ui 2.46.1 → 2.47.0-beta.0

package/dist/umd/semi-ui.js

@@ -28427,7 +28427,8 @@ class Button_Button extends external_root_React_commonjs2_react_commonjs_react_a
         [`${prefixCls}-light`]: theme === 'light',
         [`${prefixCls}-block`]: block,
         [`${prefixCls}-circle`]: circle,
-        [`${prefixCls}-borderless`]: theme === 'borderless'
+        [`${prefixCls}-borderless`]: theme === 'borderless',
+        [`${prefixCls}-${type}-disabled`]: disabled && type
       }, className),
       type: htmlType,
       'aria-disabled': disabled
@@ -36270,6 +36271,7 @@ var uniq_default = /*#__PURE__*/__webpack_require__.n(uniq);
 
 
 
+
 /**
  * Part of the utils function implementation process reference
  * https://github.com/react-component/tree/blob/master/src/util.tsx
@@ -36288,17 +36290,27 @@ function treeUtil_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 = get_default()(keyMaps, 'key', 'key');
+  const realChildrenName = get_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(omit_default()(keyMaps, 'children')).forEach(_ref => {
+          let [key, value] = _ref;
+          const result = treeNode[value];
+          !isUndefined_default()(result) && (otherData[key] = result);
+        });
+      }
       // Add FlattenDataNode into list
-      const flattenNode = Object.assign(Object.assign({}, pick_default()(treeNode, ['key', 'label', 'value', 'icon', 'disabled', 'isLeaf'])), {
+      const flattenNode = Object.assign(Object.assign(Object.assign({}, pick_default()(treeNode, ['key', 'label', 'value', 'icon', 'disabled', 'isLeaf'])), otherData), {
         parent,
         pos,
         children: null,
@@ -36311,7 +36323,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 = [];
       }
@@ -36346,17 +36358,20 @@ function convertJsonToData(treeJson) {
 /**
  * Traverse all the data by `treeData`.
  */
-function traverseDataNodes(treeNodes, callback) {
+function traverseDataNodes(treeNodes, callback, keyMaps) {
+  const realKeyName = get_default()(keyMaps, 'key', 'key');
+  const realChildrenName = get_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 = get_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
       };
@@ -36376,7 +36391,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 = {};
@@ -36385,6 +36400,7 @@ function convertDataToEntities(dataNodes) {
     keyEntities,
     valueEntities
   };
+  const realValueName = get_default()(keyMaps, 'value', 'value');
   traverseDataNodes(dataNodes, data => {
     const {
       pos,
@@ -36392,7 +36408,7 @@ function convertDataToEntities(dataNodes) {
       parentPos
     } = data;
     const entity = Object.assign({}, data);
-    const value = get_default()(entity, 'data.value', null);
+    const value = get_default()(entity, `data.${realValueName}`, null);
     if (value !== null) {
       valueEntities[value] = key;
     }
@@ -36404,7 +36420,7 @@ function convertDataToEntities(dataNodes) {
       entity.parent.children = entity.parent.children || [];
       entity.parent.children.push(entity);
     }
-  });
+  }, keyMaps);
   return wrapper;
 }
 /* Get key by value */
@@ -36802,7 +36818,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);
@@ -36813,7 +36830,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),
@@ -36822,16 +36839,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 = get_default()(keyMaps, 'value', 'value');
+  const keyName = get_default()(keyMaps, 'key', 'key');
   if (Array.isArray(data)) {
-    return data.map(item => get_default()(item, 'value', item.key));
+    return data.map(item => get_default()(item, valueName, item[keyName]));
   }
-  return get_default()(data, 'value', data.key);
+  return get_default()(data, valueName, data[keyName]);
 }
 /* Convert value to string */
-function normalizeValue(value, withObject) {
+function normalizeValue(value, withObject, keyMaps) {
   if (withObject && treeUtil_isValid(value)) {
-    return getValueOrKey(value);
+    return getValueOrKey(value, keyMaps);
   } else {
     return value;
   }
@@ -36840,8 +36859,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 = get_default()(keyMaps, 'disabled', 'disabled');
+  const disabledKeys = Object.keys(keyEntities).filter(key => keyEntities[key].data[disabledName]);
   const {
     checkedKeys
   } = calcCheckedKeys(disabledKeys, keyEntities);
@@ -48861,6 +48881,7 @@ class CollapsePanel extends external_root_React_commonjs2_react_commonjs_react_a
       isOpen: active,
       keepDOM: keepDOM,
       motion: motion,
+      onMotionEnd: this.props.onMotionEnd,
       reCalcKey: reCalcKey
     }, /*#__PURE__*/external_root_React_commonjs2_react_commonjs_react_amd_react_default().createElement("div", {
       className: contentCls,
@@ -54551,25 +54572,34 @@ class inputFoundation_InputFoundation extends foundation {
     } = options;
     const {
       format,
-      type
+      type,
+      rangeSeparator
     } = this._adapter.getProps();
     const insetFormatToken = getInsetInputFormatToken({
       type,
       format
     });
-    let newInsetInputValue = set_default()(cloneDeep_default()(insetInputValue), valuePath, value);
-    newInsetInputValue = this._autoFillTimeToInsetInputValue({
-      insetInputValue: newInsetInputValue,
+    const newInsetInputValue = set_default()(cloneDeep_default()(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 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) {
@@ -72504,7 +72534,8 @@ class Popconfirm extends BaseComponent {
         style,
         cancelType,
         icon,
-        prefixCls
+        prefixCls,
+        showCloseIcon
       } = this.props;
       const {
         direction
@@ -72538,14 +72569,14 @@ class Popconfirm extends BaseComponent {
         }, showTitle ? /*#__PURE__*/external_root_React_commonjs2_react_commonjs_react_amd_react_default().createElement("div", {
           className: `${prefixCls}-header-title`,
           "x-semi-prop": "title"
-        }, title) : null), /*#__PURE__*/external_root_React_commonjs2_react_commonjs_react_amd_react_default().createElement(button_0, {
+        }, title) : null), showCloseIcon ? /*#__PURE__*/external_root_React_commonjs2_react_commonjs_react_amd_react_default().createElement(button_0, {
           className: `${prefixCls}-btn-close`,
           icon: /*#__PURE__*/external_root_React_commonjs2_react_commonjs_react_amd_react_default().createElement(IconClose, null),
           size: "small",
           theme: 'borderless',
           type: cancelType,
           onClick: this.handleCancel
-        })), showContent ? /*#__PURE__*/external_root_React_commonjs2_react_commonjs_react_amd_react_default().createElement("div", {
+        }) : null), showContent ? /*#__PURE__*/external_root_React_commonjs2_react_commonjs_react_amd_react_default().createElement("div", {
           className: bodyCls,
           "x-semi-prop": "content"
         }, isFunction_default()(content) ? content({
@@ -72709,6 +72740,7 @@ Popconfirm.propTypes = {
   okButtonProps: (prop_types_default()).object,
   cancelButtonProps: (prop_types_default()).object,
   stopPropagation: prop_types_default().oneOfType([(prop_types_default()).bool, (prop_types_default()).string]),
+  showCloseIcon: (prop_types_default()).bool,
   zIndex: (prop_types_default()).number,
   // private
   trigger: (prop_types_default()).string,
@@ -72727,6 +72759,7 @@ Popconfirm.defaultProps = {
   cancelType: 'tertiary',
   prefixCls: popconfirm_constants_cssClasses.PREFIX,
   zIndex: popconfirm_constants_numbers.DEFAULT_Z_INDEX,
+  showCloseIcon: true,
   onCancel: (noop_default()),
   onConfirm: (noop_default()),
   onClickOutSide: (noop_default())
@@ -78459,12 +78492,12 @@ function withOrderSort(fn) {
   switch (order) {
     case 'descend':
       return (a, b) => {
-        const result = Number(fn(a, b));
+        const result = Number(fn(a, b, order));
         return result !== 0 ? -result : result;
       };
     case 'ascend':
     default:
-      return fn;
+      return (a, b) => fn(a, b, order);
   }
 }
 ;// CONCATENATED MODULE: ../semi-foundation/table/foundation.ts
@@ -87324,6 +87357,7 @@ class ToastFactory {
  */
 
 
+
 class TreeFoundation extends foundation {
   constructor(adapter) {
     super(Object.assign({}, adapter));
@@ -87436,7 +87470,8 @@ class TreeFoundation extends foundation {
     } = this.getStates();
     const {
       leafOnly,
-      checkRelation
+      checkRelation,
+      keyMaps
     } = this.getProps();
     let value;
     let keyList = [];
@@ -87448,12 +87483,15 @@ class TreeFoundation extends foundation {
     if (this.getProp('onChangeWithObject')) {
       value = keyList.map(itemKey => keyEntities[itemKey].data);
     } else {
-      value = getValueOrKey(keyList.map(itemKey => keyEntities[itemKey].data));
+      value = 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();
@@ -87469,7 +87507,7 @@ class TreeFoundation extends foundation {
         const {
           data
         } = get_default()(keyEntities, key);
-        value = getValueOrKey(data);
+        value = getValueOrKey(data, keyMaps);
       }
       this._adapter.notifyChange(value);
     }
@@ -87486,8 +87524,10 @@ class TreeFoundation extends foundation {
     const {
       showFilteredOnly,
       filterTreeNode,
-      treeNodeFilterProp
+      treeNodeFilterProp,
+      keyMaps
     } = this.getProps();
+    const realFilterProp = treeNodeFilterProp !== 'label' ? treeNodeFilterProp : get_default()(keyMaps, 'label', 'label');
     let filteredOptsKeys = [];
     let expandedOptsKeys = [];
     let flattenNodes = [];
@@ -87495,13 +87535,13 @@ class TreeFoundation extends foundation {
     if (!sugInput) {
       expandedOptsKeys = findAncestorKeys(selectedKeys, keyEntities);
       expandedOptsKeys.forEach(item => expandedKeys.add(item));
-      flattenNodes = flattenTreeData(treeData, expandedKeys);
+      flattenNodes = flattenTreeData(treeData, expandedKeys, keyMaps);
     } else {
-      filteredOptsKeys = Object.values(keyEntities).filter(item => filter(sugInput, item.data, filterTreeNode, treeNodeFilterProp)).map(item => item.key);
+      filteredOptsKeys = Object.values(keyEntities).filter(item => filter(sugInput, item.data, filterTreeNode, realFilterProp)).map(item => item.key);
       expandedOptsKeys = findAncestorKeys(filteredOptsKeys, keyEntities, false);
       const shownChildKeys = findDescendantKeys(filteredOptsKeys, keyEntities, true);
       filteredShownKeys = new Set([...shownChildKeys, ...expandedOptsKeys]);
-      flattenNodes = flattenTreeData(treeData, new Set(expandedOptsKeys), showFilteredOnly && filteredShownKeys);
+      flattenNodes = flattenTreeData(treeData, new Set(expandedOptsKeys), keyMaps, showFilteredOnly && filteredShownKeys);
     }
     const newFilteredExpandedKeys = new Set(expandedOptsKeys);
     this._adapter.notifySearch(sugInput, Array.from(newFilteredExpandedKeys));
@@ -87669,6 +87709,9 @@ class TreeFoundation extends foundation {
       filteredShownKeys,
       keyEntities
     } = this.getStates();
+    const {
+      keyMaps
+    } = this.getProps();
     const isSearching = Boolean(inputValue);
     const showFilteredOnly = this._showFilteredOnly();
     const expandedStateKey = isSearching ? 'filteredExpandedKeys' : 'expandedKeys';
@@ -87687,7 +87730,7 @@ class TreeFoundation extends foundation {
     }
     this._adapter.cacheFlattenNodes(motionType === 'hide' && this._isAnimated());
     if (!this._isExpandControlled()) {
-      const flattenNodes = flattenTreeData(treeData, expandedKeys, isSearching && showFilteredOnly && filteredShownKeys);
+      const flattenNodes = flattenTreeData(treeData, expandedKeys, keyMaps, isSearching && showFilteredOnly && filteredShownKeys);
       const motionKeys = this._isAnimated() ? getMotionKeys(eventKey, expandedKeys, keyEntities) : [];
       const newState = {
         [expandedStateKey]: expandedKeys,
@@ -88594,13 +88637,7 @@ function NodeCollapsible(props) {
 
 
 const getTreeNodeKey = treeNode => {
-  const {
-    data
-  } = treeNode;
-  const {
-    key
-  } = data;
-  return key;
+  return treeNode.key;
 };
 class NodeList extends external_root_React_commonjs2_react_commonjs_react_amd_react_.PureComponent {
   constructor(props) {
@@ -88712,6 +88749,8 @@ const IconSearch_IconComponent = convertIcon(IconSearch_SvgComponent, 'search');
 
 
 
+
+
 var tree_rest = undefined && undefined.__rest || function (s, e) {
   var t = {};
   for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
@@ -88853,17 +88892,20 @@ class Tree extends BaseComponent {
     };
     this.renderTreeNode = (treeNode, ind, style) => {
       const {
-        data
-      } = treeNode;
-      const {
+        data,
         key
-      } = data;
+      } = treeNode;
       const treeNodeProps = this.foundation.getTreeNodeProps(key);
       if (!treeNodeProps) {
         return null;
       }
-      return /*#__PURE__*/external_root_React_commonjs2_react_commonjs_react_amd_react_default().createElement(TreeNode, Object.assign({}, treeNodeProps, data, {
-        key: key,
+      const {
+        keyMaps
+      } = this.props;
+      const props = pick_default()(treeNode, ['key', 'label', 'disabled', 'isLeaf', 'icon']);
+      const children = data[get_default()(keyMaps, 'children', 'children')];
+      !isUndefined_default()(children) && (props.children = children);
+      return /*#__PURE__*/external_root_React_commonjs2_react_commonjs_react_amd_react_default().createElement(TreeNode, Object.assign({}, treeNodeProps, data, props, {
         data: data,
         style: isEmpty_default()(style) ? {} : style
       }));
@@ -88923,6 +88965,9 @@ class Tree extends BaseComponent {
     const {
       prevProps
     } = prevState;
+    const {
+      keyMaps
+    } = props;
     let treeData;
     let keyEntities = prevState.keyEntities || {};
     let valueEntities = prevState.cachedKeyValuePairs || {};
@@ -88949,7 +88994,7 @@ class Tree extends BaseComponent {
     if (needUpdateTreeData || props.draggable && needUpdateData()) {
       treeData = props.treeData;
       newState.treeData = treeData;
-      const entitiesMap = convertDataToEntities(treeData);
+      const entitiesMap = convertDataToEntities(treeData, keyMaps);
       newState.keyEntities = Object.assign({}, entitiesMap.keyEntities);
       keyEntities = newState.keyEntities;
       newState.cachedKeyValuePairs = Object.assign({}, entitiesMap.valueEntities);
@@ -88958,7 +89003,7 @@ class Tree extends BaseComponent {
       // Convert treeDataSimpleJson to treeData
       treeData = convertJsonToData(props.treeDataSimpleJson);
       newState.treeData = treeData;
-      const entitiesMap = convertDataToEntities(treeData);
+      const entitiesMap = convertDataToEntities(treeData, keyMaps);
       newState.keyEntities = Object.assign({}, entitiesMap.keyEntities);
       keyEntities = newState.keyEntities;
       newState.cachedKeyValuePairs = Object.assign({}, entitiesMap.valueEntities);
@@ -89014,7 +89059,7 @@ class Tree extends BaseComponent {
       }
       // Update flattenNodes
       if (treeData || newState.expandedKeys) {
-        const flattenNodes = flattenTreeData(treeData || prevState.treeData, newState.expandedKeys || prevState.expandedKeys);
+        const flattenNodes = flattenTreeData(treeData || prevState.treeData, newState.expandedKeys || prevState.expandedKeys, keyMaps);
         newState.flattenNodes = flattenNodes;
       }
     } else {
@@ -89029,7 +89074,8 @@ class Tree extends BaseComponent {
           filterProps: props.treeNodeFilterProp,
           showFilteredOnly: props.showFilteredOnly,
           keyEntities: newState.keyEntities,
-          prevExpandedKeys: [...prevState.filteredExpandedKeys]
+          prevExpandedKeys: [...prevState.filteredExpandedKeys],
+          keyMaps: keyMaps
         });
         newState.flattenNodes = filteredState.flattenNodes;
         newState.motionKeys = new Set([]);
@@ -89062,7 +89108,7 @@ class Tree extends BaseComponent {
             newState.motionType = motionType;
           }
         }
-        newState.flattenNodes = flattenTreeData(treeData || prevState.treeData, newState.filteredExpandedKeys || prevState.filteredExpandedKeys, props.showFilteredOnly && prevState.filteredShownKeys);
+        newState.flattenNodes = flattenTreeData(treeData || prevState.treeData, newState.filteredExpandedKeys || prevState.filteredExpandedKeys, keyMaps, props.showFilteredOnly && prevState.filteredShownKeys);
       }
     }
     // Handle single selection and multiple selection in controlled mode
@@ -89073,26 +89119,26 @@ class Tree extends BaseComponent {
       if (needUpdate('value')) {
         newState.selectedKeys = findKeysForValues(
         // In both cases whether withObject is turned on, the value is standardized to string
-        normalizeValue(props.value, withObject), valueEntities, isMultiple);
+        normalizeValue(props.value, withObject, keyMaps), valueEntities, isMultiple);
       } else if (!prevProps && props.defaultValue) {
-        newState.selectedKeys = findKeysForValues(normalizeValue(props.defaultValue, withObject), valueEntities, isMultiple);
+        newState.selectedKeys = findKeysForValues(normalizeValue(props.defaultValue, withObject, keyMaps), valueEntities, isMultiple);
       } else if (treeData) {
         // If `treeData` changed, we also need check it
         if (props.value) {
-          newState.selectedKeys = findKeysForValues(normalizeValue(props.value, withObject) || '', valueEntities, isMultiple);
+          newState.selectedKeys = findKeysForValues(normalizeValue(props.value, withObject, keyMaps) || '', valueEntities, isMultiple);
         }
       }
     } else {
       let checkedKeyValues;
       // Get the selected node during multiple selection
       if (needUpdate('value')) {
-        checkedKeyValues = findKeysForValues(normalizeValue(props.value, withObject), valueEntities, isMultiple);
+        checkedKeyValues = findKeysForValues(normalizeValue(props.value, withObject, keyMaps), valueEntities, isMultiple);
       } else if (!prevProps && props.defaultValue) {
-        checkedKeyValues = findKeysForValues(normalizeValue(props.defaultValue, withObject), valueEntities, isMultiple);
+        checkedKeyValues = findKeysForValues(normalizeValue(props.defaultValue, withObject, keyMaps), valueEntities, isMultiple);
       } else if (treeData) {
         // If `treeData` changed, we also need check it
         if (props.value) {
-          checkedKeyValues = findKeysForValues(normalizeValue(props.value, withObject) || [], valueEntities, isMultiple);
+          checkedKeyValues = findKeysForValues(normalizeValue(props.value, withObject, keyMaps) || [], valueEntities, isMultiple);
         } else {
           checkedKeyValues = updateKeys(props.checkRelation === 'related' ? prevState.checkedKeys : prevState.realCheckedKeys, keyEntities);
         }
@@ -89116,7 +89162,7 @@ class Tree extends BaseComponent {
     }
     // update disableStrictly
     if (treeData && props.disableStrictly && props.checkRelation === 'related') {
-      newState.disabledKeys = calcDisabledKeys(keyEntities);
+      newState.disabledKeys = calcDisabledKeys(keyEntities, keyMaps);
     }
     return newState;
   }
@@ -89394,11 +89440,12 @@ Tree.propTypes = {
   showFilteredOnly: (prop_types_default()).bool,
   style: (prop_types_default()).object,
   treeData: prop_types_default().arrayOf(prop_types_default().shape({
-    key: (prop_types_default()).string.isRequired,
+    key: (prop_types_default()).string,
     value: prop_types_default().oneOfType([(prop_types_default()).string, (prop_types_default()).number]),
     label: (prop_types_default()).any,
     isLeaf: (prop_types_default()).bool
   })),
+  keyMaps: (prop_types_default()).object,
   treeDataSimpleJson: (prop_types_default()).object,
   treeNodeFilterProp: (prop_types_default()).string,
   value: prop_types_default().oneOfType([(prop_types_default()).string, (prop_types_default()).number, (prop_types_default()).array, (prop_types_default()).object]),
@@ -89557,8 +89604,11 @@ class TreeSelectFoundation extends foundation {
   findDataForValue(findValue) {
     const {
       value,
-      defaultValue
+      defaultValue,
+      keyMaps
     } = this.getProps();
+    const realValueName = get_default()(keyMaps, 'value', 'value');
+    const realKeyName = get_default()(keyMaps, 'key', 'key');
     let valueArr = [];
     if (value) {
       valueArr = Array.isArray(value) ? value : [value];
@@ -89566,16 +89616,19 @@ class TreeSelectFoundation extends foundation {
       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 = get_default()(keyMaps, 'key', 'key');
+    const labelName = get_default()(keyMaps, 'label', treeNodeLabelProp);
     return {
-      key: value,
-      [treeNodeLabelProp]: value
+      [keyName]: value,
+      [labelName]: value
     };
   }
   getDataForKeyNotInKeyEntities(value) {
@@ -89692,7 +89745,8 @@ class TreeSelectFoundation extends foundation {
     } = this.getStates();
     const {
       leafOnly,
-      checkRelation
+      checkRelation,
+      keyMaps
     } = this.getProps();
     let keyList = [];
     if (checkRelation === 'related') {
@@ -89700,11 +89754,11 @@ class TreeSelectFoundation extends foundation {
     } 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 = getValueOrKey(nodes);
+      const value = getValueOrKey(nodes, keyMaps);
       this._adapter.notifyChange(value, nodes, e);
     }
   }
@@ -89712,11 +89766,14 @@ class TreeSelectFoundation extends foundation {
     const {
       keyEntities
     } = this.getStates();
+    const {
+      keyMaps
+    } = this.getProps();
     if (this._isMultiple() && Array.isArray(key)) {
       this._notifyMultipleChange(key, e);
     } else {
       const nodes = isUndefined_default()(key) ? key : keyEntities[key].data;
-      const value = isUndefined_default()(key) ? key : getValueOrKey(nodes);
+      const value = isUndefined_default()(key) ? key : getValueOrKey(nodes, keyMaps);
       if (this.getProp('onChangeWithObject')) {
         this._adapter.notifyChangeWithObject(nodes, e);
       } else {
@@ -89843,15 +89900,17 @@ class TreeSelectFoundation extends foundation {
   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 = get_default()(keyMaps, 'disabled', 'disabled');
+    if (item[disabledName] || disableStrictly && disabledKeys.has(eventKey)) {
       return;
     }
     if (checkRelation === 'unRelated') {
@@ -89890,11 +89949,14 @@ class TreeSelectFoundation extends foundation {
       keyEntities,
       treeData
     } = this.getStates();
+    const {
+      keyMaps
+    } = this.getProps();
     const newExpandedKeys = new Set(expandedKeys);
     const isExpandControlled = this._isExpandControlled();
     const expandedOptsKeys = findAncestorKeys(selectedKeys, keyEntities);
     expandedOptsKeys.forEach(item => newExpandedKeys.add(item));
-    const newFlattenNodes = flattenTreeData(treeData, newExpandedKeys);
+    const newFlattenNodes = flattenTreeData(treeData, newExpandedKeys, keyMaps);
     this._adapter.updateState({
       expandedKeys: isExpandControlled ? expandedKeys : newExpandedKeys,
       flattenNodes: isExpandControlled ? flattenNodes : newFlattenNodes,
@@ -89918,8 +89980,10 @@ class TreeSelectFoundation extends foundation {
     const {
       showFilteredOnly,
       filterTreeNode,
-      treeNodeFilterProp
+      treeNodeFilterProp,
+      keyMaps
     } = this.getProps();
+    const realFilterProp = treeNodeFilterProp !== 'label' ? treeNodeFilterProp : get_default()(keyMaps, 'label', 'label');
     const newExpandedKeys = new Set(expandedKeys);
     let filteredOptsKeys = [];
     let expandedOptsKeys = [];
@@ -89928,18 +89992,18 @@ class TreeSelectFoundation extends foundation {
     if (!sugInput) {
       expandedOptsKeys = findAncestorKeys(selectedKeys, keyEntities);
       expandedOptsKeys.forEach(item => newExpandedKeys.add(item));
-      newFlattenNodes = flattenTreeData(treeData, newExpandedKeys);
+      newFlattenNodes = flattenTreeData(treeData, newExpandedKeys, keyMaps);
     } else {
       filteredOptsKeys = Object.values(keyEntities).filter(item => {
         const {
           data
         } = item;
-        return filter(sugInput, data, filterTreeNode, treeNodeFilterProp);
+        return filter(sugInput, data, filterTreeNode, realFilterProp);
       }).map(item => item.key);
       expandedOptsKeys = findAncestorKeys(filteredOptsKeys, keyEntities, false);
       const shownChildKeys = findDescendantKeys(filteredOptsKeys, keyEntities, true);
       filteredShownKeys = new Set([...shownChildKeys, ...expandedOptsKeys]);
-      newFlattenNodes = flattenTreeData(treeData, new Set(expandedOptsKeys), showFilteredOnly && filteredShownKeys);
+      newFlattenNodes = flattenTreeData(treeData, new Set(expandedOptsKeys), keyMaps, showFilteredOnly && filteredShownKeys);
     }
     const newFilteredExpandedKeys = new Set(expandedOptsKeys);
     this._adapter.notifySearch(sugInput, Array.from(newFilteredExpandedKeys));
@@ -90073,7 +90137,7 @@ class TreeSelectFoundation extends foundation {
       return this.calcCheckedKeys(eventKey, targetStatus);
     }
     const nonDisabled = descendantKeys.filter(key => !disabledKeys.has(key));
-    const newCheckedKeys = targetStatus ? [...nonDisabled, ...checkedKeys] : difference_default()(normalizeKeyList([...checkedKeys], keyEntities, true), nonDisabled);
+    const newCheckedKeys = targetStatus ? [...nonDisabled, ...checkedKeys] : difference_default()(normalizeKeyList([...checkedKeys], keyEntities, true, true), nonDisabled);
     return calcCheckedKeys(newCheckedKeys, keyEntities);
   }
   calcCheckedStatus(targetStatus, eventKey) {
@@ -90098,7 +90162,8 @@ class TreeSelectFoundation extends foundation {
     const {
       treeData,
       filteredShownKeys,
-      keyEntities
+      keyEntities,
+      keyMaps
     } = this.getStates();
     const showFilteredOnly = this._showFilteredOnly();
     // clone otherwise will be modified unexpectedly
@@ -90122,7 +90187,7 @@ class TreeSelectFoundation extends foundation {
     this._adapter.cacheFlattenNodes(motionType === 'hide' && this._isAnimated());
     if (!this._isExpandControlled()) {
       // debugger;
-      const flattenNodes = flattenTreeData(treeData, filteredExpandedKeys, showFilteredOnly && filteredShownKeys);
+      const flattenNodes = flattenTreeData(treeData, filteredExpandedKeys, keyMaps, showFilteredOnly && filteredShownKeys);
       const motionKeys = this._isAnimated() ? getMotionKeys(eventKey, filteredExpandedKeys, keyEntities) : [];
       const newState = {
         filteredExpandedKeys,
@@ -90140,7 +90205,8 @@ class TreeSelectFoundation extends foundation {
   handleNodeExpand(e, treeNode) {
     // debugger;
     const {
-      loadData
+      loadData,
+      keyMaps
     } = this.getProps();
     const {
       inputValue,
@@ -90177,7 +90243,7 @@ class TreeSelectFoundation extends foundation {
     this._adapter.cacheFlattenNodes(motionType === 'hide' && this._isAnimated());
     if (!isExpandControlled) {
       // debugger;
-      const flattenNodes = flattenTreeData(treeData, expandedKeys);
+      const flattenNodes = flattenTreeData(treeData, expandedKeys, keyMaps);
       const motionKeys = this._isAnimated() ? getMotionKeys(eventKey, expandedKeys, keyEntities) : [];
       const newState = {
         expandedKeys,
@@ -90198,19 +90264,21 @@ class TreeSelectFoundation extends foundation {
   getRenderTextInSingle() {
     const {
       renderSelectedItem: propRenderSelectedItem,
-      treeNodeLabelProp
+      treeNodeLabelProp,
+      keyMaps
     } = this.getProps();
     const {
       selectedKeys,
       keyEntities
     } = this.getStates();
-    const renderSelectedItem = isFunction_default()(propRenderSelectedItem) ? propRenderSelectedItem : item => get_default()(item, treeNodeLabelProp, null);
+    const realLabelName = get_default()(keyMaps, 'label', treeNodeLabelProp);
+    const renderSelectedItem = isFunction_default()(propRenderSelectedItem) ? propRenderSelectedItem : item => get_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;
   }
   /**
@@ -90245,6 +90313,7 @@ var treeSelect = __webpack_require__("ZrYm");
 
 
 
+
 var treeSelect_rest = undefined && undefined.__rest || function (s, e) {
   var t = {};
   for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
@@ -90402,11 +90471,13 @@ class TreeSelect extends BaseComponent {
         disableStrictly,
         size,
         checkRelation,
-        renderSelectedItem: propRenderSelectedItem
+        renderSelectedItem: propRenderSelectedItem,
+        keyMaps
       } = this.props;
+      const realLabelName = get_default()(keyMaps, 'label', treeNodeLabelProp);
       const renderSelectedItem = isFunction_default()(propRenderSelectedItem) ? propRenderSelectedItem : item => ({
         isRenderInTag: true,
-        content: get_default()(item, treeNodeLabelProp, null)
+        content: get_default()(item, realLabelName, null)
       });
       let renderKeys = [];
       if (checkRelation === 'related') {
@@ -90416,7 +90487,7 @@ class TreeSelect extends BaseComponent {
       }
       const tagList = [];
       renderKeys.forEach((key, index) => {
-        const item = keyEntities[key] && keyEntities[key].data.key === key ? keyEntities[key].data : this.getDataForKeyNotInKeyEntities(key);
+        const item = keyEntities[key] && keyEntities[key].key === key ? keyEntities[key].data : this.getDataForKeyNotInKeyEntities(key);
         const onClose = (tagContent, e) => {
           if (e && typeof e.preventDefault === 'function') {
             // make sure that tag will not hidden immediately in controlled mode
@@ -90427,7 +90498,7 @@ class TreeSelect extends BaseComponent {
         const {
           content,
           isRenderInTag
-        } = item && treeNodeLabelProp in item ? renderSelectedItem(item, {
+        } = item ? renderSelectedItem(item, {
           index,
           onClose
         }) : {};
@@ -90690,11 +90761,13 @@ class TreeSelect extends BaseComponent {
         disabled,
         disableStrictly,
         renderSelectedItem: propRenderSelectedItem,
-        treeNodeLabelProp
+        treeNodeLabelProp,
+        keyMaps
       } = this.props;
+      const realLabelName = get_default()(keyMaps, 'label', treeNodeLabelProp);
       const keyList = normalizeKeyList([key], keyEntities, leafOnly, true);
-      const nodes = keyList.map(i => keyEntities[key] && keyEntities[key].data.key === key ? keyEntities[key].data : this.getDataForKeyNotInKeyEntities(key));
-      const value = getValueOrKey(nodes);
+      const nodes = keyList.map(i => keyEntities[key] && keyEntities[key].key === key ? keyEntities[key].data : this.getDataForKeyNotInKeyEntities(key));
+      const value = getValueOrKey(nodes, keyMaps);
       const tagCls = classnames_default()(`${treeSelect_prefixcls}-selection-tag`, {
         [`${treeSelect_prefixcls}-selection-tag-disabled`]: disabled
       });
@@ -90717,13 +90790,13 @@ class TreeSelect extends BaseComponent {
       const item = nodes[0];
       const renderSelectedItem = isFunction_default()(propRenderSelectedItem) ? propRenderSelectedItem : selectedItem => ({
         isRenderInTag: true,
-        content: get_default()(selectedItem, treeNodeLabelProp, null)
+        content: get_default()(selectedItem, realLabelName, null)
       });
       if (isFunction_default()(renderSelectedItem)) {
         const {
           content,
           isRenderInTag
-        } = item && treeNodeLabelProp in item ? renderSelectedItem(item, {
+        } = item ? renderSelectedItem(item, {
           index: idx,
           onClose
         }) : {};
@@ -90923,17 +90996,20 @@ class TreeSelect extends BaseComponent {
     };
     this.renderTreeNode = (treeNode, ind, style) => {
       const {
-        data
-      } = treeNode;
-      const {
+        data,
         key
-      } = data;
+      } = treeNode;
       const treeNodeProps = this.foundation.getTreeNodeProps(key);
       if (!treeNodeProps) {
         return null;
       }
-      return /*#__PURE__*/external_root_React_commonjs2_react_commonjs_react_amd_react_default().createElement(TreeNode, Object.assign({}, treeNodeProps, data, {
-        key: key,
+      const props = pick_default()(treeNode, ['key', 'label', 'disabled', 'isLeaf', 'icon']);
+      const {
+        keyMaps
+      } = this.props;
+      const children = data[get_default()(keyMaps, 'children', 'children')];
+      !isUndefined_default()(children) && (props.children = children);
+      return /*#__PURE__*/external_root_React_commonjs2_react_commonjs_react_amd_react_default().createElement(TreeNode, Object.assign({}, treeNodeProps, data, props, {
         data: data,
         style: style
       }));
@@ -91117,6 +91193,9 @@ class TreeSelect extends BaseComponent {
       prevProps,
       rePosKey
     } = prevState;
+    const {
+      keyMaps
+    } = props;
     const needUpdate = name => !prevProps && name in props || prevProps && !isEqual_default()(prevProps[name], props[name]);
     let treeData;
     const withObject = props.onChangeWithObject;
@@ -91131,7 +91210,7 @@ class TreeSelect extends BaseComponent {
     if (needUpdateTreeData) {
       treeData = props.treeData;
       newState.treeData = treeData;
-      const entitiesMap = convertDataToEntities(treeData);
+      const entitiesMap = convertDataToEntities(treeData, keyMaps);
       newState.keyEntities = Object.assign({}, entitiesMap.keyEntities);
       keyEntities = newState.keyEntities;
       newState.cachedKeyValuePairs = Object.assign({}, entitiesMap.valueEntities);
@@ -91162,26 +91241,26 @@ class TreeSelect extends BaseComponent {
     } else if (!prevProps && props.defaultExpandedKeys) {
       newState.expandedKeys = calcExpandedKeys(props.defaultExpandedKeys, keyEntities);
     } else if (!prevProps && props.defaultValue) {
-      newState.expandedKeys = calcExpandedKeysForValues(normalizeValue(props.defaultValue, withObject), keyEntities, props.multiple, valueEntities);
+      newState.expandedKeys = calcExpandedKeysForValues(normalizeValue(props.defaultValue, withObject, keyMaps), keyEntities, props.multiple, valueEntities);
     } else if (!prevProps && props.value) {
-      newState.expandedKeys = calcExpandedKeysForValues(normalizeValue(props.value, withObject), keyEntities, props.multiple, valueEntities);
+      newState.expandedKeys = calcExpandedKeysForValues(normalizeValue(props.value, withObject, keyMaps), keyEntities, props.multiple, valueEntities);
     }
     // flattenNodes
     if (treeData || needUpdateExpandedKeys) {
-      const flattenNodes = flattenTreeData(treeData || prevState.treeData, newState.expandedKeys || prevState.expandedKeys);
+      const flattenNodes = flattenTreeData(treeData || prevState.treeData, newState.expandedKeys || prevState.expandedKeys, keyMaps);
       newState.flattenNodes = flattenNodes;
     }
     // selectedKeys: single mode controlled
     const isMultiple = props.multiple;
     if (!isMultiple) {
       if (needUpdate('value')) {
-        newState.selectedKeys = findKeysForValues(normalizeValue(props.value, withObject), valueEntities, isMultiple);
+        newState.selectedKeys = findKeysForValues(normalizeValue(props.value, withObject, keyMaps), valueEntities, isMultiple);
       } else if (!prevProps && props.defaultValue) {
-        newState.selectedKeys = findKeysForValues(normalizeValue(props.defaultValue, withObject), valueEntities, isMultiple);
+        newState.selectedKeys = findKeysForValues(normalizeValue(props.defaultValue, withObject, keyMaps), valueEntities, isMultiple);
       } else if (treeData) {
         // If `treeData` changed, we also need check it
         if (props.value) {
-          newState.selectedKeys = findKeysForValues(normalizeValue(props.value, withObject) || '', valueEntities, isMultiple);
+          newState.selectedKeys = findKeysForValues(normalizeValue(props.value, withObject, keyMaps) || '', valueEntities, isMultiple);
         } else {
           newState.selectedKeys = updateKeys(prevState.selectedKeys, keyEntities);
         }
@@ -91190,13 +91269,13 @@ class TreeSelect extends BaseComponent {
       // checkedKeys: multiple mode controlled || data changed
       let checkedKeyValues;
       if (needUpdate('value')) {
-        checkedKeyValues = findKeysForValues(normalizeValue(props.value, withObject), valueEntities, isMultiple);
+        checkedKeyValues = findKeysForValues(normalizeValue(props.value, withObject, keyMaps), valueEntities, isMultiple);
       } else if (!prevProps && props.defaultValue) {
-        checkedKeyValues = findKeysForValues(normalizeValue(props.defaultValue, withObject), valueEntities, isMultiple);
+        checkedKeyValues = findKeysForValues(normalizeValue(props.defaultValue, withObject, keyMaps), valueEntities, isMultiple);
       } else if (treeData) {
         // If `treeData` changed, we also need check it
         if (props.value) {
-          checkedKeyValues = findKeysForValues(normalizeValue(props.value, withObject) || [], valueEntities, isMultiple);
+          checkedKeyValues = findKeysForValues(normalizeValue(props.value, withObject, keyMaps) || [], valueEntities, isMultiple);
         } else {
           checkedKeyValues = updateKeys(props.checkRelation === 'related' ? prevState.checkedKeys : prevState.realCheckedKeys, keyEntities);
         }
@@ -91224,7 +91303,7 @@ class TreeSelect extends BaseComponent {
     }
     // ================ disableStrictly =================
     if (treeData && props.disableStrictly && props.checkRelation === 'related') {
-      newState.disabledKeys = calcDisabledKeys(keyEntities);
+      newState.disabledKeys = calcDisabledKeys(keyEntities, keyMaps);
     }
     return newState;
   }
@@ -91468,9 +91547,10 @@ TreeSelect.propTypes = {
   showFilteredOnly: (prop_types_default()).bool,
   motionExpand: (prop_types_default()).bool,
   emptyContent: (prop_types_default()).node,
+  keyMaps: (prop_types_default()).object,
   leafOnly: (prop_types_default()).bool,
   treeData: prop_types_default().arrayOf(prop_types_default().shape({
-    key: (prop_types_default()).string.isRequired,
+    key: (prop_types_default()).string,
     value: prop_types_default().oneOfType([(prop_types_default()).string, (prop_types_default()).number]),
     label: (prop_types_default()).any
   })),