zmdms-webui 2.2.6 → 2.2.8

package/dist/es/applayoutheader/setting/userInfo.js

@@ -2,6 +2,7 @@ import { __assign, __awaiter, __generator } from '../../_virtual/_tslib.js';
 import { jsxs, jsx, Fragment } from 'react/jsx-runtime';
 import { useContext, useState, useMemo } from 'react';
 import { LayoutHeaderContext } from '../LayoutHeaderContext.js';
+import { useLatest } from 'ahooks';
 import LogoutOutlined from '../../node_modules/@ant-design/icons/es/icons/LogoutOutlined.js';
 import UnlockOutlined from '../../node_modules/@ant-design/icons/es/icons/UnlockOutlined.js';
 import UserOutlined from '../../node_modules/@ant-design/icons/es/icons/UserOutlined.js';
@@ -11,6 +12,7 @@ var UserInfo = function (_a) {
     var logout = _a.logout, updatePassword = _a.updatePassword;
     var userInfo = useContext(LayoutHeaderContext).userInfo;
     var _b = useState(false), spinning = _b[0], setSpinning = _b[1];
+    var logoutLatest = useLatest(logout);
     var items = useMemo(function () {
         var items = [
             {
@@ -20,11 +22,11 @@ var UserInfo = function (_a) {
                             switch (_a.label) {
                                 case 0:
                                     setSpinning(true);
-                                    if (!logout) return [3 /*break*/, 4];
+                                    if (!logoutLatest.current) return [3 /*break*/, 4];
                                     _a.label = 1;
                                 case 1:
                                     _a.trys.push([1, 3, , 4]);
-                                    return [4 /*yield*/, logout()];
+                                    return [4 /*yield*/, logoutLatest.current()];
                                 case 2:
                                     _a.sent();
                                     return [3 /*break*/, 4];
@@ -55,7 +57,7 @@ var UserInfo = function (_a) {
             ]);
         }
         return items;
-    }, [updatePassword]);
+    }, [updatePassword, logoutLatest]);
     return (jsxs(Fragment, { children: [jsx(Dropdown, __assign({ menu: { items: items }, trigger: ["click"], placement: "bottomLeft" }, { children: jsxs("div", __assign({ className: "user-operation" }, { children: [jsx(UserOutlined, {}), jsx("span", { children: userInfo === null || userInfo === void 0 ? void 0 : userInfo.realName })] })) })), spinning && jsx(Spin, { spinning: true, tip: "\u9000\u51FA\u767B\u5F55\u4E2D", className: "logout-spin" })] }));
 };
 

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

@@ -7,10 +7,11 @@ import { MENU_SEARCH_KEY } from './constants.js';
 import MemoInput from '../../input/input.js';
 import SearchOutlined from '../../node_modules/@ant-design/icons/es/icons/SearchOutlined.js';
 
-var SearchInput = function () {
-    var _a = useState("菜单搜索"), placeholderText = _a[0], setPlaceholderText = _a[1];
-    var _b = useState(), searchValue = _b[0], setSearchValue = _b[1];
-    var _c = useContext(LayoutMenuContext), userSubMenus = _c.userSubMenus, setMainMenuSelectedKeys = _c.setMainMenuSelectedKeys, setInnerUserSubMenus = _c.setInnerUserSubMenus;
+var SearchInput = function (_a) {
+    var setVisible = _a.setVisible;
+    var _b = useState("菜单搜索"), placeholderText = _b[0], setPlaceholderText = _b[1];
+    var _c = useState(), searchValue = _c[0], setSearchValue = _c[1];
+    var _d = useContext(LayoutMenuContext), userSubMenus = _d.userSubMenus, setMainMenuSelectedKeys = _d.setMainMenuSelectedKeys, setInnerUserSubMenus = _d.setInnerUserSubMenus;
     var onSearch = useMemoizedFn(function () {
         if (!searchValue) {
             return;
@@ -32,6 +33,7 @@ var SearchInput = function () {
                 }
             });
         });
+        setVisible(true);
         setMainMenuSelectedKeys === null || setMainMenuSelectedKeys === void 0 ? void 0 : setMainMenuSelectedKeys([MENU_SEARCH_KEY]);
         setInnerUserSubMenus(function (pre) {
             var _a;

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

@@ -27,7 +27,7 @@ var MenuCom = function (props) {
         var _a;
         (_a = subMenu.current) === null || _a === void 0 ? void 0 : _a.setVisible(false);
     }, []);
-    return (jsxs("div", __assign({ className: "zmdms-menu", onMouseLeave: onMouseLeave }, { children: [jsx(Logo, { logo: logo, showLine: visible && !hideSubMenuBg, style: logoStyle }), isShowSearchInput && jsx(SearchInput, {}), jsx(MainMenu, { onMouseEnter: onMouseEnter, addTab: addTab, getPrefixByAppId: getPrefixByAppId, subMenu: subMenu, hideSubMenuBg: hideSubMenuBg, menuItemLine: menuItemLine }), jsx(SubMenu, { ref: subMenu, marginLeft: width, subMenuWidth: subMenuWidth, layoutSiderRef: layoutSiderRef, addTab: addTab, getPrefixByAppId: getPrefixByAppId, subMenuLogo: subMenuLogo, visible: visible, setVisible: setVisible, defaultFixed: defaultFixed, hideSubMenuBg: hideSubMenuBg, subMenuItemLine: subMenuItemLine, openOnlyHasSubmenus: openOnlyHasSubmenus })] })));
+    return (jsxs("div", __assign({ className: "zmdms-menu", onMouseLeave: onMouseLeave }, { children: [jsx(Logo, { logo: logo, showLine: visible && !hideSubMenuBg, style: logoStyle }), isShowSearchInput && jsx(SearchInput, { setVisible: setVisible }), jsx(MainMenu, { onMouseEnter: onMouseEnter, addTab: addTab, getPrefixByAppId: getPrefixByAppId, subMenu: subMenu, hideSubMenuBg: hideSubMenuBg, menuItemLine: menuItemLine }), jsx(SubMenu, { ref: subMenu, marginLeft: width, subMenuWidth: subMenuWidth, layoutSiderRef: layoutSiderRef, addTab: addTab, getPrefixByAppId: getPrefixByAppId, subMenuLogo: subMenuLogo, visible: visible, setVisible: setVisible, defaultFixed: defaultFixed, hideSubMenuBg: hideSubMenuBg, subMenuItemLine: subMenuItemLine, openOnlyHasSubmenus: openOnlyHasSubmenus })] })));
 };
 var Menu = memo(MenuCom);
 

package/dist/es/dynamicsetting/dynamicDrawer.js

@@ -118,7 +118,7 @@ var DynamicDrawer = function (props, ref) {
                 return __spreadArray(__spreadArray(__spreadArray([], leftList, true), middleList, true), rightList, true);
             });
         };
-    }, [setTempDynamicList, isDimensionPriority]);
+    }, [setTempDynamicList]);
     // 确认
     var onSureHandle = function () {
         onSure && onSure(tempDynamicList);