ztxkui 4.2.18-72 → 4.2.18-73

package/dist/DemoCom/TableDetail.js

@@ -227,7 +227,7 @@ var BasicTable = function (_a) {
             "isResizableColumn\u5C5E\u6027\u9ED8\u8BA4\u4E3Atrue\uFF0C\u5982\u679C\u4E0D\u9700\u8981\u5217\u4F38\u7F29\u53EF\u4EE5\u4F20\u5165false"),
         React.createElement(Table, { dataSource: dataSource, columns: columns, rowKey: "id", scroll: { y: 500 }, 
             // isContextMenu
-            showColumnDynamic: true, showColumnDynamicKey: dynamicKey || 'symbol-id-1', configInfo: tableConfigInfo, isNumberInputAlignRight: true, isNumberInputThousandth: true, virtualTableKey: "virtualTableKey", summaryConfig: [
+            showColumnDynamic: true, showColumnDynamicKey: dynamicKey || 'symbol-id-1', configInfo: tableConfigInfo, isNumberInputAlignRight: true, isNumberInputThousandth: true, virtualTableKey: "virtualTableKey", isSort: false, isFilter: false, summaryConfig: [
                 {
                     type: 'subtotal',
                     fields: ['test10', 'test101'],

package/dist/components/Table/hooks/useColumns.d.ts

@@ -42,6 +42,7 @@ interface IProps<RecordType> {
     customOrder?: any;
     setCustomOrder?: any;
     isSort?: boolean;
+    isFilter?: boolean;
     onFillDownChangeRef?: any;
     isModalInput?: boolean;
     isNumberInputThousandth?: boolean;

package/dist/components/Table/hooks/useColumns.js

@@ -233,7 +233,7 @@ function getNewColumns(basicConfig, editableConfig, dynamicConfig, otherConfig)
     var columns = basicConfig.columns, newColumnsRef = basicConfig.newColumnsRef, showColumnDynamic = basicConfig.showColumnDynamic, showColumnDynamicKey = basicConfig.showColumnDynamicKey, configInfo = basicConfig.configInfo, currentDataSource = basicConfig.currentDataSource, preDataSource = basicConfig.preDataSource, rowKey = basicConfig.rowKey, dataSourceRef = basicConfig.dataSourceRef, expandableChildrenColumnName = basicConfig.expandableChildrenColumnName, upDateColumnsRef = basicConfig.upDateColumnsRef, setUpDateColumnsRef = basicConfig.setUpDateColumnsRef, isUpDateColumnsRef = basicConfig.isUpDateColumnsRef, setIsUpDateColumnsRef = basicConfig.setIsUpDateColumnsRef;
     var onEditableSave = editableConfig.onEditableSave, onTableChange = editableConfig.onTableChange, currentPage = editableConfig.currentPage, onFillDownChangeRef = editableConfig.onFillDownChangeRef;
     var ColumnDynamicCom = dynamicConfig.ColumnDynamicCom, DelAllCom = dynamicConfig.DelAllCom, onAddAndDelHandleMemo = dynamicConfig.onAddAndDelHandleMemo, onAddAndDelHandle = dynamicConfig.onAddAndDelHandle, hideAddIcon = dynamicConfig.hideAddIcon, addIconText = dynamicConfig.addIconText, hideDelIcon = dynamicConfig.hideDelIcon, delIconText = dynamicConfig.delIconText;
-    var copyByKey = otherConfig.copyByKey, myCatchColumns = otherConfig.myCatchColumns, customSortHandle = otherConfig.customSortHandle, customOrder = otherConfig.customOrder, setCustomOrder = otherConfig.setCustomOrder, isSort = otherConfig.isSort, handleSearch = otherConfig.handleSearch, handleReset = otherConfig.handleReset, searchInput = otherConfig.searchInput, isModalInput = otherConfig.isModalInput, tableNumberFormatter = otherConfig.tableNumberFormatter, isNumberInputThousandth = otherConfig.isNumberInputThousandth, isNumberInputAlignRight = otherConfig.isNumberInputAlignRight, autoDecimalFieldsRef = otherConfig.autoDecimalFieldsRef, isCustomDecimalField = otherConfig.isCustomDecimalField, customDecimalFieldRender = otherConfig.customDecimalFieldRender, isTableSortEnabled = otherConfig.isTableSortEnabled, isTableFilterEnabled = otherConfig.isTableFilterEnabled;
+    var copyByKey = otherConfig.copyByKey, myCatchColumns = otherConfig.myCatchColumns, customSortHandle = otherConfig.customSortHandle, customOrder = otherConfig.customOrder, setCustomOrder = otherConfig.setCustomOrder, isSort = otherConfig.isSort, isFilter = otherConfig.isFilter, handleSearch = otherConfig.handleSearch, handleReset = otherConfig.handleReset, searchInput = otherConfig.searchInput, isModalInput = otherConfig.isModalInput, tableNumberFormatter = otherConfig.tableNumberFormatter, isNumberInputThousandth = otherConfig.isNumberInputThousandth, isNumberInputAlignRight = otherConfig.isNumberInputAlignRight, autoDecimalFieldsRef = otherConfig.autoDecimalFieldsRef, isCustomDecimalField = otherConfig.isCustomDecimalField, customDecimalFieldRender = otherConfig.customDecimalFieldRender, isTableSortEnabled = otherConfig.isTableSortEnabled, isTableFilterEnabled = otherConfig.isTableFilterEnabled;
     var tableLayout = showColumnDynamicKey
         ? getStorage(showColumnDynamicKey)
         : myCatchColumns;
@@ -445,10 +445,12 @@ function getNewColumns(basicConfig, editableConfig, dynamicConfig, otherConfig)
         }
         // 添加过滤规则
         var filterKey = _column.key || _column.dataIndex;
-        var isFilter = _column.isFilter === false
+        var needFilter = _column.isFilter === false
             ? false
-            : isTableFilterEnabled || _column.isFilter === true;
-        if (isFilter && typeof filterKey === 'string' && !onEditableSave) {
+            : isFilter === false
+                ? false
+                : isTableFilterEnabled || _column.isFilter === true || isFilter;
+        if (needFilter && typeof filterKey === 'string' && !onEditableSave) {
             _column.filterDropdown = function (_a) {
                 var setSelectedKeys = _a.setSelectedKeys, selectedKeys = _a.selectedKeys, confirm = _a.confirm, clearFilters = _a.clearFilters;
                 return (React.createElement(FilterDropdown, { searchInputRef: searchInput, setSelectedKeys: setSelectedKeys, selectedKeys: selectedKeys, confirm: confirm, clearFilters: clearFilters, dataIndex: filterKey, handleSearch: handleSearch, handleReset: handleReset, dataSourceRef: dataSourceRef }));
@@ -490,7 +492,8 @@ function getNewColumns(basicConfig, editableConfig, dynamicConfig, otherConfig)
                 _column.sorter = false;
             }
             // 纯粹的前端排序
-            if (_column.sorter == null && (isSort || isTableSortEnabled)) {
+            var needSort = isSort === false ? false : isSort || isTableSortEnabled;
+            if (_column.sorter == null && needSort) {
                 var title_5 = _column.title;
                 _column.title = function () {
                     return (React.createElement(TableSortTitle, { title: title_5, field: key, customOrder: customOrder, setCustomOrder: setCustomOrder, onChange: customSortHandle, align: align }));
@@ -706,7 +709,7 @@ function getNewColumns(basicConfig, editableConfig, dynamicConfig, otherConfig)
     }
 }
 function useColumns(props) {
-    var columns = props.columns, hiddenColumnDynamicIcon = props.hiddenColumnDynamicIcon, showColumnDynamic = props.showColumnDynamic, showColumnDynamicKey = props.showColumnDynamicKey, onAddAndDelHandle = props.onAddAndDelHandle, hideAddIcon = props.hideAddIcon, showDelAllBtn = props.showDelAllBtn, delAllChange = props.delAllChange, addIconText = props.addIconText, hideDelIcon = props.hideDelIcon, delIconText = props.delIconText, showDynamicHandle = props.showDynamicHandle, onEditableSave = props.onEditableSave, configInfo = props.configInfo, copyByKey = props.copyByKey, onTableChange = props.onTableChange, currentPage = props.currentPage, currentDataSource = props.currentDataSource, preDataSource = props.preDataSource, rowKey = props.rowKey, dataSourceRef = props.dataSourceRef, expandableChildrenColumnName = props.expandableChildrenColumnName, customSortHandle = props.customSortHandle, customOrder = props.customOrder, setCustomOrder = props.setCustomOrder, isSort = props.isSort, onFillDownChangeRef = props.onFillDownChangeRef, isModalInput = props.isModalInput, isNumberInputThousandth = props.isNumberInputThousandth, isNumberInputAlignRight = props.isNumberInputAlignRight, autoDecimalFieldsRef = props.autoDecimalFieldsRef;
+    var columns = props.columns, hiddenColumnDynamicIcon = props.hiddenColumnDynamicIcon, showColumnDynamic = props.showColumnDynamic, showColumnDynamicKey = props.showColumnDynamicKey, onAddAndDelHandle = props.onAddAndDelHandle, hideAddIcon = props.hideAddIcon, showDelAllBtn = props.showDelAllBtn, delAllChange = props.delAllChange, addIconText = props.addIconText, hideDelIcon = props.hideDelIcon, delIconText = props.delIconText, showDynamicHandle = props.showDynamicHandle, onEditableSave = props.onEditableSave, configInfo = props.configInfo, copyByKey = props.copyByKey, onTableChange = props.onTableChange, currentPage = props.currentPage, currentDataSource = props.currentDataSource, preDataSource = props.preDataSource, rowKey = props.rowKey, dataSourceRef = props.dataSourceRef, expandableChildrenColumnName = props.expandableChildrenColumnName, customSortHandle = props.customSortHandle, customOrder = props.customOrder, setCustomOrder = props.setCustomOrder, isSort = props.isSort, isFilter = props.isFilter, onFillDownChangeRef = props.onFillDownChangeRef, isModalInput = props.isModalInput, isNumberInputThousandth = props.isNumberInputThousandth, isNumberInputAlignRight = props.isNumberInputAlignRight, autoDecimalFieldsRef = props.autoDecimalFieldsRef;
     var _a = useBaseContext(), tableNumberFormatter = _a.tableNumberFormatter, isCustomDecimalField = _a.isCustomDecimalField, customDecimalFieldRender = _a.customDecimalFieldRender, isTableSortEnabled = _a.isTableSortEnabled, isTableFilterEnabled = _a.isTableFilterEnabled;
     var newColumnsRef = useRef();
     var _b = useAsyncSetValue(columns), upDateColumnsRef = _b[0], setUpDateColumnsRef = _b[1];
@@ -775,6 +778,7 @@ function useColumns(props) {
             customOrder: customOrder,
             setCustomOrder: setCustomOrder,
             isSort: isSort,
+            isFilter: isFilter,
             handleSearch: handleSearch,
             handleReset: handleReset,
             searchInput: searchInput,
@@ -817,6 +821,7 @@ function useColumns(props) {
         isUpDateColumnsRef,
         setIsUpDateColumnsRef,
         isSort,
+        isFilter,
         onFillDownChangeRef,
         isModalInput,
         tableNumberFormatter,

package/dist/components/Table/table.d.ts

@@ -63,6 +63,8 @@ export interface IProps<RecordType> extends Omit<TableProps<RecordType>, 'column
     virtualTableKey?: string;
     /** 是否需要排序 内部会有一个排序功能。自定义的 这个在某些条件下不会开启。但是还需要别的条件也不开启 */
     isSort?: boolean;
+    /** 是否需要过滤 */
+    isFilter?: boolean;
     /** 排序方法 ascend 升序 descend 降序  */
     onSortChange?: (info: {
         order: 'ascend' | 'descend' | null;

package/dist/components/Table/table.js

@@ -132,21 +132,21 @@ export function usePrevious(value) {
 function Table(props) {
     var _this = this;
     var _a, _b, _c, _d;
-    var className = props.className, scroll = props.scroll, _e = props.pagination, pagination = _e === void 0 ? false : _e, _f = props.bordered, bordered = _f === void 0 ? true : _f, _columns = props.columns, initColumns = props.initColumns, dataSource = props.dataSource, onAddAndDelHandle = props.onAddAndDelHandle, hideAddIcon = props.hideAddIcon, addIconText = props.addIconText, hideDelIcon = props.hideDelIcon, showDelAllBtn = props.showDelAllBtn, delAllChange = props.delAllChange, delIconText = props.delIconText, hiddenColumnDynamicIcon = props.hiddenColumnDynamicIcon, showColumnDynamic = props.showColumnDynamic, showColumnDynamicKey = props.showColumnDynamicKey, summaryConfig = props.summaryConfig, summaryFixed = props.summaryFixed, summary = props.summary, onMoveRow = props.onMoveRow, onEditableSave = props.onEditableSave, onDynamicChange = props.onDynamicChange, _g = props.isResizableColumn, isResizableColumn = _g === void 0 ? true : _g, configInfo = props.configInfo, tableHandleRef = props.tableHandleRef, tableName = props.tableName, isFlex = props.isFlex, onTableChange = props.onTableChange, rowSelection = props.rowSelection, showInnerPagination = props.showInnerPagination, defaultInnerPageSize = props.defaultInnerPageSize, virtualTableKey = props.virtualTableKey, _h = props.isSort, isSort = _h === void 0 ? false : _h, onSortChange = props.onSortChange, onFillDownChange = props.onFillDownChange, _j = props.isModalInput, isModalInput = _j === void 0 ? false : _j, // 默认关闭这个功能
+    var className = props.className, scroll = props.scroll, _e = props.pagination, pagination = _e === void 0 ? false : _e, _f = props.bordered, bordered = _f === void 0 ? true : _f, _columns = props.columns, initColumns = props.initColumns, dataSource = props.dataSource, onAddAndDelHandle = props.onAddAndDelHandle, hideAddIcon = props.hideAddIcon, addIconText = props.addIconText, hideDelIcon = props.hideDelIcon, showDelAllBtn = props.showDelAllBtn, delAllChange = props.delAllChange, delIconText = props.delIconText, hiddenColumnDynamicIcon = props.hiddenColumnDynamicIcon, showColumnDynamic = props.showColumnDynamic, showColumnDynamicKey = props.showColumnDynamicKey, summaryConfig = props.summaryConfig, summaryFixed = props.summaryFixed, summary = props.summary, onMoveRow = props.onMoveRow, onEditableSave = props.onEditableSave, onDynamicChange = props.onDynamicChange, _g = props.isResizableColumn, isResizableColumn = _g === void 0 ? true : _g, configInfo = props.configInfo, tableHandleRef = props.tableHandleRef, tableName = props.tableName, isFlex = props.isFlex, onTableChange = props.onTableChange, rowSelection = props.rowSelection, showInnerPagination = props.showInnerPagination, defaultInnerPageSize = props.defaultInnerPageSize, virtualTableKey = props.virtualTableKey, isSort = props.isSort, isFilter = props.isFilter, onSortChange = props.onSortChange, onFillDownChange = props.onFillDownChange, _h = props.isModalInput, isModalInput = _h === void 0 ? false : _h, // 默认关闭这个功能
     // onRow,
-    isOpenVirtualScrollBar = props.isOpenVirtualScrollBar, _k = props.isNumberInputThousandth, isNumberInputThousandth = _k === void 0 ? true : _k, _l = props.isNumberInputAlignRight, isNumberInputAlignRight = _l === void 0 ? true : _l, restProps = __rest(props, ["className", "scroll", "pagination", "bordered", "columns", "initColumns", "dataSource", "onAddAndDelHandle", "hideAddIcon", "addIconText", "hideDelIcon", "showDelAllBtn", "delAllChange", "delIconText", "hiddenColumnDynamicIcon", "showColumnDynamic", "showColumnDynamicKey", "summaryConfig", "summaryFixed", "summary", "onMoveRow", "onEditableSave", "onDynamicChange", "isResizableColumn", "configInfo", "tableHandleRef", "tableName", "isFlex", "onTableChange", "rowSelection", "showInnerPagination", "defaultInnerPageSize", "virtualTableKey", "isSort", "onSortChange", "onFillDownChange", "isModalInput", "isOpenVirtualScrollBar", "isNumberInputThousandth", "isNumberInputAlignRight"]);
+    isOpenVirtualScrollBar = props.isOpenVirtualScrollBar, _j = props.isNumberInputThousandth, isNumberInputThousandth = _j === void 0 ? true : _j, _k = props.isNumberInputAlignRight, isNumberInputAlignRight = _k === void 0 ? true : _k, restProps = __rest(props, ["className", "scroll", "pagination", "bordered", "columns", "initColumns", "dataSource", "onAddAndDelHandle", "hideAddIcon", "addIconText", "hideDelIcon", "showDelAllBtn", "delAllChange", "delIconText", "hiddenColumnDynamicIcon", "showColumnDynamic", "showColumnDynamicKey", "summaryConfig", "summaryFixed", "summary", "onMoveRow", "onEditableSave", "onDynamicChange", "isResizableColumn", "configInfo", "tableHandleRef", "tableName", "isFlex", "onTableChange", "rowSelection", "showInnerPagination", "defaultInnerPageSize", "virtualTableKey", "isSort", "isFilter", "onSortChange", "onFillDownChange", "isModalInput", "isOpenVirtualScrollBar", "isNumberInputThousandth", "isNumberInputAlignRight"]);
     var onChange = restProps.onChange;
     var classes = classNames('zt-table', className, {
         'zt-table--flex': isFlex,
     });
-    var _m = useState(false), dynamicVisible = _m[0], setDynamicVisible = _m[1];
+    var _l = useState(false), dynamicVisible = _l[0], setDynamicVisible = _l[1];
     var showDynamicHandle = useCallback(function () { return setDynamicVisible(true); }, []);
     var hideDynamicHandle = useCallback(function () { return setDynamicVisible(false); }, []);
     var dataSourceRef = useRef();
     var preDataSource = usePrevious(dataSource);
-    var _o = useState(), sortDataSource = _o[0], setSortDataSource = _o[1];
+    var _m = useState(), sortDataSource = _m[0], setSortDataSource = _m[1];
     // 内部分页相关配置
-    var _p = useInnerPagination(showInnerPagination, defaultInnerPageSize), paginationConfig = _p.paginationConfig, currentPage = _p.currentPage, setCurrent = _p.setCurrent, pageSize = _p.pageSize;
+    var _o = useInnerPagination(showInnerPagination, defaultInnerPageSize), paginationConfig = _o.paginationConfig, currentPage = _o.currentPage, setCurrent = _o.setCurrent, pageSize = _o.pageSize;
     var rowSelectionDataSource = useRef({});
     var myScroll = useMemo(function () {
         if (scroll) {
@@ -268,7 +268,7 @@ function Table(props) {
         onTableChange && onTableChange(resultTextList, startIndex);
     }, [clearErrorClass, onTableChange]);
     // 2023-05-04 自定义表格排序方法
-    var _q = useState(), customOrder = _q[0], setCustomOrder = _q[1];
+    var _p = useState(), customOrder = _p[0], setCustomOrder = _p[1];
     var customSortHandle = useCallback(function (info, options) {
         if (Array.isArray(expandableDataSource) &&
             expandableDataSource.length > 1) {
@@ -336,7 +336,7 @@ function Table(props) {
      *              以及一个需要动态列配置的columns
      */
     var onFillDownChangeRef = useLastest(onFillDownChange);
-    var _r = useColumns({
+    var _q = useColumns({
         columns: _columns,
         hiddenColumnDynamicIcon: hiddenColumnDynamicIcon,
         showColumnDynamic: showColumnDynamic,
@@ -363,12 +363,13 @@ function Table(props) {
         customOrder: customOrder,
         setCustomOrder: setCustomOrder,
         isSort: isSort,
+        isFilter: isFilter,
         onFillDownChangeRef: onFillDownChangeRef,
         isModalInput: isModalInput,
         isNumberInputThousandth: isNumberInputThousandth,
         isNumberInputAlignRight: isNumberInputAlignRight,
         autoDecimalFieldsRef: autoDecimalFieldsRef,
-    }), newColumns = _r.newColumns, dynamicColumns = _r.dynamicColumns, refreshColumnsHandle = _r.refreshColumnsHandle;
+    }), newColumns = _q.newColumns, dynamicColumns = _q.dynamicColumns, refreshColumnsHandle = _q.refreshColumnsHandle;
     /**
      * @description 保存列配置
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ztxkui",
-  "version": "4.2.18-72",
+  "version": "4.2.18-73",
   "private": false,
   "description": "React components library",
   "author": "zt-front-end",