zmdms-webui 3.1.5 → 3.1.7

package/dist/es/applayoutsider/appLayoutSider.d.ts

@@ -57,6 +57,8 @@ interface ILayoutSiderProps {
     openOnlyHasSubmenus?: boolean;
     /** 点击logo事件 */
     onLogoClick?: () => void;
+    /** 自定义过滤菜单 */
+    filterMenuHandle?: (menus: any) => any[];
 }
 declare const _default: React__default.NamedExoticComponent<ILayoutSiderProps>;
 

package/dist/es/applayoutsider/appLayoutSider.js

@@ -16,7 +16,7 @@ var AppLayoutSider = function (props) {
     // 118 宽度改成 134宽度
     _b = props.siderWidth, 
     // 118 宽度改成 134宽度
-    siderWidth = _b === void 0 ? 134 : _b, _c = props.subMenuWidth, subMenuWidth = _c === void 0 ? 162 : _c, addTab = props.addTab, siderBg = props.siderBg, logo = props.logo, logoStyle = props.logoStyle, subMenuLogo = props.subMenuLogo, _d = props.isShowSearchInput, isShowSearchInput = _d === void 0 ? true : _d, apps = props.apps, activeTab = props.activeTab, userMenus = props.userMenus, userSubMenus = props.userSubMenus, mergeSystemIds = props.mergeSystemIds, postMergeSystemIds = props.postMergeSystemIds, drawerTitle = props.drawerTitle, selectMainMenu = props.selectMainMenu, menuJoinRule = props.menuJoinRule, renderItem = props.renderItem, defaultVisible = props.defaultVisible, defaultFixed = props.defaultFixed, openOnlyHasSubmenus = props.openOnlyHasSubmenus, hideSubMenuBg = props.hideSubMenuBg, menuItemLine = props.menuItemLine, subMenuItemLine = props.subMenuItemLine, bottomContainer = props.bottomContainer, onLogoClick = props.onLogoClick;
+    siderWidth = _b === void 0 ? 134 : _b, _c = props.subMenuWidth, subMenuWidth = _c === void 0 ? 162 : _c, addTab = props.addTab, siderBg = props.siderBg, logo = props.logo, logoStyle = props.logoStyle, subMenuLogo = props.subMenuLogo, _d = props.isShowSearchInput, isShowSearchInput = _d === void 0 ? true : _d, apps = props.apps, activeTab = props.activeTab, userMenus = props.userMenus, userSubMenus = props.userSubMenus, mergeSystemIds = props.mergeSystemIds, postMergeSystemIds = props.postMergeSystemIds, drawerTitle = props.drawerTitle, selectMainMenu = props.selectMainMenu, menuJoinRule = props.menuJoinRule, renderItem = props.renderItem, defaultVisible = props.defaultVisible, defaultFixed = props.defaultFixed, openOnlyHasSubmenus = props.openOnlyHasSubmenus, hideSubMenuBg = props.hideSubMenuBg, menuItemLine = props.menuItemLine, subMenuItemLine = props.subMenuItemLine, bottomContainer = props.bottomContainer, onLogoClick = props.onLogoClick, filterMenuHandle = props.filterMenuHandle;
     // 当前选中的主菜单item
     var _e = useState([]), mainMenuSelectedKeys = _e[0], setMainMenuSelectedKeys = _e[1];
     // 内部二级菜单管理
@@ -55,7 +55,6 @@ var AppLayoutSider = function (props) {
                     ? "/".concat(prefix).concat(path)
                     : path;
     }, [menuJoinRule]);
