@flatbiz/antd 5.0.27 → 5.0.28

package/dist/tree-wrapper/index.js

@@ -339,7 +339,7 @@ var completionParentChildrenNode = function completionParentChildrenNode(values,
   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", "clickParentNodeToggleExpand", "disableNodeSelect", "required"];
+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", "clickParentNodeToggleExpand", "disableNodeSelect", "required", "executeOnChangeInRenderFirstValue"];
 var compareArrays = function compareArrays(arr1, arr2) {
   var sortedArr1 = arr1.slice().sort();
   var sortedArr2 = arr2.slice().sort();
@@ -396,6 +396,7 @@ var TreeWrapper$1 = /*#__PURE__*/forwardRef(function (props, ref) {
     clickParentNodeToggleExpand = props.clickParentNodeToggleExpand,
     disableNodeSelect = props.disableNodeSelect,
     required = props.required,
+    executeOnChangeInRenderFirstValue = props.executeOnChangeInRenderFirstValue,
     otherProps = _objectWithoutProperties(props, _excluded);
   // eslint-disable-next-line no-prototype-builtins
   var hasSelectorTreeList = props.hasOwnProperty('selectorTreeList');
@@ -442,6 +443,24 @@ var TreeWrapper$1 = /*#__PURE__*/forwardRef(function (props, ref) {
   }, [labelInValueFieldNamesMerge, value]);
   fbaHooks.useEffectCustom(function () {
     if (state.treeList.length > 0) {
+      if (responseFirstRef.current && labelInValue && executeOnChangeInRenderFirstValue && valueList.length > 0) {
+        var dataList = [];
+        var originalList = [];
+        valueList.forEach(function (item) {
+          var target = state.treeTiledArrayMap[item];
+          if (target) {
+            originalList.push(target);
+            dataList.push(_defineProperty(_defineProperty({}, labelInValueFieldNamesMerge.label, target[fieldNames.label]), labelInValueFieldNamesMerge.value, target[fieldNames.value]));
+          }
+        });
+        if (checkable) {
+          var _props$onChange;
+          (_props$onChange = props.onChange) === null || _props$onChange === void 0 || _props$onChange.call(props, dataList ? dataList : undefined, originalList);
+        } else {
+          var _props$onChange2;
+          (_props$onChange2 = props.onChange) === null || _props$onChange2 === void 0 || _props$onChange2.call(props, dataList ? dataList[0] : undefined, originalList[0]);
+        }
+      }
       if (responseFirstRef.current && isUndefinedOrNull(value)) {
         responseFirstRef.current = false;
         if (defaultExpandAll) {
@@ -453,12 +472,19 @@ var TreeWrapper$1 = /*#__PURE__*/forwardRef(function (props, ref) {
         }
       }
       if (!isUndefinedOrNull(value)) {
-        if (innerValueListRef.current && !compareArrays(valueList, innerValueListRef.current)) {
-          var innerExpandedKeys = getTreeExpandedKeys(valueList);
-          setTreeExpandedKeys(Array.from(new Set(treeExpandedKeys === null || treeExpandedKeys === void 0 ? void 0 : treeExpandedKeys.concat(innerExpandedKeys))));
+        responseFirstRef.current = false;
+        if (innerValueListRef.current) {
+          if (!compareArrays(valueList, innerValueListRef.current)) {
+            var innerExpandedKeys = getTreeExpandedKeys(valueList);
+            setTreeExpandedKeys(Array.from(new Set(treeExpandedKeys === null || treeExpandedKeys === void 0 ? void 0 : treeExpandedKeys.concat(innerExpandedKeys))));
+          }
+        } else {
+          var _innerExpandedKeys = getTreeExpandedKeys(valueList);
+          setTreeExpandedKeys(Array.from(new Set(treeExpandedKeys === null || treeExpandedKeys === void 0 ? void 0 : treeExpandedKeys.concat(_innerExpandedKeys))));
         }
       }
     }
+    // 当 valueList 为空时，不去清除treeExpandedKeys数据
   }, [state.treeList, JSON.stringify(valueList)]);
   var valueIsEmpty = function valueIsEmpty(data) {
     return data === '' || isUndefinedOrNull(data);
@@ -643,6 +669,12 @@ var TreeWrapper$1 = /*#__PURE__*/forwardRef(function (props, ref) {
       getTreeDataList: function getTreeDataList() {
         return state.treeList;
       },
+      getTreeTiledArray: function getTreeTiledArray() {
+        return state.treeTiledArray;
+      },
+      getTreeTiledArrayMap: function getTreeTiledArrayMap() {
+        return state.treeTiledArrayMap;
+      },
       onChangeExpandedKeys: function onChangeExpandedKeys(dataList) {
         setTreeExpandedKeys(dataList);
       },
@@ -674,13 +706,13 @@ var TreeWrapper$1 = /*#__PURE__*/forwardRef(function (props, ref) {
   var onInnerChange = function onInnerChange(selectedKey, operateNodeData, operateAllNodeDataList, operateInfo) {
     innerValueListRef.current = toArray(selectedKey);
     if (toArray(selectedKey).length === 0) {
-      var _props$onChange;
+      var _props$onChange3;
       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);
+      (_props$onChange3 = props.onChange) === null || _props$onChange3 === void 0 || _props$onChange3.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);
+      var _props$onChange4;
+      (_props$onChange4 = props.onChange) === null || _props$onChange4 === void 0 || _props$onChange4.call(props, selectedKey, operateNodeData, operateAllNodeDataList, operateInfo);
     }
   };
   var onTreeChangeHandle = hooks.useCallbackRef(function (checkedData, operateInfo) {