@hi-ui/check-cascader 4.3.0 → 4.3.1-alpha.1

package/lib/cjs/CheckCascader.js

@@ -251,6 +251,7 @@ var CheckCascader = /*#__PURE__*/React.forwardRef(function (_a, ref) {
     flatted: flatted || !!searchValue,
     // @ts-ignore
     flattedData: selectProps.data,
+    originalFlattedData: flattedData,
     data: cascaderData,
     onChangeData: setCascaderData,
     checkedMode: checkedMode,

package/lib/cjs/CheckCascaderMenuList.js

@@ -41,6 +41,7 @@ var CheckCascaderMenuList = /*#__PURE__*/React.forwardRef(function (_a, ref) {
     role = _a$role === void 0 ? _role : _a$role,
     className = _a.className,
     flattedData = _a.flattedData,
+    originalFlattedData = _a.originalFlattedData,
     onChangeData = _a.onChangeData,
     valueProp = _a.value,
     _a$defaultValue = _a.defaultValue,
@@ -60,7 +61,7 @@ var CheckCascaderMenuList = /*#__PURE__*/React.forwardRef(function (_a, ref) {
     flatted = _a.flatted,
     _a$checkedMode = _a.checkedMode,
     checkedMode = _a$checkedMode === void 0 ? 'ALL' : _a$checkedMode,
-    rest = tslib.__rest(_a, ["prefixCls", "role", "className", "children", "data", "flattedData", "onChangeData", "value", "defaultValue", "disabled", "expandTrigger", "changeOnSelect", "checkCascaded", "onLoadChildren", "onChange", "onSelect", "titleRender", "dropdownColumnRender", "flatted", "checkedMode"]);
+    rest = tslib.__rest(_a, ["prefixCls", "role", "className", "children", "data", "flattedData", "originalFlattedData", "onChangeData", "value", "defaultValue", "disabled", "expandTrigger", "changeOnSelect", "checkCascaded", "onLoadChildren", "onChange", "onSelect", "titleRender", "dropdownColumnRender", "flatted", "checkedMode"]);
   if (checkCascaded === false) {
     checkedMode = 'SEPARATE';
   }
@@ -71,7 +72,7 @@ var CheckCascaderMenuList = /*#__PURE__*/React.forwardRef(function (_a, ref) {
   var _useAsyncSwitch = useAsyncSwitch.useAsyncSwitch(onChangeData, onOptionSelect, onLoadChildren),
     isLoadingId = _useAsyncSwitch[0],
     onItemExpand = _useAsyncSwitch[1];
-  var _useCheck = useCheck.useCheck(checkedMode, disabled, flattedData, defaultValue, valueProp, function (_ref, target, shouldChecked) {
+  var _useCheck = useCheck.useCheck(checkedMode, disabled, originalFlattedData, defaultValue, valueProp, function (_ref, target, shouldChecked) {
       var checkedIds = _ref.checkedIds;
       // @ts-ignore
       onChange === null || onChange === void 0 ? void 0 : onChange(checkedIds, target, shouldChecked);

package/lib/cjs/utils/index.js

@@ -101,10 +101,13 @@ function getCascaderItemEventData(node, requiredProps) {
  */
 var processCheckedIds = function processCheckedIds(type, checkedIds, flattenData, allowCheck) {
   var keySet = new Set(checkedIds);
+  var flattenDataMap = new Map(flattenData.map(function (node) {
+    return [node.id, node];
+  }));
   switch (type) {
     case 'CHILD':
       return checkedIds.filter(function (id) {
-        var node = treeUtils.fFindNodeById(flattenData, id);
+        var node = flattenDataMap.get(id);
         if (node) {
           var children = node.children;
           if (typeAssertion.isArrayNonEmpty(children)) {
@@ -120,7 +123,7 @@ var processCheckedIds = function processCheckedIds(type, checkedIds, flattenData
       });
     case 'PARENT':
       return checkedIds.filter(function (id) {
-        var node = treeUtils.fFindNodeById(flattenData, id);
+        var node = flattenDataMap.get(id);
         if (node) {
           // 向上递归遍历是否被勾选
           var ancestors = treeUtils.getNodeAncestors(node);

package/lib/esm/CheckCascader.js

@@ -239,6 +239,7 @@ var CheckCascader = /*#__PURE__*/forwardRef(function (_a, ref) {
     flatted: flatted || !!searchValue,
     // @ts-ignore
     flattedData: selectProps.data,
+    originalFlattedData: flattedData,
     data: cascaderData,
     onChangeData: setCascaderData,
     checkedMode: checkedMode,

package/lib/esm/CheckCascaderMenuList.js

@@ -29,6 +29,7 @@ var CheckCascaderMenuList = /*#__PURE__*/forwardRef(function (_a, ref) {
     role = _a$role === void 0 ? _role : _a$role,
     className = _a.className,
     flattedData = _a.flattedData,
+    originalFlattedData = _a.originalFlattedData,
     onChangeData = _a.onChangeData,
     valueProp = _a.value,
     _a$defaultValue = _a.defaultValue,
@@ -48,7 +49,7 @@ var CheckCascaderMenuList = /*#__PURE__*/forwardRef(function (_a, ref) {
     flatted = _a.flatted,
     _a$checkedMode = _a.checkedMode,
     checkedMode = _a$checkedMode === void 0 ? 'ALL' : _a$checkedMode,
-    rest = __rest(_a, ["prefixCls", "role", "className", "children", "data", "flattedData", "onChangeData", "value", "defaultValue", "disabled", "expandTrigger", "changeOnSelect", "checkCascaded", "onLoadChildren", "onChange", "onSelect", "titleRender", "dropdownColumnRender", "flatted", "checkedMode"]);
+    rest = __rest(_a, ["prefixCls", "role", "className", "children", "data", "flattedData", "originalFlattedData", "onChangeData", "value", "defaultValue", "disabled", "expandTrigger", "changeOnSelect", "checkCascaded", "onLoadChildren", "onChange", "onSelect", "titleRender", "dropdownColumnRender", "flatted", "checkedMode"]);
   if (checkCascaded === false) {
     checkedMode = 'SEPARATE';
   }
@@ -59,7 +60,7 @@ var CheckCascaderMenuList = /*#__PURE__*/forwardRef(function (_a, ref) {
   var _useAsyncSwitch = useAsyncSwitch(onChangeData, onOptionSelect, onLoadChildren),
     isLoadingId = _useAsyncSwitch[0],
     onItemExpand = _useAsyncSwitch[1];
-  var _useCheck = useCheck(checkedMode, disabled, flattedData, defaultValue, valueProp, function (_ref, target, shouldChecked) {
+  var _useCheck = useCheck(checkedMode, disabled, originalFlattedData, defaultValue, valueProp, function (_ref, target, shouldChecked) {
       var checkedIds = _ref.checkedIds;
       // @ts-ignore
       onChange === null || onChange === void 0 ? void 0 : onChange(checkedIds, target, shouldChecked);

package/lib/esm/utils/index.js

@@ -7,7 +7,7 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
-import { baseFlattenTree, getTopDownAncestors, fFindNodeById, getNodeAncestors, findNestedChildren } from '@hi-ui/tree-utils';
+import { baseFlattenTree, getTopDownAncestors, getNodeAncestors, findNestedChildren } from '@hi-ui/tree-utils';
 import { isArrayNonEmpty } from '@hi-ui/type-assertion';
 
 /**
@@ -96,10 +96,13 @@ function getCascaderItemEventData(node, requiredProps) {
  */
 var processCheckedIds = function processCheckedIds(type, checkedIds, flattenData, allowCheck) {
   var keySet = new Set(checkedIds);
+  var flattenDataMap = new Map(flattenData.map(function (node) {
+    return [node.id, node];
+  }));
   switch (type) {
     case 'CHILD':
       return checkedIds.filter(function (id) {
-        var node = fFindNodeById(flattenData, id);
+        var node = flattenDataMap.get(id);
         if (node) {
           var children = node.children;
           if (isArrayNonEmpty(children)) {
@@ -115,7 +118,7 @@ var processCheckedIds = function processCheckedIds(type, checkedIds, flattenData
       });
     case 'PARENT':
       return checkedIds.filter(function (id) {
-        var node = fFindNodeById(flattenData, id);
+        var node = flattenDataMap.get(id);
         if (node) {
           // 向上递归遍历是否被勾选
           var ancestors = getNodeAncestors(node);

package/lib/types/CheckCascaderMenuList.d.ts

@@ -30,6 +30,11 @@ export interface CascaderMenusProps {
      * 设置选择项数据源
      */
     flattedData: FlattedCheckCascaderDataItem[];
+    /**
+     * 未被过滤的选择项数据源，Hotfix：https://github.com/XiaoMi/hiui/issues/2992
+     * @private
+     */
+    originalFlattedData: FlattedCheckCascaderDataItem[];
     /**
      * 设置当前多选值
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hi-ui/check-cascader",
-  "version": "4.3.0",
+  "version": "4.3.1-alpha.1",
   "description": "A sub-package for @hi-ui/hiui.",
   "keywords": [],
   "author": "HiUI <mi-hiui@xiaomi.com>",