-    console.log(mainMenuSelectedKeys);
     return (jsx(Layout.Sider, __assign({ className: "zmdms-sider", collapsedWidth: "0", collapsible: true, trigger: null, width: siderWidth, ref: layoutSiderRef, style: {
             backgroundImage: "url(".concat(siderBg, ")"),
         } }, { children: jsx(LayoutMenuContext.Provider, __assign({ value: {
@@ -75,6 +74,7 @@ var AppLayoutSider = function (props) {
                 menuJoinRule: menuJoinRule,
                 getNewPath: getNewPath,
                 renderItem: renderItem,
+                filterMenuHandle: filterMenuHandle,
             } }, { children: jsx(Menu, { width: siderWidth, subMenuWidth: subMenuWidth, layoutSiderRef: layoutSiderRef, addTab: addTab, logo: logo, logoStyle: logoStyle, subMenuLogo: subMenuLogo, getPrefixByAppId: getPrefixByAppId, defaultVisible: defaultVisible, openOnlyHasSubmenus: openOnlyHasSubmenus, defaultFixed: defaultFixed, isShowSearchInput: isShowSearchInput, hideSubMenuBg: hideSubMenuBg, menuItemLine: menuItemLine, subMenuItemLine: subMenuItemLine, bottomContainer: bottomContainer, onLogoClick: onLogoClick }) })) })));
 };
 AppLayoutSider.displayName = "ZTXK_WEBUI_AppLayoutSider";

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

