fan-standard-comp 4.1.44 → 4.1.45

package/es/RefactorTree/index.js

@@ -15,12 +15,12 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 // 重构树控件，可直接配置数据
-import React, { useMemo, useState, useCallback, useContext, useImperativeHandle, useRef } from 'react';
+import React, { useMemo, useState, useCallback, useContext, useImperativeHandle, useRef, useEffect } from 'react';
 import { Tree, Empty, Popconfirm, Input, Button } from 'antd';
 import { SearchOutlined } from '@ant-design/icons';
 import SpecIcon from "../SpecIcon/index";
 import { transDataParam, resetDataWithLimit, resetDataWithDisabled, selectAllExcludingDisabled } from "./util";
-import { filterTreeNodes } from "../utils/index";
+import { filterTreeNodes, getLastLeafParentNodes } from "../utils/index";
 var Search = Input.Search;
 import { useLanguageObject } from "../hooks/use-language";
 import useStyle from "./style";
@@ -120,6 +120,33 @@ var RefactorTree = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var selectAllData = useMemo(function () {
     return selectAllExcludingDisabled(transTreeData, optionName, false);
   }, [transTreeData, optionName]);
+  // 动态更新配置expandedKeys
+  useEffect(function () {
+    if (searchReactorValue) {
+      var _getLastLeafParentNod = getLastLeafParentNodes(transTreeData, {
+          childrenParam: optionName['children'],
+          keyParam: optionName['value']
+        }),
+        leafParentKeys = _getLastLeafParentNod.leafParentKeys;
+      setRefactorExpandedKeys(leafParentKeys);
+    }
+  }, [transTreeData, searchReactorValue, optionName]);
+
+  // 动态扩展配置项：动态更新配置expandedKeys及autoExpandParent的节点，使得匹配到可默认展开对应的上层节点
+  var refactorDynamicProps = useMemo(function () {
+    if (searchReactorValue) {
+      return {
+        expandedKeys: refactorExpandedKeys,
+        // (leafParentKeys || []).concat(leafNodes.map(item => item[optionName['value']])),
+        autoExpandParent: true,
+        onExpand: function onExpand(keys) {
+          setRefactorExpandedKeys(keys);
+        }
+      };
+    } else {
+      return {};
+    }
+  }, [searchReactorValue, refactorExpandedKeys]);
   useImperativeHandle(ref, function () {
     return {
       selectAllData: selectAllData,
@@ -250,7 +277,7 @@ var RefactorTree = /*#__PURE__*/React.forwardRef(function (props, ref) {
       } else {
         defExpand = rootKey ? [rootKey] : ['0'];
       }
-      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Tree, _extends({}, otherProps, {
+      return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Tree, _extends({}, otherProps, refactorDynamicProps, {
         onSelect: function onSelect(keys, e) {
           return handleToSelectTreeNode(keys, e);
         },

package/es/utils/getParentNodes.d.ts

@@ -107,3 +107,27 @@ export declare const filterTreeNodes: (list: any[], nodeKey: string | number, pa
  * @param {Object} extra 扩展配置 {separator: '/'}
  * */
 export declare const addTreeLevels: (data: any, level: number | undefined, parentIndexPath: never[] | undefined, parentNamePath: never[] | undefined, optionName: any, extra: any) => any[];
+/**
+ * @description  获取树数据中所有叶子节点的上层节点路径（用于antd树组件的expandedKeys配置）
+ * @params {Array}  list 树数据集合
+ * @params {Object} params 指定当前数据中，子集合字段名及标识值字段名
+ *                         （childrenParam：指当前子集合数据字段名，keyParam： 指当前匹配标识值字段名）
+ * @params {Object} extra 额外配置
+ *
+ * @result {Array} leafParentKeys 所有叶子节点的上层节点key集合（去重后的数组）
+ * @result {Array} leafNodes 所有叶子节点本身
+ * @result {Array} leafNodesKeys 所有叶子节点的key集合
+ * @result {Array} leafParentPaths 所有叶子节点的完整上层路径数组
+ *
+ * 用法：
+ * const { leafParentKeys, leafNodes , leafNodesKeys, leafParentPaths} = getLastLeafParentNodes(treeList, { childrenParam: 'children', keyParam: 'id' })
+ */
+export declare const getLastLeafParentNodes: (list?: never[], params?: {
+    childrenParam: string;
+    keyParam: string;
+}, extra?: {}) => {
+    leafNodes: any[];
+    leafNodesKeys: any[];
+    leafParentKeys: unknown[];
+    leafParentPaths: any[];
+};

package/es/utils/getParentNodes.js

@@ -385,4 +385,82 @@ export var addTreeLevels = function addTreeLevels(data) {
     }
     return node;
   });
+};
+
+/**
+ * @description  获取树数据中所有叶子节点的上层节点路径（用于antd树组件的expandedKeys配置）
+ * @params {Array}  list 树数据集合
+ * @params {Object} params 指定当前数据中，子集合字段名及标识值字段名
+ *                         （childrenParam：指当前子集合数据字段名，keyParam： 指当前匹配标识值字段名）
+ * @params {Object} extra 额外配置
+ *
+ * @result {Array} leafParentKeys 所有叶子节点的上层节点key集合（去重后的数组）
+ * @result {Array} leafNodes 所有叶子节点本身
+ * @result {Array} leafNodesKeys 所有叶子节点的key集合
+ * @result {Array} leafParentPaths 所有叶子节点的完整上层路径数组
+ *
+ * 用法：
+ * const { leafParentKeys, leafNodes , leafNodesKeys, leafParentPaths} = getLastLeafParentNodes(treeList, { childrenParam: 'children', keyParam: 'id' })
+ */
+
+export var getLastLeafParentNodes = function getLastLeafParentNodes() {
+  var list = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {
+    childrenParam: 'children',
+    keyParam: 'value'
+  };
+  var extra = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+  var leafNodes = []; // 存储所有叶子节点
+  var leafParentPaths = []; // 存储所有叶子节点的完整上层路径
+  var expandedKeysSet = new Set(); // 用于去重的expandedKeys集合
+
+  // 递归遍历树，找到所有叶子节点及其上层路径
+  var traverseTree = function traverseTree(nodes) {
+    var parentPath = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+    if (!nodes || !Array.isArray(nodes)) return;
+    nodes.forEach(function (node) {
+      var currentPath = [].concat(_toConsumableArray(parentPath), [node]);
+
+      // 检查是否是叶子节点（children为空或无值）
+      var children = node[params.childrenParam];
+      var isLeaf = !children || Array.isArray(children) && children.length === 0;
+      if (isLeaf) {
+        // 这是叶子节点
+        leafNodes.push(node);
+
+        // 获取完整上层路径（排除当前叶子节点本身）
+        if (parentPath.length > 0) {
+          leafParentPaths.push(_toConsumableArray(parentPath));
+
+          // 将上层路径中的所有节点的key添加到expandedKeys集合中
+          parentPath.forEach(function (parentNode) {
+            var key = parentNode[params.keyParam];
+            if (key !== undefined && key !== null) {
+              expandedKeysSet.add(key);
+            }
+          });
+        }
+      } else {
+        // 递归遍历子节点
+        traverseTree(children, currentPath);
+      }
+    });
+  };
+
+  // 开始遍历
+  traverseTree(list);
+
+  // 将Set转换为数组
+  var expandedKeys = Array.from(expandedKeysSet);
+  return {
+    leafNodes: leafNodes,
+    // 所有叶子节点本身
+    leafNodesKeys: leafNodes.map(function (item) {
+      return item[params.keyParam];
+    }),
+    // 所有叶子节点的key集合
+    leafParentKeys: expandedKeys,
+    // 所有叶子节点的上层节点key集合（去重后的数组）
+    leafParentPaths: leafParentPaths // 所有叶子节点的完整上层路径数组
+  };
 };

package/lib/RefactorTree/index.js

@@ -127,6 +127,33 @@ var RefactorTree = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
   var selectAllData = (0, _react.useMemo)(function () {
     return (0, _util.selectAllExcludingDisabled)(transTreeData, optionName, false);
   }, [transTreeData, optionName]);
+  // 动态更新配置expandedKeys
+  (0, _react.useEffect)(function () {
+    if (searchReactorValue) {
+      var _getLastLeafParentNod = (0, _index2.getLastLeafParentNodes)(transTreeData, {
+          childrenParam: optionName['children'],
+          keyParam: optionName['value']
+        }),
+        leafParentKeys = _getLastLeafParentNod.leafParentKeys;
+      setRefactorExpandedKeys(leafParentKeys);
+    }
+  }, [transTreeData, searchReactorValue, optionName]);
+
+  // 动态扩展配置项：动态更新配置expandedKeys及autoExpandParent的节点，使得匹配到可默认展开对应的上层节点
+  var refactorDynamicProps = (0, _react.useMemo)(function () {
+    if (searchReactorValue) {
+      return {
+        expandedKeys: refactorExpandedKeys,
+        // (leafParentKeys || []).concat(leafNodes.map(item => item[optionName['value']])),
+        autoExpandParent: true,
+        onExpand: function onExpand(keys) {
+          setRefactorExpandedKeys(keys);
+        }
+      };
+    } else {
+      return {};
+    }
+  }, [searchReactorValue, refactorExpandedKeys]);
   (0, _react.useImperativeHandle)(ref, function () {
     return {
       selectAllData: selectAllData,
@@ -257,7 +284,7 @@ var RefactorTree = /*#__PURE__*/_react.default.forwardRef(function (props, ref)
       } else {
         defExpand = rootKey ? [rootKey] : ['0'];
       }
-      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_antd.Tree, _extends({}, otherProps, {
+      return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(_antd.Tree, _extends({}, otherProps, refactorDynamicProps, {
         onSelect: function onSelect(keys, e) {
           return handleToSelectTreeNode(keys, e);
         },

package/lib/utils/getParentNodes.d.ts

@@ -107,3 +107,27 @@ export declare const filterTreeNodes: (list: any[], nodeKey: string | number, pa
  * @param {Object} extra 扩展配置 {separator: '/'}
  * */
 export declare const addTreeLevels: (data: any, level: number | undefined, parentIndexPath: never[] | undefined, parentNamePath: never[] | undefined, optionName: any, extra: any) => any[];
+/**
+ * @description  获取树数据中所有叶子节点的上层节点路径（用于antd树组件的expandedKeys配置）
+ * @params {Array}  list 树数据集合
+ * @params {Object} params 指定当前数据中，子集合字段名及标识值字段名
+ *                         （childrenParam：指当前子集合数据字段名，keyParam： 指当前匹配标识值字段名）
+ * @params {Object} extra 额外配置
+ *
+ * @result {Array} leafParentKeys 所有叶子节点的上层节点key集合（去重后的数组）
+ * @result {Array} leafNodes 所有叶子节点本身
+ * @result {Array} leafNodesKeys 所有叶子节点的key集合
+ * @result {Array} leafParentPaths 所有叶子节点的完整上层路径数组
+ *
+ * 用法：
+ * const { leafParentKeys, leafNodes , leafNodesKeys, leafParentPaths} = getLastLeafParentNodes(treeList, { childrenParam: 'children', keyParam: 'id' })
+ */
+export declare const getLastLeafParentNodes: (list?: never[], params?: {
+    childrenParam: string;
+    keyParam: string;
+}, extra?: {}) => {
+    leafNodes: any[];
+    leafNodesKeys: any[];
+    leafParentKeys: unknown[];
+    leafParentPaths: any[];
+};

package/lib/utils/getParentNodes.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getParentNodes = exports.getNodePaths = exports.getNode = exports.getChildrenNodes = exports.filterTreeNodes = exports.convertToArray = exports.arrayToTree = exports.addTreeLevels = void 0;
+exports.getParentNodes = exports.getNodePaths = exports.getNode = exports.getLastLeafParentNodes = exports.getChildrenNodes = exports.filterTreeNodes = exports.convertToArray = exports.arrayToTree = exports.addTreeLevels = void 0;
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -391,4 +391,82 @@ var addTreeLevels = exports.addTreeLevels = function addTreeLevels(data) {
     }
     return node;
   });
+};
+
+/**
+ * @description  获取树数据中所有叶子节点的上层节点路径（用于antd树组件的expandedKeys配置）
+ * @params {Array}  list 树数据集合
+ * @params {Object} params 指定当前数据中，子集合字段名及标识值字段名
+ *                         （childrenParam：指当前子集合数据字段名，keyParam： 指当前匹配标识值字段名）
+ * @params {Object} extra 额外配置
+ *
+ * @result {Array} leafParentKeys 所有叶子节点的上层节点key集合（去重后的数组）
+ * @result {Array} leafNodes 所有叶子节点本身
+ * @result {Array} leafNodesKeys 所有叶子节点的key集合
+ * @result {Array} leafParentPaths 所有叶子节点的完整上层路径数组
+ *
+ * 用法：
+ * const { leafParentKeys, leafNodes , leafNodesKeys, leafParentPaths} = getLastLeafParentNodes(treeList, { childrenParam: 'children', keyParam: 'id' })
+ */
+
+var getLastLeafParentNodes = exports.getLastLeafParentNodes = function getLastLeafParentNodes() {
+  var list = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  var params = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {
+    childrenParam: 'children',
+    keyParam: 'value'
+  };
+  var extra = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
+  var leafNodes = []; // 存储所有叶子节点
+  var leafParentPaths = []; // 存储所有叶子节点的完整上层路径
+  var expandedKeysSet = new Set(); // 用于去重的expandedKeys集合
+
+  // 递归遍历树，找到所有叶子节点及其上层路径
+  var traverseTree = function traverseTree(nodes) {
+    var parentPath = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+    if (!nodes || !Array.isArray(nodes)) return;
+    nodes.forEach(function (node) {
+      var currentPath = [].concat(_toConsumableArray(parentPath), [node]);
+
+      // 检查是否是叶子节点（children为空或无值）
+      var children = node[params.childrenParam];
+      var isLeaf = !children || Array.isArray(children) && children.length === 0;
+      if (isLeaf) {
+        // 这是叶子节点
+        leafNodes.push(node);
+
+        // 获取完整上层路径（排除当前叶子节点本身）
+        if (parentPath.length > 0) {
+          leafParentPaths.push(_toConsumableArray(parentPath));
+
+          // 将上层路径中的所有节点的key添加到expandedKeys集合中
+          parentPath.forEach(function (parentNode) {
+            var key = parentNode[params.keyParam];
+            if (key !== undefined && key !== null) {
+              expandedKeysSet.add(key);
+            }
+          });
+        }
+      } else {
+        // 递归遍历子节点
+        traverseTree(children, currentPath);
+      }
+    });
+  };
+
+  // 开始遍历
+  traverseTree(list);
+
+  // 将Set转换为数组
+  var expandedKeys = Array.from(expandedKeysSet);
+  return {
+    leafNodes: leafNodes,
+    // 所有叶子节点本身
+    leafNodesKeys: leafNodes.map(function (item) {
+      return item[params.keyParam];
+    }),
+    // 所有叶子节点的key集合
+    leafParentKeys: expandedKeys,
+    // 所有叶子节点的上层节点key集合（去重后的数组）
+    leafParentPaths: leafParentPaths // 所有叶子节点的完整上层路径数组
+  };
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fan-standard-comp",
-  "version": "4.1.44",
+  "version": "4.1.45",
   "description": "FZ standard-comp,basic of antd5.0 and custom component.",
   "main": "lib/index.js",
   "module": "es/index.js",