zmdms-webui 2.2.5 → 2.2.7

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

@@ -2,6 +2,7 @@ import { __assign, __awaiter, __generator } from '../../_virtual/_tslib.js';
 import { jsxs, jsx, Fragment } from 'react/jsx-runtime';
 import { useContext, useState, useMemo } from 'react';
 import { LayoutHeaderContext } from '../LayoutHeaderContext.js';
+import { useLatest } from 'ahooks';
 import LogoutOutlined from '../../node_modules/@ant-design/icons/es/icons/LogoutOutlined.js';
 import UnlockOutlined from '../../node_modules/@ant-design/icons/es/icons/UnlockOutlined.js';
 import UserOutlined from '../../node_modules/@ant-design/icons/es/icons/UserOutlined.js';
@@ -11,6 +12,7 @@ var UserInfo = function (_a) {
     var logout = _a.logout, updatePassword = _a.updatePassword;
     var userInfo = useContext(LayoutHeaderContext).userInfo;
     var _b = useState(false), spinning = _b[0], setSpinning = _b[1];
+    var logoutLatest = useLatest(logout);
     var items = useMemo(function () {
         var items = [
             {
@@ -20,11 +22,11 @@ var UserInfo = function (_a) {
                             switch (_a.label) {
                                 case 0:
                                     setSpinning(true);
-                                    if (!logout) return [3 /*break*/, 4];
+                                    if (!logoutLatest.current) return [3 /*break*/, 4];
                                     _a.label = 1;
                                 case 1:
                                     _a.trys.push([1, 3, , 4]);
-                                    return [4 /*yield*/, logout()];
+                                    return [4 /*yield*/, logoutLatest.current()];
                                 case 2:
                                     _a.sent();
                                     return [3 /*break*/, 4];
@@ -55,7 +57,7 @@ var UserInfo = function (_a) {
             ]);
         }
         return items;
-    }, [updatePassword]);
+    }, [updatePassword, logoutLatest]);
     return (jsxs(Fragment, { children: [jsx(Dropdown, __assign({ menu: { items: items }, trigger: ["click"], placement: "bottomLeft" }, { children: jsxs("div", __assign({ className: "user-operation" }, { children: [jsx(UserOutlined, {}), jsx("span", { children: userInfo === null || userInfo === void 0 ? void 0 : userInfo.realName })] })) })), spinning && jsx(Spin, { spinning: true, tip: "\u9000\u51FA\u767B\u5F55\u4E2D", className: "logout-spin" })] }));
 };
 

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

@@ -7,10 +7,11 @@ import { MENU_SEARCH_KEY } from './constants.js';
 import MemoInput from '../../input/input.js';
 import SearchOutlined from '../../node_modules/@ant-design/icons/es/icons/SearchOutlined.js';
 
-var SearchInput = function () {
-    var _a = useState("菜单搜索"), placeholderText = _a[0], setPlaceholderText = _a[1];
-    var _b = useState(), searchValue = _b[0], setSearchValue = _b[1];
-    var _c = useContext(LayoutMenuContext), userSubMenus = _c.userSubMenus, setMainMenuSelectedKeys = _c.setMainMenuSelectedKeys, setInnerUserSubMenus = _c.setInnerUserSubMenus;
+var SearchInput = function (_a) {
+    var setVisible = _a.setVisible;
+    var _b = useState("菜单搜索"), placeholderText = _b[0], setPlaceholderText = _b[1];
+    var _c = useState(), searchValue = _c[0], setSearchValue = _c[1];
+    var _d = useContext(LayoutMenuContext), userSubMenus = _d.userSubMenus, setMainMenuSelectedKeys = _d.setMainMenuSelectedKeys, setInnerUserSubMenus = _d.setInnerUserSubMenus;
     var onSearch = useMemoizedFn(function () {
         if (!searchValue) {
             return;
@@ -32,6 +33,7 @@ var SearchInput = function () {
                 }
             });
         });
+        setVisible(true);
         setMainMenuSelectedKeys === null || setMainMenuSelectedKeys === void 0 ? void 0 : setMainMenuSelectedKeys([MENU_SEARCH_KEY]);
         setInnerUserSubMenus(function (pre) {
             var _a;

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

@@ -27,7 +27,7 @@ var MenuCom = function (props) {
         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, openOnlyHasSubmenus: openOnlyHasSubmenus })] })));
+    return (jsxs("div", __assign({ className: "zmdms-menu", onMouseLeave: onMouseLeave }, { children: [jsx(Logo, { logo: logo, showLine: visible && !hideSubMenuBg, style: logoStyle }), isShowSearchInput && jsx(SearchInput, { setVisible: setVisible }), 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/dynamicsetting/dynamicDrawer.js

@@ -118,7 +118,7 @@ var DynamicDrawer = function (props, ref) {
                 return __spreadArray(__spreadArray(__spreadArray([], leftList, true), middleList, true), rightList, true);
             });
         };
-    }, [setTempDynamicList, isDimensionPriority]);
+    }, [setTempDynamicList]);
     // 确认
     var onSureHandle = function () {
         onSure && onSure(tempDynamicList);

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/dist/less/components/Alert/style/index.less

@@ -0,0 +1,53 @@
+.zt-alert {
+  border-radius: @border-radius;
+  border: none;
+  > .anticon {
+    font-size: 16px;
+    margin-right: 10px;
+  }
+  &.ant-alert-with-description {
+    padding: 8px 15px;
+    > .anticon {
+      margin-top: 2px;
+      font-size: 24px;
+    }
+  }
+  &.zt-alert--margin-top {
+    margin-top: @margin-base;
+  }
+  &.zt-alert--margin-bottom {
+    margin-bottom: @margin-base;
+  }
+  &.ant-alert-success {
+    background-color: @active-color;
+    color: #fff;
+    .anticon {
+      color: #fff;
+    }
+    .ant-alert-message {
+      color: #fff;
+    }
+  }
+  &.ant-alert-error {
+    background-color: @stress-color;
+    color: #fff;
+    .anticon {
+      color: #fff;
+      margin-top: 1px;
+    }
+    .ant-alert-message {
+      color: #fff;
+    }
+  }
+  &.ant-alert-info,
+  &.ant-alert-warning {
+    background-color: @global-color;
+    color: @global-text-color;
+    .anticon {
+      color: @global-text-color;
+    }
+    .ant-alert-message {
+      color: @global-text-color;
+    }
+  }
+}

package/dist/less/components/Alert/style/style.less

@@ -0,0 +1,4 @@
+@import "antd/lib/alert/style/index.less";
+
+@import "../../../styles/default.less";
+@import "./index.less";