@chaoswise/ui 3.1.5 → 3.1.6

package/lib/BasicLayout/Breadcrumb.js

@@ -10,8 +10,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
 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; }
 import React, { useMemo } from 'react';
-import { useHistory } from 'react-router-dom';
-import { Link } from 'react-router-dom';
+import { useHistory, Link } from 'react-router-dom';
 function BreadcrumbShow(_ref) {
   var _ref$routes = _ref.routes,
     routes = _ref$routes === void 0 ? [] : _ref$routes,
@@ -55,15 +54,15 @@ function BreadcrumbShow(_ref) {
     }
     return data;
   }, [routes, pathname, formatData]);
+  var _breadcrumbData = breadData ? breadData : breadcrumbData;
   if (render) {
     return render({
       routes: routes,
-      data: data,
+      data: _breadcrumbData,
       currentPath: currentPath,
       breadcrumbOptions: breadcrumbOptions
     });
   }
-  var _breadcrumbData = breadData ? breadData : breadcrumbData;
   return /*#__PURE__*/React.createElement(_Breadcrumb, _extends({
     style: _objectSpread({}, style)
   }, resP), _breadcrumbData.map(function (bread, index) {

package/lib/BasicLayout/Footer.js

@@ -1,4 +1,5 @@
-var _excluded = ["children", "id"];
+import _useConfigContext2 from "@chaoswise/ui/lib/useConfigContext";
+var _excluded = ["children"];
 function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
 function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
@@ -9,16 +10,13 @@ function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
 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; }
 import React, { useLayoutEffect, useRef, useEffect } from "react";
-import useConfigContext from "../useConfigContext";
 import { eventManager } from "../utils";
 import classnames from "classnames";
 import useStyle from "./style/footer";
 function Footer(_ref) {
   var children = _ref.children,
-    _ref$id = _ref.id,
-    id = _ref$id === void 0 ? "" : _ref$id,
     res = _objectWithoutProperties(_ref, _excluded);
-  var _useConfigContext = useConfigContext(),
+  var _useConfigContext = _useConfigContext2(),
     getPrefixCls = _useConfigContext.getPrefixCls;
   var prefixCls = getPrefixCls("basic-layout");
   var dom = useRef(null);

package/lib/BasicLayout/Sider.js

@@ -1,6 +1,7 @@
 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); }
 import _Tooltip from "@chaoswise/ui/lib/Tooltip";
 import _SiderMenu from "@chaoswise/ui/lib/SiderMenu";
+import _useConfigContext2 from "@chaoswise/ui/lib/useConfigContext";
 import _Layout from "@chaoswise/ui/lib/Layout";
 var _excluded = ["canDrag", "enable", "maxDragWidth", "resizeBarColor", "onResizeStart", "onResizeStop", "onResize", "siderDragWidth"],
   _excluded2 = ["menuData", "resizableProps"];
@@ -23,7 +24,6 @@ import { Resizable } from "re-resizable";
 import { MenuFoldOutlined, MenuUnfoldOutlined } from "@ant-design/icons";
 import { useTheme } from '../antd-style';
 import classnames from 'classnames';
-import useConfigContext from "../useConfigContext";
 import useStyle from "./style/sider";
 var AntSider = _Layout.Sider;
 function Sider(_ref) {
@@ -38,7 +38,7 @@ function Sider(_ref) {
     _setSiderDragWidth = _ref._setSiderDragWidth,
     menuOptions = _ref.menuOptions,
     onCollapse = _ref.onCollapse;
-  var _useConfigContext = useConfigContext(),
+  var _useConfigContext = _useConfigContext2(),
     getPrefixCls = _useConfigContext.getPrefixCls;
   var prefixCls = getPrefixCls("basic-layout");
   var _useStyle = useStyle("".concat(prefixCls, "-cw-side")),

package/lib/BasicLayout/index.js

@@ -1,5 +1,6 @@
 import _ErrorBoundary from "@chaoswise/ui/lib/ErrorBoundary";
 import _Header from "@chaoswise/ui/lib/Header";
+import _useConfigContext2 from "@chaoswise/ui/lib/useConfigContext";
 import _Layout from "@chaoswise/ui/lib/Layout";
 function _extends() { return _extends = Object.assign ? Object.assign.bind() : function (n) { for (var e = 1; e < arguments.length; e++) { var t = arguments[e]; for (var r in t) ({}).hasOwnProperty.call(t, r) && (n[r] = t[r]); } return n; }, _extends.apply(null, arguments); }
 function _slicedToArray(r, e) { return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest(); }
@@ -21,7 +22,6 @@ import { eventManager } from '../utils';
 import { judgeIsIframe } from "./utils";
 import intl from "../locales";
 import useStyle from "./style/index";
-import useConfigContext from "../useConfigContext";
 var Content = _Layout.Content,
   AntHeader = _Layout.Header;
 
@@ -82,7 +82,7 @@ var BasicLayout = function BasicLayout(_ref) {
     _ref$style = _ref.style,
     style = _ref$style === void 0 ? {} : _ref$style;
   var isInIrame = judgeIsIframe();
-  var _useConfigContext = useConfigContext(),
+  var _useConfigContext = _useConfigContext2(),
     getPrefixCls = _useConfigContext.getPrefixCls;
   var prefixCls = getPrefixCls("basic-layout");
   var _useStyle = useStyle("".concat(prefixCls, "-cw-layout-out")),

package/lib/ConfigProvider/theme/common.js

@@ -78,8 +78,7 @@ export var commonComponentToken = {
     opacityLoading: 0.35
   },
   Select: {
-    optionPadding: "5px 10px",
-    algorithm: true
+    optionPadding: "5px 10px"
   },
   CWSelect: {
     optionPadding: "5px 10px"

package/lib/treeLoad/index.js

@@ -1,43 +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";
+
 /**
- *
  * 封装的树形结构懒加载组件
  */
 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.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/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@chaoswise/ui",
   "packageName": "chaoswiseUI",
-  "version": "3.1.5",
+  "version": "3.1.6",
   "description": "公共UI库",
   "keywords": [
     "ui",
@@ -50,7 +50,7 @@
     "echarts-for-react": "^3.0.2",
     "highlight.js": "^9.18.5",
     "immutability-helper": "^3.1.1",
-    "marked": "^15.0.7",
+    "marked": "^4.3.0",
     "moment-timezone": "^0.5.46",
     "omit.js": "^2.0.2",
     "qrcode.react": "^3.1.0",

package/lib/BasicLayout/locale/en_US.js

@@ -1,4 +0,0 @@
-export default {
-  back: 'Back',
-  allProductsTitle: 'Products'
-};

package/lib/BasicLayout/locale/index.js

@@ -1,11 +0,0 @@
-import zh_CN from './zh_CN.js';
-import en_US from './en_US.js';
-import zh_TW from './zh_TW.js';
-export default {
-  zh_CN: zh_CN,
-  en_US: en_US,
-  zh_TW: zh_TW,
-  // 兼容
-  zh: zh_CN,
-  en: en_US
-};

package/lib/BasicLayout/locale/zh_CN.js

@@ -1,4 +0,0 @@
-export default {
-  back: '返回',
-  allProductsTitle: '所有产品'
-};

package/lib/BasicLayout/locale/zh_TW.js

@@ -1,4 +0,0 @@
-export default {
-  back: '返回',
-  allProductsTitle: '所有產品'
-};