@arim-aisdc/public-components 0.0.22 → 0.0.24

package/dist/components/TableMax/TableMax.js

@@ -43,7 +43,7 @@ import customFilterFns from "./components/ColumnFilter/customFilterFns";
 import ColumnSetting from "./components/ColumnSetting";
 import customSortFns, { setDefaultSortFn } from "./components/ColumnSort/customSortFns";
 import "./tableMax.less";
-import { getSizeInfo, setInitColumnsSize, setRemainColumnsWidth } from "./utils";
+import { getFormatFilters, getSizeInfo, setInitColumnsSize, setRemainColumnsWidth } from "./utils";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 export var ColumnType = /*#__PURE__*/function (ColumnType) {
@@ -630,7 +630,13 @@ var TableMax = function TableMax(_ref) {
     // eslint-disable-next-line @typescript-eslint/no-unused-expressions
     manualFiltering && manualFilteringChange && manualFilteringChange(columnFilters, tableId, filteredData, filteredRowModel);
     if (onFilteringChange) {
-      onFilteringChange(columnFilters, tableId, filteredData, filteredRowModel);
+      onFilteringChange({
+        tableId: tableId,
+        filteredData: filteredData,
+        filteredRowModel: filteredRowModel,
+        filters: columnFilters,
+        formatFilters: getFormatFilters(columns, columnFilters)
+      });
     }
   }, [JSON.stringify(columnFilters), manualFiltering, tableId]);
 
@@ -779,7 +785,7 @@ var TableMax = function TableMax(_ref) {
       draggedRows: draggedRows,
       updatedTableDatas: newTableDatas
     });
-  }, [tableDatas]);
+  }, [tableDatas, rowOrderChange]);
 
   // 把row数据填充到表单
   var setFormData = function setFormData(rowOriginal) {

package/dist/components/TableMax/components/ColumnSetting/index.js

@@ -97,6 +97,23 @@ var SettingItem = function SettingItem(_ref) {
         return [];
     }
   };
