zmdms-webui 2.2.4 → 2.2.6

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/formitem/formItem.js

@@ -1,17 +1,16 @@
 import { __rest, __assign } from '../_virtual/_tslib.js';
 import { jsx, jsxs } from 'react/jsx-runtime';
 import { memo } from 'react';
+import { Form, Col, Tooltip } from 'antd';
 import classNames from '../node_modules/classnames/index.js';
 import '../config/ZtxkContext.js';
 import isEqual from '../config/isEqual.js';
-import MemoForm from '../form/form.js';
 import QuestionCircleOutlined from '../node_modules/@ant-design/icons/es/icons/QuestionCircleOutlined.js';
-import { Col, Tooltip } from 'antd';
 
 var hiddenLabelCol = { span: 0 };
 var FormItem = function (props) {
     var children = props.children, isDisplay = props.isDisplay, isRequired = props.isRequired, isChangeable = props.isChangeable, isStress = props.isStress, preNode = props.preNode, nextNode = props.nextNode; props.dynamicDisabled; var hiddenBorder = props.hiddenBorder, singleSelectShowBorder = props.singleSelectShowBorder, singleSelect = props.singleSelect, hiddenLabel = props.hiddenLabel, width = props.width, className = props.className, itemClassName = props.itemClassName, render = props.render, shouldUpdateNames = props.shouldUpdateNames; props.shouldUpdateClear; var dependencies = props.dependencies, shouldUpdate = props.shouldUpdate; props.index; props.outsideState; props.shouldUpdateBeOutsideState; props.nonForm; var isCustomItem = props.isCustomItem, customStyle = props.customStyle, tipString = props.tipString, directionColumn = props.directionColumn, divider = props.divider, resetProps = __rest(props, ["children", "isDisplay", "isRequired", "isChangeable", "isStress", "preNode", "nextNode", "dynamicDisabled", "hiddenBorder", "singleSelectShowBorder", "singleSelect", "hiddenLabel", "width", "className", "itemClassName", "render", "shouldUpdateNames", "shouldUpdateClear", "dependencies", "shouldUpdate", "index", "outsideState", "shouldUpdateBeOutsideState", "nonForm", "isCustomItem", "customStyle", "tipString", "directionColumn", "divider"]);
-    var form = MemoForm.useFormInstance();
+    var form = Form.useFormInstance();
     // 根据配置属性，判断是否渲染表单项
     // 是否显示表单项
     if (isDisplay === false || isDisplay === "0") {
@@ -74,8 +73,8 @@ var FormItem = function (props) {
         resetProps.labelCol = hiddenLabelCol;
     }
     if (dependencies) {
-        return (jsxs(ItemWrap, __assign({ width: width, className: className, tipString: tipString }, { children: [preNode ? preNode : null, jsx(MemoForm.Item, __assign({ dependencies: dependencies, noStyle: true }, { children: function (formInstance) {
-                        return (jsx(MemoForm.Item, __assign({}, resetProps, { className: itemClasses }, { children: render && render(itemProps, formInstance) })));
+        return (jsxs(ItemWrap, __assign({ width: width, className: className, tipString: tipString }, { children: [preNode ? preNode : null, jsx(Form.Item, __assign({ dependencies: dependencies, noStyle: true }, { children: function (formInstance) {
+                        return (jsx(Form.Item, __assign({}, resetProps, { className: itemClasses }, { children: render && render(itemProps, formInstance) })));
                     } })), nextNode ? nextNode : null] })));
     }
     if (shouldUpdate !== undefined || shouldUpdateNames) {
@@ -96,7 +95,7 @@ var FormItem = function (props) {
                 return false;
             }
             : shouldUpdate;
-        return (jsx(MemoForm.Item, __assign({ shouldUpdate: shouldUpdateHandle, noStyle: true }, { children: function (formInstance) {
+        return (jsx(Form.Item, __assign({ shouldUpdate: shouldUpdateHandle, noStyle: true }, { children: function (formInstance) {
                 if (typeof isDisplay === "function") {
                     var isD = isDisplay(form);
                     if (!isD) {
@@ -118,10 +117,10 @@ var FormItem = function (props) {
                         itemClasses = itemClasses.replace(" ztxk-form__item--disabled", "");
                     }
                 }
-                return resetProps.name ? (jsxs(ItemWrap, __assign({ width: width, className: className, tipString: tipString }, { children: [preNode ? preNode : null, jsx(MemoForm.Item, __assign({}, resetProps, { className: itemClasses }, { children: render && render(itemProps, formInstance) })), nextNode ? nextNode : null] }))) : (jsxs(ItemWrap, __assign({ width: width, className: className, tipString: tipString }, { children: [preNode ? preNode : null, render && render(itemProps, formInstance), nextNode ? nextNode : null] })));
+                return resetProps.name ? (jsxs(ItemWrap, __assign({ width: width, className: className, tipString: tipString }, { children: [preNode ? preNode : null, jsx(Form.Item, __assign({}, resetProps, { className: itemClasses }, { children: render && render(itemProps, formInstance) })), nextNode ? nextNode : null] }))) : (jsxs(ItemWrap, __assign({ width: width, className: className, tipString: tipString }, { children: [preNode ? preNode : null, render && render(itemProps, formInstance), nextNode ? nextNode : null] })));
             } })));
     }
-    return (jsxs(ItemWrap, __assign({ width: width, className: className, tipString: tipString }, { children: [preNode ? preNode : null, jsx(MemoForm.Item, __assign({}, resetProps, { className: itemClasses }, { children: render ? render(itemProps, form) : children })), nextNode ? nextNode : null] })));
+    return (jsxs(ItemWrap, __assign({ width: width, className: className, tipString: tipString }, { children: [preNode ? preNode : null, jsx(Form.Item, __assign({}, resetProps, { className: itemClasses }, { children: render ? render(itemProps, form) : children })), nextNode ? nextNode : null] })));
 };
 function getWidthNum(width) {
     if (typeof width === "number") {

package/dist/es/input/input.js

@@ -14,7 +14,7 @@ var Input = function (props, ref) {
                 (_a = props.onPressEnter) === null || _a === void 0 ? void 0 : _a.call(props, e);
                 onSearch === null || onSearch === void 0 ? void 0 : onSearch();
             }
-            : undefined })));
+            : props.onPressEnter })));
 };
 var MemoInput = memo(forwardRef(Input));
 MemoInput.displayName = "ZTXK_WEBUI_Input";

package/dist/es/inputnumber/inputNumber.js

@@ -36,7 +36,7 @@ var InputNumber = function (props, ref) {
                 (_a = props.onPressEnter) === null || _a === void 0 ? void 0 : _a.call(props, e);
                 onSearch === null || onSearch === void 0 ? void 0 : onSearch();
             }
-            : undefined })));
+            : props.onPressEnter })));
 };
 InputNumber.displayName = "ZTXK_WEBUI_InputNumber";
 var InputNumber$1 = memo(forwardRef(InputNumber));

package/package.json

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