@arim-aisdc/public-components 2.3.71 → 2.3.72

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/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/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/package.json

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