@douyinfe/semi-foundation 2.1.4 → 2.2.0-beta.1

package/lib/cjs/tree/treeUtil.js

@@ -57,12 +57,10 @@ var _every = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stab
 
 var _keys = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/keys"));
 
-var _filter = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/filter"));
-
-var _from = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/array/from"));
-
 var _some = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/some"));
 
+var _filter = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/instance/filter"));
+
 var _values = _interopRequireDefault(require("@babel/runtime-corejs3/core-js-stable/object/values"));
 
 var _get2 = _interopRequireDefault(require("lodash/get"));
@@ -557,7 +555,7 @@ function normalizedArr(val) {
 
 function normalizeKeyList(keyList, keyEntities) {
   let leafOnly = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : false;
-  let res = [];
+  const res = [];
   const keyListSet = new _set.default(keyList);
 
   if (!leafOnly) {
@@ -577,9 +575,11 @@ function normalizeKeyList(keyList, keyEntities) {
       res.push(key);
     });
   } else {
-    var _context8;
-
-    res = (0, _filter.default)(_context8 = (0, _from.default)(keyList)).call(_context8, key => keyEntities[key] && !isValid(keyEntities[key].children));
+    (0, _forEach.default)(keyList).call(keyList, key => {
+      if (keyEntities[key] && !isValid(keyEntities[key].children)) {
+        res.push(key);
+      }
+    });
   }
 
   return res;
@@ -589,9 +589,9 @@ function getMotionKeys(eventKey, expandedKeys, keyEntities) {
   const res = [];
 
   const getChild = itemKey => {
-    var _context9;
+    var _context8;
 
-    keyEntities[itemKey].children && (0, _forEach.default)(_context9 = keyEntities[itemKey].children).call(_context9, item => {
+    keyEntities[itemKey].children && (0, _forEach.default)(_context8 = keyEntities[itemKey].children).call(_context8, item => {
       const {
         key
       } = item;
@@ -707,7 +707,7 @@ function calcCheckedKeysForUnchecked(key, keyEntities, checkedKeys, halfCheckedK
 }
 
 function filterTreeData(info) {
-  var _context10, _context11;
+  var _context9, _context10;
 
   const {
     showFilteredOnly,
@@ -719,7 +719,7 @@ function filterTreeData(info) {
     prevExpandedKeys
   } = info;
   let filteredOptsKeys = [];
-  filteredOptsKeys = (0, _map.default)(_context10 = (0, _filter.default)(_context11 = (0, _values.default)(keyEntities)).call(_context11, item => filter(inputValue, item.data, filterTreeNode, filterProps))).call(_context10, item => item.key);
+  filteredOptsKeys = (0, _map.default)(_context9 = (0, _filter.default)(_context10 = (0, _values.default)(keyEntities)).call(_context10, item => filter(inputValue, item.data, filterTreeNode, filterProps))).call(_context9, item => item.key);
   let expandedOptsKeys = findAncestorKeys(filteredOptsKeys, keyEntities, false);
 
   if (prevExpandedKeys.length) {
@@ -763,9 +763,9 @@ function updateKeys(keySet, keyEntities) {
 }
 
 function calcDisabledKeys(keyEntities) {
-  var _context12;
+  var _context11;
 
-  const disabledKeys = (0, _filter.default)(_context12 = (0, _keys.default)(keyEntities)).call(_context12, key => keyEntities[key].data.disabled);
+  const disabledKeys = (0, _filter.default)(_context11 = (0, _keys.default)(keyEntities)).call(_context11, key => keyEntities[key].data.disabled);
   const {
     checkedKeys
   } = calcCheckedKeys(disabledKeys, keyEntities);

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

@@ -119,6 +119,7 @@ declare class UploadFoundation<P = Record<string, any>, S = Record<string, any>>
     buildFileItem(fileInstance: CustomFile, uploadTrigger: string): BaseFileItem;
     replaceFileList(files: Array<CustomFile>): void;
     addFilesToList(files: Array<CustomFile>): void;
+    insertFileToList(files: Array<CustomFile>, index: number): void;
     manualUpload(): void;
     startUpload(fileList: Array<BaseFileItem>): void;
     upload(file: BaseFileItem): void;

package/lib/cjs/upload/foundation.js

@@ -405,6 +405,112 @@ class UploadFoundation extends _foundation.default {
         this.startUpload(currentFiles);
       }
     });
+  } // 插入多个文件到指定位置
+  // Insert files to the specified location
+
+
+  insertFileToList(files, index) {
+    const {
+      limit,
+      transformFile,
+      accept,
+      uploadTrigger
+    } = this.getProps();
+    const {
+      fileList
+    } = this.getStates();
+    const unAcceptFileList = []; // 当次选中的文件
+    // current selected file
+
+    let currentFileList = (0, _from.default)(files);
+
+    if (typeof accept !== 'undefined') {
+      currentFileList = (0, _filter.default)(currentFileList).call(currentFileList, item => {
+        const isValid = this.checkFileFormat(accept, item);
+
+        if (!isValid) {
+          unAcceptFileList.push(item);
+        }
+
+        return isValid;
+      });
+
+      if (unAcceptFileList.length !== 0) {
+        this._adapter.notifyAcceptInvalid(unAcceptFileList);
+      }
+
+      if (currentFileList.length === 0) {
+        return;
+      }
+    }
+
+    currentFileList = (0, _map.default)(currentFileList).call(currentFileList, file => {
+      if (!file.uid) {
+        file.uid = (0, _uuid.getUuidv4)();
+      }
+
+      if (this.checkFileSize(file)) {
+        file._sizeInvalid = true;
+        file.status = FILE_STATUS_VALID_FAIL;
+
+        this._adapter.notifySizeError(file, fileList);
+      }
+
+      if (transformFile) {
+        file = transformFile(file);
+      }
+
+      return file;
+    });
+    const total = fileList.length + currentFileList.length;
+
+    if (typeof limit !== 'undefined') {
+      // 判断是否超出限制
+      // Determine whether the limit is exceeded
+      if (total > limit) {
+        if (limit === 1) {
+          // 使用最后面的文件对当前文件进行替换
+          // Use the last file to replace the current file
+          currentFileList = (0, _slice.default)(currentFileList).call(currentFileList, -1);
+
+          this._adapter.notifyFileSelect(currentFileList);
+
+          this._adapter.resetInput();
+
+          this.replaceFileList(currentFileList);
+          return;
+        } // 如果超出了限制，则计算还能添加几个文件，将剩余的文件继续上传
+        // If the limit is exceeded, several files can be added to the calculation, and the remaining files will continue to be uploaded
+
+
+        const restNum = limit - fileList.length;
+        currentFileList = (0, _slice.default)(currentFileList).call(currentFileList, 0, restNum);
+
+        this._adapter.notifyExceed(currentFileList);
+      }
+    }
+
+    const fileItemList = (0, _map.default)(currentFileList).call(currentFileList, file => this.buildFileItem(file, uploadTrigger));
+    const newFileList = (0, _slice.default)(fileList).call(fileList);
+
+    if (typeof index !== 'undefined') {
+      (0, _splice.default)(newFileList).call(newFileList, index, 0, ...fileItemList);
+    } else {
+      newFileList.push(...fileItemList);
+    }
+
+    this._adapter.notifyFileSelect(currentFileList);
+
+    this._adapter.notifyChange({
+      fileList: newFileList,
+      currentFile: null
+    });
+
+    this._adapter.updateFileList(newFileList, () => {
+      if (uploadTrigger === TRIGGER_AUTO) {
+        this.startUpload(fileItemList);
+      }
+    });
   }
 
   manualUpload() {

package/lib/cjs/upload/rtl.scss

@@ -22,8 +22,6 @@ $module: #{$prefix}-upload;
         }
 
         &-file-card {
-            margin-right: 0;
-            margin-left: $spacing-upload_picture_file_card-marginRight;
 
             &-info {
 
@@ -53,8 +51,6 @@ $module: #{$prefix}-upload;
         &-picture {
 
             &-file-card {
-                margin-right: 0;
-                margin-left: $spacing-upload_picture_file_card-marginRight;
 
                 &-close {
                     right: auto;

package/lib/cjs/upload/upload.css

@@ -73,6 +73,8 @@
   display: flex;
   flex-wrap: wrap;
   flex-shrink: 0;
+  gap: 8px;
+  margin-bottom: 8px;
 }
 .semi-upload-file-list-main p {
   display: flex;
@@ -99,8 +101,6 @@
   justify-content: space-between;
   height: 52px;
   width: 250px;
-  margin-right: 8px;
-  margin-bottom: 8px;
   background-color: var(--semi-color-fill-0);
   cursor: pointer;
 }
@@ -235,16 +235,16 @@
   flex-direction: column;
 }
 .semi-upload-picture[x-prompt-pos=bottom] .semi-upload-prompt {
-  order: 2;
+  order: 1;
 }
 .semi-upload-picture[x-prompt-pos=bottom] .semi-upload-add {
-  order: 1;
+  order: 0;
 }
 .semi-upload-picture[x-prompt-pos=right] .semi-upload-prompt {
-  order: 2;
+  order: 1;
 }
 .semi-upload-picture[x-prompt-pos=right] .semi-upload-add {
-  order: 1;
+  order: 0;
 }
 .semi-upload-picture-add {
   background-color: var(--semi-color-fill-0);
@@ -281,11 +281,14 @@
   margin-bottom: 0;
 }
 .semi-upload-picture-file-card {
+  display: flex;
+  align-items: center;
+  justify-content: center;
   height: 96px;
   width: 96px;
+  border-radius: var(--semi-border-radius-small);
   position: relative;
-  margin-right: 8px;
-  margin-bottom: 8px;
+  overflow: hidden;
 }
 .semi-upload-picture-file-card img {
   height: 96px;
@@ -296,7 +299,7 @@
 .semi-upload-picture-file-card-close {
   width: 16px;
   height: 16px;
-  background-color: var(--semi-overlay-bg);
+  background-color: var(--semi-color-overlay-bg);
   position: absolute;
   top: 8px;
   right: 8px;
@@ -350,6 +353,22 @@
   color: var(--semi-color-white);
   transform: translate3D(-50%, -50%, 0);
 }
+.semi-upload-picture-file-card-pic-info {
+  display: inline-flex;
+  box-sizing: border-box;
+  justify-content: space-between;
+  align-items: center;
+  position: absolute;
+  width: 100%;
+  height: 24px;
+  padding: 0 10px;
+  bottom: 0;
+  left: 0;
+  color: var(--semi-color-white);
+  font-size: 12px;
+  font-weight: 600;
+  background: linear-gradient(0deg, rgba(22, 22, 26, 0.3) 0%, rgba(22, 22, 26, 0) 77.08%);
+}
 .semi-upload-picture-file-card-icon-loading, .semi-upload-picture-file-card-icon-error {
   position: absolute;
   bottom: 6px;
@@ -362,6 +381,9 @@
 .semi-upload-picture-file-card-show-pointer {
   cursor: pointer;
 }
+.semi-upload-picture-file-card-error {
+  outline: 1px solid var(--semi-color-danger);
+}
 .semi-upload-drag-area {
   border-radius: var(--semi-border-radius-small);
   border: 2px dashed var(--semi-color-border);
@@ -442,11 +464,6 @@
 .semi-portal-rtl .semi-upload-file-list-title-clear {
   display: inline-block;
 }
-.semi-rtl .semi-upload-file-card,
-.semi-portal-rtl .semi-upload-file-card {
-  margin-right: 0;
-  margin-left: 8px;
-}
 .semi-rtl .semi-upload-file-card-info-size,
 .semi-portal-rtl .semi-upload-file-card-info-size {
   margin-left: 0;
@@ -463,11 +480,6 @@
   margin-right: 0;
   margin-left: 2px;
 }
-.semi-rtl .semi-upload-picture-file-card,
-.semi-portal-rtl .semi-upload-picture-file-card {
-  margin-right: 0;
-  margin-left: 8px;
-}
 .semi-rtl .semi-upload-picture-file-card-close,
 .semi-portal-rtl .semi-upload-picture-file-card-close {
   right: auto;

package/lib/cjs/upload/upload.scss

@@ -99,6 +99,8 @@ $module: #{$prefix}-upload;
             display: flex;
             flex-wrap: wrap;
             flex-shrink: 0;
+            gap: $spacing-upload_picture_file_card-gap;
+            margin-bottom: $spacing-upload_picture_file_card-marginBottom;
 
             p {
                 @include ver-center;
@@ -130,8 +132,6 @@ $module: #{$prefix}-upload;
         justify-content: space-between;
         height: $height-upload_file_card;
         width: $width-upload_file_card;
-        margin-right: $spacing-tight;
-        margin-bottom: $spacing-tight;
         background-color: $color-upload_card-bg;
         cursor: pointer;
 
@@ -292,21 +292,21 @@ $module: #{$prefix}-upload;
             flex-direction: column;
 
             .#{$module}-prompt {
-                order: 2;
+                order: 1;
             }
 
             .#{$module}-add {
-                order: 1;
+                order: 0;
             }
         }
 
         &[x-prompt-pos="right"] {
             .#{$module}-prompt {
-                order: 2;
+                order: 1;
             }
 
             .#{$module}-add {
-                order: 1;
+                order: 0;
             }
         }
 
@@ -353,11 +353,14 @@ $module: #{$prefix}-upload;
         }
 
         &-file-card {
+            display: flex;
+            align-items: center;
+            justify-content: center;
             height: $height-upload_file_pic_card;
             width: $width-upload_file_pic_card;
+            border-radius: $radius-upload_picture_file_card_img;
             position: relative;
-            margin-right: $spacing-upload_picture_file_card-marginRight;
-            margin-bottom: $spacing-upload_picture_file_card-marginBottom;
+            overflow: hidden;
 
             img {
                 height: $width-upload_picture_file_card_img;
@@ -429,6 +432,22 @@ $module: #{$prefix}-upload;
                 color: $color-upload_replace-text;
                 transform: translate3D(-50%, -50%, 0);
             }
+            &-pic-info {
+                display: inline-flex;
+                box-sizing: border-box;
+                justify-content: space-between;
+                align-items: center;
+                position: absolute;
+                width: 100%;
+                height: 24px;
+                padding: 0 10px;
+                bottom: 0;
+                left: 0;
+                color: $color-upload_picture_file_card_pic_info-text;
+                font-size: $font-upload_picture_file_card_pic_info-fontSize;
+                font-weight: $font-upload_picture_file_card_pic_info-fontWeight;
+                background: linear-gradient(0deg, rgba(22, 22, 26, 0.3) 0%, rgba(22, 22, 26, 0) 77.08%);
+            }
 
             &-icon-loading,
             &-icon-error {
@@ -445,6 +464,10 @@ $module: #{$prefix}-upload;
             &-show-pointer {
                 cursor: pointer;
             }
+
+            &-error {
+                outline: 1px solid $color-upload_picture_file_card_error-border;
+            }
         }
     }
 

package/lib/cjs/upload/variables.scss

@@ -22,8 +22,10 @@ $color-upload-icon: var(--semi-color-tertiary); // 图片墙上传图标加号
 $color-upload_pic_add-bg-active: var(--semi-color-fill-2); // 图片墙上传背景色 - 按下
 $color-upload_pic_add-bg-hover: var(--semi-color-fill-1); // 图片墙上传背景色 - 悬浮
 $color-upload_pic_add-bg: var(--semi-color-fill-0); // 图片墙上传背景色 - 默认
-$color-upload_pic_remove-bg: var(--semi-overlay-bg); // 图片墙上传移除图标颜色
+$color-upload_pic_remove-bg: var(--semi-color-overlay-bg); // 图片墙上传移除图标颜色
 $color-upload_picture_file_card_loading_error-icon: var(--semi-color-danger); // 图片墙上传移除图标颜色
+$color-upload_picture_file_card_error-border: var(--semi-color-danger); // 图片墙上传移除图标颜色
+$color-upload_picture_file_card_pic_info-text: var(--semi-color-white); // 图片墙图片信息（序号）文字颜色
 $color-upload_preview-icon: var(--semi-color-text-2); // 上传文件卡片文本颜色
 $color-upload_retry-text: var(--semi-color-primary); // 上传文件卡片重新上传按钮文本颜色
 $color-upload_replace-text: var(--semi-color-white); // 上传文件卡片重新替换按钮文本颜色
@@ -56,7 +58,7 @@ $spacing-upload_file_card_info_progress-marginTop: 4px; // 上传文件卡片进
 $spacing-upload_file_card_close-marginLeft: $spacing-tight; // 上传文件卡片删除按钮左侧外边距
 $spacing-upload_file_card_close-marginRight: $spacing-tight; // 上传文件卡片删除按钮右侧外边距
 $spacing-upload_file_card_icon-marginRight: $spacing-super-tight; // 上传文件卡片图标右侧外边距
-$spacing-upload_picture_file_card-marginRight: $spacing-tight; // 图片墙上传卡片右侧外边距
+$spacing-upload_picture_file_card-gap: $spacing-tight; // 图片墙卡片之间边距
 $spacing-upload_picture_file_card-marginBottom: $spacing-tight; // 图片墙上传卡片底部外边距
 $spacing-upload_picture_file_card_close-top: 8px; // 图片墙上传卡片删除按钮顶部位置
 $spacing-upload_picture_file_card_close-right: 8px; // 图片墙上传卡片删除右侧位置
@@ -79,3 +81,5 @@ $radius-upload_drag_area: var(--semi-border-radius-small); // 可拖拽上传拖
 $font-upload_file_card_info_name-fontWeight: $font-weight-bold; // 上传文件卡片文件名字重
 $font-upload_file_card_info_size-fontWeight: $font-weight-regular; // 上传文件卡片文件尺寸字重
 $font-upload_drag_area_tips-fontWeight: 600; // 可拖拽上传提示文本字重
+$font-upload_picture_file_card_pic_info-fontSize: 12px; // 图片墙图片信息字体大小
+$font-upload_picture_file_card_pic_info-fontWeight: 600; // 图片墙图片信息文本字重

package/lib/es/cascader/cascader.css

@@ -99,11 +99,11 @@
 .semi-cascader-selection-tag:first-child {
   margin-left: 0;
 }
-.semi-cascader-selection-tag-disabled {
+.semi-cascader-selection-tag-disabled.semi-tag {
   color: var(--semi-color-disabled-text);
   cursor: not-allowed;
 }
-.semi-cascader-selection-tag-disabled .semi-tag-close {
+.semi-cascader-selection-tag-disabled.semi-tag .semi-tag-close {
   color: var(--semi-color-disabled-text);
   cursor: not-allowed;
   pointer-events: none;

package/lib/es/cascader/cascader.scss

@@ -116,7 +116,7 @@ $module: #{$prefix}-cascader;
                 margin-left: 0;
             }
 
-            &-disabled {
+            &-disabled.#{$prefix}-tag {
                 color: $color-cascader_input_disabled-text-default;
                 cursor: not-allowed;
                 

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

@@ -9,6 +9,9 @@ declare const strings: {
     readonly IS_VALUE: "isValue";
     readonly SHOW_NEXT_BY_CLICK: "click";
     readonly SHOW_NEXT_BY_HOVER: "hover";
+    readonly LEAF_ONLY_MERGE_TYPE: "leafOnly";
+    readonly AUTO_MERGE_VALUE_MERGE_TYPE: "autoMergeValue";
+    readonly NONE_MERGE_TYPE: "none";
 };
 declare const numbers: {};
 export { cssClasses, strings, numbers };

package/lib/es/cascader/constants.js

@@ -9,7 +9,12 @@ const strings = {
   IS_KEY: 'isKey',
   IS_VALUE: 'isValue',
   SHOW_NEXT_BY_CLICK: 'click',
-  SHOW_NEXT_BY_HOVER: 'hover'
+  SHOW_NEXT_BY_HOVER: 'hover',
+
+  /* Merge Type */
+  LEAF_ONLY_MERGE_TYPE: 'leafOnly',
+  AUTO_MERGE_VALUE_MERGE_TYPE: 'autoMergeValue',
+  NONE_MERGE_TYPE: 'none'
 };
 const numbers = {};
 export { cssClasses, strings, numbers };

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

@@ -57,6 +57,7 @@ export interface BasicScrollPanelProps {
 export interface BasicCascaderProps {
     mouseEnterDelay?: number;
     mouseLeaveDelay?: number;
+    separator?: string;
     arrowIcon?: any;
     changeOnSelect?: boolean;
     multiple?: boolean;
@@ -96,6 +97,8 @@ export interface BasicCascaderProps {
     topSlot?: any;
     showNext?: ShowNextType;
     disableStrictly?: boolean;
+    leafOnly?: boolean;
+    enableLeafClick?: boolean;
     onClear?: () => void;
     triggerRender?: (props: BasicTriggerRenderProps) => any;
     onListScroll?: (e: any, panel: BasicScrollPanelProps) => void;
@@ -125,7 +128,7 @@ export interface BasicCascaderInnerData {
     isHovering: boolean;
     checkedKeys: Set<string>;
     halfCheckedKeys: Set<string>;
-    mergedCheckedKeys: Set<string>;
+    resolvedCheckedKeys: Set<string>;
     loadedKeys: Set<string>;
     loadingKeys: Set<string>;
     loading: boolean;

package/lib/es/cascader/foundation.js

@@ -22,7 +22,8 @@ import _sortInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instanc
 import _parseInt from "@babel/runtime-corejs3/core-js-stable/parse-int";
 import BaseFoundation from '../base/foundation';
 import { filter, findAncestorKeys, calcCheckedKeysForUnchecked, calcCheckedKeysForChecked, calcCheckedKeys, findDescendantKeys, normalizeKeyList } from '../tree/treeUtil';
-import { convertDataToEntities, findKeysForValues, normalizedArr, isValid } from './util'; // eslint-disable-next-line max-len
+import { convertDataToEntities, findKeysForValues, normalizedArr, isValid, calcMergeType } from './util';
+import { strings } from './constants'; // eslint-disable-next-line max-len
 
 export default class CascaderFoundation extends BaseFoundation {
   constructor(adapter) {
@@ -535,10 +536,12 @@ export default class CascaderFoundation extends BaseFoundation {
   }
 
   _defaultRenderText(path, displayRender) {
+    const separator = this.getProp('separator');
+
     if (displayRender && typeof displayRender === 'function') {
       return displayRender(path);
     } else {
-      return path.join(' / ');
+      return path.join(separator);
     }
   }
 
@@ -612,7 +615,8 @@ export default class CascaderFoundation extends BaseFoundation {
     const {
       changeOnSelect: allowChange,
       filterLeafOnly,
-      multiple
+      multiple,
+      enableLeafClick
     } = this.getProps();
     const {
       keyEntities,
@@ -646,6 +650,10 @@ export default class CascaderFoundation extends BaseFoundation {
       this._adapter.updateStates({
         activeKeys: new _Set(activeKeys)
       });
+
+      if (isLeaf && enableLeafClick) {
+        this.onItemCheckboxClick(item);
+      }
     } else {
       this._adapter.notifySelect(data.value);
 
@@ -695,12 +703,13 @@ export default class CascaderFoundation extends BaseFoundation {
     const {
       checkedKeys,
       keyEntities,
-      mergedCheckedKeys
+      resolvedCheckedKeys
     } = this.getStates();
     const {
       autoMergeValue,
       max,
-      disableStrictly
+      disableStrictly,
+      leafOnly
     } = this.getProps(); // prev checked status
 
     const prevCheckedStatus = checkedKeys.has(key); // next checked status
@@ -711,16 +720,19 @@ export default class CascaderFoundation extends BaseFoundation {
       checkedKeys: curCheckedKeys,
       halfCheckedKeys: curHalfCheckedKeys
     } = disableStrictly ? this.calcNonDisabedCheckedKeys(key, curCheckedStatus) : this.calcCheckedKeys(key, curCheckedStatus);
-    const curMergedCheckedKeys = new _Set(normalizeKeyList(curCheckedKeys, keyEntities));
-    const curRealCheckedKeys = autoMergeValue ? curMergedCheckedKeys : curCheckedKeys;
+    const mergeType = calcMergeType(autoMergeValue, leafOnly);
+    const isLeafOnlyMerge = mergeType === strings.LEAF_ONLY_MERGE_TYPE;
+    const isNoneMerge = mergeType === strings.NONE_MERGE_TYPE;
+    const curResolvedCheckedKeys = new _Set(normalizeKeyList(curCheckedKeys, keyEntities, isLeafOnlyMerge));
+    const curRealCheckedKeys = isNoneMerge ? curCheckedKeys : curResolvedCheckedKeys;
 
     if (_isNumber(max)) {
-      if (autoMergeValue) {
+      if (!isNoneMerge) {
         // When it exceeds max, the quantity is allowed to be reduced, and no further increase is allowed
-        if (mergedCheckedKeys.size < curMergedCheckedKeys.size && curMergedCheckedKeys.size > max) {
+        if (resolvedCheckedKeys.size < curResolvedCheckedKeys.size && curResolvedCheckedKeys.size > max) {
           const checkedEntities = [];
 
-          _forEachInstanceProperty(curMergedCheckedKeys).call(curMergedCheckedKeys, itemKey => {
+          _forEachInstanceProperty(curResolvedCheckedKeys).call(curResolvedCheckedKeys, itemKey => {
             checkedEntities.push(keyEntities[itemKey]);
           });
 
@@ -748,7 +760,7 @@ export default class CascaderFoundation extends BaseFoundation {
       this._adapter.updateStates({
         checkedKeys: curCheckedKeys,
         halfCheckedKeys: curHalfCheckedKeys,
-        mergedCheckedKeys: curMergedCheckedKeys
+        resolvedCheckedKeys: curResolvedCheckedKeys
       });
     } // The click event during multiple selection will definitely cause the checked state of node to change,
     // so there is no need to judge the value to change.
@@ -911,7 +923,7 @@ export default class CascaderFoundation extends BaseFoundation {
       newState.halfCheckedKeys = new _Set([]);
       newState.selectedKeys = new _Set([]);
       newState.activeKeys = new _Set([]);
-      newState.mergedCheckedKeys = new _Set([]);
+      newState.resolvedCheckedKeys = new _Set([]);
 
       this._adapter.notifyChange([]);
     } else {

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

@@ -2,3 +2,4 @@ export declare function isValid(val: any): boolean;
 export declare function normalizedArr(val: any): any[];
 export declare function convertDataToEntities(dataNodes: any): any;
 export declare function findKeysForValues(value: any, keyEntities: any): any[];
+export declare function calcMergeType(autoMergeValue: boolean, leafOnly: boolean): string;

package/lib/es/cascader/util.js

@@ -8,6 +8,7 @@ import _forEachInstanceProperty from "@babel/runtime-corejs3/core-js-stable/inst
 import _mapInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/map";
 import _filterInstanceProperty from "@babel/runtime-corejs3/core-js-stable/instance/filter";
 import _Object$values from "@babel/runtime-corejs3/core-js-stable/object/values";
+import { strings } from './constants';
 
 function getPosition(level, index) {
   var _context;
@@ -88,4 +89,17 @@ export function findKeysForValues(value, keyEntities) {
   const res = _mapInstanceProperty(_context2 = _filterInstanceProperty(_context3 = _Object$values(keyEntities)).call(_context3, item => _isEqual(item.valuePath, valuePath))).call(_context2, item => item.key);
 
   return res;
+}
+export function calcMergeType(autoMergeValue, leafOnly) {
+  let mergeType;
+
+  if (leafOnly) {
+    mergeType = strings.LEAF_ONLY_MERGE_TYPE;
+  } else if (autoMergeValue) {
+    mergeType = strings.AUTO_MERGE_VALUE_MERGE_TYPE;
+  } else {
+    mergeType = strings.NONE_MERGE_TYPE;
+  }
+
+  return mergeType;
 }