zmdms-webui 3.3.2 → 3.3.4

package/dist/es/applayout/appLayout.d.ts

@@ -5,6 +5,7 @@ interface ILayoutProps {
     layoutSliderRender?: React__default.ReactNode;
     layoutHeaderRender?: React__default.ReactNode;
     contentClassName?: string;
+    hiddenWrap?: boolean;
 }
 declare const _default: React__default.NamedExoticComponent<ILayoutProps>;
 

package/dist/es/applayout/appLayout.js

@@ -1,13 +1,16 @@
 import { __assign } from '../_virtual/_tslib.js';
-import { jsxs, jsx } from 'react/jsx-runtime';
+import { jsxs, Fragment, jsx } from 'react/jsx-runtime';
 import { memo } from 'react';
 import classNames from '../node_modules/classnames/index.js';
 import { Layout } from 'antd';
 
 var AppLayout = function (props) {
     // console.log("layout- rerender");
-    var children = props.children, layoutSliderRender = props.layoutSliderRender, layoutHeaderRender = props.layoutHeaderRender, contentClassName = props.contentClassName;
+    var children = props.children, layoutSliderRender = props.layoutSliderRender, layoutHeaderRender = props.layoutHeaderRender, contentClassName = props.contentClassName, hiddenWrap = props.hiddenWrap;
     var classes = classNames("zmdms-content--content", contentClassName);
+    if (hiddenWrap) {
+        return (jsxs(Fragment, { children: [layoutSliderRender, layoutHeaderRender, children] }));
+    }
     return (jsxs(Layout, __assign({ className: "zmdms-container" }, { children: [layoutSliderRender, jsxs(Layout, __assign({ className: "zmdms-content" }, { children: [layoutHeaderRender, jsx(Layout.Content, __assign({ className: classes }, { children: children }))] }))] })));
 };
 AppLayout.displayName = "ZTXK_WEBUI_AppLayout";

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

@@ -85,9 +85,15 @@ var SubMenu = function (props, ref) {
                 if (keys && keys.length > 0) {
                     var r = userSubMenus[keys[0]];
                     if (Array.isArray(r)) {
-                        hasMenuData.current = true;
-                        if (!visible) {
-                            setVisible(true);
+                        if (r.length === 0 && openOnlyHasSubmenus) {
+                            hasMenuData.current = false;
+                            setVisible(false);
+                        }
+                        else {
+                            hasMenuData.current = true;
+                            if (!visible) {
+                                setVisible(true);
+                            }
                         }
                         onSubMenuOpenChange(r.map(function (i) { return i.id; }));
                     }
@@ -187,6 +193,17 @@ var SubMenu = function (props, ref) {
         renderItem,
         filterMenuHandle,
     ]);
+    // 直接根据是否有items来计算是否显示二级菜单
+    useEffect(function () {
+        if (openOnlyHasSubmenus) {
+            if (items && items.length > 0) {
+                hasMenuData.current = true;
+            }
+            else {
+                hasMenuData.current = false;
+            }
+        }
+    }, [openOnlyHasSubmenus, items]);
     var classes = classNames("zmdms-menu--sub", {
         "zmdms-menu--sub-margin": !drawerTitle,
         "zmdms-menu--sub-hide-bg": hideSubMenuBg,

package/package.json

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