zmdms-webui 0.0.39 → 0.0.40

package/dist/es/applayoutheader/appLayoutHeader.d.ts

@@ -6,7 +6,6 @@ interface IProps {
     deleteTabHandle?: any;
     deleteTabsHandle?: any;
     setActiveTab?: any;
-    userInfo?: any;
     logout?: () => void;
 }
 declare const _default: React__default.NamedExoticComponent<IProps>;

package/dist/es/applayoutheader/appLayoutHeader.js

@@ -6,9 +6,9 @@ import SettingCom from './setting/index.js';
 import { Layout } from 'antd';
 
 var AppLayoutHeader = function (_a) {
-    var tabs = _a.tabs, activeTab = _a.activeTab, deleteTabHandle = _a.deleteTabHandle, deleteTabsHandle = _a.deleteTabsHandle, setActiveTab = _a.setActiveTab, userInfo = _a.userInfo, logout = _a.logout;
+    var tabs = _a.tabs, activeTab = _a.activeTab, deleteTabHandle = _a.deleteTabHandle, deleteTabsHandle = _a.deleteTabsHandle, setActiveTab = _a.setActiveTab, logout = _a.logout;
     // console.log("layout-header- rerender");
-    return (jsxs(Layout.Header, __assign({ className: "zmdms-content--header" }, { children: [jsx(TabsCom, { tabs: tabs, activeTab: activeTab, deleteTabHandle: deleteTabHandle, deleteTabsHandle: deleteTabsHandle, setActiveTab: setActiveTab }), jsx(SettingCom, { userInfo: userInfo, logout: logout })] })));
+    return (jsxs(Layout.Header, __assign({ className: "zmdms-content--header" }, { children: [jsx(TabsCom, { tabs: tabs, activeTab: activeTab, deleteTabHandle: deleteTabHandle, deleteTabsHandle: deleteTabsHandle, setActiveTab: setActiveTab }), jsx(SettingCom, { logout: logout })] })));
 };
 AppLayoutHeader.displayName = "ZTXK_WEBUI_AppLayoutHeader";
 var AppLayoutHeader$1 = memo(AppLayoutHeader);

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

@@ -4,8 +4,8 @@ import FullCom from './fullCom.js';
 import UserInfo from './userInfo.js';
 
 var SettingCom = function (_a) {
-    var userInfo = _a.userInfo, logout = _a.logout;
-    return (jsxs("div", __assign({ className: "zmdms-content--header-info" }, { children: [jsx(FullCom, {}), jsx(UserInfo, { userInfo: userInfo, logout: logout })] })));
+    var logout = _a.logout;
+    return (jsxs("div", __assign({ className: "zmdms-content--header-info" }, { children: [jsx(FullCom, {}), jsx(UserInfo, { logout: logout })] })));
 };
 
 export { SettingCom as default };

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

@@ -1,12 +1,15 @@
 import { __assign } from '../../_virtual/_tslib.js';
 import { jsxs, jsx } from 'react/jsx-runtime';
