zmdms-webui 3.1.3 → 3.1.4

package/dist/es/applayoutsider/appLayoutSider.js

@@ -55,6 +55,7 @@ var AppLayoutSider = function (props) {
                     ? "/".concat(prefix).concat(path)
                     : path;
     }, [menuJoinRule]);
+    console.log(mainMenuSelectedKeys);
     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(LayoutMenuContext.Provider, __assign({ value: {

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

@@ -98,7 +98,7 @@ function useSubMenuOpenKeys(userSubMenus, activeTab, options) {
             return;
         }
         // 如果没有选中页签
-        if (!activeTab) {
+        if (!activeTab || activeTab === "/") {
             return;
         }
         // 专门为那种主菜单带路由跳转的逻辑处理
@@ -186,7 +186,9 @@ function useSubMenuOpenKeys(userSubMenus, activeTab, options) {
                     if (Array.isArray(value)) {
                         // 要先过滤掉没有子级的菜单，因为没有子级的菜单不需要展开
                         setOpenKeys(value
-                            .filter(function (i) { return Array.isArray(i.children) && i.children.length > 0; })
+                            .filter(function (i) {
+                            return Array.isArray(i.children) && i.children.length > 0;
+                        })
                             .map(function (i) { return i.id; }));
                     }
                     return true;

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

@@ -70,6 +70,10 @@ interface IZtxkConfig {
      * 操作按钮是否默认展示更多按钮
      */
     enableOperationBtnGroupShowMore?: boolean;
+    /**
+     * 表格的展开收起图标是否使用组件自定义图标，或者自己自定义
+     */
+    enableTableExpandIcon?: boolean | ((option: any) => React__default.ReactNode);
 }
 declare const ZtxkContext: React__default.Context<IZtxkConfig>;
 

package/dist/es/config/ZtxkContext.js

@@ -17,6 +17,7 @@ var ztxkConfig = {
     enableTableSummaryCollapse: false,
     enableTableSummaryDefaultExpand: false,
     enableOperationBtnGroupShowMore: false,
+    enableTableExpandIcon: false,
 };
 var ZtxkContext = React__default.createContext(ztxkConfig);
 

package/dist/es/node_modules/@ant-design/icons/es/icons/UpOutlined.js

@@ -0,0 +1,18 @@
+import _objectSpread2 from '../../../../@babel/runtime/helpers/esm/objectSpread2.js';
+import * as React from 'react';
+import UpOutlinedSvg from '../../../icons-svg/es/asn/UpOutlined.js';
+import AntdIcon from '../components/AntdIcon.js';
+
+var UpOutlined = function UpOutlined(props, ref) {
+  return /*#__PURE__*/React.createElement(AntdIcon, _objectSpread2(_objectSpread2({}, props), {}, {
+    ref: ref,
+    icon: UpOutlinedSvg
+  }));
+};
+var RefIcon = /*#__PURE__*/React.forwardRef(UpOutlined);
+if (process.env.NODE_ENV !== 'production') {
+  RefIcon.displayName = 'UpOutlined';
+}
+var UpOutlined$1 = RefIcon;
+
+export { UpOutlined$1 as default };

package/dist/es/node_modules/@ant-design/icons-svg/es/asn/UpOutlined.js

@@ -0,0 +1,5 @@
+// This icon file is generated automatically.
+var UpOutlined = { "icon": { "tag": "svg", "attrs": { "viewBox": "64 64 896 896", "focusable": "false" }, "children": [{ "tag": "path", "attrs": { "d": "M890.5 755.3L537.9 269.2c-12.8-17.6-39-17.6-51.7 0L133.5 755.3A8 8 0 00140 768h75c5.1 0 9.9-2.5 12.9-6.6L512 369.8l284.1 391.6c3 4.1 7.8 6.6 12.9 6.6h75c6.5 0 10.3-7.4 6.5-12.7z" } }] }, "name": "up", "theme": "outlined" };
+var UpOutlinedSvg = UpOutlined;
+
+export { UpOutlinedSvg as default };

package/dist/es/table/table.js

@@ -34,6 +34,8 @@ import useTableSummaryCollapse from './useTableSummaryCollapse.js';
 import MehOutlined from '../node_modules/@ant-design/icons/es/icons/MehOutlined.js';
 import { DndProvider } from '../node_modules/react-dnd/dist/core/DndProvider.js';
 import DynamicSetting from '../dynamicsetting/dynamicSetting.js';
+import UpOutlined from '../node_modules/@ant-design/icons/es/icons/UpOutlined.js';
+import DownOutlined from '../node_modules/@ant-design/icons/es/icons/DownOutlined.js';
 
 // completed: 实现列拖拽切换位置、显隐功能
 // completed: 实现新增行、删除行功能 新增时 可以选择新增多少行 删除时 可以选择删除全部
@@ -50,7 +52,12 @@ var Table = function (props) {
     var _a;
     // console.log("表格渲染");
     var className = props.className, _b = props.bordered, bordered = _b === void 0 ? true : _b, _c = props.pagination, pagination = _c === void 0 ? false : _c, isFlex = props.isFlex; props.tablePreferences; var dynamicKey = props.dynamicKey, dynamicVersion = props.dynamicVersion, customDynamicListHandle = props.customDynamicListHandle, isRemeberFilter = props.isRemeberFilter, _d = props.isOrderUpdateData, isOrderUpdateData = _d === void 0 ? true : _d, hiddenDynamicIcon = props.hiddenDynamicIcon, _columns = props.columns, dataSource = props.dataSource, onTableChange = props.onTableChange, isEdit = props.isEdit, isMove = props.isMove, isAdd = props.isAdd, hiddenAddBtnHandle = props.hiddenAddBtnHandle, _e = props.isTheadTitleAdd, isTheadTitleAdd = _e === void 0 ? true : _e, addMode = props.addMode, addCallback = props.addCallback, isDel = props.isDel, delPopTitle = props.delPopTitle, hiddenDelBtnHandle = props.hiddenDelBtnHandle, _f = props.isDelAll, isDelAll = _f === void 0 ? true : _f, isAddAndDelAuto = props.isAddAndDelAuto, summaryConfig = props.summaryConfig, _g = props.summaryFixed, summaryFixed = _g === void 0 ? true : _g, isInnerPagination = props.isInnerPagination, _h = props.innerPaginationPageSize, innerPaginationPageSize = _h === void 0 ? 30 : _h, _j = props.innerPaginationPosition, innerPaginationPosition = _j === void 0 ? INNER_TABLE_PAGINATION_POSITION : _j, _k = props.innerPaginationPageSizeOptions, innerPaginationPageSizeOptions = _k === void 0 ? INNER_TABLE_PAGINATION_PAGESIZEOPTIONS : _k, innerPaginationConfig = props.innerPaginationConfig, tableRefHandle = props.tableRefHandle, tableName = props.tableName, serviceOrder = props.serviceOrder, differences = props.differences, virtualKey = props.virtualKey, _l = props.isResizableColumn, isResizableColumn = _l === void 0 ? true : _l, _m = props.isResizableTitleEllipsis, isResizableTitleEllipsis = _m === void 0 ? true : _m, _o = props.isRealTimeValidate, isRealTimeValidate = _o === void 0 ? true : _o, isMarginTop = props.isMarginTop, isMarginBottom = props.isMarginBottom, scroll = props.scroll, addAndDelProps = props.addAndDelProps, _p = props.autoScrollYMarginBottom, autoScrollYMarginBottom = _p === void 0 ? 65 : _p, _q = props.isAutoScrollY, isAutoScrollY = _q === void 0 ? false : _q, tableId = props.tableId, extraOnRow = props.onRow, fixedRowsCount = props.fixedRowsCount, fixedRowsConfig = props.fixedRowsConfig, headerAlign = props.headerAlign, isDimensionDynamic = props.isDimensionDynamic, _r = props.isDimensionMergeChildren, isDimensionMergeChildren = _r === void 0 ? true : _r, dimensionCustomSumKeys = props.dimensionCustomSumKeys, isAutoMerge = props.isAutoMerge, mode = props.mode, rowSelection = props.rowSelection, isContextMenu = props.isContextMenu, isFullscreenHandle = props.isFullscreenHandle, _s = props.isExportSummary, isExportSummary = _s === void 0 ? true : _s, isAutoMergeAddAndDel = props.isAutoMergeAddAndDel, isDynamicColumnText = props.isDynamicColumnText, isTableSummaryCollapse = props.isTableSummaryCollapse, isTableSummaryDefaultExpand = props.isTableSummaryDefaultExpand, emptyCompact = props.emptyCompact, rowKey = props.rowKey, resetProps = __rest(props, ["className", "bordered", "pagination", "isFlex", "tablePreferences", "dynamicKey", "dynamicVersion", "customDynamicListHandle", "isRemeberFilter", "isOrderUpdateData", "hiddenDynamicIcon", "columns", "dataSource", "onTableChange", "isEdit", "isMove", "isAdd", "hiddenAddBtnHandle", "isTheadTitleAdd", "addMode", "addCallback", "isDel", "delPopTitle", "hiddenDelBtnHandle", "isDelAll", "isAddAndDelAuto", "summaryConfig", "summaryFixed", "isInnerPagination", "innerPaginationPageSize", "innerPaginationPosition", "innerPaginationPageSizeOptions", "innerPaginationConfig", "tableRefHandle", "tableName", "serviceOrder", "differences", "virtualKey", "isResizableColumn", "isResizableTitleEllipsis", "isRealTimeValidate", "isMarginTop", "isMarginBottom", "scroll", "addAndDelProps", "autoScrollYMarginBottom", "isAutoScrollY", "tableId", "onRow", "fixedRowsCount", "fixedRowsConfig", "headerAlign", "isDimensionDynamic", "isDimensionMergeChildren", "dimensionCustomSumKeys", "isAutoMerge", "mode", "rowSelection", "isContextMenu", "isFullscreenHandle", "isExportSummary", "isAutoMergeAddAndDel", "isDynamicColumnText", "isTableSummaryCollapse", "isTableSummaryDefaultExpand", "emptyCompact", "rowKey"]);
-    var _t = useBaseContext(), enableDynamicColumnText = _t.enableDynamicColumnText, enableTableSummaryCollapse = _t.enableTableSummaryCollapse, enableTableSummaryDefaultExpand = _t.enableTableSummaryDefaultExpand;
+    var _t = useBaseContext(), enableDynamicColumnText = _t.enableDynamicColumnText, enableTableSummaryCollapse = _t.enableTableSummaryCollapse, enableTableSummaryDefaultExpand = _t.enableTableSummaryDefaultExpand, enableTableExpandIcon = _t.enableTableExpandIcon;
+    // 处理expandable
+    var expandIcon = getExpandIcon({
+        expandable: props.expandable,
+        enableTableExpandIcon: enableTableExpandIcon,
+    });
     // 表格动态列配置是否显示文字
     var isDynamicColumnTextEnable = getFinalValue(enableDynamicColumnText, isDynamicColumnText);
     // 表格合计是否可以展开收起
@@ -454,7 +461,8 @@ var Table = function (props) {
             ? function () {
                 return document.querySelector(".ztxk-table--fullscreen") || document.body;
             }
-            : undefined }, resetProps, { rowKey: newRowKey, locale: locale })));
+            : undefined }, resetProps, { expandable: expandIcon
+            ? __assign(__assign({}, props.expandable), { expandIcon: expandIcon }) : props.expandable, rowKey: newRowKey, locale: locale })));
     return (jsxs("div", __assign({ style: isFlex
             ? {
                 position: "relative",
@@ -485,6 +493,20 @@ MemoTable.Summary = Table$1.Summary;
 MemoTable.TitleDirectionColumn = TitleDirectionColumn;
 MemoTable.TableDynamicHeader = TableDynamicHeader;
 MemoTable.DifferencesClassName = "ztxk-table--differences";
-MemoTable.IS_SUMMARY = IS_SUMMARY;
+MemoTable.IS_SUMMARY = IS_SUMMARY;
+function getExpandIcon(option) {
+    var expandable = option.expandable, enableTableExpandIcon = option.enableTableExpandIcon;
+    var expandIcon = null;
+    if (expandable && !expandable.expandIcon && enableTableExpandIcon) {
+        expandIcon =
+            enableTableExpandIcon === true
+                ? function (_a) {
+                    var expanded = _a.expanded, onExpand = _a.onExpand, record = _a.record;
+                    return expanded ? (jsx(UpOutlined, { onClick: function (e) { return onExpand(record, e); } })) : (jsx(DownOutlined, { onClick: function (e) { return onExpand(record, e); } }));
+                }
+                : enableTableExpandIcon;
+    }
+    return expandIcon;
+}
 
 export { MemoTable as default };

package/dist/es/uploadlist/uploadList.js

@@ -301,7 +301,7 @@ var UploadList = function (props, ref) {
             };
     }, [showTable, isDownload, isDelete]);
     // 上传子元素
-    var renderChildren = (jsx(Upload, __assign({ showUploadList: showUploadListMemo, multiple: true, beforeUpload: beforeUploadHandle, onChange: onChangeHandle, action: fileAction, headers: fileHeaders, data: fileData, fileList: innerFileList, onPreview: onPreview, onDownload: onDownload }, resetProps, { children: children ? (children) : !listType || listType === "text" ? (jsxs(ButtonCom, __assign({ type: "primary", icon: jsx(UploadOutlined, {}) }, { children: [btnText || "添加附件", maxCount ? "(\u6700\u591A\u4E0A\u4F20".concat(maxCount, "\u4E2A\u6587\u4EF6)") : ""] }))) : isImage &&
+    var renderChildren = (jsx(Upload, __assign({ showUploadList: showUploadListMemo, multiple: maxCount === 1 ? false : true, beforeUpload: beforeUploadHandle, onChange: onChangeHandle, action: fileAction, headers: fileHeaders, data: fileData, fileList: innerFileList, onPreview: onPreview, onDownload: onDownload }, resetProps, { children: children ? (children) : !listType || listType === "text" ? (jsxs(ButtonCom, __assign({ type: "primary", icon: jsx(UploadOutlined, {}) }, { children: [btnText || "添加附件", maxCount ? "(\u6700\u591A\u4E0A\u4F20".concat(maxCount, "\u4E2A\u6587\u4EF6)") : ""] }))) : isImage &&
             maxCount &&
             innerFileList &&
             innerFileList.length >= maxCount &&

package/package.json

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