+
+  // 从左侧固定列中删除某一列
+  var deleteFromLeft = function deleteFromLeft() {
+    var left = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+    var toDeleteId = arguments.length > 1 ? arguments[1] : undefined;
+    var newLeft = _toConsumableArray(left);
+    var index = newLeft.findIndex(function (item) {
+      return item === toDeleteId;
+    });
+    newLeft.splice(index, 1);
+    if (newLeft.length === [getRowCanExpand(), canSelection && !selectionWithoutChecked].filter(function (item) {
+      return item === true;
+    }).length) {
+      return [];
+    }
+    return newLeft;
+  };
   var columnPinningChange = function columnPinningChange(value) {
     console.log(value);
     var _ref2 = table.getState().columnPinning || {
@@ -106,42 +123,52 @@ var SettingItem = function SettingItem(_ref) {
       left = _ref2.left,
       right = _ref2.right;
     if (value === 'right') {
+      // 固定到右侧
       right.unshift(column.id);
+
+      // 如果之前是固定在左侧了，就从left中删掉
+      var newLeft = left;
+      if (left && left.includes(column.id)) {
+        newLeft = deleteFromLeft(left, column.id);
+      }
       table.setColumnPinning({
-        left: left,
+        left: newLeft,
         right: cloneDeep(right)
       });
-      return;
-    }
-    if (value === 'left') {
+    } else if (value === 'left') {
+      // 固定到左侧
       if (left.length === 0) {
-        column.id !== ColumnType.Expander && getRowCanExpand() && left.push(ColumnType.Expander);
-        column.id !== ColumnType.Selection && canSelection && !selectionWithoutChecked && left.push(ColumnType.Selection);
+        if (column.id !== ColumnType.Expander && getRowCanExpand()) {
+          left.push(ColumnType.Expander);
+        }
+        if (column.id !== ColumnType.Selection && canSelection && !selectionWithoutChecked) {
+          left.push(ColumnType.Selection);
+        }
       }
       left.push(column.id);
+
+      // 如果已经是固定在右侧了，就从右侧中删掉
+      if (right && right.includes(column.id)) {
+        var indexInRight = right.findIndex(function (item) {
+          return item === column.id;
+        });
+        right.splice(indexInRight, 1);
+      }
       table.setColumnPinning({
         left: cloneDeep(left),
-        right: right
+        right: cloneDeep(right)
       });
-      return;
-    }
-    if (value === false) {
+    } else if (value === false) {
       if (right && right.includes(column.id)) {
         column.pin(false);
         return;
       }
       if (left && left.includes(column.id)) {
-        var index = left.findIndex(function (item) {
-          return item === column.id;
-        });
-        left.splice(index, 1);
+        var _newLeft = deleteFromLeft(left, column.id);
         table.setColumnPinning({
-          left: left.length === [getRowCanExpand(), canSelection || selectionWithoutChecked].filter(function (item) {
-            return item === true;
-          }).length ? [] : cloneDeep(left),
+          left: _newLeft,
           right: right
         });
-        return;
       }
     }
   };

package/dist/components/TableMax/type.d.ts

@@ -18,7 +18,9 @@ export type TableMaxProps = {
      */
     /**用于缓存,要保证tableId的唯一性 */
     tableId: string;
+    /**列配置 */
     columns: TableMaxColumnType[];
+    /**表格数据 */
     datas: any[];
     theme?: string;
     /**控制列显示 */
@@ -111,7 +113,15 @@ export type TableMaxProps = {
      */
     getColumnFiltersData?: (columnFilters: ColumnFiltersState, tableId: string, filteredData: any[], filteredRowModel: RowModel<any>) => void;
     /**筛选参数变化时触发的函数,前端筛选、后端筛选时都会触发 */
-    onFilteringChange?: (columnFilters: ColumnFiltersState, tableId: string, filteredData: any[], filteredRowModel: RowModel<any>) => void;
+    onFilteringChange?: (params: {
+        tableId: string;
+        filteredData: any[];
+        filteredRowModel: RowModel<any>;
+        filters: ColumnFiltersState;
+        formatFilters: {
+            [key: string]: any;
+        };
+    }) => void;
     /**自定义表格顶部所有的内容 */
     renderOperate?: ReactNode;
     /**表格顶部左侧标题，与renderOperateLeft互斥 */
@@ -254,6 +264,8 @@ export interface TableMaxColumnType {
         format?: string;
         picker?: 'date' | 'week' | 'month' | 'quarter' | 'year';
     };
+    /**自定义当前列筛选值所使用的key，默认为当前列的id： { [ filterKey || id ]: value} */
+    filterKey?: string;
     /**当前列是否可筛选 */
     enableColumnFilter?: boolean;
     /**自定义列的类名 */

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

@@ -1,3 +1,4 @@
+import { ColumnFiltersState } from '@tanstack/react-table';
 import { TableMaxColumnType } from './type';
 export declare const getSizeInfo: (columns: TableMaxColumnType[]) => {
     allCount: number;
@@ -19,3 +20,4 @@ export declare const getShadowInfo: (column: any, table: any) => {
     isRightFirst: boolean;
     isLeftLast: boolean;
 };
+export declare const getFormatFilters: (columns: TableMaxColumnType[], originFilters: ColumnFiltersState) => {};

package/dist/components/TableMax/utils.js

@@ -95,4 +95,36 @@ export var getShadowInfo = function getShadowInfo(column, table) {
     isRightFirst: isRightFirst,
     isLeftLast: isLeftLast
   };
+};
+export var getFormatFilters = function getFormatFilters(columns, originFilters) {
+  // console.log('getFormatFilters :>> ', columns, originFilters);
+  var formatFilters = {};
+  originFilters.forEach(function (filter) {
+    var id = filter.id,
+      value = filter.value;
+    var curColumn = columns.find(function (item) {
+      return item.id === id;
+    });
+    var filterType = curColumn.filterType,
+      filterKey = curColumn.filterKey;
+    // 优先取formattedFilterKey作为key
+    var formatKey = filterKey || id;
+    if (filterType === FilterType.Date) {
+      // 时间范围
+      formatFilters["".concat(formatKey, "From")] = value === null || value === void 0 ? void 0 : value.startDate;
+      formatFilters["".concat(formatKey, "To")] = value === null || value === void 0 ? void 0 : value.endDate;
+    } else if (filterType === FilterType.Integer) {
+      // 数字范围
+      formatFilters["".concat(formatKey, "From")] = value === null || value === void 0 ? void 0 : value[0];
+      formatFilters["".concat(formatKey, "To")] = value === null || value === void 0 ? void 0 : value[1];
+    } else if (filterType === FilterType.MultiSelect || !filterType) {
+      // 多选组件
+      formatFilters["".concat(formatKey, "List")] = value;
+      formatFilters[formatKey] = value;
+    } else {
+      // 其他
+      formatFilters[formatKey] = value;
+    }
+  });
+  return formatFilters;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arim-aisdc/public-components",
-  "version": "0.0.22",
+  "version": "0.0.24",
   "description": "前端组件库",
   "license": "MIT",
   "main": "dist/index.js",
@@ -92,4 +92,4 @@
   "authors": [
     "na.xu2278@foxmail.com"
   ]
-}
+}