@flatbiz/antd 5.0.5 → 5.0.6

package/dist/tree-wrapper/index.js

@@ -9,13 +9,13 @@ import './../request-status/index.css';
 import './index.css';
 /*! @flatjs/forge MIT @flatbiz/antd */
 
-import { treeToArray, treeToTiledArray, treeLeafParentsArray, isUndefinedOrNull, treeFilter, attachPropertiesToComponent } from '@flatbiz/utils';
+import { treeToArray, arrayToMap, treeToTiledArray, treeLeafParentsArray, isUndefinedOrNull, isNotEmptyArray, treeToTiledMap, toArray, treeFilter, attachPropertiesToComponent } from '@flatbiz/utils';
 import { isArray } from '@dimjs/lang/is-array';
 import { Model } from '@dimjs/model-react';
 import _CaretDownFilled from '@ant-design/icons/es/icons/CaretDownFilled.js';
 import _MoreOutlined from '@ant-design/icons/es/icons/MoreOutlined.js';
 import { classNames } from '@dimjs/utils/class-names/class-names';
-import { i as _defineProperty, _ as _objectWithoutProperties, a as _slicedToArray, b as _objectSpread2 } from '../_rollupPluginBabelHelpers-BYm17lo8.js';
+import { i as _defineProperty, b as _objectSpread2, c as _toConsumableArray, _ as _objectWithoutProperties, a as _slicedToArray } from '../_rollupPluginBabelHelpers-BYm17lo8.js';
 import { extend } from '@dimjs/utils/extend/extend';
 import { hooks } from '@wove/react/hooks';
 import { get } from '@dimjs/utils/get/get';
