@arim-aisdc/public-components 2.3.71 → 2.3.73

package/dist/components/BaseInfo/BaseInfo.d.ts

@@ -17,7 +17,7 @@ export declare const foramtBaseInfoField: (data: any, dataField: BaseInfoFieldTy
     value: any;
     field: string;
     label?: string;
-    text: string | JSX.Element | Element;
+    text: string | Element | JSX.Element;
     units?: string;
     width?: string;
     labelWidth?: string;

package/dist/components/ConditionExpression/index.d.ts

@@ -31,6 +31,8 @@ export interface ConditionExpressionPropsType {
     labelInValue?: boolean;
     /** 是否支持前端筛选 */
     canFrontFilter?: boolean;
+    /** 前端筛选函数 */
+    frontendFilterOptionFun?: (input: any, option: any) => boolean;
 }
 declare const _default: React.NamedExoticComponent<ConditionExpressionPropsType>;
 export default _default;

package/dist/components/ConditionExpression/index.js

@@ -68,7 +68,8 @@ var ConditionExpression = function ConditionExpression(_ref) {
     showParameter = _ref$showParameter === void 0 ? true : _ref$showParameter,
     parameterOptions = _ref.parameterOptions,
     labelInValue = _ref.labelInValue,
-    canFrontFilter = _ref.canFrontFilter;
+    canFrontFilter = _ref.canFrontFilter,
+    frontendFilterOptionFun = _ref.frontendFilterOptionFun;
   /** 添加条件触发 */
   var addExpression = function addExpression(index) {
     var _conditionExpressionItem = value.map(function (e, i) {
@@ -167,6 +168,11 @@ var ConditionExpression = function ConditionExpression(_ref) {
           className: 'condition-all-undelete',
           children: [item === null || item === void 0 ? void 0 : item.map(function (e, i) {
             var _value$index$, _value$index$2, _value$index$3, _value$index$4;
+            // 前端筛选逻辑
+            var frontendFilterOption = function frontendFilterOption(input, option) {
+              var _option$label;
+              return ((_option$label = option === null || option === void 0 ? void 0 : option.label) !== null && _option$label !== void 0 ? _option$label : '').toLowerCase().includes(input.toLowerCase());
+            };
             return /*#__PURE__*/_jsxs("div", {
               style: {
                 display: 'flex',
@@ -188,10 +194,7 @@ var ConditionExpression = function ConditionExpression(_ref) {
                       return dataChange('arguments', data, [index[0], i]);
                     },
                     showSearch: canFrontFilter,
-                    filterOption: canFrontFilter ? function (input, option) {
-                      var _option$label;
-                      return ((_option$label = option === null || option === void 0 ? void 0 : option.label) !== null && _option$label !== void 0 ? _option$label : '').toLowerCase().includes(input.toLowerCase());
-                    } : true
+                    filterOption: canFrontFilter || frontendFilterOptionFun ? frontendFilterOptionFun || frontendFilterOption : true
                   })
                 }), /*#__PURE__*/_jsx("div", {
                   className: 'condition-select-middle',

package/dist/components/ConfigProvider/context.d.ts

@@ -33,6 +33,7 @@ export interface ConfigConsumerProps {
         openMemo?: boolean;
         canSelectionUseShift?: boolean;
         openNullValueFilter?: boolean;
+        openIndexColumn?: boolean;
     };
     keepAliveActivateKey?: number;
     keepAliveUnactivateKey?: number;

package/dist/components/TableMax/TableBody/VirtualRow.js

@@ -373,7 +373,7 @@ var VirtualRow = function VirtualRow(_ref) {
     }
   }, [
   // 依赖项保持不变
-  row, row.id, rowEditing, tableId, editting, canRowDrag, disableDragRowIds, isDragging, selectedRowDragging, rowStyle, handleRowClick, rowMouseEnter, rowMouseLeave, rowClassNames, cellClassName, theme, table, handleCellRightClick, getCellProps, tableTooltip, onEditValueChange, dateFormat, row.getVisibleCells(), row.getIsSelected(), rowStyles]);
+  row, row.id, rowEditing, tableId, editting, canRowDrag, disableDragRowIds, isDragging, selectedRowDragging, rowStyle, handleRowClick, rowMouseEnter, rowMouseLeave, rowClassNames, cellClassName, theme, table, handleCellRightClick, getCellProps, tableTooltip, onEditValueChange, dateFormat, row.getVisibleCells(), row.getIsSelected(), rowStyles, table.getState().columnSizing]);
   var rowCom = function rowCom() {
     var renderCell = function renderCell(cell) {
       var _cellClassName2;

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

@@ -5,7 +5,8 @@ export declare enum ColumnType {
     Selection = "selection-column",
     Darg = "darg-column",
     PlaceHolder = "placeholder-column",
-    Expander = "expander"
+    Expander = "expander",
+    Index = "inner-index"
 }
 export type ColumnSizing = Record<string, number>;
 export declare const CACHE_MAX_AGE: number;

package/dist/components/TableMax/TableMax.js

@@ -47,6 +47,7 @@ export var ColumnType = /*#__PURE__*/function (ColumnType) {
   ColumnType["Darg"] = "darg-column";
   ColumnType["PlaceHolder"] = "placeholder-column";
   ColumnType["Expander"] = "expander";
+  ColumnType["Index"] = "inner-index";
   return ColumnType;
 }({});
 export var CACHE_MAX_AGE = 1 * 60 * 60 * 1000;
@@ -66,6 +67,15 @@ var defaultColumnPinningConfig = {
 };
 var initSelectedRowIds = [];
 var initColumnFilters = [];
+var defaultOnSelectAllChange = function defaultOnSelectAllChange() {
+  return false;
+};
+var defaultGetRowCanExpand = function defaultGetRowCanExpand() {
+  return false;
+};
+var defaultDragBeforeEnd = function defaultDragBeforeEnd() {
+  return false;
+};
 var TableMax = function TableMax(_ref) {
   var _JSON$parse;
   var tableId = _ref.tableId,
@@ -158,15 +168,11 @@ var TableMax = function TableMax(_ref) {
     getColumnFiltersData = _ref.getColumnFiltersData,
     saveEditing = _ref.saveEditing,
     _ref$getRowCanExpand = _ref.getRowCanExpand,
-    getRowCanExpand = _ref$getRowCanExpand === void 0 ? function () {
-      return false;
-    } : _ref$getRowCanExpand,
+    getRowCanExpand = _ref$getRowCanExpand === void 0 ? defaultGetRowCanExpand : _ref$getRowCanExpand,
     renderSubComponent = _ref.renderSubComponent,
     refInstance = _ref.refInstance,
     _ref$onSelectAllChang = _ref.onSelectAllChange,
-    onSelectAllChange = _ref$onSelectAllChang === void 0 ? function () {
-      return false;
-    } : _ref$onSelectAllChang,
+    onSelectAllChange = _ref$onSelectAllChang === void 0 ? defaultOnSelectAllChange : _ref$onSelectAllChang,
     _ref$enableRowSelecti = _ref.enableRowSelection,
     enableRowSelection = _ref$enableRowSelecti === void 0 ? true : _ref$enableRowSelecti,
     onRowMouseEnter = _ref.onRowMouseEnter,
@@ -182,9 +188,7 @@ var TableMax = function TableMax(_ref) {
     _ref$autoHeight = _ref.autoHeight,
     autoHeight = _ref$autoHeight === void 0 ? false : _ref$autoHeight,
     _ref$dragBeforeEnd = _ref.dragBeforeEnd,
-    dragBeforeEnd = _ref$dragBeforeEnd === void 0 ? function () {
-      return true;
-    } : _ref$dragBeforeEnd,
+    dragBeforeEnd = _ref$dragBeforeEnd === void 0 ? defaultDragBeforeEnd : _ref$dragBeforeEnd,
     dragBeforeStart = _ref.dragBeforeStart,
     getContextMenu = _ref.getContextMenu,
     onClickContextMenu = _ref.onClickContextMenu,
@@ -208,7 +212,8 @@ var TableMax = function TableMax(_ref) {
     openVirtualColumns = _ref$openVirtualColum === void 0 ? false : _ref$openVirtualColum,
     _ref$openVirtualRows = _ref.openVirtualRows,
     openVirtualRows = _ref$openVirtualRows === void 0 ? false : _ref$openVirtualRows,
-    openNullValueFilter = _ref.openNullValueFilter;
+    openNullValueFilter = _ref.openNullValueFilter,
+    openIndexColumn = _ref.openIndexColumn;
   var tableMaxRef = useRef(null);
   // 表格元素
   var tableContentRef = useRef(null);
@@ -234,14 +239,16 @@ var TableMax = function TableMax(_ref) {
       openMemo = _ref2.openMemo,
       globalCanExport = _ref2.canExport,
       canSelectionUseShift = _ref2.canSelectionUseShift,
-      openNullValueFilter = _ref2.openNullValueFilter;
+      openNullValueFilter = _ref2.openNullValueFilter,
+      openIndexColumn = _ref2.openIndexColumn;
     return {
       globalCanExport: globalCanExport,
       globalPageSizeOptions: globalPageSizeOptions,
       canSelectionUseShift: canSelectionUseShift,
       cacheMaxAge: cacheMaxAge,
       openMemo: openMemo,
-      openNullValueFilter: openNullValueFilter
+      openNullValueFilter: openNullValueFilter,
+      openIndexColumn: openIndexColumn
     };
   }, [JSON.stringify(tableMax)]);
 
@@ -596,6 +603,21 @@ var TableMax = function TableMax(_ref) {
   var recentlyCheckedRow = useRef(null);
   var setColumnsByProps = useCallback(function () {
     var extraColumns = [];
+    if (openIndexColumn !== null && openIndexColumn !== void 0 ? openIndexColumn : tableMaxConfig === null || tableMaxConfig === void 0 ? void 0 : tableMaxConfig.openIndexColumn) {
+      extraColumns.unshift({
+        id: ColumnType.Index,
+        tooltip: false,
+        accessorKey: ColumnType.Index,
+        header: '序号',
+        cell: function cell(_ref6) {
+          var row = _ref6.row;
+          return row.index + 1;
+        },
+        size: 60,
+        enableSorting: false,
+        enableColumnFilter: false
+      });
+    }
     if (getRowCanExpand() && columns.findIndex(function (column) {
       return column.id === 'expander';
     }) === -1) {
@@ -605,8 +627,8 @@ var TableMax = function TableMax(_ref) {
         size: 40,
         tooltip: false,
         enableResizing: false,
-        cell: function cell(_ref6) {
-          var row = _ref6.row;
+        cell: function cell(_ref7) {
+          var row = _ref7.row;
           return row.getCanExpand() ? /*#__PURE__*/_jsx("div", {
             onClick: function onClick(evt) {
               evt.stopPropagation();
@@ -627,8 +649,8 @@ var TableMax = function TableMax(_ref) {
         id: ColumnType.Selection,
         tooltip: false,
         enableResizing: false,
-        header: function header(_ref7) {
-          var table = _ref7.table;
+        header: function header(_ref8) {
+          var table = _ref8.table;
           return /*#__PURE__*/_jsx(Checkbox, {
             checked: table.getIsAllRowsSelected(),
             indeterminate: table.getIsSomePageRowsSelected(),
@@ -639,9 +661,9 @@ var TableMax = function TableMax(_ref) {
             }
           });
         },
-        cell: function cell(_ref8) {
-          var row = _ref8.row,
-            table = _ref8.table;
+        cell: function cell(_ref9) {
+          var row = _ref9.row,
+            table = _ref9.table;
           return /*#__PURE__*/_jsx(Checkbox, {
             checked: row.getIsSelected(),
             disabled: !row.getCanSelect(),
@@ -967,7 +989,7 @@ var TableMax = function TableMax(_ref) {
 
   // 保存编辑内容
   var save = /*#__PURE__*/function () {
-    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var _tableRows$find2;
       var newRow, _table$getRowModel4, tableRows, originRow;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -990,7 +1012,7 @@ var TableMax = function TableMax(_ref) {
       }, _callee);
     }));
     return function save() {
-      return _ref9.apply(this, arguments);
+      return _ref10.apply(this, arguments);
     };
   }();
   var triggerSave = function triggerSave(e) {
@@ -1231,31 +1253,6 @@ var TableMax = function TableMax(_ref) {
                 return refreshFun === null || refreshFun === void 0 ? void 0 : refreshFun();
               }
             })
-          }), canEditting && /*#__PURE__*/_jsx("span", {
-            className: canClickEditIcon ? undefined : 'disableBtn',
-            children: /*#__PURE__*/_jsx(Tooltip, {
-              placement: "top",
-              title: '编辑',
-              children: /*#__PURE__*/_jsx("i", {
-                className: "iconfont-other icon-other-bianji handleRightItem",
-                style: {
-                  fontSize: '16px',
-                  marginRight: 0
-                },
-                onClick: editFun
-              })
-            })
-          }), canDelete && /*#__PURE__*/_jsx(Tooltip, {
-            placement: "top",
-            title: '删除',
-            children: /*#__PURE__*/_jsx("i", {
-              className: "iconfont-table icon-table-delete handleRightItem",
-              style: {
-                fontSize: '16px',
-                marginRight: 0
-              },
-              onClick: handleClickDelete
-            })
           }), canFilter && /*#__PURE__*/_jsx(Tooltip, {
             placement: "top",
             title: '重置筛选',
@@ -1288,6 +1285,31 @@ var TableMax = function TableMax(_ref) {
               },
               onClick: changeCompactMode
             })
+          }), canEditting && /*#__PURE__*/_jsx("span", {
+            className: canClickEditIcon ? undefined : 'disableBtn',
+            children: /*#__PURE__*/_jsx(Tooltip, {
+              placement: "top",
+              title: '编辑',
+              children: /*#__PURE__*/_jsx("i", {
+                className: "iconfont-other icon-other-bianji handleRightItem",
+                style: {
+                  fontSize: '16px',
+                  marginRight: 0
+                },
+                onClick: editFun
+              })
+            })
+          }), canDelete && /*#__PURE__*/_jsx(Tooltip, {
+            placement: "top",
+            title: '删除',
+            children: /*#__PURE__*/_jsx("i", {
+              className: "iconfont-table icon-table-delete handleRightItem",
+              style: {
+                fontSize: '16px',
+                marginRight: 0
+              },
+              onClick: handleClickDelete
+            })
           }), canSetting && /*#__PURE__*/_jsx(ColumnSetting, {
             table: table,
             tableId: tableId,

package/dist/components/TableMax/components/ColumnSort/customSortFns.d.ts

@@ -1,13 +1,13 @@
 import { TableMaxColumnType } from "../../type";
-export declare const numberSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
-export declare const stringSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
-export declare const numberOrStringSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
-export declare const timeSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
+export declare const numberSortFn: (rowA: any, rowB: any, columnId: string) => 1 | -1 | 0;
+export declare const stringSortFn: (rowA: any, rowB: any, columnId: string) => 1 | -1 | 0;
+export declare const numberOrStringSortFn: (rowA: any, rowB: any, columnId: string) => 1 | -1 | 0;
+export declare const timeSortFn: (rowA: any, rowB: any, columnId: string) => 1 | -1 | 0;
 declare const customSortFns: {
-    numberSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
-    stringSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
-    timeSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
-    numberOrStringSortFn: (rowA: any, rowB: any, columnId: string) => 1 | 0 | -1;
+    numberSortFn: (rowA: any, rowB: any, columnId: string) => 1 | -1 | 0;
+    stringSortFn: (rowA: any, rowB: any, columnId: string) => 1 | -1 | 0;
+    timeSortFn: (rowA: any, rowB: any, columnId: string) => 1 | -1 | 0;
+    numberOrStringSortFn: (rowA: any, rowB: any, columnId: string) => 1 | -1 | 0;
 };
 export default customSortFns;
 export type SortFnType = keyof typeof customSortFns | undefined;

package/dist/components/TableMax/components/Export/useTableExport.js

@@ -22,6 +22,11 @@ import { useCallback, useState } from 'react';
 import * as XLSX from 'xlsx';
 import { message } from 'antd';
 import { ColumnType } from "../../TableMax";
+var DefaultPageParams = {
+  skipCount: 0,
+  maxResultCount: 1000
+};
+
 /**
  * 默认的单元格逻辑转换函数
  */
@@ -85,7 +90,6 @@ export var useTableExport = function useTableExport(
     _useState2 = _slicedToArray(_useState, 2),
     exporting = _useState2[0],
     setExporting = _useState2[1];
-
   /**
    * 根据列配置处理数据
    */
@@ -130,7 +134,6 @@ export var useTableExport = function useTableExport(
       return processedItem;
     });
   }, []);
-
   /**
    * 设置列宽
    */
@@ -143,7 +146,6 @@ export var useTableExport = function useTableExport(
       };
     });
   }, []);
-
   /**
    * 计算列宽
    */
@@ -153,7 +155,6 @@ export var useTableExport = function useTableExport(
     var width = chineseCharCount * 2 + otherCharCount * 1.1 + 4;
     return Math.min(Math.max(width, 12), 50);
   };
-
   /**
    * 主导出函数
    */
@@ -174,28 +175,28 @@ export var useTableExport = function useTableExport(
           case 5:
             setExporting(true);
             if (!customOptions.getExportDataList) {
-              _context.next = 10;
+              _context.next = 11;
               break;
             }
             _context.next = 9;
-            return customOptions.getExportDataList();
+            return customOptions.getExportDataList(DefaultPageParams);
           case 9:
             exportData = _context.sent;
-          case 10:
+            if (!(Array.isArray(exportData) && exportData.length > 0)) {
+              message.warning('未获取到导出数据');
+            }
+          case 11:
             if (isIncludeTotalRow && hasTotalRow) {
               exportData = [].concat(_toConsumableArray(exportData), [totalDatas]);
             }
             try {
               finalOptions = _objectSpread({}, customOptions); // 处理数据
-              processedData = processDataWithColumns(columns, exportData, isIncludeTotalRow && hasTotalRow); // console.log(processedData, 'processedData')
-              // 创建工作簿
+              processedData = processDataWithColumns(columns, exportData, isIncludeTotalRow && hasTotalRow); // 创建工作簿
               workbook = XLSX.utils.book_new();
               worksheet = XLSX.utils.json_to_sheet(processedData); // 设置列宽
               setColumnWidths(columns, worksheet);
-
               // 添加到工作簿
               XLSX.utils.book_append_sheet(workbook, worksheet, finalOptions.sheetName);
-
               // 生成文件名
               timestamp = new Date().toISOString().slice(0, 10).replace(/-/g, '');
               exportFilename = "".concat(finalOptions.fileName, "_").concat(timestamp, ".xlsx"); // 导出文件
@@ -207,7 +208,7 @@ export var useTableExport = function useTableExport(
             } finally {
               setExporting(false);
             }
-          case 12:
+          case 13:
           case "end":
             return _context.stop();
         }

package/dist/components/TableMax/hooks/useColumnWidth.js

@@ -73,7 +73,7 @@ export var useColumnWidth = function useColumnWidth(_ref) {
    */
   var getAdjustableColumns = useCallback(function (columns) {
     return Object.keys(columns).filter(function (key) {
-      return !['expander', 'selection-column'].includes(key);
+      return !['expander', 'selection-column', 'inner-index'].includes(key);
     });
   }, []);
 

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

@@ -335,6 +335,7 @@ export type TableMaxProps = {
     openVirtualRows?: boolean;
     /**开启空值过滤 */
     openNullValueFilter?: boolean;
+    openIndexColumn?: boolean;
 };
 export interface TableMaxColumnType {
     /**每一列的id是唯一的 */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arim-aisdc/public-components",
-  "version": "2.3.71",
+  "version": "2.3.73",
   "description": "前端组件库",
   "license": "MIT",
   "main": "dist/index.js",