zmdms-webui 2.0.3 → 2.0.6

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

@@ -2,9 +2,9 @@ import { __assign } from '../../_virtual/_tslib.js';
 import { jsxs, jsx } from 'react/jsx-runtime';
 import { useMemo, useEffect, useState } from 'react';
 import { useLatest } from 'ahooks';
+import myMessage from '../../message/index.js';
 import MemoInput from '../../input/input.js';
 import ButtonCom from '../../button/button.js';
-import myMessage from '../../message/index.js';
 import { Checkbox, Tooltip } from 'antd';
 import QuestionCircleOutlined from '../../node_modules/@ant-design/icons/es/icons/QuestionCircleOutlined.js';
 

package/dist/es/table/excel.js

@@ -502,7 +502,6 @@ function applyExcelStyles(worksheet, data, numKeys, columns, headerRowCount, has
         var isSubtotal = rowData.__is_summary__;
         for (var c = 1; c <= totalCols; c++) {
             var cell = worksheet.getCell(headerRowCount + rowIndex + 1, c);
-            var currentColumn = columns && Array.isArray(columns) ? columns[c - 1] : undefined;
             var base = isSubtotal ? summaryStyle : normalStyle;
             var columnAlign = columns && Array.isArray(columns)
                 ? (_c = columns[c - 1]) === null || _c === void 0 ? void 0 : _c.align
@@ -562,8 +561,8 @@ function useExcelExport(records, config) {
     var columns = config.columns, isAutoMerge = config.isAutoMerge, columnHeaders = config.columnHeaders, summaryConfig = config.summaryConfig;
     var mergeKeys = useMergeKeys(columns, isAutoMerge);
     var numKeys = useNumKeys(columns);
-    var exportFunction = useMemoizedFn(function (fileName, _a) {
-        var topDescription = _a.topDescription, topDescriptionRowHeight = _a.topDescriptionRowHeight, time = _a.time;
+    var exportFunction = useMemoizedFn(function (fileName, options) {
+        var _a = options || {}, topDescription = _a.topDescription, topDescriptionRowHeight = _a.topDescriptionRowHeight, time = _a.time;
         if (!fileName.includes(".xlsx")) {
             fileName = fileName + ".xlsx";
         }

package/dist/es/table/hooks.js

@@ -1,10 +1,11 @@
 import { __assign, __spreadArray } from '../_virtual/_tslib.js';
 import { useCallback, useRef, useState, useEffect, useMemo } from 'react';
+import { useMemoizedFn } from 'ahooks';
 import update from '../node_modules/immutability-helper/index.js';
 import { getInnerIndex } from './useInnerPagination.js';
 import { flattenRecordsOptimized } from './utils.js';
 import { IS_SUMMARY, MERGE_INDEX, MERGE_ROW_SPANS } from './constant.js';
-import { useMemoizedFn } from 'ahooks';
+import { filterHandle } from './components/FilterDropdown.js';
 
 /**
  * @param dataSourceRef 数据引用
@@ -398,7 +399,7 @@ var useNumKeys = function (columns) {
  * 自动合并的一些处理
  */
 function useAutoMerge(dataSource, columns, _a) {
-    var isAutoMerge = _a.isAutoMerge, isDimensionDynamic = _a.isDimensionDynamic;
+    var isAutoMerge = _a.isAutoMerge, isDimensionDynamic = _a.isDimensionDynamic, order = _a.order;
     // 计算需要合并的字段key集合
     var mergeKeys = useMergeKeys(columns, isAutoMerge);
     var firstMergeKey = mergeKeys === null || mergeKeys === void 0 ? void 0 : mergeKeys[0];
@@ -422,7 +423,7 @@ function useAutoMerge(dataSource, columns, _a) {
             if (!mergeKeys)
                 return dataSource;
             else {
-                var newDataSource_2 = flattenRecordsOptimized(__spreadArray([], (dataSource || []), true), mergeKeys, dimensionSummaryKeys, summaryKeys, isDimensionDynamic);
+                var newDataSource_2 = flattenRecordsOptimized(__spreadArray([], (dataSource || []), true), mergeKeys, dimensionSummaryKeys, summaryKeys, isDimensionDynamic, order);
                 return newDataSource_2;
             }
         }
@@ -433,6 +434,7 @@ function useAutoMerge(dataSource, columns, _a) {
         dimensionSummaryKeys,
         summaryKeys,
         isDimensionDynamic,
+        order,
     ]);
     var newColumns = useMemo(function () {
         var _columns = columns;
@@ -517,6 +519,48 @@ function useMergeAddAndDel(_a) {
         return addAndDelProps;
     }, [addAndDelProps, isAutoMerge, firstMergeKey]);
     return [newRowSelection, newAddAndDelProps];
+}
+/**
+ * 自定义处理过滤逻辑
+ */
+function useCustomFilter(dataSource) {
+    var _a = useState(), filterConfig = _a[0], setFilterConfig = _a[1];
+    var newDataSource = useMemo(function () {
+        if (!filterConfig)
+            return dataSource;
+        return dataSource.filter(function (item) {
+            var keys = Object.keys(filterConfig);
+            for (var i = 0; i < keys.length; i++) {
+                var key = keys[i];
+                var filter = filterConfig[key];
+                if (filter.input) {
+                    if (!filterHandle(filter.input, item, key)) {
+                        return false;
+                    }
+                }
+                if (filter.checkbox && filter.checkbox.length > 0) {
+                    var flag = false;
+                    for (var _a = 0, _b = filter.checkbox; _a < _b.length; _a++) {
+                        var value = _b[_a];
+                        if (filterHandle(value, item, key)) {
+                            flag = true;
+                            break;
+                        }
+                    }
+                    if (!flag) {
+                        return false;
+                    }
+                }
+            }
+            return true;
+        });
+    }, [dataSource, filterConfig]);
+    var handleFilterConfigChange = useMemoizedFn(function (value) {
+        setFilterConfig(function (oldValue) {
+            return __assign(__assign({}, oldValue), value);
+        });
+    });
+    return [newDataSource, handleFilterConfigChange];
 }
 
-export { useAddAndDelChange, useAutoMerge, useCalcScrollY, useCustomSort, useEditChange, useMergeAddAndDel, useMergeKeys, useMoveRowChange, useNumKeys, useScuRfresh };
+export { useAddAndDelChange, useAutoMerge, useCalcScrollY, useCustomFilter, useCustomSort, useEditChange, useMergeAddAndDel, useMergeKeys, useMoveRowChange, useNumKeys, useScuRfresh };

package/dist/es/table/table.js

@@ -17,7 +17,7 @@ import { useColumns } from './useColumns.js';
 import { useDynamicListByColumns } from './useDynamicListByColumns.js';
 import useSummary from './useSummary.js';
 import useInnerPagination, { getInnerIndex } from './useInnerPagination.js';
-import { useScuRfresh, useCustomSort, useCalcScrollY, useEditChange, useMoveRowChange, useAddAndDelChange, useAutoMerge } from './hooks.js';
+import { useScuRfresh, useCustomSort, useCalcScrollY, useEditChange, useMoveRowChange, useAddAndDelChange, useCustomFilter, useAutoMerge } from './hooks.js';
 import { HTML5Backend } from '../node_modules/react-dnd-html5-backend/dist/index.js';
 import { VList, scrollTo } from '../node_modules/virtuallist-antd/dist/index.es.js';
 import useTableValidate, { tableValidate } from './useTableValidate.js';
@@ -129,8 +129,10 @@ var Table = function (props) {
         currentPage: currentPage,
         filterConfigRef: filterConfigRef,
     });
+    // 表格内部自定义处理过滤，不走antd内部
+    var _u = useCustomFilter(currentTableDataSource), filterDataSource = _u[0], handleFilterConfigChange = _u[1];
     // 处理列配置信息 得到新的列配置信息
-    var _u = useColumns(columns, {
+    var _v = useColumns(columns, {
         // 动态列配置相关信息
         dynamicKey: dynamicKey,
         isRemeberFilter: isRemeberFilter,
@@ -171,12 +173,14 @@ var Table = function (props) {
         headerAlign: headerAlign,
         mode: mode,
         isAutoMerge: isAutoMerge,
-    }), _newColumns = _u.newColumns, newRowSelection = _u.rowSelection;
+        handleFilterConfigChange: handleFilterConfigChange,
+    }), _newColumns = _v.newColumns, newRowSelection = _v.rowSelection;
     // 处理表格合并和维度
-    var _v = useAutoMerge(currentTableDataSource, _newColumns, {
+    var _w = useAutoMerge(filterDataSource, _newColumns, {
         isAutoMerge: isAutoMerge,
         isDimensionDynamic: isDimensionDynamic,
-    }), newDataSource = _v[0], newColumns = _v[1];
+        order: order,
+    }), newDataSource = _w[0], newColumns = _w[1];
     // 内部表格总结栏
     var getSummaryHandle = useSummary(summaryConfig, newColumns, {
         summaryFixed: summaryFixed,
@@ -186,7 +190,7 @@ var Table = function (props) {
         isDel: isDel,
     });
     // 表格验证
-    var _w = useTableValidate(), tableRef = _w.tableRef, getCurrentTable = _w.getCurrentTable, clearErrorClass = _w.clearErrorClass;
+    var _x = useTableValidate(), tableRef = _x.tableRef, getCurrentTable = _x.getCurrentTable, clearErrorClass = _x.clearErrorClass;
     // 虚拟滚动选项
     var vComponents = useMemo(function () {
         if (virtualKey) {

package/dist/es/table/useColumns.js

@@ -26,7 +26,7 @@ import ModalComponent from '../modal/modal.js';
 function useColumns(columns, options) {
     var _this = this;
     var _a, _b;
-    var dynamicKey = options.dynamicKey, isRemeberFilter = options.isRemeberFilter, hiddenDynamicIcon = options.hiddenDynamicIcon, currentDynamicList = options.currentDynamicList, dataSource = options.dataSource, dataSourceRef = options.dataSourceRef, onEditableSave = options.onEditableSave, isEdit = options.isEdit, isAdd = options.isAdd, isTheadTitleAdd = options.isTheadTitleAdd, isDel = options.isDel, delPopTitle = options.delPopTitle, dynamicSettingRef = options.dynamicSettingRef, onCurrentListChange = options.onCurrentListChange, onAddAndDel = options.onAddAndDel, getRefreshScuCell = options.getRefreshScuCell, isDelAll = options.isDelAll, currentPage = options.currentPage, onTableChange = options.onTableChange, order = options.order, setOrder = options.setOrder, customSortHandle = options.customSortHandle, isResizableColumn = options.isResizableColumn, isResizableTitleEllipsis = options.isResizableTitleEllipsis, isRealTimeValidate = options.isRealTimeValidate, hiddenDelBtnHandleRef = options.hiddenDelBtnHandleRef, hiddenAddBtnHandleRef = options.hiddenAddBtnHandleRef, rowKey = options.rowKey, filterConfigRef = options.filterConfigRef, rowSelection = options.rowSelection, addAndDelProps = options.addAndDelProps, headerAlign = options.headerAlign, mode = options.mode, isAutoMerge = options.isAutoMerge;
+    var dynamicKey = options.dynamicKey, isRemeberFilter = options.isRemeberFilter, hiddenDynamicIcon = options.hiddenDynamicIcon, currentDynamicList = options.currentDynamicList, dataSource = options.dataSource, dataSourceRef = options.dataSourceRef, onEditableSave = options.onEditableSave, isEdit = options.isEdit, isAdd = options.isAdd, isTheadTitleAdd = options.isTheadTitleAdd, isDel = options.isDel, delPopTitle = options.delPopTitle, dynamicSettingRef = options.dynamicSettingRef, onCurrentListChange = options.onCurrentListChange, onAddAndDel = options.onAddAndDel, getRefreshScuCell = options.getRefreshScuCell, isDelAll = options.isDelAll, currentPage = options.currentPage, onTableChange = options.onTableChange, order = options.order, setOrder = options.setOrder, customSortHandle = options.customSortHandle, isResizableColumn = options.isResizableColumn, isResizableTitleEllipsis = options.isResizableTitleEllipsis, isRealTimeValidate = options.isRealTimeValidate, hiddenDelBtnHandleRef = options.hiddenDelBtnHandleRef, hiddenAddBtnHandleRef = options.hiddenAddBtnHandleRef, rowKey = options.rowKey, filterConfigRef = options.filterConfigRef, rowSelection = options.rowSelection, addAndDelProps = options.addAndDelProps, headerAlign = options.headerAlign, mode = options.mode, isAutoMerge = options.isAutoMerge, handleFilterConfigChange = options.handleFilterConfigChange;
     var newColumns = getTableColumns(columns, currentDynamicList).columns;
     // 处理自动合并的加减和选择框
     var _c = useMergeAddAndDel({
@@ -109,27 +109,30 @@ function useColumns(columns, options) {
             _column.filterDropdown = function (_a) {
                 var selectedKeys = _a.selectedKeys, setSelectedKeys = _a.setSelectedKeys, confirm = _a.confirm, clearFilters = _a.clearFilters;
                 return (jsx(FilterDropdown, { dataSource: dataSource, dataSourceRef: dataSourceRef, filterKey: _key, selectedKeys: selectedKeys, setSelectedKeys: setSelectedKeys, confirm: confirm, clearFilters: clearFilters, searchValueInputRef: searchValueInputRef, defaultFilterSearchValue: isRemeberFilter ? input_1 : undefined, defaultFilterSearchCheckboxValue: isRemeberFilter ? checkbox_1 : undefined, onFilterChange: function (filter) {
-                        var _a;
-                        var _b;
+                        var _a, _b;
+                        var _c;
                         // 实时记录下当前的值
                         var filteredValue = createFilterValue(filter === null || filter === void 0 ? void 0 : filter.input, filter === null || filter === void 0 ? void 0 : filter.checkbox);
                         filterConfigRef.current = (_a = {},
                             _a[_key] = filteredValue,
                             _a);
+                        handleFilterConfigChange === null || handleFilterConfigChange === void 0 ? void 0 : handleFilterConfigChange((_b = {},
+                            _b[_key] = filter,
+                            _b));
                         if (!isRemeberFilter) {
                             return;
                         }
                         // 如果有持久化 那么更新持久化数据
-                        var _c = getColumnsItem({
+                        var _d = getColumnsItem({
                             currentDynamicList: currentDynamicList,
                             currentKey: _key,
                             keyIndex: keyIndex,
-                        }), result = _c.result, newList = _c.newList;
+                        }), result = _d.result, newList = _d.newList;
                         if (result) {
                             result.filter = filter;
                         }
                         if (dynamicKey) {
-                            (_b = dynamicSettingRef === null || dynamicSettingRef === void 0 ? void 0 : dynamicSettingRef.current) === null || _b === void 0 ? void 0 : _b.updateList(newList);
+                            (_c = dynamicSettingRef === null || dynamicSettingRef === void 0 ? void 0 : dynamicSettingRef.current) === null || _c === void 0 ? void 0 : _c.updateList(newList);
                         }
                         else {
                             onCurrentListChange === null || onCurrentListChange === void 0 ? void 0 : onCurrentListChange(newList);
@@ -145,9 +148,12 @@ function useColumns(columns, options) {
                 _column.filteredValue = filteredValue;
             }
             _column.filterIcon = function () { return jsx(SearchOutlined, {}); };
-            _column.onFilter = function (value, record) {
-                return filterHandle(value, record, _key);
-            };
+            // 自动合并单元格的情况下，不进行内部过滤
+            if (!isAutoMerge) {
+                _column.onFilter = function (value, record) {
+                    return filterHandle(value, record, _key);
+                };
+            }
             _column.onFilterDropdownOpenChange = function (visible) {
                 if (visible) {
                     setTimeout(function () {

package/dist/es/table/utils.js

@@ -449,7 +449,7 @@ function startColumnInsertTableData(options) {
  * @param summaryKeys 合计字段
  * @param isDimensionDynamic 维度合并
  */
-function flattenRecordsOptimized(records, mergeKeys, dimensionSummaryKeys, summaryKeys, isDimensionDynamic) {
+function flattenRecordsOptimized(records, mergeKeys, dimensionSummaryKeys, summaryKeys, isDimensionDynamic, order) {
     var _a;
     if (!records ||
         records.length === 0 ||
@@ -458,14 +458,27 @@ function flattenRecordsOptimized(records, mergeKeys, dimensionSummaryKeys, summa
         return records;
     }
     // 0. 首先根据维度字段对数据进行排序
-    var result = isDimensionDynamic
-        ? sortByDimensions(__spreadArray([], records, true), mergeKeys)
-        : __spreadArray([], records, true);
+    var result = [];
+    // 如果order没有排序方向，但isDimensionDynamic为true，则按维度字段排序
+    if (isDimensionDynamic) {
+        result = sortByDimensions(__spreadArray([], records, true), mergeKeys);
+    }
+    // 否则保持原样
+    else {
+        result = __spreadArray([], records, true);
+    }
     // 1. 如果开启了维度合并，按所有 mergeKeys 的组合来计算合计值
     if (isDimensionDynamic && mergeKeys.length > 0) {
         var groupedResult = groupByLastMergeKey(result, mergeKeys, summaryKeys);
         result = groupedResult;
     }
+    // 如果order有排序方向，则按order排序
+    result = sortRecords({
+        records: result,
+        // 开启自定义维度后因为最后一个维度字段会合并为一行，所以可以不排序最后一个维度字段
+        mergeKeys: isDimensionDynamic ? mergeKeys.slice(0, -1) : mergeKeys,
+        order: order,
+    });
     // 2. 首先插入维度合计行
     if (dimensionSummaryKeys &&
         dimensionSummaryKeys.length > 0 &&
@@ -565,22 +578,108 @@ function flattenRecordsOptimized(records, mergeKeys, dimensionSummaryKeys, summa
     }
     return result;
 }
+function sortRecords(_a) {
+    var records = _a.records, mergeKeys = _a.mergeKeys, order = _a.order;
+    var result = [];
+    if (order && order.order) {
+        result = sortByDimensions(__spreadArray([], records, true), mergeKeys, order);
+    }
+    // 否则保持原样
+    else {
+        result = __spreadArray([], records, true);
+    }
+    return result;
+}
 /**
  * 根据维度字段对数据进行排序
  * 确保相同维度值的记录连续排列，以便正确进行合并处理
+ * @param records 数据记录
+ * @param dimensionKeys 维度字段
+ * @param order 排序配置
  */
-function sortByDimensions(records, dimensionKeys) {
+function sortByDimensions(records, dimensionKeys, order) {
     return records.sort(function (a, b) {
-        for (var i = 0; i < dimensionKeys.length; i++) {
-            var key = dimensionKeys[i];
-            var valueA = a[key] || "";
-            var valueB = b[key] || "";
-            // 字符串比较
-            if (valueA < valueB)
-                return -1;
-            if (valueA > valueB)
-                return 1;
-            // 如果当前字段相等，继续比较下一个字段
+        // 如果有排序配置且有排序方向
+        if (order && order.order && order.field) {
+            var field = order.field, sortOrder = order.order;
+            // 找到排序字段在维度字段中的位置
+            var sortFieldIndex = dimensionKeys.indexOf(field);
+            if (sortFieldIndex !== -1) {
+                // 先按维度字段排序到排序字段之前的字段
+                for (var i = 0; i < sortFieldIndex; i++) {
+                    var key = dimensionKeys[i];
+                    var valueA_1 = a[key] || "";
+                    var valueB_1 = b[key] || "";
+                    // 字符串比较
+                    if (valueA_1 < valueB_1)
+                        return -1;
+                    if (valueA_1 > valueB_1)
+                        return 1;
+                    // 如果当前字段相等，继续比较下一个字段
+                }
+                // 按排序字段进行排序
+                var valueA = a[field] || "";
+                var valueB = b[field] || "";
+                var compareResult = 0;
+                if (valueA < valueB)
+                    compareResult = -1;
+                else if (valueA > valueB)
+                    compareResult = 1;
+                if (compareResult !== 0) {
+                    return sortOrder === "ascend" ? compareResult : -compareResult;
+                }
+                // 如果排序字段相等，继续按后面的维度字段排序
+                for (var i = sortFieldIndex + 1; i < dimensionKeys.length; i++) {
+                    var key = dimensionKeys[i];
+                    var valueA_2 = a[key] || "";
+                    var valueB_2 = b[key] || "";
+                    // 字符串比较
+                    if (valueA_2 < valueB_2)
+                        return -1;
+                    if (valueA_2 > valueB_2)
+                        return 1;
+                    // 如果当前字段相等，继续比较下一个字段
+                }
+            }
+            else {
+                // 如果排序字段不在维度字段中，按原逻辑排序维度字段
+                for (var i = 0; i < dimensionKeys.length; i++) {
+                    var key = dimensionKeys[i];
+                    var valueA_3 = a[key] || "";
+                    var valueB_3 = b[key] || "";
+                    // 字符串比较
+                    if (valueA_3 < valueB_3)
+                        return -1;
+                    if (valueA_3 > valueB_3)
+                        return 1;
+                    // 如果当前字段相等，继续比较下一个字段
+                }
+                // 最后按排序字段排序
+                var valueA = a[field] || "";
+                var valueB = b[field] || "";
+                var compareResult = 0;
+                if (valueA < valueB)
+                    compareResult = -1;
+                else if (valueA > valueB)
+                    compareResult = 1;
+                if (compareResult !== 0) {
+                    return sortOrder === "ascend" ? compareResult : -compareResult;
+                }
+            }
+        }
+        else {
+            // 没有排序配置，按原逻辑排序
+            for (var i = 0; i < dimensionKeys.length; i++) {
+                var key = dimensionKeys[i];
+                var valueA = a[key] || "";
+                var valueB = b[key] || "";
+                // 字符串比较
+                if (valueA < valueB)
+                    return -1;
+                if (valueA > valueB)
+                    return 1;
+                // 如果当前字段相等，继续比较下一个字段
+            }
         }
         return 0; // 所有字段都相等
     });
@@ -591,7 +690,8 @@ function sortByDimensions(records, dimensionKeys) {
  */
 function insertDimensionSummaryRows(records, allDimensionKeys, // 完整的维度字段列表
 dimensionSummaryKeys, // 需要合计的维度字段
-summaryKeys) {
+summaryKeys, order // 排序配置
+) {
     var result = __spreadArray([], records, true);
     // 按维度层级从深到浅处理
     for (var i = dimensionSummaryKeys.length - 1; i >= 0; i--) {
@@ -616,8 +716,7 @@ summaryKeys) {
             summaryKeys, currentDimensionIndex);
             newResult.push(summaryRow);
         }
-        // 对插入合计行后的结果重新排序，确保数据顺序正确
-        result = sortByDimensions(newResult, allDimensionKeys);
+        result = newResult;
     }
     return result;
 }

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

@@ -39,6 +39,8 @@ interface IUploadListProps extends Omit<UploadProps, "onChange"> {
     /** 是否显示下载按钮 */
     isDownload?: boolean;
     isDelete?: boolean;
+    /** 是否支持文件预览 */
+    filePreview?: boolean;
     /** 批量下载的zip包名 */
     zipName?: string;
     /** 是否只上传图片 */

package/dist/es/uploadlist/uploadList.js

@@ -31,7 +31,7 @@ var MAXSIZE = 104857600; // 100 * 1024 * 1024
  */
 var UploadList = function (props, ref) {
     var _a;
-    var children = props.children, btnText = props.btnText, className = props.className, _b = props.showTip, showTip = _b === void 0 ? true : _b, _c = props.maxSize, maxSize = _c === void 0 ? MAXSIZE : _c, showTable = props.showTable, acceptList = props.acceptList, beforeUpload = props.beforeUpload, onChange = props.onChange, PROPS_API_BASEURL = props.API_BASEURL, PROPS_FILE_API_BASEURL = props.FILE_API_BASEURL, action = props.action, headers = props.headers, data = props.data, userName = props.userName, fileList = props.fileList, isPublic = props.isPublic, _d = props.maxPreviewSize, maxPreviewSize = _d === void 0 ? MAX_PREVIEW_SIZE : _d, isPreview = props.isPreview, isDownload = props.isDownload, isDelete = props.isDelete, _e = props.zipName, zipName = _e === void 0 ? "\u6279\u91CF\u4E0B\u8F7D-".concat(Date.now(), ".zip") : _e, isImage = props.isImage, imgCropProps = props.imgCropProps, _f = props.imgWidth, imgWidth = _f === void 0 ? 110 : _f, _g = props.imgHeight, imgHeight = _g === void 0 ? 110 : _g, customRenderBtn = props.customRenderBtn, disAllowDuplicateFile = props.disAllowDuplicateFile, fieldNames = props.fieldNames, tableColumns = props.tableColumns, onBeforeDownloadValidate = props.onBeforeDownloadValidate, onBeforePreviewValidate = props.onBeforePreviewValidate, onBeforeDeleteValidate = props.onBeforeDeleteValidate, resetProps = __rest(props, ["children", "btnText", "className", "showTip", "maxSize", "showTable", "acceptList", "beforeUpload", "onChange", "API_BASEURL", "FILE_API_BASEURL", "action", "headers", "data", "userName", "fileList", "isPublic", "maxPreviewSize", "isPreview", "isDownload", "isDelete", "zipName", "isImage", "imgCropProps", "imgWidth", "imgHeight", "customRenderBtn", "disAllowDuplicateFile", "fieldNames", "tableColumns", "onBeforeDownloadValidate", "onBeforePreviewValidate", "onBeforeDeleteValidate"]);
+    var children = props.children, btnText = props.btnText, className = props.className, _b = props.showTip, showTip = _b === void 0 ? true : _b, _c = props.maxSize, maxSize = _c === void 0 ? MAXSIZE : _c, showTable = props.showTable, acceptList = props.acceptList, beforeUpload = props.beforeUpload, onChange = props.onChange, PROPS_API_BASEURL = props.API_BASEURL, PROPS_FILE_API_BASEURL = props.FILE_API_BASEURL, action = props.action, headers = props.headers, data = props.data, userName = props.userName, fileList = props.fileList, isPublic = props.isPublic, _d = props.maxPreviewSize, maxPreviewSize = _d === void 0 ? MAX_PREVIEW_SIZE : _d, isPreview = props.isPreview, isDownload = props.isDownload, isDelete = props.isDelete, _e = props.filePreview, filePreview = _e === void 0 ? true : _e, _f = props.zipName, zipName = _f === void 0 ? "\u6279\u91CF\u4E0B\u8F7D-".concat(Date.now(), ".zip") : _f, isImage = props.isImage, imgCropProps = props.imgCropProps, _g = props.imgWidth, imgWidth = _g === void 0 ? 110 : _g, _h = props.imgHeight, imgHeight = _h === void 0 ? 110 : _h, customRenderBtn = props.customRenderBtn, disAllowDuplicateFile = props.disAllowDuplicateFile, fieldNames = props.fieldNames, tableColumns = props.tableColumns, onBeforeDownloadValidate = props.onBeforeDownloadValidate, onBeforePreviewValidate = props.onBeforePreviewValidate, onBeforeDeleteValidate = props.onBeforeDeleteValidate, resetProps = __rest(props, ["children", "btnText", "className", "showTip", "maxSize", "showTable", "acceptList", "beforeUpload", "onChange", "API_BASEURL", "FILE_API_BASEURL", "action", "headers", "data", "userName", "fileList", "isPublic", "maxPreviewSize", "isPreview", "isDownload", "isDelete", "filePreview", "zipName", "isImage", "imgCropProps", "imgWidth", "imgHeight", "customRenderBtn", "disAllowDuplicateFile", "fieldNames", "tableColumns", "onBeforeDownloadValidate", "onBeforePreviewValidate", "onBeforeDeleteValidate"]);
     var maxCount = resetProps.maxCount, listType = resetProps.listType, method = resetProps.method;
     var imgSizeClassName = "temporary-className-".concat(imgWidth, "-").concat(imgHeight);
     var classes = classNames("ztxk-upload", className, (_a = {},
@@ -41,7 +41,7 @@ var UploadList = function (props, ref) {
     var tableRef = useRef({});
     var modalRef = useRef({});
     var imgCropModalRef = useRef();
-    var _h = useState(), imgSrc = _h[0], setImgSrc = _h[1];
+    var _j = useState(), imgSrc = _j[0], setImgSrc = _j[1];
     useEffect(function () {
         if (!isImage) {
             return;
@@ -59,7 +59,7 @@ var UploadList = function (props, ref) {
         };
     }, [imgHeight, imgSizeClassName, imgWidth, isImage]);
     var newFieldNames = getField(fieldNames);
-    var _j = useBaseContext(), apiBaseUrl = _j.apiBaseUrl, fileBaseUrl = _j.fileBaseUrl;
+    var _k = useBaseContext(), apiBaseUrl = _k.apiBaseUrl, fileBaseUrl = _k.fileBaseUrl;
     var API_BASEURL = PROPS_API_BASEURL ? PROPS_API_BASEURL : apiBaseUrl;
     var FILE_API_BASEURL = PROPS_FILE_API_BASEURL
         ? PROPS_FILE_API_BASEURL
@@ -75,7 +75,7 @@ var UploadList = function (props, ref) {
         fileList: fileList,
     });
     // 文件改变逻辑
-    var _k = useOnChange({
+    var _l = useOnChange({
         onChange: onChange,
         userName: userName,
         fileList: fileList,
@@ -84,15 +84,15 @@ var UploadList = function (props, ref) {
         API_BASEURL: API_BASEURL,
         newFieldNames: newFieldNames,
         listType: listType,
-    }), onChangeHandle = _k.onChangeHandle, innerFileList = _k.innerFileList, setInnerFileList = _k.setInnerFileList;
+    }), onChangeHandle = _l.onChangeHandle, innerFileList = _l.innerFileList, setInnerFileList = _l.setInnerFileList;
     // 基础参数
-    var _l = useBasicInfo({
+    var _m = useBasicInfo({
         action: action,
         API_BASEURL: API_BASEURL,
         headers: headers,
         data: data,
         isPublic: isPublic,
-    }), fileAction = _l.fileAction, fileHeaders = _l.fileHeaders, fileData = _l.fileData;
+    }), fileAction = _m.fileAction, fileHeaders = _m.fileHeaders, fileData = _m.fileData;
     // 表格需要的附件列表数据
     var uploadTableData = useUploadTableData({
         fileList: innerFileList,
@@ -208,6 +208,9 @@ var UploadList = function (props, ref) {
     }); };
     // 图片预览
     var onPreview = function (file) {
+        if (!filePreview) {
+            return;
+        }
         if (isImage) {
             var url = createDownloadLink(file.attachId, {
                 API_BASEURL: API_BASEURL,
@@ -385,7 +388,7 @@ var UploadList = function (props, ref) {
                     onClick: function (e) {
                         onBatchDownloadHandle(e.key);
                     },
-                }, placement: "bottomLeft" }, { children: jsx(ButtonCom, __assign({ type: "primary" }, { children: "\u6279\u91CF\u4E0B\u8F7D" })) }))) : null, customRenderBtn, showTable ? (jsx(UploadTable, { dataSource: uploadTableData, action: fileAction, headers: fileHeaders, data: fileData, method: method, setInnerFileList: setInnerFileList, isPublic: isPublic, API_BASEURL: API_BASEURL, FILE_API_BASEURL: FILE_API_BASEURL, maxPreviewSize: maxPreviewSize, isPreview: isPreview, isDelete: isDelete, isDownload: isDownload, ref: tableRef, listType: listType, tableColumns: tableColumns, onBeforeDeleteValidate: onBeforeDeleteValidate, onBeforeDownloadValidate: onBeforeDownloadValidate, onBeforePreviewValidate: onBeforePreviewValidate })) : null, isPreview && !showTable && !isImage ? (jsx(UploadListDetail, { dataSource: uploadTableData, action: fileAction, headers: fileHeaders, data: fileData, method: method, setInnerFileList: setInnerFileList, isPublic: isPublic, API_BASEURL: API_BASEURL, FILE_API_BASEURL: FILE_API_BASEURL, maxPreviewSize: maxPreviewSize, isPreview: isPreview, isDelete: isDelete, isDownload: isDownload, ref: tableRef, listType: listType, tableColumns: tableColumns, onBeforeDeleteValidate: onBeforeDeleteValidate, onBeforeDownloadValidate: onBeforeDownloadValidate, onBeforePreviewValidate: onBeforePreviewValidate })) : null, isImage && (jsx(ModalComponent, __assign({ ref: modalRef, footer: null, width: "520px" }, { children: jsx("div", __assign({ style: {
+                }, placement: "bottomLeft" }, { children: jsx(ButtonCom, __assign({ type: "primary" }, { children: "\u6279\u91CF\u4E0B\u8F7D" })) }))) : null, customRenderBtn, showTable ? (jsx(UploadTable, { dataSource: uploadTableData, action: fileAction, headers: fileHeaders, data: fileData, method: method, setInnerFileList: setInnerFileList, isPublic: isPublic, API_BASEURL: API_BASEURL, FILE_API_BASEURL: FILE_API_BASEURL, maxPreviewSize: maxPreviewSize, isPreview: isPreview, filePreview: filePreview, isDelete: isDelete, isDownload: isDownload, ref: tableRef, listType: listType, tableColumns: tableColumns, onBeforeDeleteValidate: onBeforeDeleteValidate, onBeforeDownloadValidate: onBeforeDownloadValidate, onBeforePreviewValidate: onBeforePreviewValidate })) : null, isPreview && !showTable && !isImage ? (jsx(UploadListDetail, { dataSource: uploadTableData, action: fileAction, headers: fileHeaders, data: fileData, method: method, setInnerFileList: setInnerFileList, isPublic: isPublic, API_BASEURL: API_BASEURL, FILE_API_BASEURL: FILE_API_BASEURL, maxPreviewSize: maxPreviewSize, isPreview: isPreview, isDelete: isDelete, isDownload: isDownload, ref: tableRef, listType: listType, tableColumns: tableColumns, onBeforeDeleteValidate: onBeforeDeleteValidate, onBeforeDownloadValidate: onBeforeDownloadValidate, onBeforePreviewValidate: onBeforePreviewValidate })) : null, isImage && (jsx(ModalComponent, __assign({ ref: modalRef, footer: null, width: "520px" }, { children: jsx("div", __assign({ style: {
                         textAlign: "center",
                     } }, { children: jsx("img", { src: imgSrc, alt: "\u9884\u89C8", style: {
                             maxWidth: "400px",

package/dist/es/uploadlist/uploadTable.js

@@ -13,7 +13,7 @@ import myMessage from '../message/index.js';
 import { Progress } from 'antd';
 
 var UploadTable = function (_a, ref) {
-    var dataSource = _a.dataSource, action = _a.action, headers = _a.headers, data = _a.data, method = _a.method, setInnerFileList = _a.setInnerFileList, isPublic = _a.isPublic, _b = _a.API_BASEURL, API_BASEURL = _b === void 0 ? "" : _b, _c = _a.FILE_API_BASEURL, FILE_API_BASEURL = _c === void 0 ? "" : _c, maxPreviewSize = _a.maxPreviewSize, isPreview = _a.isPreview, isDelete = _a.isDelete, isDownload = _a.isDownload; _a.listType; var tableColumns = _a.tableColumns, onBeforeDownloadValidate = _a.onBeforeDownloadValidate, onBeforePreviewValidate = _a.onBeforePreviewValidate, onBeforeDeleteValidate = _a.onBeforeDeleteValidate;
+    var dataSource = _a.dataSource, action = _a.action, headers = _a.headers, data = _a.data, method = _a.method, setInnerFileList = _a.setInnerFileList, isPublic = _a.isPublic, _b = _a.API_BASEURL, API_BASEURL = _b === void 0 ? "" : _b, _c = _a.FILE_API_BASEURL, FILE_API_BASEURL = _c === void 0 ? "" : _c, maxPreviewSize = _a.maxPreviewSize, isPreview = _a.isPreview, filePreview = _a.filePreview, isDelete = _a.isDelete, isDownload = _a.isDownload; _a.listType; var tableColumns = _a.tableColumns, onBeforeDownloadValidate = _a.onBeforeDownloadValidate, onBeforePreviewValidate = _a.onBeforePreviewValidate, onBeforeDeleteValidate = _a.onBeforeDeleteValidate;
     var _d = useState(false), loading = _d[0], setLoading = _d[1];
     var _e = useState(), checked = _e[0], setChecked = _e[1];
     var isDownloadSingleBoolean = isDownload;
@@ -182,7 +182,7 @@ var UploadTable = function (_a, ref) {
         key: "attachName",
         align: "left",
         render: function (text, record, index) {
-            return (jsx(ButtonCom, __assign({ type: "link", onClick: function () { return operationCallback("preview", record, index); }, style: { textAlign: "left" } }, { children: text })));
+            return !filePreview ? (text) : (jsx(ButtonCom, __assign({ type: "link", onClick: function () { return operationCallback("preview", record, index); }, style: { textAlign: "left" } }, { children: text })));
         },
     };
     var fileSizeColumn = {
@@ -311,11 +311,13 @@ var UploadTable = function (_a, ref) {
                     loading: loading,
                 });
             }
-            statusBtnConfig.push({
-                name: "预览",
-                type: "preview",
-                loading: onBeforePreviewValidate ? loading : undefined,
-            });
+            if (filePreview) {
+                statusBtnConfig.push({
+                    name: "预览",
+                    type: "preview",
+                    loading: onBeforePreviewValidate ? loading : undefined,
+                });
+            }
             if (isDeleteSingleBoolean) {
                 statusBtnConfig.push({
                     name: "删除",

package/package.json

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