+import { useContext } from 'react';
+import LayoutContext from '../../config/LayoutContext.js';
 import UserOutlined from '../../node_modules/@ant-design/icons/es/icons/UserOutlined.js';
 import UnlockOutlined from '../../node_modules/@ant-design/icons/es/icons/UnlockOutlined.js';
 import LogoutOutlined from '../../node_modules/@ant-design/icons/es/icons/LogoutOutlined.js';
 import { Dropdown } from 'antd';
 
 var UserInfo = function (_a) {
-    var userInfo = _a.userInfo, logout = _a.logout;
+    var logout = _a.logout;
+    var userInfo = useContext(LayoutContext).userInfo;
     var items = [
         {
             label: (jsxs("div", { children: [jsx(UserOutlined, { style: { marginRight: 5 } }), " \u8D26\u53F7\u4FE1\u606F"] })),

package/dist/es/applayoutsider/LayoutSiderContext.js

@@ -0,0 +1,7 @@
+import React__default from 'react';
+
+var ztxkMenuContext = {};
+/** 菜单相关Context */
+var LayoutMenuContext = React__default.createContext(ztxkMenuContext);
+
+export { LayoutMenuContext };

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

@@ -3,15 +3,9 @@ import React__default from 'react';
 interface ILayoutSiderProps {
     siderWidth?: number;
     subMenuWidth?: number;
-    userMenus?: any;
-    userSubMenus?: any;
     addTab?: any;
     siderBg?: any;
     logo?: any;
-    /**
-     * 微应用列表，在qiankun下有用 需要拼接路由前缀
-     */
-    apps?: any;
 }
 declare const _default: React__default.NamedExoticComponent<ILayoutSiderProps>;
 

package/dist/es/applayoutsider/appLayoutSider.js

@@ -1,12 +1,21 @@
 import { __assign } from '../_virtual/_tslib.js';
 import { jsx } from 'react/jsx-runtime';
-import { memo, useRef, useCallback } from 'react';
+import { memo, useContext, useState, useRef, useCallback } from 'react';
 import Menu from './menu/index.js';
+import { LayoutMenuContext } from './LayoutSiderContext.js';
+import LayoutContext from '../config/LayoutContext.js';
 import { Layout } from 'antd';
 
+/**
+ * TODO: 增加收藏、搜索菜单的功能
+ */
 var AppLayoutSider = function (props) {
     // console.log("layout-sider- rerender");
-    var _a = props.siderWidth, siderWidth = _a === void 0 ? 118 : _a, _b = props.subMenuWidth, subMenuWidth = _b === void 0 ? 162 : _b, userMenus = props.userMenus, userSubMenus = props.userSubMenus, addTab = props.addTab, siderBg = props.siderBg, logo = props.logo, apps = props.apps;
+    var _a = props.siderWidth, siderWidth = _a === void 0 ? 118 : _a, _b = props.subMenuWidth, subMenuWidth = _b === void 0 ? 162 : _b, addTab = props.addTab, siderBg = props.siderBg, logo = props.logo;
+    // 微应用信息
+    var apps = useContext(LayoutContext).apps;
+    // 当前选中的主菜单item
+    var _c = useState([]), mainMenuSelectedKeys = _c[0], setMainMenuSelectedKeys = _c[1];
     var layoutSiderRef = useRef();
     // 通过系统id获取前缀
     var getPrefixByAppId = useCallback(function (id) {
@@ -20,7 +29,7 @@ var AppLayoutSider = function (props) {
     }, [apps]);
     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(Menu, { width: siderWidth, subMenuWidth: subMenuWidth, layoutSiderRef: layoutSiderRef, userMenus: userMenus, userSubMenus: userSubMenus, addTab: addTab, logo: logo, getPrefixByAppId: getPrefixByAppId }) })));
+        } }, { children: jsx(LayoutMenuContext.Provider, __assign({ value: { mainMenuSelectedKeys: mainMenuSelectedKeys, setMainMenuSelectedKeys: setMainMenuSelectedKeys } }, { children: jsx(Menu, { width: siderWidth, subMenuWidth: subMenuWidth, layoutSiderRef: layoutSiderRef, addTab: addTab, logo: logo, getPrefixByAppId: getPrefixByAppId }) })) })));
 };
 AppLayoutSider.displayName = "ZTXK_WEBUI_AppLayoutSider";
 var AppLayoutSider$1 = memo(AppLayoutSider);

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

@@ -1,12 +1,19 @@
 import { __assign } from '../../_virtual/_tslib.js';
 import { jsx } from 'react/jsx-runtime';
-import { useCallback, useMemo } from 'react';
+import { useContext, useCallback, useMemo } from 'react';
 import { Link } from 'react-router-dom';
