zmdms-webui 0.0.104 → 0.0.106

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

@@ -14,6 +14,7 @@ var MainMenu = function (props) {
     var _b = useMainMenuOpenKeys(userMenus, mainMenuSelectedKeys, { apps: apps, mergeSystemIds: mergeSystemIds, postMergeSystemIds: postMergeSystemIds }), mainMenuOpenKeys = _b.mainMenuOpenKeys, onMainMenuOpenChange = _b.onMainMenuOpenChange;
     // 创建主菜单标签
     var getLabel = useCallback(function (menuItem) {
+        var _a, _b;
         // 获取当前菜单的系统id
         var system = menuItem.system, path = menuItem.path;
         var prefix = getPrefixByAppId(system);
@@ -29,7 +30,12 @@ var MainMenu = function (props) {
                     ? "/".concat(prefix).concat(path)
                     : path;
         // 根据type的类型做出不同的处理 这里只是留个入口 暂时没有特别的处理
-        if (menuItem.type === "index") {
+        // 如果是以 _index结尾，说明是首页，路由保留
+        // 并且要是顶层 并且之前的路由要是 /
+        if (menuItem.type === "index" ||
+            (((_b = (_a = menuItem.code) === null || _a === void 0 ? void 0 : _a.endsWith) === null || _b === void 0 ? void 0 : _b.call(_a, "_index")) &&
+                menuItem.parentId === menuItem.system &&
+                newPath === "/")) {
             var newPath_1 = prefix ? "/".concat(prefix).concat(path) : path;
             return (jsx(Link, __assign({ to: newPath_1, onClick: function () {
                     addTab &&

package/dist/es/table/components/EnhanceBodyCell.js

@@ -5,6 +5,7 @@ import { useEditing, useIptRef, useTdRef } from './hooks.js';
 import { getInnerIndex } from '../useInnerPagination.js';
 import { getFormatter } from '../../inputnumber/utils.js';
 import { useLatest } from 'ahooks';
+import classNames from '../../node_modules/classnames/index.js';
 import MemoInput from '../../input/input.js';
 import InputNumber from '../../inputnumber/inputNumber.js';
 import { Popover } from 'antd';
@@ -124,6 +125,16 @@ var EnhanceCell = function (props) {
                     }
                 }, onPressEnter: onSave, onBlur: onSave, ref: iptRef, disabled: resultDisabled }, resetEditableConfigProps)));
         }
+        // 文本域输入框处理
+        if (type === "textarea") {
+            CurrentReactNode = (jsx(MemoInput.TextArea, __assign({ value: val, onChange: function (e) {
+                    var resultValue = e.target.value;
+                    setVal(resultValue);
+                    if (isValidate) {
+                        removeErrorClass();
+                    }
+                }, onPressEnter: onSave, onBlur: onSave, ref: iptRef, disabled: resultDisabled }, resetEditableConfigProps)));
+        }
         // 数字输入框处理
         if (type === "inputNumber") {
             var resultMax_1 = maxHandle ? maxHandle(newRecord) : max;
@@ -155,7 +166,13 @@ var EnhanceCell = function (props) {
                 console.error(err);
             }
         }
-        return (jsx("td", __assign({ ref: tdRef }, resetProps, { children: editing ? (jsx("div", __assign({ className: "ztxk-table__enhance-cell" }, { children: jsx(Popover, __assign({ trigger: "click", content: showPopover.message, open: showPopover.open, overlayClassName: "error-popover" }, { children: CurrentReactNode })) }))) : (jsx("div", __assign({ className: "ztxk-table__enhance-cell-wrap ".concat(resultDisabled ? "ztxk-table__enhance-cell-wrap--disabled" : ""), onClick: resultDisabled
+        return (jsx("td", __assign({ ref: tdRef }, resetProps, { children: editing ? (jsx("div", __assign({ className: "ztxk-table__enhance-cell" }, { children: jsx(Popover, __assign({ trigger: "click", content: showPopover.message, open: showPopover.open, overlayClassName: "error-popover" }, { children: CurrentReactNode })) }))) : (jsx("div", __assign({ className: classNames("ztxk-table__enhance-cell-wrap", {
+                    "ztxk-table__enhance-cell-wrap--disabled": resultDisabled,
+                }), style: {
+                    lineHeight: resetEditableConfigProps.rows
+                        ? "".concat(26 * resetEditableConfigProps.rows, "px")
+                        : "30px",
+                }, title: val, onClick: resultDisabled
                     ? undefined
                     : function () {
                         setIsCurrent(true);

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

@@ -1,15 +1,16 @@
 import { Table } from 'antd';
 import { TableProps, TablePaginationConfig, ColumnType } from 'antd/lib/table';
+import { TextAreaProps } from 'antd/es/input/TextArea';
 import { IInputProps } from '../input/input.js';
 import { IInputNumberProps } from '../inputnumber/inputNumber.js';
 import _default from './components/TitleDirectionColumn.js';
 
-type IEditableConfigOtherProps = IInputProps & IInputNumberProps;
+type IEditableConfigOtherProps = IInputProps & IInputNumberProps & TextAreaProps;
 interface IEditableConfig extends Partial<IEditableConfigOtherProps> {
     /**
      * 列编辑类型
      */
-    type: "input" | "inputNumber";
+    type: "input" | "inputNumber" | "textarea";
     /**
      * 最大值函数
      */