@yueglobal/ui 1.0.3 → 1.0.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yueglobal/ui",
-  "version": "1.0.3",
+  "version": "1.0.4",
   "description": "粤链全球 - react组件库",
   "license": "MIT",
   "module": "index.js",

package/yue-page-footer/index.less

@@ -1,5 +1,20 @@
 .yue-page-footer {
   background-color: #f4f7fc;
+  position: relative;
+
+  &:before {
+    content: '';
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 3px;
+    background: linear-gradient(
+      90deg,
+      rgba(23, 241, 161, 0.4),
+      rgba(26, 75, 255, 0.3)
+    );
+  }
 
   * {
     box-sizing: border-box;

package/yue-page-header/first-menus/index.js

@@ -144,7 +144,6 @@ var Index = function Index(_ref) {
       }
     },
     selectedKeys: selectedKeys
-    // openKeys={['home']}
   }));
 };
 export default /*#__PURE__*/memo(Index);

package/yue-page-header/helper.d.ts

@@ -25,6 +25,11 @@ export declare const firstMenuList: YueMenuItem[];
 export declare function flattenTreeList<T extends {
     children?: T[];
 }>(data: T[]): T[];
+/**
+ * 则根据 key 的长度进行降序排序
+ * @param list
+ */
+export declare function sortListByKey(list: any[]): any[];
 /**
  * 将 firstMenuList 转换为一维数组并根据 key 长度排序
  * @param isSort 是否进行排序

package/yue-page-header/helper.js

@@ -11,8 +11,8 @@ import { ExpoIcon, HomeIcon, HwcIcon, InsuranceIcon, LawIcon, SelectionIcon, Tax
 // 主网站域名
 export var mainHost = 'https://www.yueglobal.com';
 
-/**
- * 一级菜单（主菜单）
+/**
+ * 一级菜单（主菜单）
  */
 export var firstMenuList = [{
   key: 'home',
@@ -46,7 +46,7 @@ export var firstMenuList = [{
     icon: /*#__PURE__*/React.createElement(LawIcon, null)
   }, {
     key: "".concat(mainHost, "/ktms-web/"),
-    label: '通关税务',
+    label: '数智关税',
     icon: /*#__PURE__*/React.createElement(TaxationIcon, null)
   }, {
     key: "".concat(mainHost, "/hwc/"),
@@ -86,9 +86,9 @@ export var firstMenuList = [{
   label: '关于我们'
 }];
 
-/**
- * 将树结构转换为一维数组
- * @param data
+/**
+ * 将树结构转换为一维数组
+ * @param data
  */
 export function flattenTreeList(data) {
   // 递归函数，将嵌套的菜单数组转换为一维数组
@@ -114,10 +114,20 @@ export function flattenTreeList(data) {
   return flatten(data);
 }
 
-/**
- * 将 firstMenuList 转换为一维数组并根据 key 长度排序
- * @param isSort 是否进行排序
- * @returns 排序后的一维数组
+/**
+ * 则根据 key 的长度进行降序排序
+ * @param list
+ */
+export function sortListByKey(list) {
+  return list.sort(function (a, b) {
+    return b.key.length - a.key.length;
+  });
+}
+
+/**
+ * 将 firstMenuList 转换为一维数组并根据 key 长度排序
+ * @param isSort 是否进行排序
+ * @returns 排序后的一维数组
  */
 export function flattenMenuList(isSort) {
   // 将嵌套的菜单数组转换为一维数组
@@ -125,17 +135,15 @@ export function flattenMenuList(isSort) {
 
   // 如果需要排序，则根据 key 的长度进行降序排序
   if (isSort) {
-    return flattenedList.sort(function (a, b) {
-      return b.key.length - a.key.length;
-    });
+    return sortListByKey(flattenedList);
   }
   return flattenedList;
 }
 
-/**
- * 加载script域外资源
- * @param src
- * @param async
+/**
+ * 加载script域外资源
+ * @param src
+ * @param async
  */
 export function loadScript(src, async) {
   return new Promise(function (resolve, reject) {
@@ -163,10 +171,10 @@ export function loadScript(src, async) {
   });
 }
 
-/**
- * 检查页面中是否已存在指定文件名的script资源
- * @param filename 要检查的脚本文件名
- * @returns 如果存在返回true，否则返回false
+/**
+ * 检查页面中是否已存在指定文件名的script资源
+ * @param filename 要检查的脚本文件名
+ * @returns 如果存在返回true，否则返回false
  */
 export function checkExistScript(filename) {
   // 使用filename参数检查script标签是否存在
@@ -174,11 +182,11 @@ export function checkExistScript(filename) {
   return !!script;
 }
 
-/**
- * 检查路径是否匹配，支持路由参数匹配
- * @param routePath 路由定义路径，可能包含参数如 /news/:id/detail
- * @param actualPath 实际访问路径，如 /news/123/detail
- * @returns 是否匹配
+/**
+ * 检查路径是否匹配，支持路由参数匹配
+ * @param routePath 路由定义路径，可能包含参数如 /news/:id/detail
+ * @param actualPath 实际访问路径，如 /news/123/detail
+ * @returns 是否匹配
  */
 function isPathMatch(routePath, actualPath) {
   if (routePath === actualPath) {
@@ -215,11 +223,11 @@ function isPathMatch(routePath, actualPath) {
   }
   return true;
 }
-/**
- * 根据path值获取完整的节点路径数组（支持动态路由参数）
- * @param arr - 包含id, parentId, title, path字段的数组
- * @param path - 要查找的完整path值
- * @returns 完整的节点路径数组，如果未找到则返回空数组
+/**
+ * 根据path值获取完整的节点路径数组（支持动态路由参数）
+ * @param arr - 包含id, parentId, title, path字段的数组
+ * @param path - 要查找的完整path值
+ * @returns 完整的节点路径数组，如果未找到则返回空数组
  */
 export function getFullPathNodesByPath(arr, path) {
   if (!path || path === '/') {
@@ -277,10 +285,10 @@ export function getFullPathNodesByPath(arr, path) {
   return result;
 }
 
-/**
- * 根据path值对数组进行去重
- * @param arr - 包含path字段的数组
- * @returns 去重后的数组
+/**
+ * 根据path值对数组进行去重
+ * @param arr - 包含path字段的数组
+ * @returns 去重后的数组
  */
 export function uniqByPath(arr) {
   var seenPaths = new Set();
@@ -304,10 +312,10 @@ export function uniqByPath(arr) {
   return result;
 }
 
-/**
- * 深度拷贝对象或数组
- * @param obj - 要深度拷贝的对象或数组
- * @returns 拷贝后的新对象或数组
+/**
+ * 深度拷贝对象或数组
+ * @param obj - 要深度拷贝的对象或数组
+ * @returns 拷贝后的新对象或数组
  */
 export function deepClone(obj) {
   // 处理 null 和 undefined
@@ -363,10 +371,10 @@ function _setPopupStyle(uuid, left) {
   return false;
 }
 
-/**
- * 设置子菜单弹出层的样式
- * @param menuRef - 菜单实例
- * @param index - 子菜单索引
+/**
+ * 设置子菜单弹出层的样式
+ * @param menuRef - 菜单实例
+ * @param index - 子菜单索引
  */
 export function setSubMenuPopupStyle(menuRef, index) {
   var _menuRef$menu;

package/yue-page-header/second-menus/index.js

@@ -1,3 +1,9 @@
+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(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(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 _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _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."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -8,7 +14,7 @@ import { ComputerIcon } from "../../components/svg-icon";
 import { ConfigProvider, Menu } from 'antd';
 import React, { memo, useEffect, useMemo, useRef, useState } from 'react';
 import Breadcrumb from "../breadcrumb";
-import { flattenTreeList, setSubMenuPopupStyle } from "../helper";
+import { flattenTreeList, setSubMenuPopupStyle, sortListByKey } from "../helper";
 import "./index.less";
 var Index = function Index(_ref) {
   var width = _ref.width,
@@ -23,7 +29,12 @@ var Index = function Index(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     selectedKeys = _useState2[0],
     setSelectedKeys = _useState2[1];
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    isLoaded = _useState4[0],
+    setIsLoaded = _useState4[1];
   var menuRef = useRef(null);
+  var menuListRef = useRef([]);
 
   // 弹出层的布局，默认是 vertical
   var popupLayout = useMemo(function () {
@@ -32,16 +43,52 @@ var Index = function Index(_ref) {
     }
     return 'vertical';
   }, [subMenuLayout]);
+  var mergeMenuItems = useMemo(function () {
+    return menuItems === null || menuItems === void 0 ? void 0 : menuItems.map(function (m) {
+      var _m$children;
+      var item = _objectSpread({}, m);
+      if ((_m$children = m.children) !== null && _m$children !== void 0 && _m$children.length) {
+        item.onTitleClick = function (_ref2) {
+          var key = _ref2.key;
+          if (item.key === key) {
+            onRouteChange === null || onRouteChange === void 0 || onRouteChange({
+              key: key,
+              label: item.label
+            });
+          }
+        };
+      }
+      return item;
+    });
+  }, [menuItems]);
+  useEffect(function () {
+    if (menuItems !== null && menuItems !== void 0 && menuItems.length) {
+      setIsLoaded(true);
+    }
+    menuListRef.current = sortListByKey(flattenTreeList(menuItems !== null && menuItems !== void 0 ? menuItems : []));
+  }, [menuItems]);
   useEffect(function () {
-    if (pathname) setSelectedKeys([pathname]);
-  }, [pathname]);
-  var onMenuClick = function onMenuClick(_ref2) {
-    var key = _ref2.key,
-      selectedKeys = _ref2.selectedKeys;
+    if (pathname) {
+      var _menuListRef$current;
+      var key = pathname;
+      if ((_menuListRef$current = menuListRef.current) !== null && _menuListRef$current !== void 0 && _menuListRef$current.length) {
+        var cur = menuListRef.current.find(function (m) {
+          return m.key && pathname.startsWith(m.key);
+        });
+        if (cur) {
+          key = cur.key;
+        }
+      }
+      setSelectedKeys([key]);
+    }
+  }, [pathname, isLoaded]);
+  var onMenuClick = function onMenuClick(_ref3) {
+    var key = _ref3.key,
+      selectedKeys = _ref3.selectedKeys;
     setSelectedKeys(selectedKeys);
     if (onRouteChange && menuItems !== null && menuItems !== void 0 && menuItems.length) {
-      var menuList = flattenTreeList(menuItems);
-      var current = menuList.find(function (m) {
+      var _menuListRef$current2;
+      var current = (_menuListRef$current2 = menuListRef.current) === null || _menuListRef$current2 === void 0 ? void 0 : _menuListRef$current2.find(function (m) {
         return m.key === key;
       });
       var value = {
@@ -106,7 +153,7 @@ var Index = function Index(_ref) {
     className: "menus"
   }, /*#__PURE__*/React.createElement(Menu, {
     ref: menuRef,
-    items: menuItems,
+    items: mergeMenuItems,
     mode: "horizontal",
     rootClassName: ['yue-second-menu-bar', "yue-second-menu-".concat(popupLayout)].join(' '),
     onSelect: onMenuClick,