+import { useMainMenuOpenKeys } from './hook.js';
+import { LayoutMenuContext } from '../LayoutSiderContext.js';
+import LayoutContext from '../../config/LayoutContext.js';
 import IconFont from '../../icon/index.js';
 import { Menu } from 'antd';
 
 var MainMenu = function (props) {
-    var userMenus = props.userMenus, onMouseEnter = props.onMouseEnter, onMainLinkClick = props.onMainLinkClick, addTab = props.addTab, getPrefixByAppId = props.getPrefixByAppId;
+    var onMouseEnter = props.onMouseEnter, addTab = props.addTab, getPrefixByAppId = props.getPrefixByAppId;
+    var _a = useContext(LayoutContext), userMenus = _a.userMenus, apps = _a.apps;
+    var _b = useContext(LayoutMenuContext), mainMenuSelectedKeys = _b.mainMenuSelectedKeys, setMainMenuSelectedKeys = _b.setMainMenuSelectedKeys;
+    // 获取主菜单展开的内容
+    var _c = useMainMenuOpenKeys(userMenus, mainMenuSelectedKeys, { apps: apps }), mainMenuOpenKeys = _c.mainMenuOpenKeys, onMainMenuOpenChange = _c.onMainMenuOpenChange;
     // 创建主菜单标签
     var getLabel = useCallback(function (menuItem) {
         // 获取当前菜单的系统id
@@ -75,12 +82,11 @@ var MainMenu = function (props) {
             };
         });
     }, [userMenus, getLabel]);
-    // 主菜单点击事件
-    var onClickHandle = useCallback(function (info) {
-        var key = info.key;
-        onMainLinkClick(key);
-    }, [onMainLinkClick]);
-    return (jsx(Menu, { className: "zmdms-menu--main", items: items, inlineIndent: 10, mode: "inline", onMouseEnter: onMouseEnter, onClick: onClickHandle }));
+    // 主菜单选中时调用
+    var onSelectHandle = useCallback(function (info) {
+        setMainMenuSelectedKeys && setMainMenuSelectedKeys(info.selectedKeys);
+    }, [setMainMenuSelectedKeys]);
+    return (jsx(Menu, { className: "zmdms-menu--main", items: items, inlineIndent: 10, mode: "inline", onMouseEnter: onMouseEnter, selectedKeys: mainMenuSelectedKeys, onSelect: onSelectHandle, openKeys: mainMenuOpenKeys, onOpenChange: onMainMenuOpenChange }));
 };
 
 export { MainMenu as default };

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

@@ -1,17 +1,39 @@
 import { __assign } from '../../_virtual/_tslib.js';
 import { jsxs, jsx } from 'react/jsx-runtime';
-import { memo, forwardRef, useState, useCallback, useImperativeHandle, useMemo } from 'react';
+import { memo, forwardRef, useContext, useMemo, useState, useCallback, useImperativeHandle } from 'react';
 import { Link } from 'react-router-dom';
+import { useSubMenuOpenKeys } from './hook.js';
+import { LayoutMenuContext } from '../LayoutSiderContext.js';
+import LayoutContext from '../../config/LayoutContext.js';
 import ButtonCom from '../../button/button.js';
 import IconFont from '../../icon/index.js';
 import { Drawer, Menu } from 'antd';
 
