zmdms-webui 2.2.3 → 2.2.5

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

@@ -21,13 +21,13 @@ var SearchInput = function () {
             subUserMenuArr.forEach(function (item) {
                 var copyItem = __assign(__assign({}, item), { selectedKey: key });
                 if (Array.isArray(item === null || item === void 0 ? void 0 : item.children)) {
-                    var result = item === null || item === void 0 ? void 0 : item.children.filter(function (child) {
-                        return child.name.includes(searchValue);
-                    });
+                    var result = item === null || item === void 0 ? void 0 : item.children.filter(function (child) { return child.name && child.name.includes(searchValue); });
                     copyItem.children = result.map(function (resultItem) { return (__assign(__assign({}, resultItem), { selectedKey: key })); });
                 }
                 if ((Array.isArray(copyItem.children) && copyItem.children.length > 0) ||
-                    (copyItem.name.includes(searchValue) && copyItem.path !== "/")) {
+                    (copyItem.name &&
+                        copyItem.name.includes(searchValue) &&
+                        copyItem.path !== "/")) {
                     newSubUserMenuArr.push(copyItem);
                 }
             });

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, openOnlyHasSubmenus = props.openOnlyHasSubmenus;
+    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 subMenusSelectedKeys = useMemo(function () {
@@ -146,9 +146,14 @@ var SubMenu = function (props, ref) {
                         // 这里为什么要用newPath 而不是menuItem.id
                         // 因为如果要选到叶子节点，是直接拿路由去做匹配
                         // 如果这个菜单有子元素，那么这个菜单是不需要跳转的，他的key应该取menuItem.id
-                        key: newPath === "/" || ((_a = menuItem.children) === null || _a === void 0 ? void 0 : _a.length) > 0
-                            ? menuItem.id
-                            : newPath,
+                        key: newPath !== "/"
+                            ? newPath
+                            : ((_a = menuItem.children) === null || _a === void 0 ? void 0 : _a.length) > 0
+                                ? menuItem.id
+                                : newPath,
+                        // newPath === "/" || menuItem.children?.length > 0
+                        //   ? menuItem.id
+                        //   : newPath,
                         // icon: menuItem.source ? (
                         //   <Icon type={menuItem.source} style={{ fontSize: "18px" }} />
                         // ) : null,

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

@@ -7,7 +7,7 @@ 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, openOnlyHasSubmenus = props.openOnlyHasSubmenus, 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 ? false : _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对象

package/dist/es/table/interface.d.ts

@@ -571,9 +571,10 @@ interface IFields {
     /**
      * 对当前字段的值做最终处理，v 跟 showKey 或者 value的类型一一对应 如果传入的是数组 那么返回的即是数组
      * @param v 当前处理值
+     * @param summaryTotalObj 总结栏总对象
      * @returns
      */
-    callback?: (v: any) => any;
+    callback?: (v: any, summaryTotalObj: any) => any;
     /** 对齐方式 */
     align?: "left" | "center" | "right";
 }

package/dist/es/table/useSummary.js

@@ -231,7 +231,7 @@ function getSubtotalObj(fields, dataSource) {
                 }
                 // 如果数据还需要最终处理的话
                 if (callback && index === dataSource.length - 1) {
-                    summaryTotalObj[key] = callback(summaryTotalObj[key]);
+                    summaryTotalObj[key] = callback(summaryTotalObj[key], summaryTotalObj);
                 }
                 summaryTotalConfigObj[key] = {
                     align: field === null || field === void 0 ? void 0 : field.align,
@@ -289,7 +289,7 @@ function getTotalObj(fields) {
                 summaryTotalObj[key] = 0;
             }
             if (callback) {
-                summaryTotalObj[key] = callback(summaryTotalObj[key]);
+                summaryTotalObj[key] = callback(summaryTotalObj[key], summaryTotalObj);
             }
             summaryTotalConfigObj[key] = {
                 align: field === null || field === void 0 ? void 0 : field.align,

package/package.json

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