ztxkui 4.2.18-71 → 4.2.18-72

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", isSort: true, summaryConfig: [
+            showColumnDynamic: true, showColumnDynamicKey: dynamicKey || 'symbol-id-1', configInfo: tableConfigInfo, isNumberInputAlignRight: true, isNumberInputThousandth: true, virtualTableKey: "virtualTableKey", summaryConfig: [
                 {
                     type: 'subtotal',
                     fields: ['test10', 'test101'],

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;
+    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 tableLayout = showColumnDynamicKey
         ? getStorage(showColumnDynamicKey)
         : myCatchColumns;
@@ -445,9 +445,10 @@ function getNewColumns(basicConfig, editableConfig, dynamicConfig, otherConfig)
         }
         // 添加过滤规则
         var filterKey = _column.key || _column.dataIndex;
-        if (_column.isFilter === true &&
-            typeof filterKey === 'string' &&
-            !onEditableSave) {
+        var isFilter = _column.isFilter === false
+            ? false
+            : isTableFilterEnabled || _column.isFilter === true;
+        if (isFilter && 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 }));
@@ -489,7 +490,7 @@ function getNewColumns(basicConfig, editableConfig, dynamicConfig, otherConfig)
                 _column.sorter = false;
             }
             // 纯粹的前端排序
-            if (_column.sorter == null && isSort) {
+            if (_column.sorter == null && (isSort || isTableSortEnabled)) {
                 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 +707,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 _a = useBaseContext(), tableNumberFormatter = _a.tableNumberFormatter, isCustomDecimalField = _a.isCustomDecimalField, customDecimalFieldRender = _a.customDecimalFieldRender;
+    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];
     var _c = useAsyncSetValue(false), isUpDateColumnsRef = _c[0], setIsUpDateColumnsRef = _c[1];
@@ -784,6 +785,8 @@ function useColumns(props) {
             autoDecimalFieldsRef: autoDecimalFieldsRef,
             isCustomDecimalField: isCustomDecimalField,
             customDecimalFieldRender: customDecimalFieldRender,
+            isTableSortEnabled: isTableSortEnabled,
+            isTableFilterEnabled: isTableFilterEnabled,
         });
     }, [
         showColumnDynamic,

package/dist/components/utils/ZtxkContext.d.ts

@@ -21,6 +21,14 @@ export interface IZtxkConfig {
      * 显示自定义小数位字段渲染逻辑
      */
     customDecimalFieldRender?: (text: any, record: any, index: any) => any;
+    /**
+     * 表格是否默认开启前端排序
+     */
+    isTableSortEnabled?: boolean;
+    /**
+     * 表格是否默认开启前端过滤
+     */
+    isTableFilterEnabled?: boolean;
 }
 declare const ZtxkContext: React.Context<IZtxkConfig>;
 export default ZtxkContext;

package/dist/components/utils/ZtxkContext.js

@@ -6,6 +6,8 @@ var ztxkConfig = {
     tableNumberFormatter: undefined,
     isCustomDecimalField: undefined,
     customDecimalFieldRender: undefined,
+    isTableSortEnabled: false,
+    isTableFilterEnabled: false,
 };
 var ZtxkContext = React.createContext(ztxkConfig);
 export default ZtxkContext;

package/dist/index.js

@@ -113,6 +113,14 @@
 //       return text;
 //     }
 //   },
+//   /**
+//    * 表格是否默认开启前端排序
+//    */
+//   isTableSortEnabled: true,
+//   /**
+//    * 表格是否默认开启前端过滤
+//    */
+//   isTableFilterEnabled: true,
 // };
 // ReactDOM.render(
 //   // <React.StrictMode>

package/package.json

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