+var defaultSubMenu = [];
 var SubMenu = function (props, ref) {
-    var marginLeft = props.marginLeft, subMenus = props.subMenus, subMenuWidth = props.subMenuWidth, layoutSiderRef = props.layoutSiderRef, addTab = props.addTab, getPrefixByAppId = props.getPrefixByAppId;
+    var marginLeft = props.marginLeft, subMenuWidth = props.subMenuWidth, layoutSiderRef = props.layoutSiderRef, addTab = props.addTab, getPrefixByAppId = props.getPrefixByAppId;
+    var _a = useContext(LayoutContext), activeTab = _a.activeTab, userSubMenus = _a.userSubMenus;
+    var _b = useContext(LayoutMenuContext), mainMenuSelectedKeys = _b.mainMenuSelectedKeys, setMainMenuSelectedKeys = _b.setMainMenuSelectedKeys;
+    // 二级菜单当前选中项
+    var subMenusSelectedKeys = useMemo(function () {
+        return activeTab ? [activeTab] : [];
+    }, [activeTab]);
+    // 根据主菜单当前选中项，设置二级菜单应该展示的内容
+    var subMenus = useMemo(function () {
+        if (mainMenuSelectedKeys && mainMenuSelectedKeys.length > 0) {
+            return userSubMenus[mainMenuSelectedKeys[0]];
+        }
+        return defaultSubMenu;
+    }, [mainMenuSelectedKeys, userSubMenus]);
+    // 展开指定的二级菜单
+    var _c = useSubMenuOpenKeys(userSubMenus, activeTab, {
+        getPrefixByAppId: getPrefixByAppId,
+        setMainMenuSelectedKeys: setMainMenuSelectedKeys,
+    }), subMenuOpenKeys = _c.subMenuOpenKeys, onSubMenuOpenChange = _c.onSubMenuOpenChange;
     // 二级菜单是否显示
-    var _a = useState(), visible = _a[0], setVisible = _a[1];
+    var _d = useState(), visible = _d[0], setVisible = _d[1];
     // 二级菜单是否固定
-    var _b = useState(), isFixed = _b[0], setIsFixed = _b[1];
+    var _e = useState(), isFixed = _e[0], setIsFixed = _e[1];
     var onToggleSubMenuFixed = useCallback(function () {
         setIsFixed(function (preFixed) {
             layoutSiderRef.current.style.marginRight = !preFixed
@@ -57,7 +79,8 @@ var SubMenu = function (props, ref) {
                                 });
                             } }, { children: menuItem.name }))),
                         title: menuItem.name,
-                        key: menuItem.id,
+                        // key: menuItem.id,
+                        key: newPath === "/" ? menuItem.id : newPath,
                         // icon: menuItem.source ? (
                         //   <Icon type={menuItem.source} style={{ fontSize: "18px" }} />
                         // ) : null,
@@ -73,7 +96,7 @@ var SubMenu = function (props, ref) {
         var newSubMenusItems = dfn(subMenus);
         return newSubMenusItems;
     }, [subMenus, addTab, getPrefixByAppId]);
-    return (jsx(Drawer, __assign({ mask: false, placement: "left", width: subMenuWidth, zIndex: 99, closable: false, open: visible, className: "zmdms-menu--sub", style: { marginLeft: marginLeft }, footer: footerDom }, { children: jsx(Menu, { inlineIndent: 10, mode: "inline", items: items }) })));
+    return (jsx(Drawer, __assign({ mask: false, placement: "left", width: subMenuWidth, zIndex: 99, closable: false, open: visible, className: "zmdms-menu--sub", style: { marginLeft: marginLeft }, footer: footerDom }, { children: jsx(Menu, { inlineIndent: 10, selectedKeys: subMenusSelectedKeys, mode: "inline", items: items, openKeys: subMenuOpenKeys, onOpenChange: onSubMenuOpenChange }) })));
 };
 var SubMenu$1 = memo(forwardRef(SubMenu));
 

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

