zmdms-webui 1.6.5 → 1.6.7

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

@@ -49,6 +49,8 @@ interface ILayoutSiderProps {
     renderItem?: (path: string, menu: any, onClick: any) => React__default.ReactNode | false;
     defaultVisible?: boolean;
     defaultFixed?: boolean;
+    /** 只有当主菜单有对应子菜单数据时，点击时才打开子菜单 */
+    openOnlyHasSubmenus?: boolean;
 }
 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, hideSubMenuBg = props.hideSubMenuBg, menuItemLine = props.menuItemLine, subMenuItemLine = props.subMenuItemLine;
+    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;
     // 当前选中的主菜单item
     var _e = useState([]), mainMenuSelectedKeys = _e[0], setMainMenuSelectedKeys = _e[1];
     // 内部二级菜单管理
@@ -74,7 +74,7 @@ var AppLayoutSider = function (props) {
                 menuJoinRule: menuJoinRule,
                 getNewPath: getNewPath,
                 renderItem: renderItem,
-            } }, { children: jsx(Menu, { width: siderWidth, subMenuWidth: subMenuWidth, layoutSiderRef: layoutSiderRef, addTab: addTab, logo: logo, logoStyle: logoStyle, subMenuLogo: subMenuLogo, getPrefixByAppId: getPrefixByAppId, defaultVisible: defaultVisible, defaultFixed: defaultFixed, isShowSearchInput: isShowSearchInput, hideSubMenuBg: hideSubMenuBg, menuItemLine: menuItemLine, subMenuItemLine: subMenuItemLine }) })) })));
+            } }, { 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 }) })) })));
 };
 AppLayoutSider.displayName = "ZTXK_WEBUI_AppLayoutSider";
 var AppLayoutSider$1 = memo(AppLayoutSider);

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

@@ -14,7 +14,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, hideSubMenuBg = props.hideSubMenuBg, subMenuItemLine = props.subMenuItemLine;
+    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, 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 subMenusSelectedKeys = useMemo(function () {
@@ -73,6 +73,7 @@ var SubMenu = function (props, ref) {
     }, [layoutSiderRef, subMenuWidth]);
     // 底部按钮
     var footerDom = (jsxs(ButtonCom, __assign({ type: "link", onClick: onToggleSubMenuFixed }, { children: [jsx(SwapOutlined, { style: { fontSize: "14px", color: hideSubMenuBg ? "#4285f4" : "#fff" } }), isFixed ? "浮动" : "固定"] })));
+    var hasMenuData = useRef(false);
     useImperativeHandle(ref, function () {
         return {
             setVisible: function (visible) {
@@ -84,10 +85,21 @@ 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);
+                        }
                         onSubMenuOpenChange(r.map(function (i) { return i.id; }));
                     }
+                    else {
+                        hasMenuData.current = false;
+                        openOnlyHasSubmenus && setVisible(false);
+                    }
                 }
             },
+            hasMenuData: function () {
+                return hasMenuData.current;
+            },
         };
     });
     var items = useMemo(function () {

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

@@ -7,22 +7,27 @@ import MainMenu from './MainMenu.js';
 import SubMenu from './SubMenu.js';
 
 var MenuCom = function (props) {
-    var width = props.width, subMenuWidth = props.subMenuWidth, layoutSiderRef = props.layoutSiderRef, addTab = props.addTab, logo = props.logo, logoStyle = props.logoStyle, getPrefixByAppId = props.getPrefixByAppId, subMenuLogo = props.subMenuLogo, _a = props.defaultVisible, defaultVisible = _a === void 0 ? true : _a, defaultFixed = props.defaultFixed, isShowSearchInput = props.isShowSearchInput, hideSubMenuBg = props.hideSubMenuBg, menuItemLine = props.menuItemLine, subMenuItemLine = props.subMenuItemLine;
+    var width = props.width, subMenuWidth = props.subMenuWidth, layoutSiderRef = props.layoutSiderRef, addTab = props.addTab, logo = props.logo, logoStyle = props.logoStyle, getPrefixByAppId = props.getPrefixByAppId, subMenuLogo = props.subMenuLogo, _a = props.defaultVisible, defaultVisible = _a === void 0 ? true : _a, openOnlyHasSubmenus = props.openOnlyHasSubmenus, defaultFixed = props.defaultFixed, isShowSearchInput = props.isShowSearchInput, hideSubMenuBg = props.hideSubMenuBg, menuItemLine = props.menuItemLine, subMenuItemLine = props.subMenuItemLine;
     // 二级菜单是否显示
     var _b = useState(defaultVisible), visible = _b[0], setVisible = _b[1];
     // 二级菜单Ref对象
     var subMenu = useRef({});
     // 一级菜单mouseEnter事件
     var onMouseEnter = useCallback(function () {
-        var _a;
-        (_a = subMenu.current) === null || _a === void 0 ? void 0 : _a.setVisible(true);
-    }, []);
+        var _a, _b;
+        if (openOnlyHasSubmenus) {
+            if (!((_a = subMenu.current) === null || _a === void 0 ? void 0 : _a.hasMenuData())) {
+                return;
+            }
+        }
+        (_b = subMenu.current) === null || _b === void 0 ? void 0 : _b.setVisible(true);
+    }, [openOnlyHasSubmenus]);
     // 主容器mouseLeave事件
     var onMouseLeave = useCallback(function () {
         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 })] })));
