@chaoswise/ui 2.7.6 → 2.7.7

package/lib/treeLoad/index.js

@@ -1,46 +1,79 @@
+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 ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
+function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 import React from "react";
-import PropTypes from 'prop-types';
+import PropTypes from "prop-types";
+
 /**
- * 
  * 封装的树形结构懒加载组件
  */
 function fetchTreeNode(oldData, parentId, childNode) {
+  var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
+  var _options$keyField = options.keyField,
+    keyField = _options$keyField === void 0 ? "value" : _options$keyField,
+    compareFn = options.compareFn;
   return oldData.map(function (item) {
-    if (item.value === parentId) {
-      item.children = childNode;
+    var isMatch = false;
+    if (compareFn) {
+      isMatch = compareFn(item, parentId);
+    } else {
+      var itemKey = item[keyField];
+      isMatch = itemKey === parentId;
+    }
+    if (isMatch) {
+      return _objectSpread(_objectSpread({}, item), {}, {
+        children: childNode
+      });
     } else if (item.children) {
-      item.children = fetchTreeNode(item.children, parentId, childNode);
+      return _objectSpread(_objectSpread({}, item), {}, {
+        children: fetchTreeNode(item.children, parentId, childNode, options)
+      });
     }
     return item;
   });
 }
-function treeLoad(oldData, treeNodeKey, fetchData, getChildNode) {
+// 1. 旧版API: treeLoad(oldData, treeNodeKey, fetchData, getChildNode)
+// 2. 新版API: treeLoad(oldData, treeNodeKey, fetchData, options)
+// 3. 混合API-1: treeLoad(oldData, treeNodeKey, fetchData, getChildNode, options) - 第四个参数是函数，第五个是对象
+// 4. 混合API-2: treeLoad(oldData, treeNodeKey, fetchData, options, getChildNode) - 第四个参数是对象，第五个是函数
+
+function treeLoad(oldData, treeNodeKey, fetchData, getChildNodeOrOptions, maybeOptions) {
+  // 兼容旧版API: 第四个参数可能是getChildNode回调函数或options对象
+  var getChildNode;
+  var options = {};
+  if (typeof getChildNodeOrOptions === "function") {
+    // 旧版API: 第四个参数是getChildNode回调函数
+    getChildNode = getChildNodeOrOptions;
+    // 如果第五个参数是对象，则作为options
+    if (maybeOptions && _typeof(maybeOptions) === "object") {
+      options = maybeOptions;
+    }
+  } else if (getChildNodeOrOptions && _typeof(getChildNodeOrOptions) === "object") {
+    // 新版API: 第四个参数是options对象
+    options = getChildNodeOrOptions;
+    // 如果提供了第五个参数且为函数，则视为getChildNode
+    if (typeof maybeOptions === "function") {
+      getChildNode = maybeOptions;
+    }
+  }
   fetchData(treeNodeKey, function (childNode) {
-    var newData = fetchTreeNode(oldData, treeNodeKey, childNode);
+    var newData = fetchTreeNode(oldData, treeNodeKey, childNode, options);
     getChildNode && getChildNode();
     return newData;
   });
 }
-treeLoad.defaultProps = {
-  // 
-};
 treeLoad.propTypes = {
-  /**
-   * 获取子节点的数据，并通过回调函数返回最终渲染的数据。
-   * function(pageNum,callback(res):Data)
-   */
   fetchData: PropTypes.func,
-  /**
-   * 加载前的树形结构数据,结构中把value作为唯一键值
-   */
   oldData: PropTypes.array,
-  /**
-   * 要展开的树节点
-   */
   treeNodeKey: PropTypes.string,
-  /**
-   * 获取子树数据时额外执行的回调函数。
-   */
-  getChildNode: PropTypes.func
+  getChildNode: PropTypes.func,
+  options: PropTypes.shape({
+    keyField: PropTypes.string,
+    // 指定用于匹配的字段名
+    compareFn: PropTypes.func // 自定义比较函数
+  })
 };
 export default treeLoad;

package/lib/useLocale/index.js

@@ -6,8 +6,8 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var n = Object.getOwnPropertySymbols(e); for (r = 0; r < n.length; r++) o = n[r], -1 === t.indexOf(o) && {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
-function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (-1 !== e.indexOf(n)) continue; t[n] = r[n]; } return t; }
+function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var s = Object.getOwnPropertySymbols(e); for (r = 0; r < s.length; r++) o = s[r], t.includes(o) || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
+function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (e.includes(n)) continue; t[n] = r[n]; } return t; }
 function useLocale(langConfig) {
   var _ConfigProvider$useLo = _ConfigProvider.useLocale(),
     locale = _ConfigProvider$useLo.locale,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chaoswise/ui",
-  "version": "2.7.6",
+  "version": "2.7.7",
   "description": "公共UI库",
   "keywords": [
     "ui",
@@ -152,5 +152,5 @@
   "overrides": {
     "node-fetch": "^2.7.0"
   },
-  "gitHead": "54db53013c7d2b04e8cfc7f336eb71fa54da5024"
+  "gitHead": "cf3568b1947cf3833fbaa6f6f7fa493c5282562b"
 }