@@ -0,0 +1,122 @@
+import { useState, useEffect, useRef } from 'react';
+
+// 需要打开的主菜单
+function useMainMenuOpenKeys(userMenus, mainMenuSelectedKeys, options) {
+    var apps = options.apps;
+    var firstInRef = useRef(true);
+    // 展开指定的主菜单
+    var _a = useState([]), openKeys = _a[0], setOpenKeys = _a[1];
+    var onOpenChange = function (openKeys) {
+        firstInRef.current = false;
+        setOpenKeys(openKeys);
+    };
+    useEffect(function () {
+        // 如果不是基座，那么不需要展开功能
+        if (!apps) {
+            return;
+        }
+        // 获取当前选中项的父级节点
+        if (!userMenus || !Array.isArray(userMenus)) {
+            return;
+        }
+        // 如果是第一次进来，默认打开所有菜单
+        if (firstInRef.current) {
+            setOpenKeys(userMenus.map(function (userMenu) { return userMenu.id + ""; }));
+            return;
+        }
+        // 遍历主菜单，找到当前选中项对应的父级菜单
+        var selectedKey = mainMenuSelectedKeys && mainMenuSelectedKeys.length > 0
+            ? mainMenuSelectedKeys[0]
+            : "";
+        if (!selectedKey) {
+            return;
+        }
+        userMenus.find(function (userMenu) {
+            var userMenuChild = userMenu.children;
+            if (!userMenuChild) {
+                return false;
+            }
+            return userMenuChild.find(function (item) {
+                if (item.id === selectedKey) {
+                    // 如果是单点登录，那么打开选中的菜单
+                    // 或者不是第一次点击
+                    if (!firstInRef.current) {
+                        setOpenKeys([item.parentId + ""]);
+                    }
+                    return true;
+                }
+                return false;
+            });
+        });
+    }, [userMenus, mainMenuSelectedKeys, apps]);
+    return {
+        mainMenuOpenKeys: openKeys,
+        onMainMenuOpenChange: onOpenChange,
+    };
+}
+// 需要打开的二级菜单
+function useSubMenuOpenKeys(userSubMenus, activeTab, options) {
+    var getPrefixByAppId = options.getPrefixByAppId, setMainMenuSelectedKeys = options.setMainMenuSelectedKeys;
+    // 展开指定的二级菜单
+    var _a = useState([]), openKeys = _a[0], setOpenKeys = _a[1];
+    var onOpenChange = function (openKeys) {
+        setOpenKeys(openKeys);
+    };
+    // 选中的页签 需要展开指定的父级菜单
+    useEffect(function () {
+        if (!userSubMenus) {
+            return;
+        }
+        // 遍历二级菜单
+        for (var _i = 0, _a = Object.entries(userSubMenus); _i < _a.length; _i++) {
+            var _b = _a[_i], key = _b[0], value = _b[1];
+            if (!Array.isArray(value)) {
+                continue;
+            }
+            // 存放当前二级菜单的值
+            // let currentSubMenu: any = null;
+            var result = value.find(function (subMenuVal) {
+                var system = subMenuVal.system, path = subMenuVal.path;
+                var prefix = getPrefixByAppId(system);
+                // 二级菜单如果没有配置路由的 不需要跳转
+                var newPath = path === "/" ? "/" : prefix ? "/".concat(prefix).concat(path) : path;
+                // 如果值相等的话，说明这个就是目标值
+                // 即父级就是当前选中项
+                if (newPath === activeTab) {
+                    // currentSubMenu = { ...subMenuVal };
+                    // 这里可能有点问题  应该是当前的id
+                    setOpenKeys([subMenuVal.parentId]);
+                    return true;
+                }
+                // 如果没有子元素，或者子元素不是数组 直接下一轮遍历
+                if (!subMenuVal.children || !Array.isArray(subMenuVal.children)) {
+                    return false;
+                }
+                return subMenuVal.children.find(function (item) {
+                    var system = item.system, path = item.path;
+                    var prefix = getPrefixByAppId(system);
+                    // 二级菜单如果没有配置路由的 不需要跳转
+                    var newPath = path === "/" ? "/" : prefix ? "/".concat(prefix).concat(path) : path;
+                    if (newPath === activeTab) {
+                        // currentSubMenu = { ...item };
+                        setOpenKeys([item.parentId]);
+                        return true;
+                    }
+                    return false;
+                });
+            });
+            // 找到当前路由 对应的二级菜单 提前结束循环
+            if (result) {
+                // 设置一级菜单选中的key
+                setMainMenuSelectedKeys && setMainMenuSelectedKeys([key]);
+                break;
+            }
+        }
+    }, [userSubMenus, activeTab, getPrefixByAppId, setMainMenuSelectedKeys]);
+    return {
+        subMenuOpenKeys: openKeys,
+        onSubMenuOpenChange: onOpenChange,
+    };
+}
+
+export { useMainMenuOpenKeys, useSubMenuOpenKeys };

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

@@ -1,40 +1,25 @@
 import { __assign } from '../../_virtual/_tslib.js';
 import { jsxs, jsx } from 'react/jsx-runtime';
-import { memo, useRef, useState, useCallback } from 'react';
+import { memo, useRef, useCallback } from 'react';
 import Logo from './Logo.js';
 import MainMenu from './MainMenu.js';
 import SubMenu from './SubMenu.js';
 