@@ -11,7 +11,7 @@ import { Menu } from 'antd';
 // 是否隐藏菜单 isHiddenMenu 1 是 2 否
 var MainMenu = function (props) {
     var onMouseEnter = props.onMouseEnter, addTab = props.addTab, getPrefixByAppId = props.getPrefixByAppId, subMenu = props.subMenu, hideSubMenuBg = props.hideSubMenuBg, menuItemLine = props.menuItemLine;
-    var _a = useContext(LayoutMenuContext), mainMenuSelectedKeys = _a.mainMenuSelectedKeys, setMainMenuSelectedKeys = _a.setMainMenuSelectedKeys, userMenus = _a.userMenus, apps = _a.apps, mergeSystemIds = _a.mergeSystemIds, postMergeSystemIds = _a.postMergeSystemIds, getNewPath = _a.getNewPath, renderItem = _a.renderItem;
+    var _a = useContext(LayoutMenuContext), mainMenuSelectedKeys = _a.mainMenuSelectedKeys, setMainMenuSelectedKeys = _a.setMainMenuSelectedKeys, userMenus = _a.userMenus, apps = _a.apps, mergeSystemIds = _a.mergeSystemIds, postMergeSystemIds = _a.postMergeSystemIds, getNewPath = _a.getNewPath, renderItem = _a.renderItem, filterMenuHandle = _a.filterMenuHandle;
     // 获取主菜单展开的内容
     var _b = useMainMenuOpenKeys(userMenus, mainMenuSelectedKeys, { apps: apps, mergeSystemIds: mergeSystemIds, postMergeSystemIds: postMergeSystemIds }), mainMenuOpenKeys = _b.mainMenuOpenKeys, onMainMenuOpenChange = _b.onMainMenuOpenChange;
     // 创建主菜单标签
@@ -65,7 +65,11 @@ var MainMenu = function (props) {
         // 如果菜单列表只有一项的话 那么认为当前只有一个系统
         // 不需要展示多个系统
         if (userMenus.length === 1) {
-            return filterMenu(((_a = userMenus[0]) === null || _a === void 0 ? void 0 : _a.children) || []).map(function (userMenu) {
+            var filterMenus = filterMenu(((_a = userMenus[0]) === null || _a === void 0 ? void 0 : _a.children) || []);
+            if (filterMenuHandle) {
+                filterMenus = filterMenuHandle(filterMenus);
+            }
+            return filterMenus.map(function (userMenu) {
                 return {
                     label: getLabel(userMenu),
                     title: userMenu.name,
@@ -76,13 +80,20 @@ var MainMenu = function (props) {
         }
         return userMenus.map(function (userMenu) {
             var children = userMenu.children;
+            var filterMenus = [];
+            if (children) {
+                filterMenus = filterMenu(children || []);
+                if (filterMenuHandle) {
+                    filterMenus = filterMenuHandle(filterMenus);
+                }
+            }
             return {
                 label: jsx("span", __assign({ title: userMenu.name }, { children: userMenu.name })),
                 title: userMenu.name,
                 key: userMenu.id,
                 icon: userMenu.source ? (jsx(IconFont, { type: userMenu.source, style: { fontSize: "18px" } })) : null,
                 children: children
-                    ? filterMenu(children || []).map(function (item) {
+                    ? filterMenus.map(function (item) {
                         return {
                             label: getLabel(item),
                             title: item.name,

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 ? false : _a, hideSubMenuBg = props.hideSubMenuBg, subMenuItemLine = props.subMenuItemLine, openOnlyHasSubmenus = props.openOnlyHasSubmenus;
-    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 _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, filterMenuHandle = _b.filterMenuHandle;
     // 二级菜单当前选中项
     var subMenusSelectedKeys = useMemo(function () {
         return activeTab ? [activeTab] : [];
@@ -112,7 +112,11 @@ var SubMenu = function (props, ref) {
             }
             deep++;
             if (Array.isArray(arr)) {
-                filterMenu(arr).forEach(function (menuItem) {
+                var filterMenus = filterMenu(arr);
+                if (filterMenuHandle) {
+                    filterMenus = filterMenuHandle(filterMenus);
+                }
+                filterMenus.forEach(function (menuItem) {
                     var _a;
                     // 获取当前菜单的系统id
                     var system = menuItem.system;

package/dist/es/electronsignatures/filecomponents/file-upload.js

@@ -6,7 +6,7 @@ import '../../config/ZtxkContext.js';
 import useBaseContext from '../../config/useBaseContext.js';
 import '../../config/MyStorage.js';
 import { useLatest } from 'ahooks';
-import { getToken } from 'zmdms-utils';
+import { getPreToken } from 'zmdms-utils';
 import { formatUnit, getFileExtension } from '../utils.js';
 import myMessage from '../../message/index.js';
 import ButtonCom from '../../button/button.js';
@@ -50,7 +50,8 @@ function useBasicInfo(props) {
     var fileAction = action ? action : createUploadFileLink({ apiBaseUrl: apiBaseUrl });
     // 文件上传头部参数
     var fileHeaders = useMemo(function () {
-        return __assign({ "Zmdms-Auth": getToken() || "" }, headers);
+        var _a;
+        return __assign((_a = {}, _a[window.__TOKEN_KEY__ || "Zmdms-Auth"] = getPreToken() || "", _a), headers);
     }, [headers]);
     // 其余参数
     var fileData = useMemo(function () {

package/dist/es/uploadlist/hooks.js

@@ -1,7 +1,7 @@
 import { __assign, __awaiter, __generator } from '../_virtual/_tslib.js';
 import { useCallback, useState, useEffect, useMemo } from 'react';
 import { flushSync } from 'react-dom';
-import { getFileExtension, isImageExtension, createDownloadLink, createUploadFileLink, TOKEN_KEY, getToken, exactRound, times, divide } from 'zmdms-utils';
+import { getFileExtension, isImageExtension, createDownloadLink, createUploadFileLink, TOKEN_KEY, getPreToken, exactRound, times, divide } from 'zmdms-utils';
 import MemoUploadList from './uploadList.js';
 import { useLatest } from 'ahooks';
 import myMessage from '../message/index.js';
@@ -234,7 +234,7 @@ function useBasicInfo(props) {
     // 文件上传头部参数
     var fileHeaders = useMemo(function () {
         var _a;
-        return __assign(__assign((_a = {}, _a[TOKEN_KEY] = getToken() || "", _a), fileListRequestHeaders), headers);
+        return __assign(__assign((_a = {}, _a[TOKEN_KEY] = getPreToken() || "", _a), fileListRequestHeaders), headers);
     }, [headers, fileListRequestHeaders]);
     // 其余参数
     var fileData = useMemo(function () {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zmdms-webui",
-  "version": "3.1.5",
+  "version": "3.1.7",
   "private": false,
   "main": "dist/index.es.js",
   "module": "dist/index.es.js",
@@ -136,7 +136,7 @@
     "storybook": "^7.6.16",
     "typescript": "^4.9.5",
     "web-vitals": "^2.1.4",
-    "zmdms-utils": "^0.0.87"
+    "zmdms-utils": "^0.0.92"
   },
   "resolutions": {
     "rc-virtual-list": "3.11.3"