@arim-aisdc/public-components 2.3.95 → 2.3.97

package/dist/components/CustomForm/CustomForm.js

@@ -16,7 +16,7 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import { MinusOutlined } from '@ant-design/icons';
 import { useDebounceFn } from 'ahooks';
-import { AutoComplete, Badge, Button, Cascader, Checkbox, Col, DatePicker, Form, Input, InputNumber, Radio, Row, Select, Spin, Switch } from 'antd';
+import { AutoComplete, Badge, Button, Cascader, Checkbox, Col, DatePicker, Form, Input, InputNumber, Radio, Row, Select, Spin, Switch, Tooltip } from 'antd';
 import dayjs from 'dayjs';
 import { debounce } from 'lodash';
 import React, { forwardRef, useEffect, useMemo, useState } from 'react';
@@ -319,6 +319,38 @@ var CustomForm = function CustomForm(_ref, ref) {
           maxTagCount: item.maxTagCount,
           optionFilterProp: item.optionFilterProp || 'value',
           optionLabelProp: item.optionLabelProp || 'children',
+          maxTagPlaceholder: item.maxTagPlaceholder || function (omittedValues) {
+            return /*#__PURE__*/_jsx(Tooltip, {
+              styles: {
+                root: {
+                  pointerEvents: 'none'
+                }
+              },
+              title: omittedValues.map(function (_ref2) {
+                var label = _ref2.label;
+                if (typeof label === 'string' || typeof label === 'number') {
+                  return String(label);
+                } else if ( /*#__PURE__*/React.isValidElement(label)) {
+                  var _element = label;
+                  var props = _element.props;
+
+                  // 尝试提取文本
+                  if ((props === null || props === void 0 ? void 0 : props.text) !== undefined) {
+                    var text = props.text;
+                    if (Array.isArray(text)) {
+                      return text.join(', ');
+                    }
+                    return String(text);
+                  }
+                } else {
+                  return '';
+                }
+              }).join(', '),
+              children: /*#__PURE__*/_jsxs("span", {
+                children: ["+", omittedValues.length, "..."]
+              })
+            });
+          },
           children: (item === null || item === void 0 ? void 0 : item.setting) && Array.isArray(item.setting) && ((_item$setting2 = item.setting) === null || _item$setting2 === void 0 ? void 0 : _item$setting2.map(function (el, num) {
             var _el$options;
             if (el !== null && el !== void 0 && el.options && (el === null || el === void 0 || (_el$options = el.options) === null || _el$options === void 0 ? void 0 : _el$options.length) > 0) {
@@ -579,6 +611,38 @@ var CustomForm = function CustomForm(_ref, ref) {
               style: {
                 width: '100%'
               },
+              maxTagPlaceholder: item.maxTagPlaceholder || function (omittedValues) {
+                return /*#__PURE__*/_jsx(Tooltip, {
+                  styles: {
+                    root: {
+                      pointerEvents: 'none'
+                    }
+                  },
+                  title: omittedValues.map(function (_ref3) {
+                    var label = _ref3.label;
+                    if (typeof label === 'string' || typeof label === 'number') {
+                      return String(label);
+                    } else if ( /*#__PURE__*/React.isValidElement(label)) {
+                      var _element2 = label;
+                      var props = _element2.props;
+
+                      // 尝试提取文本
+                      if ((props === null || props === void 0 ? void 0 : props.text) !== undefined) {
+                        var text = props.text;
+                        if (Array.isArray(text)) {
+                          return text.join(', ');
+                        }
+                        return String(text);
+                      }
+                    } else {
+                      return '';
+                    }
+                  }).join(', '),
+                  children: /*#__PURE__*/_jsxs("span", {
+                    children: ["+", omittedValues.length, "..."]
+                  })
+                });
+              },
               children: (item === null || item === void 0 ? void 0 : item.setting) && Array.isArray(item.setting) && item.setting.map(function (el, num) {
                 return /*#__PURE__*/_jsx(Option, {
                   value: el.value,
@@ -622,6 +686,38 @@ var CustomForm = function CustomForm(_ref, ref) {
               style: {
                 width: '100%'
               },
+              maxTagPlaceholder: item.maxTagPlaceholder || function (omittedValues) {
+                return /*#__PURE__*/_jsx(Tooltip, {
+                  styles: {
+                    root: {
+                      pointerEvents: 'none'
+                    }
+                  },
+                  title: omittedValues.map(function (_ref4) {
+                    var label = _ref4.label;
+                    if (typeof label === 'string' || typeof label === 'number') {
+                      return String(label);
+                    } else if ( /*#__PURE__*/React.isValidElement(label)) {
+                      var _element3 = label;
+                      var props = _element3.props;
+
+                      // 尝试提取文本
+                      if ((props === null || props === void 0 ? void 0 : props.text) !== undefined) {
+                        var text = props.text;
+                        if (Array.isArray(text)) {
+                          return text.join(', ');
+                        }
+                        return String(text);
+                      }
+                    } else {
+                      return '';
+                    }
+                  }).join(', '),
+                  children: /*#__PURE__*/_jsxs("span", {
+                    children: ["+", omittedValues.length, "..."]
+                  })
+                });
+              },
               children: item.setting1.map(function (el, num) {
                 return /*#__PURE__*/_jsx(Option, {
                   value: el.value,

package/dist/components/TableMax/TableHeader/Cell.js

@@ -20,7 +20,7 @@ import { Tooltip } from 'antd';
 import { useMemo } from 'react';
 import { useDrag, useDrop } from 'react-dnd';
 import { useConfig } from "../../ConfigProvider";
-import { ColumnType } from "../TableMax";
+import { ColumnType } from "../type";
 import { ColumnFilter } from "../components/ColumnFilterV2";
 import Sort from "../components/ColumnSort";
 import "./index.less";

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

@@ -1,13 +1,6 @@
 import React from 'react';
 import './tableMax.less';
 import { type TableMaxProps } from './type';
-export declare enum ColumnType {
-    Selection = "selection-column",
-    Darg = "darg-column",
-    PlaceHolder = "placeholder-column",
-    Expander = "expander",
-    Index = "inner-index"
-}
 export type ColumnSizing = Record<string, number>;
 export declare const CACHE_MAX_AGE: number;
 declare const _default: React.MemoExoticComponent<React.ForwardRefExoticComponent<TableMaxProps & React.RefAttributes<unknown>>>;

package/dist/components/TableMax/TableMax.js

@@ -35,6 +35,7 @@ import customSortFns, { setDefaultSortFn } from "./components/ColumnSort/customS
 import PaginationV2 from "./components/PaginationV2";
 import { useColumnWidth } from "./hooks/useColumnWidth";
 import "./tableMax.less";
+import { ColumnType } from "./type";
 import { downloadExcel, getFormatFilters, getFormatFiltersV2, getFormatSorting, operationColumnNoTooltips } from "./utils";
 import { useTableScrollShadow } from "./hooks/useTableScrollShadow";
 import { ExportTableData } from "./components/Export";
@@ -42,14 +43,6 @@ import UnifiedTable from "./UnifiedTable";
 import { useHoverDetection } from "./hooks/useHoverDetection";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
-export var ColumnType = /*#__PURE__*/function (ColumnType) {
-  ColumnType["Selection"] = "selection-column";
-  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;
 var getCurrentRouterName = function getCurrentRouterName() {
   return window.location.pathname.slice(1);

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

@@ -14,7 +14,7 @@ import React, { useEffect, useLayoutEffect, useMemo, useRef, useState } from 're
 import { useDrag, useDrop } from 'react-dnd';
 import { createPortal } from 'react-dom';
 import { useConfig } from "../../../ConfigProvider";
-import { ColumnType } from "../../index";
+import { ColumnType } from "../../type";
 import "./index.less";
 import { useTranslation } from "../../../../hooks/useTranslation";
 import { jsx as _jsx } from "react/jsx-runtime";

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) => 0 | 1 | -1;
-export declare const stringSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
-export declare const numberOrStringSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
-export declare const timeSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
+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;
 declare const customSortFns: {
-    numberSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
-    stringSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
-    timeSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
-    numberOrStringSortFn: (rowA: any, rowB: any, columnId: string) => 0 | 1 | -1;
+    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;
 };
 export default customSortFns;
 export type SortFnType = keyof typeof customSortFns | undefined;

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

@@ -357,7 +357,8 @@ var ExportComp = function ExportComp(_ref) {
     var apiFn = pageFetcher.apiFn,
       extractItems = pageFetcher.extractItems,
       extractTotalCount = pageFetcher.extractTotalCount,
-      extraParams = pageFetcher.extraParams;
+      extraParams = pageFetcher.extraParams,
+      pageSize = pageFetcher.pageSize;
     return /*#__PURE__*/function () {
       var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(params) {
         var _ref4, _ref5;
@@ -619,6 +620,7 @@ var ExportComp = function ExportComp(_ref) {
                 }
                 setProgress(percent);
               },
+              batchSize: pageSize,
               onBatchComplete: function onBatchComplete(batchIndex, totalBatches) {
                 console.log("\u5DF2\u5B8C\u6210 ".concat(batchIndex, "/").concat(totalBatches, " \u6279\u6570\u636E\u5BFC\u51FA"));
               }

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

@@ -16,14 +16,7 @@ function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" ==
 import { useCallback, useState, useRef } from 'react';
 import * as XLSX from 'xlsx';
 import { message } from 'antd';
-var ColumnType = /*#__PURE__*/function (ColumnType) {
-  ColumnType["Selection"] = "selection-column";
-  ColumnType["Drag"] = "darg-column";
-  ColumnType["PlaceHolder"] = "placeholder-column";
-  ColumnType["Expander"] = "expander";
-  ColumnType["Index"] = "inner-index";
-  return ColumnType;
-}(ColumnType || {});
+import { ColumnType } from "../../type";
 var defaultApplyCellLogic = function defaultApplyCellLogic(value, columnId, originalRow, column) {
   var cell = column.cell,
     accessorKey = column.accessorKey,
@@ -65,7 +58,7 @@ var defaultApplyCellLogic = function defaultApplyCellLogic(value, columnId, orig
   }
   return value !== null && value !== void 0 ? value : '';
 };
-var EnableExportColumnTypeList = [ColumnType.Selection, ColumnType.Drag, ColumnType.PlaceHolder, ColumnType.Expander, ColumnType.Index];
+var EnableExportColumnTypeList = [ColumnType.Selection, ColumnType.Darg, ColumnType.PlaceHolder, ColumnType.Expander, ColumnType.Index];
 function fetchWithRetry(_x) {
   return _fetchWithRetry.apply(this, arguments);
 }

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

@@ -1,5 +1,5 @@
 import TableMax from './TableMax';
-export { ColumnType } from './TableMax';
+export { ColumnType } from './type';
 export { InputType } from './components/ColumnEdit';
 export { FilterType } from './components/ColumnFilterV2';
 export type { FilterFnType } from './components/ColumnFilterV2';

package/dist/components/TableMax/index.js

@@ -1,5 +1,5 @@
 import TableMax from "./TableMax";
-export { ColumnType } from "./TableMax";
+export { ColumnType } from "./type";
 export { InputType } from "./components/ColumnEdit";
 export { FilterType } from "./components/ColumnFilterV2";
 export default TableMax;

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

@@ -5,6 +5,13 @@ import { InputType } from './components/ColumnEdit';
 import { FilterFnType, FilterType } from './components/ColumnFilterV2';
 import { SortFnType } from './components/ColumnSort/customSortFns';
 import { ExportOptions } from './components/Export';
+export declare enum ColumnType {
+    Selection = "selection-column",
+    Darg = "darg-column",
+    PlaceHolder = "placeholder-column",
+    Expander = "expander",
+    Index = "inner-index"
+}
 export type PrefixClsType = 'custom-light' | 'custom-dark';
 export declare enum DropSide {
     Top = "top",

package/dist/components/TableMax/type.js

@@ -1,3 +1,11 @@
+export var ColumnType = /*#__PURE__*/function (ColumnType) {
+  ColumnType["Selection"] = "selection-column";
+  ColumnType["Darg"] = "darg-column";
+  ColumnType["PlaceHolder"] = "placeholder-column";
+  ColumnType["Expander"] = "expander";
+  ColumnType["Index"] = "inner-index";
+  return ColumnType;
+}({});
 export var DropSide = /*#__PURE__*/function (DropSide) {
   DropSide["Top"] = "top";
   DropSide["Bottom"] = "bottom";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arim-aisdc/public-components",
-  "version": "2.3.95",
+  "version": "2.3.97",
   "description": "前端组件库",
   "license": "MIT",
   "main": "dist/index.js",
@@ -48,7 +48,7 @@
   "dependencies": {
     "@ant-design/icons": "^5.3.7",
     "@ant-design/pro-components": "^2.7.10",
-    "@arim-aisdc/public-components": "^2.3.90",
+    "@arim-aisdc/public-components": "^2.3.96",
     "@tanstack/match-sorter-utils": "^8.8.4",
     "@tanstack/react-table": "^8.9.1",
     "@tanstack/react-virtual": "^3.13.12",