-var defaultSubMenu = [];
 var MenuCom = function (props) {
-    var width = props.width, subMenuWidth = props.subMenuWidth, layoutSiderRef = props.layoutSiderRef, userMenus = props.userMenus, userSubMenus = props.userSubMenus, addTab = props.addTab, logo = props.logo, getPrefixByAppId = props.getPrefixByAppId;
+    var width = props.width, subMenuWidth = props.subMenuWidth, layoutSiderRef = props.layoutSiderRef, addTab = props.addTab, logo = props.logo, getPrefixByAppId = props.getPrefixByAppId;
     // 二级菜单Ref对象
     var subMenu = useRef({});
-    var _a = useState(defaultSubMenu), subMenus = _a[0], setSubMenus = _a[1];
     // 一级菜单mouseEnter事件
     var onMouseEnter = useCallback(function () {
         var _a;
         (_a = subMenu.current) === null || _a === void 0 ? void 0 : _a.setVisible(true);
     }, []);
-    // 一级菜单点击事件
-    // 1、设置二级菜单内容
-    // 2、设置二级菜单显示
-    var onMainLinkClick = useCallback(function (mainMenuId) {
-        if (mainMenuId) {
-            if (userSubMenus) {
-                setSubMenus(userSubMenus[mainMenuId]);
-            }
-        }
-        else {
-            setSubMenus(defaultSubMenu);
-        }
-    }, [userSubMenus]);
     // 主容器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 }), jsx(MainMenu, { userMenus: userMenus, onMouseEnter: onMouseEnter, onMainLinkClick: onMainLinkClick, addTab: addTab, getPrefixByAppId: getPrefixByAppId }), jsx(SubMenu, { ref: subMenu, marginLeft: width, subMenuWidth: subMenuWidth, subMenus: subMenus, layoutSiderRef: layoutSiderRef, addTab: addTab, getPrefixByAppId: getPrefixByAppId })] })));
+    return (jsxs("div", __assign({ className: "zmdms-menu", onMouseLeave: onMouseLeave }, { children: [jsx(Logo, { logo: logo }), jsx(MainMenu, { onMouseEnter: onMouseEnter, addTab: addTab, getPrefixByAppId: getPrefixByAppId }), jsx(SubMenu, { ref: subMenu, marginLeft: width, subMenuWidth: subMenuWidth, layoutSiderRef: layoutSiderRef, addTab: addTab, getPrefixByAppId: getPrefixByAppId })] })));
 };
 var Menu = memo(MenuCom);
 

package/dist/es/config/LayoutContext.d.ts

@@ -0,0 +1,22 @@
+import React__default from 'react';
+
+/**
+ * 菜单相关的context配置
+ */
+interface IZtxkLayoutContext {
+    /** 当前选中页签 */
+    activeTab?: string;
+    /** 用户一级菜单 */
+    userMenus?: any;
+    /** 用户二级菜单 */
+    userSubMenus?: any;
+    /** 用户信息 */
+    userInfo?: any;
+    /**
+     * 微应用列表，在qiankun下有用 需要拼接路由前缀
+     */
+    apps?: any;
+}
+declare const LayoutContext: React__default.Context<IZtxkLayoutContext>;
+
+export { LayoutContext as default };

package/dist/es/config/LayoutContext.js

@@ -0,0 +1,6 @@
+import React__default from 'react';
+
+var ztxkLayout = {};
+var LayoutContext = React__default.createContext(ztxkLayout);
+
+export { LayoutContext as default };

package/dist/es/descriptions/descriptions.js

@@ -7,7 +7,7 @@ var Descriptions = function (props) {
     var className = props.className, resetProps = __rest(props, ["className"]);
     // 主容器类名
     var classes = classNames("ztxk-descriptions", className, {});
-    return (jsx(Descriptions$1, __assign({ column: 4, size: "middle", className: classes }, resetProps)));
+    return (jsx(Descriptions$1, __assign({ column: 3, size: "middle", className: classes }, resetProps)));
 };
 var DescriptionsCom = Descriptions;
 DescriptionsCom.displayName = "ZTXK_WEBUI_Descriptions";