+    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 })] })));
 };
 var Menu = memo(MenuCom);
 

package/dist/es/electronsignatures/electron-signatures-fragment.js

@@ -45,6 +45,7 @@ var ElectronSignaturesFragment = function (props) {
         records: records,
         canEdit: canEdit,
     }), electronList = _e.electronList, firstLevelPersonName = _e.firstLevelPersonName;
+    console.log("deptId", deptId);
     // 群杰物理章列表相关数据
     var qunjList = useFetchQunjData({
         request: request,

package/dist/es/electronsignatures/index.js

@@ -794,7 +794,7 @@ var ElectronSignatures = function (props) {
     return (jsxs(Fragment, { children: [allOptions.map(function (options, index) {
                 var mergeOptions = index === 0
                     ? __assign(__assign({}, options), { onValueChange: onValueChange }) : __assign(__assign({ deptId: resetProps.deptId, flowId: resetProps.flowId }, options), { onValueChange: onValueChange });
-                return (jsx(ElectronSignaturesFragment, __assign({ dataType: "".concat(index), onTrackChange: onTrackChange, request: request, isUnControlled: isUnControlled, setLoading: setLoading, apiBaseUrl: apiBaseUrl, fileBaseUrl: fileBaseUrl, isSingleQj: isSingleQj }, mergeOptions), index));
+                return (jsx(ElectronSignaturesFragment, __assign({ dataType: "".concat(index), onTrackChange: onTrackChange, request: request, isUnControlled: isUnControlled, setLoading: setLoading, apiBaseUrl: apiBaseUrl, fileBaseUrl: fileBaseUrl, isSingleQj: isSingleQj }, mergeOptions, { deptId: resetProps.deptId }), index));
             }), jsxs(ElectronSealBatchDownload, __assign({ request: request, apiBaseUrl: apiBaseUrl, selectRows: selectRows, allData: allData, isShowElectronBatchBtn: isShowElectronBatchBtn, isShowDownloadBatchBtn: isShowDownloadBatchBtn, isShowDoubleSignedBatchBtn: isShowDoubleSignedBatchBtn, batchDownloadZipName: batchDownloadZipName, firstDataType: firstDataType }, { children: [isShowBatchDeleteBtn ? (jsx(Button, __assign({ type: "primary", onClick: onBatchDeleteHandle, style: { marginRight: "10px" } }, { children: "\u6279\u91CF\u5220\u9664" }))) : null, isShowFileUpload && currentIsEditMemo ? (jsx(FileUpload, __assign({ fileList: sameTypeRecords, apiBaseUrl: apiBaseUrl, onFileChange: onFileChange, multiple: true }, fileUploadProps, { children: "\u6DFB\u52A0\u9644\u4EF6" }))) : null] })), jsx(Table, { dataSource: mergeRecords, columns: columns, rowKey: function (record) { return record.id || record.attachId; }, className: "ztxk-table electron-table", bordered: true, pagination: false, loading: loading, rowSelection: myRowSelection, scroll: __assign({ x: "max-content", y: 500 }, tableScroll) }), jsx(LastQysModal, { modalHandleRef: modalHandleRef, appointSignLocation: function (info) {
                     // 未盖章的印章id列表
                     var needReSealList = info.needReSealList;

package/package.json

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