@zat-design/sisyphus-react 4.0.0-beta.3 → 4.0.0-beta.5

package/lib/ProLayout/utils/index.js

@@ -1,48 +1,42 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+"use strict";
 
-// src/ProLayout/utils/index.ts
-var utils_exports = {};
-__export(utils_exports, {
-  getIdsByPathName: () => getIdsByPathName,
-  getPathNameKey: () => getPathNameKey,
-  getUrlParams: () => getUrlParams,
-  transformMenu: () => transformMenu,
-  transformMenus: () => transformMenus
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(utils_exports);
-var import_lodash = require("lodash");
+exports.getPathNameKey = exports.getIdsByPathName = exports.findMenuItemByKey = void 0;
+exports.getUrlParams = getUrlParams;
+exports.transformMenus = exports.transformMenu = void 0;
+var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/createForOfIteratorHelper"));
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _lodash = require("lodash");
+/* eslint-disable prefer-destructuring */
+/* eslint-disable no-mixed-operators */
+
+/**
+ * 通过URL获取对应keyIdPath
+ * @param menus  菜单数据
+ * @param activeMenu  上一次激活url地址
+ * @return result
+ */
 var getIdsByPathName = (menus, activeMenu) => {
-  let _pathName = window.location.pathname;
+  var _pathName = window.location.pathname;
   if (activeMenu) {
     _pathName = activeMenu;
   }
-  let result;
-  const menuDeep = (menuDeepItem) => {
-    for (let i = 0; i <= menuDeepItem.length - 1; i++) {
-      const item = menuDeepItem[i];
-      if ((item == null ? void 0 : item.url) === _pathName || item.redirectUrl === _pathName) {
+  var result;
+  var menuDeep = menuDeepItem => {
+    for (var i = 0; i <= menuDeepItem.length - 1; i++) {
+      var item = menuDeepItem[i];
+      // 只包含一级菜单时，解决URL：/endorsement/demo/123无法选中问题
+      if ((item === null || item === void 0 ? void 0 : item.url) === _pathName || item.redirectUrl === _pathName) {
         result = item.keyIdPath;
         break;
       }
       if (Array.isArray(item.children) && item.children.length) {
         menuDeep(item.children);
-      } else if (((item == null ? void 0 : item.url) && _pathName.includes(item.url.split("?")[0]) || (item == null ? void 0 : item.redirectUrl) && _pathName.includes(item.redirectUrl.split("?")[0])) && !result) {
+      } else if ((item !== null && item !== void 0 && item.url && _pathName.includes(item.url.split('?')[0]) || item !== null && item !== void 0 && item.redirectUrl && _pathName.includes(item.redirectUrl.split('?')[0])) && !result) {
+        // 当循环到最后一层时判断URL是否包含最后一层的URL，解决URL在URL中不存在的场景
         result = item.keyIdPath;
         break;
       }
@@ -51,34 +45,45 @@ var getIdsByPathName = (menus, activeMenu) => {
   menuDeep(menus);
   return result || [];
 };
+
+/**
+ * 转换菜单数据源评价keyUrlPath与keyIdPath
+ * @param menuData 菜单数据源
+ * @returns []
+ */
+exports.getIdsByPathName = getIdsByPathName;
 var transformMenu = (menuData, pathPrefix) => {
-  const data = [...menuData];
-  const menuDeep = (menuDeepItem) => {
+  var data = [...menuData];
+  var menuDeep = menuDeepItem => {
     if (!Array.isArray(menuDeepItem) || !menuDeepItem.length) {
       return [];
     }
     menuDeepItem.forEach((item, index) => {
-      var _a, _b, _c;
+      var _item$keyUrlPath, _item$keyIdPath, _item$children;
       item.code = item.code || item.id;
       item.url = `${pathPrefix}${item.url}`;
-      item.redirectUrl = (item == null ? void 0 : item.redirectUrl) ? `${pathPrefix}${item.redirectUrl}` : "";
-      if ((_a = item == null ? void 0 : item.keyUrlPath) == null ? void 0 : _a.length) {
+      item.redirectUrl = item !== null && item !== void 0 && item.redirectUrl ? `${pathPrefix}${item.redirectUrl}` : '';
+      // 拼接父级url与id数据
+      if (item !== null && item !== void 0 && (_item$keyUrlPath = item.keyUrlPath) !== null && _item$keyUrlPath !== void 0 && _item$keyUrlPath.length) {
         item.keyUrlPath.push(item.redirectUrl || item.url);
+        // 去重解决重复问题
         item.keyUrlPath = [...new Set(item.keyUrlPath)];
       } else {
         item.keyUrlPath = [item.redirectUrl || item.url];
       }
-      if ((_b = item == null ? void 0 : item.keyIdPath) == null ? void 0 : _b.length) {
+      if (item !== null && item !== void 0 && (_item$keyIdPath = item.keyIdPath) !== null && _item$keyIdPath !== void 0 && _item$keyIdPath.length) {
         item.keyIdPath.push(item.id);
+        // 去重解决重复问题
         item.keyIdPath = [...new Set(item.keyIdPath)];
       } else {
         item.keyIdPath = [item.id];
       }
-      if (!["PAGE", "MENU"].includes(item.type)) {
+      if (!['PAGE', 'MENU'].includes(item.type)) {
         menuDeepItem.splice(index, 1);
       }
-      if (Array.isArray(item == null ? void 0 : item.children) && ((_c = item == null ? void 0 : item.children) == null ? void 0 : _c.length)) {
-        item.children.forEach((childrenItem) => {
+      if (Array.isArray(item === null || item === void 0 ? void 0 : item.children) && item !== null && item !== void 0 && (_item$children = item.children) !== null && _item$children !== void 0 && _item$children.length) {
+        // 给children注入keyUrlPath，keyIdPath
+        item.children.forEach(childrenItem => {
           childrenItem.keyUrlPath = [...item.keyUrlPath];
           childrenItem.keyIdPath = [...item.keyIdPath];
         });
@@ -89,11 +94,20 @@ var transformMenu = (menuData, pathPrefix) => {
   menuDeep(data);
   return data;
 };
+
+/**
+ * 转换菜单数据源评价keyUrlPath与keyIdPath
+ * @param data 菜单数据源
+ * @returns []
+ */
+exports.transformMenu = transformMenu;
 var transformMenus = (data, pathPrefix) => {
-  if ((0, import_lodash.isPlainObject)(data)) {
-    if (!Array.isArray(data == null ? void 0 : data.menus)) {
+  if ((0, _lodash.isPlainObject)(data)) {
+    // @ts-ignore
+    if (!Array.isArray(data === null || data === void 0 ? void 0 : data.menus)) {
       return [];
     }
+    // @ts-ignore
     data.menus = transformMenu(data.menus, pathPrefix);
     return data;
   }
@@ -102,46 +116,58 @@ var transformMenus = (data, pathPrefix) => {
   }
   return data;
 };
+
+/**
+ * 获取URL中的search参数
+ * @param name 参数key
+ * @returns string
+ */
+exports.transformMenus = transformMenus;
 function getUrlParams(name) {
-  const { search } = window.location;
-  const tmpArray = search.substr(1, search.length).split("&");
-  let paramsObj = {};
+  var search = window.location.search;
+  var tmpArray = search.substr(1, search.length).split('&');
+  var paramsObj = {};
   if (tmpArray != null) {
-    for (let i = 0; i < tmpArray.length; i++) {
-      const reg = /[=|^==]/;
-      const set1 = tmpArray[i].replace(reg, "&");
-      const tmpStr2 = set1.split("&");
-      const array = {};
+    for (var i = 0; i < tmpArray.length; i++) {
+      var reg = /[=|^==]/; // 用=进行拆分，但不包括==
+      var set1 = tmpArray[i].replace(reg, '&');
+      var tmpStr2 = set1.split('&');
+      var array = {};
       array[tmpStr2[0]] = tmpStr2[1];
-      paramsObj = {
-        ...paramsObj,
-        ...array
-      };
+      paramsObj = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, paramsObj), array);
     }
   }
-  return paramsObj[name] ? decodeURIComponent(paramsObj[name]) : "";
+  // 将参数进行返回
+  return paramsObj[name] ? decodeURIComponent(paramsObj[name]) : '';
 }
-var getPathNameKey = ({
-  menus,
-  pathName
-}) => {
-  let result;
-  const menuDeep = (menuDeepItem) => {
+
+/**
+ * 通过URL获取对应keyIdPath
+ * @param menus  菜单数据
+ * @param pathName  url地址
+ * @param routerMatch  匹配模式id & url
+ */
+var getPathNameKey = _ref => {
+  var menus = _ref.menus,
+    pathName = _ref.pathName;
+  var result;
+  var menuDeep = menuDeepItem => {
     if (!Array.isArray(menuDeepItem) || !menuDeepItem.length) {
       return [];
     }
-    for (let i = 0; i <= menuDeepItem.length - 1; i++) {
-      const item = menuDeepItem[i];
+    for (var i = 0; i <= menuDeepItem.length - 1; i++) {
+      var item = menuDeepItem[i];
       if (!Array.isArray(item.keyUrlPath) || !item.keyUrlPath.length) {
         break;
       }
-      if ((item == null ? void 0 : item.url) === pathName || (item == null ? void 0 : item.redirectUrl) === pathName) {
+      if ((item === null || item === void 0 ? void 0 : item.url) === pathName || (item === null || item === void 0 ? void 0 : item.redirectUrl) === pathName) {
         result = item.keyIdPath;
         break;
       }
       if (Array.isArray(item.children) && item.children.length) {
         menuDeep(item.children);
-      } else if (((item == null ? void 0 : item.url) && pathName.includes(item.url.split("?")[0]) || (item == null ? void 0 : item.redirectUrl) && pathName.includes(item.redirectUrl.split("?")[0])) && !result) {
+      } else if ((item !== null && item !== void 0 && item.url && pathName.includes(item.url.split('?')[0]) || item !== null && item !== void 0 && item.redirectUrl && pathName.includes(item.redirectUrl.split('?')[0])) && !result) {
+        // URL未匹配时，循环到最后一层时判断URL是否包含最后一层的URL，解决URL在URL中不存在的场景
         result = item.keyIdPath;
         break;
       }
@@ -150,11 +176,34 @@ var getPathNameKey = ({
   menuDeep(menus);
   return result;
 };
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  getIdsByPathName,
-  getPathNameKey,
-  getUrlParams,
-  transformMenu,
-  transformMenus
-});
+
+/**
+ * 根据key查找完整的菜单项数据
+ * @param menus 菜单数据数组
+ * @param key 要查找的菜单项key
+ * @returns 找到的菜单项数据或null
+ */
+exports.getPathNameKey = getPathNameKey;
+var findMenuItemByKey = (menus, key) => {
+  // eslint-disable-next-line no-restricted-syntax
+  var _iterator = (0, _createForOfIteratorHelper2.default)(menus),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var item = _step.value;
+      if (String(item.id) === key) {
+        return item;
+      }
+      if (Array.isArray(item.children) && item.children.length) {
+        var found = findMenuItemByKey(item.children, key);
+        if (found) return found;
+      }
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  return null;
+};
+exports.findMenuItemByKey = findMenuItemByKey;

package/lib/ProSelect/components/AdaptiveTooltip.js

@@ -1,58 +1,51 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+"use strict";
 
-// src/ProSelect/components/AdaptiveTooltip.tsx
-var AdaptiveTooltip_exports = {};
-__export(AdaptiveTooltip_exports, {
-  default: () => AdaptiveTooltip_default
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
 });
-module.exports = __toCommonJS(AdaptiveTooltip_exports);
-var import_antd = require("antd");
-var import_react = require("react");
-var AdaptiveTooltip = ({ children }) => {
-  const [placement, setPlacement] = (0, import_react.useState)("right");
-  (0, import_react.useEffect)(() => {
-    const handleResize = () => {
-      const tooltipElement = document.getElementById("adaptive-tooltip");
+exports.default = void 0;
+require("antd/es/tooltip/style");
+var _tooltip = _interopRequireDefault(require("antd/es/tooltip"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _react = require("react");
+var _jsxRuntime = require("react/jsx-runtime");
+var AdaptiveTooltip = _ref => {
+  var children = _ref.children;
+  var _useState = (0, _react.useState)('right'),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    placement = _useState2[0],
+    setPlacement = _useState2[1];
+  (0, _react.useEffect)(() => {
+    var handleResize = () => {
+      var tooltipElement = document.getElementById('adaptive-tooltip');
       if (tooltipElement) {
-        const boundingRect = tooltipElement.getBoundingClientRect();
-        const windowWidth = window.innerWidth;
+        var boundingRect = tooltipElement.getBoundingClientRect();
+        var windowWidth = window.innerWidth;
         if (windowWidth - boundingRect.right < 150) {
-          setPlacement("left");
+          setPlacement('left');
         } else {
-          setPlacement("right");
+          setPlacement('right');
         }
       }
     };
-    window.addEventListener("resize", handleResize);
+    window.addEventListener('resize', handleResize);
     handleResize();
     return () => {
-      window.removeEventListener("resize", handleResize);
+      window.removeEventListener('resize', handleResize);
     };
   }, [children]);
-  return /* @__PURE__ */ React.createElement(
-    import_antd.Tooltip,
-    {
-      placement,
-      title: /* @__PURE__ */ React.createElement("div", { onMouseDown: (e) => e.stopPropagation() }, children),
-      id: "adaptive-tooltip"
-    },
-    /* @__PURE__ */ React.createElement("span", { className: "pro-select-ellipse" }, " ", children)
-  );
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.default, {
+    placement: placement,
+    title: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
+      onMouseDown: e => e.stopPropagation(),
+      children: children
+    }),
+    id: "adaptive-tooltip",
+    children: /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
+      className: "pro-select-ellipse",
+      children: [" ", children]
+    })
+  });
 };
-var AdaptiveTooltip_default = AdaptiveTooltip;
+var _default = exports.default = AdaptiveTooltip;