package/dist/es/formitem/formItem.js

@@ -1,5 +1,5 @@
 import { __rest, __assign } from '../_virtual/_tslib.js';
-import { jsx, jsxs } from 'react/jsx-runtime';
+import { jsxs, jsx } from 'react/jsx-runtime';
 import { memo } from 'react';
 import classNames from '../node_modules/classnames/index.js';
 import '../config/ZtxkContext.js';
@@ -9,12 +9,8 @@ import { Col } from 'antd';
 
 var FormItem = function (props) {
     var _a;
-    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, 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; var nonForm = props.nonForm, resetProps = __rest(props, ["children", "isDisplay", "isRequired", "isChangeable", "isStress", "preNode", "nextNode", "dynamicDisabled", "hiddenBorder", "singleSelectShowBorder", "hiddenLabel", "width", "className", "itemClassName", "render", "shouldUpdateNames", "shouldUpdateClear", "dependencies", "shouldUpdate", "index", "outsideState", "shouldUpdateBeOutsideState", "nonForm"]);
+    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, 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 resetProps = __rest(props, ["children", "isDisplay", "isRequired", "isChangeable", "isStress", "preNode", "nextNode", "dynamicDisabled", "hiddenBorder", "singleSelectShowBorder", "hiddenLabel", "width", "className", "itemClassName", "render", "shouldUpdateNames", "shouldUpdateClear", "dependencies", "shouldUpdate", "index", "outsideState", "shouldUpdateBeOutsideState", "nonForm"]);
     var form = MemoForm.useFormInstance();
-    // 如果是纯文本渲染
-    if (nonForm) {
-        return render ? (render({}, form)) : (jsx(Col, { className: "ztxk-form__item--collapse", span: 24 }));
-    }
     // 根据配置属性，判断是否渲染表单项
     // 是否显示表单项
     if (isDisplay === false || isDisplay === "0") {
@@ -66,7 +62,7 @@ var FormItem = function (props) {
                         return (jsx(MemoForm.Item, __assign({}, resetProps, { className: itemClasses }, { children: render && render(itemProps, formInstance) })));
                     } })), nextNode ? nextNode : null] })));
     }
-    if (shouldUpdate || shouldUpdateNames) {
+    if (shouldUpdate !== undefined || shouldUpdateNames) {
         var shouldUpdateHandle = shouldUpdateNames
             ? function (prevValues, curValues, info) {
                 for (var i = 0; i < shouldUpdateNames.length; i++) {
@@ -132,4 +128,4 @@ var FormItem$1 = memo(FormItem, function (prev, next) {
     return isEqual(prev, next);
 });
 
-export { FormItem$1 as default };
+export { ItemWrap, FormItem$1 as default };

package/dist/index.build.d.ts

@@ -29,6 +29,7 @@ export { default as TreeSelect } from './es/treeselect/treeSelect.js';
 export { default as Tree } from './es/tree/tree.js';
 export { default as Descriptions } from './es/descriptions/descriptions.js';
 export { default as Title } from './es/title/title.js';
+export { default as LayoutContext } from './es/config/LayoutContext.js';
 export { Affix, Alert, Anchor, AutoComplete, Avatar, BackTop, Badge, Breadcrumb, Card, Carousel, Cascader, Checkbox, Col, Collapse, Comment, ConfigProvider, Divider, Drawer, Dropdown, Empty, Grid, Image, Layout, List, Mentions, Menu, PageHeader, Popconfirm, Popover, Progress, Radio, Rate, Result, Row, Segmented, Skeleton, Slider, Space, Spin, Statistic, Steps, Switch, Tag, Timeline, Tooltip, Transfer, Typography, Upload, message, notification } from 'antd';
 export { IModalOpenOptions, IModalProps, IModalRef } from './es/modal/interface.js';
 export { IFooterDom, IFooterProps } from './es/footer/interface.js';