zmdms-webui 0.0.106 → 0.0.108

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

@@ -1,4 +1,5 @@
 import { useState, useEffect, useRef } from 'react';
+import isEqual from 'lodash/isEqual';
 
 // 需要打开的主菜单
 function useMainMenuOpenKeys(userMenus, mainMenuSelectedKeys, options) {
@@ -100,10 +101,23 @@ function useSubMenuOpenKeys(userSubMenus, activeTab, options) {
         if (!activeTab) {
             return;
         }
+        // 专门为那种主菜单带路由跳转的逻辑处理
         if (selectMainMenu) {
-            var mainMainId = selectMainMenu(activeTab);
-            if (mainMainId) {
-                setMainMenuSelectedKeys && setMainMenuSelectedKeys([mainMainId]);
+            var mainMainId_1 = selectMainMenu(activeTab);
+            if (mainMainId_1) {
+                setMainMenuSelectedKeys &&
+                    setMainMenuSelectedKeys(function (preMainMainIds) {
+                        if (isEqual(preMainMainIds, [mainMainId_1])) {
+                            return preMainMainIds;
+                        }
+                        return [mainMainId_1];
+                    });
+                // 展开下面的菜单 如果有菜单的话
+                if (userSubMenus &&
+                    Array.isArray(userSubMenus[mainMainId_1]) &&
+                    userSubMenus[mainMainId_1].length > 0) {
+                    setOpenKeys(userSubMenus[mainMainId_1].map(function (i) { return i.id; }));
+                }
                 return;
             }
         }

package/dist/es/table/useColumns.js

@@ -169,7 +169,7 @@ function useColumns(columns, options) {
         if (isAdd || isDel) {
             var newColumn = {
                 title: function () {
-                    return isDelAll ? jsx(ColumnDelAll, { onAddAndDel: onAddAndDel }) : null;
+                    return isDelAll && isDel ? jsx(ColumnDelAll, { onAddAndDel: onAddAndDel }) : null;
                 },
                 width: 52,
                 fixed: "left",
@@ -185,7 +185,7 @@ function useColumns(columns, options) {
         // 处理一些配置放置的位置
         if (dynamicKey && !hiddenDynamicIcon) {
             myNewColumns[0].title = function () {
-                return isAdd || isDel ? (jsxs(Fragment, { children: [isDelAll ? jsx(ColumnDelAll, { onAddAndDel: onAddAndDel }) : null, jsx(ColumnDynamic, { dynamicSettingRef: dynamicSettingRef })] })) : (jsx(ColumnDynamic, { dynamicSettingRef: dynamicSettingRef }));
+                return isAdd || isDel ? (jsxs(Fragment, { children: [isDelAll && isDel ? (jsx(ColumnDelAll, { onAddAndDel: onAddAndDel })) : null, jsx(ColumnDynamic, { dynamicSettingRef: dynamicSettingRef })] })) : (jsx(ColumnDynamic, { dynamicSettingRef: dynamicSettingRef }));
             };
         }
     }

package/dist/es/uploadlist/uploadList.js

@@ -33,6 +33,7 @@ var UploadList = function (props, ref) {
     var maxSizeStr = formatUnit(maxSize);
     var tableRef = useRef({});
     var modalRef = useRef({});
+    var imgCropModalRef = useRef();
     var _e = useState(), imgSrc = _e[0], setImgSrc = _e[1];
     var _f = useBaseContext(), apiBaseUrl = _f.apiBaseUrl, fileBaseUrl = _f.fileBaseUrl;
     var API_BASEURL = PROPS_API_BASEURL ? PROPS_API_BASEURL : apiBaseUrl;
@@ -236,7 +237,7 @@ var UploadList = function (props, ref) {
             },
         };
     });
-    return (jsxs("div", __assign({ className: classes }, { children: [isPreview ? null : (jsxs(Fragment, { children: [isImage ? (jsx(ImgCrop, __assign({ rotationSlider: true, showReset: true, quality: 0.8, modalClassName: "ztxk-upload-imgcrop" }, { children: renderChildren }))) : (renderChildren), showTip ? (jsxs("span", __assign({ className: "ztxk-upload--tips" }, { children: ["(\u5355\u4E2A\u9644\u4EF6\u6700\u5927\u652F\u6301", maxSizeStr, ")"] }))) : ("")] })), isDelete && !isPreview && listType !== "text" ? (jsx(Popconfirm, __assign({ title: "\u662F\u5426\u5220\u9664\u9009\u4E2D\u9644\u4EF6\uFF1F", cancelText: "\u5426", okText: "\u662F", onConfirm: function () { return onBatchDeleteHandle(); } }, { children: jsx(ButtonCom, __assign({ type: "primary" }, { children: "\u6279\u91CF\u5220\u9664" })) }))) : null, isDownload && listType !== "text" ? (jsx(Dropdown, __assign({ menu: {
+    return (jsxs("div", __assign({ className: classes, ref: imgCropModalRef }, { children: [isPreview ? null : (jsxs(Fragment, { children: [isImage ? (jsx(ImgCrop, __assign({ rotationSlider: true, showReset: true, quality: 0.8, modalClassName: "ztxk-upload-imgcrop", modalProps: { getContainer: function () { return imgCropModalRef.current; } } }, { children: renderChildren }))) : (renderChildren), showTip ? (jsxs("span", __assign({ className: "ztxk-upload--tips" }, { children: ["(\u5355\u4E2A\u9644\u4EF6\u6700\u5927\u652F\u6301", maxSizeStr, ")"] }))) : ("")] })), isDelete && !isPreview && listType !== "text" ? (jsx(Popconfirm, __assign({ title: "\u662F\u5426\u5220\u9664\u9009\u4E2D\u9644\u4EF6\uFF1F", cancelText: "\u5426", okText: "\u662F", onConfirm: function () { return onBatchDeleteHandle(); } }, { children: jsx(ButtonCom, __assign({ type: "primary" }, { children: "\u6279\u91CF\u5220\u9664" })) }))) : null, isDownload && listType !== "text" ? (jsx(Dropdown, __assign({ menu: {
                     items: [
                         {
                             label: "压缩",