@@ -63,6 +63,7 @@ import '../use-responsive-point-Bp3D3lZT.js';
 var defaultState = {
   treeList: [],
   treeTiledArray: [],
+  treeTiledArrayMap: {},
   queryIsEmpty: false
 };
 var TreeWrapperModel = {
@@ -71,6 +72,7 @@ var TreeWrapperModel = {
       return function (state) {
         state.treeList = params.treeList || [];
         state.treeTiledArray = treeToArray(state.treeList, params.childrenName);
+        state.treeTiledArrayMap = arrayToMap(state.treeTiledArray, params.valueName);
         state.requestStatus = 'request-success';
       };
     },
@@ -78,6 +80,7 @@ var TreeWrapperModel = {
       return function (state) {
         state.treeList = [];
         state.treeTiledArray = [];
+        state.treeTiledArrayMap = {};
       };
     },
     changeRequestStatus: function changeRequestStatus(params) {
@@ -86,6 +89,7 @@ var TreeWrapperModel = {
         if (params.status === 'request-error') {
           state.treeList = [];
           state.treeTiledArray = [];
+          state.treeTiledArrayMap = {};
           state.requestErrorMessage = params.errorMessage || '数据查询异常';
         } else {
           state.requestErrorMessage = undefined;
@@ -94,10 +98,9 @@ var TreeWrapperModel = {
     },
     treeListAppendChildren: function treeListAppendChildren(params) {
       return function (state) {
-        var array = treeToArray(state.treeList, params.childrenName);
-        var target = array.find(function (item) {
-          return item[params.valueName] === params.value;
-        });
+        var tiledArray = treeToArray(state.treeList, params.childrenName);
+        var treeTiledArrayMap = arrayToMap(tiledArray, params.valueName);
+        var target = treeTiledArrayMap[params.value];
         if (target) {
           if (isArray(params.appendList) && params.appendList.length > 0) {
             target[params.childrenName] = params.appendList;
@@ -105,7 +108,8 @@ var TreeWrapperModel = {
             target.isLeaf = true;
           }
         }
-        state.treeTiledArray = treeToArray(state.treeList, params.childrenName);
+        state.treeTiledArray = tiledArray;
+        state.treeTiledArrayMap = treeTiledArrayMap;
       };
     }
   },
@@ -242,7 +246,98 @@ var dragNodeData = function dragNodeData(dorpNodeId, dataList, fieldNames) {
   };
 };
 
-var _excluded = ["style", "serviceConfig", "effectDependencyList", "selectorTreeList", "value", "onChange", "modelKey", "checkableResponseParentNode", "checkable", "onSelectorTreeListChange", "onRequestResponseChange", "treeItemDataAdapter", "searchValue", "showSearch", "searchPlaceholder", "requestMessageConfig", "labelInValueFieldNames", "labelInValue", "disabledCanUse", "menuLayoutType", "menuTriggerType", "initRootExpand", "searchResultType", "onDropNodeHandle", "onDropPrev", "labelRender", "searchStyle", "className", "defaultExpandAll", "menus", "customSearchRule"];
+/**
+ * 由于树节点过滤后，选中了父节点不一定是全部子节点，此处进行筛查
+ */
+var getActualSelectKeyList = function getActualSelectKeyList(checkedValueList, treeTiledArrayMap, chidlrenKey, valueKey) {
+  var leafValueDataMap = {};
+  var hasChildrenList = [];
+  var retainHasChildrenValueList = [];
+  checkedValueList.forEach(function (item) {
+    var _treeTiledArrayMap$it;
+    if (isNotEmptyArray((_treeTiledArrayMap$it = treeTiledArrayMap[item]) === null || _treeTiledArrayMap$it === void 0 ? void 0 : _treeTiledArrayMap$it[chidlrenKey])) {
+      hasChildrenList.push(item);
+    } else {
+      leafValueDataMap[item] = item;
+    }
+  });
+  if (hasChildrenList.length > 0) {
+    hasChildrenList.forEach(function (item) {
+      var childrenTiledList = treeToArray(treeTiledArrayMap[item][chidlrenKey], chidlrenKey);
+      if (Object.keys(leafValueDataMap).length > childrenTiledList.length) {
+        var targetList = childrenTiledList.filter(function (item) {
+          return checkedValueList.find(function (temp) {
+            return temp === item[valueKey];
+          });
+        });
+        if (targetList.length === childrenTiledList.length) {
+          retainHasChildrenValueList.push(item);
+        }
+      }
+    });
+  }
+  return checkedValueList.filter(function (item) {
+    return retainHasChildrenValueList.find(function (temp) {
+      return temp == item;
+    }) || leafValueDataMap[item];
+  });
+};
+
+/** 移除指定节点以及所有子节点 */
+var removeTargetNodeAndAllChildrenNode = function removeTargetNodeAndAllChildrenNode(checkedValueList, awitDeleteNode, chidlrenKey, valueKey) {
+  var awitDeleteTieldDataMap = treeToTiledMap([awitDeleteNode], {
+    value: valueKey,
+    children: chidlrenKey
+  });
+  return checkedValueList.filter(function (item) {
+    return !awitDeleteTieldDataMap[item];
+  });
+};
+
+/** 移除父节点全选下的叶子节点 */
+var removeAllSelectLeafNode = function removeAllSelectLeafNode(checkedValueList, treeTiledArrayMap, chidlrenKey, valueKey) {
+  var awitDeleteCheckedValueMap = {};
+  checkedValueList.forEach(function (item) {
+    var _treeTiledArrayMap$it2;
+    var childrenList = (_treeTiledArrayMap$it2 = treeTiledArrayMap[item]) === null || _treeTiledArrayMap$it2 === void 0 ? void 0 : _treeTiledArrayMap$it2[chidlrenKey];
+    if (isNotEmptyArray(childrenList)) {
+      // hasChildrenList.push(item);
+      var targetMap = treeToTiledMap(childrenList, {
+        value: valueKey,
+        children: chidlrenKey
+      });
+      awitDeleteCheckedValueMap = _objectSpread2(_objectSpread2({}, awitDeleteCheckedValueMap), targetMap);
+    }
+  });
+  return checkedValueList.filter(function (item) {
+    return !awitDeleteCheckedValueMap[item];
+  });
+};
+
+/** 移除所有的父节点 */
+var removeAllParentNode = function removeAllParentNode(checkedValueList, treeTiledArrayMap, chidlrenKey) {
+  return checkedValueList.filter(function (item) {
+    return !isNotEmptyArray(treeTiledArrayMap[item][chidlrenKey]);
+  });
+};
+
+/** values中的数据可能存在缺少父节点下的子节点情况，此处不起 */
+var completionParentChildrenNode = function completionParentChildrenNode(values, treeTiledArrayMap, chidlrenKey, valueKey) {
+  var allValues = _toConsumableArray(values);
+  values.forEach(function (item) {
+    var _treeTiledArrayMap$it3;
+    var childrenList = (_treeTiledArrayMap$it3 = treeTiledArrayMap[item]) === null || _treeTiledArrayMap$it3 === void 0 ? void 0 : _treeTiledArrayMap$it3[chidlrenKey];
+    if (isNotEmptyArray(childrenList)) {
+      var targetList = treeToArray(childrenList, chidlrenKey);
+      allValues = allValues.concat(targetList.map(function (temp) {
+        return temp[valueKey];
+      }));
+    }
+  });
+  return Array.from(new Set(allValues));
+};
+
+var _excluded = ["style", "serviceConfig", "effectDependencyList", "selectorTreeList", "value", "onChange", "modelKey", "checkableResponseParentNode", "checkable", "onSelectorTreeListChange", "onRequestResponseChange", "treeItemDataAdapter", "searchValue", "showSearch", "searchPlaceholder", "requestMessageConfig", "labelInValueFieldNames", "labelInValue", "disabledCanUse", "menuLayoutType", "menuTriggerType", "initRootExpand", "searchResultType", "onDropNodeHandle", "onDropPrev", "labelRender", "searchStyle", "className", "defaultExpandAll", "menus", "customSearchRule", "checkableType"];
 /**
  * Tree包装组件，默认返回父节点，可配置不返回
  * @param props
@@ -292,6 +387,7 @@ var TreeWrapper$1 = /*#__PURE__*/forwardRef(function (props, ref) {
     defaultExpandAll = props.defaultExpandAll,
     menus = props.menus,
     customSearchRule = props.customSearchRule,
+    checkableType = props.checkableType,
     otherProps = _objectWithoutProperties(props, _excluded);
   // eslint-disable-next-line no-prototype-builtins
   var hasSelectorTreeList = props.hasOwnProperty('selectorTreeList');
@@ -310,6 +406,7 @@ var TreeWrapper$1 = /*#__PURE__*/forwardRef(function (props, ref) {
     loading = _fbaHooks$useSafeStat2[0],
     setLoading = _fbaHooks$useSafeStat2[1];
   var requestPreKey = "request-progress-".concat(props.modelKey);
+  var searchTypeHighlight = searchResultType === 'highlight';
   var fieldNames = useMemo(function () {
     return _objectSpread2({
       label: 'label',
@@ -331,7 +428,6 @@ var TreeWrapper$1 = /*#__PURE__*/forwardRef(function (props, ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     treeSearchValue = _useState4[0],
     setTreeSearchValue = _useState4[1];
-  var innerOperateValueRef = useRef();
   var valueList = useMemo(function () {
     return getVauleList(value, labelInValueFieldNamesMerge);
   }, [labelInValueFieldNamesMerge, value]);
@@ -348,7 +444,7 @@ var TreeWrapper$1 = /*#__PURE__*/forwardRef(function (props, ref) {
         }
       }
       if (!isUndefinedOrNull(value)) {
-        var expandedKeys = getTreeExpandedKeys(valueList, true);
+        var expandedKeys = getTreeExpandedKeys(valueList);
         setTreeExpandedKeys(Array.from(new Set(treeExpandedKeys === null || treeExpandedKeys === void 0 ? void 0 : treeExpandedKeys.concat(expandedKeys))));
       }
     }
@@ -499,14 +595,14 @@ var TreeWrapper$1 = /*#__PURE__*/forwardRef(function (props, ref) {
     }
     void actions.setTreeList({
       treeList: dataList || [],
-      childrenName: fieldNames.children
+      childrenName: fieldNames.children,
+      valueName: fieldNames.value
     });
     onSelectorTreeListChange === null || onSelectorTreeListChange === void 0 || onSelectorTreeListChange(dataList);
   });
   var getTreeExpandedKeys = function getTreeExpandedKeys(valueList, refresh) {
     var newTreeExpandedKeys = [];
     valueList.forEach(function (value) {
-      if (!refresh && treeExpandedKeys !== null && treeExpandedKeys !== void 0 && treeExpandedKeys.includes(value)) return;
       var targetKeys = getExpandedKeys(value, state.treeList, fieldNames);
       newTreeExpandedKeys = newTreeExpandedKeys.concat(targetKeys);
     });
@@ -523,7 +619,7 @@ var TreeWrapper$1 = /*#__PURE__*/forwardRef(function (props, ref) {
       });
       var treeExpandedKeysNew = getTreeExpandedKeys(targetList.map(function (item) {
         return item[fieldNames.value];
-      }), true);
+      }));
       setTreeExpandedKeys(Array.from(new Set(treeExpandedKeysNew)));
     } else {
       setTreeExpandedKeys([]);
@@ -565,75 +661,92 @@ var TreeWrapper$1 = /*#__PURE__*/forwardRef(function (props, ref) {
   var onExpand = hooks.useCallbackRef(function (expandedKeys) {
     setTreeExpandedKeys(expandedKeys);
   });
-  var onRespChange = hooks.useCallbackRef(function (selectedKey, selectInfo, selectAllList, operateInfo) {
-    innerOperateValueRef.current = selectedKey;
-    var selectList = isUndefinedOrNull(selectInfo) ? [] : isArray(selectInfo) ? selectInfo : [selectInfo];
-    if (isUndefinedOrNull(selectedKey)) {
-      onChange === null || onChange === void 0 || onChange(selectedKey, selectInfo, selectAllList);
-      return;
+  var onInnerChange = function onInnerChange(selectedKey, operateNodeData, operateAllNodeDataList, operateInfo) {
+    if (toArray(selectedKey).length === 0) {
+      var _props$onChange;
+      var nodeValue = operateInfo === null || operateInfo === void 0 ? void 0 : operateInfo.node[fieldNames.value];
+      var target = state.treeTiledArrayMap[nodeValue];
+      (_props$onChange = props.onChange) === null || _props$onChange === void 0 || _props$onChange.call(props, undefined, target, [target], operateInfo);
+    } else {
+      var _props$onChange2;
+      (_props$onChange2 = props.onChange) === null || _props$onChange2 === void 0 || _props$onChange2.call(props, selectedKey, operateNodeData, operateAllNodeDataList, operateInfo);
     }
-    if (labelInValue) {
-      var lvLabel = labelInValueFieldNamesMerge.label;
-      var lvValue = labelInValueFieldNamesMerge.value;
-      var labelInValueList = selectList.map(function (item) {
-        return _defineProperty(_defineProperty({}, lvLabel, item[fieldNames.label]), lvValue, item[fieldNames.value]);
-      });
-      if (isArray(selectedKey)) {
-        onChange === null || onChange === void 0 || onChange(labelInValueList, selectList, selectAllList, operateInfo);
-      } else {
-        onChange === null || onChange === void 0 || onChange(labelInValueList[0], selectList[0], selectAllList, operateInfo);
-      }
+  };
+  var onTreeChangeHandle = hooks.useCallbackRef(function (checkedData, operateInfo) {
+    // 最终checkValueList
+    var finalCheckedValueList = [];
+    // 完整checkValueList
+    var completeCheckedValueList = [];
+    if (checkable) {
+      finalCheckedValueList = props.checkStrictly ? checkedData.checked : checkedData;
+    } else {
+      finalCheckedValueList = checkedData;
+    }
+    finalCheckedValueList = toArray(finalCheckedValueList);
+    if (checkable == false) {
+      completeCheckedValueList = finalCheckedValueList;
     } else {
-      if (isArray(selectedKey)) {
-        onChange === null || onChange === void 0 || onChange(selectedKey, selectList, selectAllList, operateInfo);
+      if (showSearch && treeSearchValue && !searchTypeHighlight) {
+        // 数据源被过滤情况
+        var operateNode = operateInfo === null || operateInfo === void 0 ? void 0 : operateInfo.node;
+        if (props.checkStrictly) {
+          if (operateInfo.checked == false) {
+            finalCheckedValueList = valueList.filter(function (item) {
+              return item != operateNode[fieldNames.value];
+            });
+          } else {
+            finalCheckedValueList = Array.from(new Set([].concat(_toConsumableArray(valueList), _toConsumableArray(finalCheckedValueList))));
+          }
+          completeCheckedValueList = finalCheckedValueList;
+        } else {
+          // 非checkStrictly=true情况
+          var propsCompleteValues = checkableType === '2' || checkableType === '3' ? completionParentChildrenNode(valueList, state.treeTiledArrayMap, fieldNames.children, fieldNames.value) : valueList;
+          if (operateInfo.checked == false) {
+            finalCheckedValueList = removeTargetNodeAndAllChildrenNode(_toConsumableArray(propsCompleteValues), operateNode, fieldNames.children, fieldNames.value);
+          } else {
+            finalCheckedValueList = Array.from(new Set([].concat(_toConsumableArray(propsCompleteValues), _toConsumableArray(finalCheckedValueList))));
+          }
+          completeCheckedValueList = getActualSelectKeyList(finalCheckedValueList, state.treeTiledArrayMap, fieldNames.children, fieldNames.value);
+        }
       } else {
-        onChange === null || onChange === void 0 || onChange(selectedKey, selectList[0], selectAllList, operateInfo);
+        // 无搜索情况
+        completeCheckedValueList = finalCheckedValueList;
       }
-    }
-  });
-  var onTreeChangeHandle = hooks.useCallbackRef(function (checkedData, operateInfo) {
-    var checkedValueList = isUndefinedOrNull(checkedData) ? [] : checkedData;
-    checkedValueList = props.checkStrictly ? checkedData.checked : checkedData;
-    checkedValueList = isArray(checkedValueList) ? checkedValueList : [checkedValueList];
-    var selectedLeafList = [];
-    var selectedLeafValueList = [];
-    var selectedAllList = [];
-    var selectedAllValueList = [];
-    checkedValueList.forEach(function (item) {
-      var target = state.treeTiledArray.find(function (temp) {
-        return temp[fieldNames.value] === item;
-      });
-      if (!target) return;
-      var children = target === null || target === void 0 ? void 0 : target[fieldNames.children];
-      if (!isArray(children) || children.length === 0) {
-        selectedLeafList.push(target);
-        selectedLeafValueList.push(target[fieldNames.value]);
+      if (!props.checkStrictly) {
+        if (checkableType === '2') {
+          finalCheckedValueList = removeAllParentNode(completeCheckedValueList, state.treeTiledArrayMap, fieldNames.children);
+        } else if (checkableType === '3') {
+          finalCheckedValueList = removeAllSelectLeafNode(completeCheckedValueList, state.treeTiledArrayMap, fieldNames.children, fieldNames.value);
+        } else if (checkableResponseParentNode == false) {
+          finalCheckedValueList = removeAllParentNode(completeCheckedValueList, state.treeTiledArrayMap, fieldNames.children);
+        } else {
+          finalCheckedValueList = completeCheckedValueList;
+        }
       }
-      selectedAllList.push(target);
-      selectedAllValueList.push(target[fieldNames.value]);
+    }
+    var completeCheckedItemList = completeCheckedValueList.map(function (item) {
+      return state.treeTiledArrayMap[item];
     });
-    if (checkable) {
-      setTreeExpandedKeys(function (prev) {
-        var mergeList = getTreeExpandedKeys(selectedLeafValueList).concat(prev || []);
-        return Array.from(new Set(mergeList));
+    if (labelInValue) {
+      var lvValue = labelInValueFieldNamesMerge.value;
+      var lvLabel = labelInValueFieldNamesMerge.label;
+      var finalCheckedList = finalCheckedValueList.map(function (item) {
+        return _defineProperty(_defineProperty({}, lvLabel, state.treeTiledArrayMap[item][fieldNames.label]), lvValue, state.treeTiledArrayMap[item][fieldNames.value]);
       });
-      if (!checkableResponseParentNode && !props.checkStrictly) {
-        onRespChange(selectedLeafValueList, selectedLeafList, selectedAllList, operateInfo);
+      if (checkable) {
+        onInnerChange(finalCheckedList, finalCheckedValueList.map(function (item) {
+          return state.treeTiledArrayMap[item];
+        }), completeCheckedItemList, operateInfo);
       } else {
-        onRespChange(selectedAllValueList, selectedAllList, selectedAllList, operateInfo);
+        onInnerChange(finalCheckedList[0], state.treeTiledArrayMap[finalCheckedValueList[0]], completeCheckedItemList, operateInfo);
       }
     } else {
-      if (checkedValueList[0]) {
-        var currentNode = selectedAllList.find(function (item) {
-          return item[fieldNames.value] === checkedValueList[0];
-        });
-        onRespChange(checkedValueList[0], currentNode, [currentNode], operateInfo);
+      if (checkable) {
+        onInnerChange(finalCheckedValueList, finalCheckedValueList.map(function (item) {
+          return state.treeTiledArrayMap[item];
+        }), completeCheckedItemList, operateInfo);
       } else {
-        var nodeValue = operateInfo.node[fieldNames.value];
-        var target = state.treeTiledArray.find(function (temp) {
-          return temp[fieldNames.value] === nodeValue;
-        });
-        onRespChange(undefined, target, [target], operateInfo);
+        onInnerChange(finalCheckedValueList[0], state.treeTiledArrayMap[finalCheckedValueList[0]], completeCheckedItemList, operateInfo);
       }
     }
   });
@@ -643,7 +756,7 @@ var TreeWrapper$1 = /*#__PURE__*/forwardRef(function (props, ref) {
   var originalDataList = useMemo(function () {
     var list = cloneState(state.treeList || []);
     if (treeSearchValue && searchResultType !== 'highlight') {
-      return treeFilter(cloneState(state.treeList || []), function (node) {
+      var resultList = treeFilter(cloneState(state.treeList || []), function (node) {
         var _node$fieldNames$labe;
         if (customSearchRule) {
           return customSearchRule(node, treeSearchValue);
@@ -653,9 +766,10 @@ var TreeWrapper$1 = /*#__PURE__*/forwardRef(function (props, ref) {
       }, {
         childrenName: fieldNames.children
       });
+      return resultList;
     }
     return list;
-  }, [fieldNames.children, fieldNames.label, searchResultType, state.treeList, treeSearchValue]);
+  }, [customSearchRule, fieldNames.children, fieldNames.label, searchResultType, state.treeList, treeSearchValue]);
   var treeData = useMemo(function () {
     var _loop = function loop(data) {
       return data === null || data === void 0 ? void 0 : data.map(function (item) {
@@ -884,7 +998,7 @@ var TreeWrapper$1 = /*#__PURE__*/forwardRef(function (props, ref) {
         className: "v-tree-wrapper-search",
         placeholder: isUndefinedOrNull(searchPlaceholder) ? '搜索' : searchPlaceholder,
         onChange: onSearchChange,
-        value: searchValue,
+        value: treeSearchValue,
         allowClear: true
       }), !!props.searchExtraElement && /*#__PURE__*/jsx("span", {
         className: "v-tree-wrapper-search-extra",
@@ -912,9 +1026,6 @@ var TreeWrapper$1 = /*#__PURE__*/forwardRef(function (props, ref) {
     })]
   });
 });
-TreeWrapper$1.defaultProps = {
-  disabledCanUse: true
-};
 
 /**
  * Tree包装组件，默认返回父节点，可配置不返回