zmdms-webui 1.4.2 → 1.4.4

package/dist/es/applayoutsider/menu/MainMenu.js

@@ -39,7 +39,7 @@ var MainMenu = function (props) {
                         addTab({
                             key: newPath_1,
                             path: newPath_1,
-                            label: menuItem.name,
+                            label: menuItem.label || menuItem.name,
                         });
                 } }, { children: menuItem.name })));
         }
@@ -51,7 +51,7 @@ var MainMenu = function (props) {
                     addTab({
                         key: newPath,
                         path: newPath,
-                        label: menuItem.name,
+                        label: menuItem.label || menuItem.name,
                     });
             } }, { children: menuItem.name })));
     }, [addTab, getPrefixByAppId, getNewPath, renderItem]);

package/dist/es/applayoutsider/menu/SubMenu.js

@@ -15,7 +15,7 @@ import { Drawer, Menu } from 'antd';
 var defaultSubMenu = [];
 var SubMenu = function (props, ref) {
     var marginLeft = props.marginLeft, subMenuWidth = props.subMenuWidth, layoutSiderRef = props.layoutSiderRef, addTab = props.addTab, getPrefixByAppId = props.getPrefixByAppId, subMenuLogo = props.subMenuLogo, visible = props.visible, setVisible = props.setVisible, _a = props.defaultFixed, defaultFixed = _a === void 0 ? true : _a;
-    var _b = useContext(LayoutMenuContext), mainMenuSelectedKeys = _b.mainMenuSelectedKeys, setMainMenuSelectedKeys = _b.setMainMenuSelectedKeys, activeTab = _b.activeTab, userSubMenus = _b.userSubMenus, innerUserSubMenus = _b.innerUserSubMenus, drawerTitle = _b.drawerTitle, selectMainMenu = _b.selectMainMenu, getNewPath = _b.getNewPath, renderItem = _b.renderItem;
+    var _b = useContext(LayoutMenuContext), mainMenuSelectedKeys = _b.mainMenuSelectedKeys, setMainMenuSelectedKeys = _b.setMainMenuSelectedKeys, activeTab = _b.activeTab, userMenus = _b.userMenus, userSubMenus = _b.userSubMenus, innerUserSubMenus = _b.innerUserSubMenus, drawerTitle = _b.drawerTitle, selectMainMenu = _b.selectMainMenu, getNewPath = _b.getNewPath, renderItem = _b.renderItem;
     // 二级菜单当前选中项
     var subMenusSelectedKeys = useMemo(function () {
         return activeTab ? [activeTab] : [];
@@ -40,6 +40,7 @@ var SubMenu = function (props, ref) {
         selectMainMenu: selectMainMenu,
         isClickSubMenu: isClickSubMenu,
         getNewPath: getNewPath,
+        userMenus: userMenus,
     }), subMenuOpenKeys = _c.subMenuOpenKeys, onSubMenuOpenChange = _c.onSubMenuOpenChange;
     // 如果是搜索或者收藏 把二级菜单都展开
     useEffect(function () {
@@ -148,7 +149,7 @@ var SubMenu = function (props, ref) {
     var classes = classNames("zmdms-menu--sub", {
         "zmdms-menu--sub-margin": !drawerTitle,
     });
-    return (jsx(Drawer, __assign({ mask: false, placement: "left", width: subMenuWidth, zIndex: 101, closable: false, open: visible, className: classes, style: { marginLeft: marginLeft }, footer: footerDom, title: jsx("img", { src: subMenuLogo, title: "\u4EBA\u529B\u8D44\u6E90\u7CFB\u7EDF", alt: "cico_logo" }) }, { children: jsx(Menu, { inlineIndent: 5, selectedKeys: subMenusSelectedKeys, mode: "inline", items: items, openKeys: subMenuOpenKeys, onOpenChange: onSubMenuOpenChange }) })));
+    return (jsx(Drawer, __assign({ mask: false, placement: "left", width: subMenuWidth, zIndex: 101, closable: false, open: visible, className: classes, style: { marginLeft: marginLeft }, footer: footerDom, title: subMenuLogo ? (jsx("img", { src: subMenuLogo, title: "\u4EBA\u529B\u8D44\u6E90\u7CFB\u7EDF", alt: "cico_logo" })) : null }, { children: jsx(Menu, { inlineIndent: 5, selectedKeys: subMenusSelectedKeys, mode: "inline", items: items, openKeys: subMenuOpenKeys, onOpenChange: onSubMenuOpenChange }) })));
 };
 var SubMenu$1 = memo(forwardRef(SubMenu));
 

package/dist/es/applayoutsider/menu/hook.js

@@ -82,7 +82,7 @@ function useMainMenuOpenKeys(userMenus, mainMenuSelectedKeys, options) {
 }
 // 需要打开的二级菜单
 function useSubMenuOpenKeys(userSubMenus, activeTab, options) {
-    var getPrefixByAppId = options.getPrefixByAppId, setMainMenuSelectedKeys = options.setMainMenuSelectedKeys, selectMainMenu = options.selectMainMenu, isClickSubMenu = options.isClickSubMenu, getNewPath = options.getNewPath;
+    var getPrefixByAppId = options.getPrefixByAppId, setMainMenuSelectedKeys = options.setMainMenuSelectedKeys, selectMainMenu = options.selectMainMenu, isClickSubMenu = options.isClickSubMenu, getNewPath = options.getNewPath, userMenus = options.userMenus;
     // 展开指定的二级菜单
     var _a = useState([]), openKeys = _a[0], setOpenKeys = _a[1];
     var onOpenChange = useCallback(function (openKeys) {
@@ -121,6 +121,44 @@ function useSubMenuOpenKeys(userSubMenus, activeTab, options) {
                 return;
             }
         }
+        // 如果当前activeTab直接与一级菜单匹配上，那么说明当前选中的是主菜单带路由
+        var currentUserMenu = null;
+        userMenus.find(function (userMenu) {
+            var path = userMenu.path, children = userMenu.children;
+            if (path === activeTab) {
+                currentUserMenu = userMenu;
+                return true;
+            }
+            // 最多只往下遍历一层
+            if (Array.isArray(children)) {
+                return children.find(function (item) {
+                    var path = item.path;
+                    if (path === activeTab) {
+                        currentUserMenu = item;
+                        return true;
+                    }
+                    return false;
+                });
+            }
+        });
+        if (currentUserMenu) {
+            var id_1 = currentUserMenu.id;
+            // 如果在主菜单中找到了的话 那么说明是主菜单带路由
+            setMainMenuSelectedKeys &&
+                setMainMenuSelectedKeys(function (preMainMainIds) {
+                    if (isEqual(preMainMainIds, [id_1])) {
+                        return preMainMainIds;
+                    }
+                    return [id_1];
+                });
+            // 展开下面的菜单 如果有菜单的话
+            if (userSubMenus &&
+                Array.isArray(userSubMenus[id_1]) &&
+                userSubMenus[id_1].length > 0) {
+                setOpenKeys(userSubMenus[id_1].map(function (i) { return i.id; }));
+            }
+            return;
+        }
         var _loop_1 = function (key, value) {
             if (!Array.isArray(value)) {
                 return "continue";

package/dist/es/table/useTableValidate.js

@@ -71,23 +71,32 @@ function tableValidate(dataSource, columns, restParams) {
                     parseValidateFiledsHandle = function (columns) {
                         if (Array.isArray(columns)) {
                             columns.forEach(function (column, index) {
-                                var _a, _b;
+                                var _a;
                                 if (!isMerge) {
-                                    // 这里判断需要改动，只需要有rowSpan属性或者colSpan属性就有合并
-                                    var mergeColumn = (_a = column === null || column === void 0 ? void 0 : column.onCell) === null || _a === void 0 ? void 0 : _a.call(column, {}, 1);
-                                    // if (mergeColumn && (mergeColumn?.rowSpan || mergeColumn?.colSpan)) {
-                                    if (mergeColumn &&
-                                        (Reflect.has(mergeColumn, "rowSpan") ||
-                                            Reflect.has(mergeColumn, "colSpan"))) {
+                                    // 29259116 这里判断是否有行列合并的逻辑变化一下。认为只要配置中传入了onCell
+                                    // 那就是有合并
+                                    // 因为如果用 column?.onCell?.({}, 1) 这种模式，可能开发会根据record来判断，而这里拿不到record
+                                    // 并且索引也不是所有的情况
+                                    if (column === null || column === void 0 ? void 0 : column.onCell) {
                                         isMerge = true;
                                     }
+                                    // // 这里判断需要改动，只需要有rowSpan属性或者colSpan属性就有合并
+                                    // const mergeColumn = column?.onCell?.({}, 1);
+                                    // // if (mergeColumn && (mergeColumn?.rowSpan || mergeColumn?.colSpan)) {
+                                    // if (
+                                    //   mergeColumn &&
+                                    //   (Reflect.has(mergeColumn, "rowSpan") ||
+                                    //     Reflect.has(mergeColumn, "colSpan"))
+                                    // ) {
+                                    //   isMerge = true;
+                                    // }
                                 }
                                 // 如果有子元素，需要递归往下遍历
                                 if (Array.isArray(column.children)) {
                                     parseValidateFiledsHandle(column.children);
                                     return;
                                 }
-                                var _key = ((_b = column === null || column === void 0 ? void 0 : column.validate) === null || _b === void 0 ? void 0 : _b.dataIndex)
+                                var _key = ((_a = column === null || column === void 0 ? void 0 : column.validate) === null || _a === void 0 ? void 0 : _a.dataIndex)
                                     ? column.validate.dataIndex
                                     : (column === null || column === void 0 ? void 0 : column.key)
                                         ? column === null || column === void 0 ? void 0 : column.key

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zmdms-webui",
-  "version": "1.4.2",
+  "version": "1.4.4",
   "private": false,
   "main": "dist/index.es.js",
   "module": "dist/index.es.js",