@arim-aisdc/public-components 2.3.42 → 2.3.43

package/dist/components/TableMax/TableMax.js

@@ -108,7 +108,7 @@ var TableMax = function TableMax(_ref) {
     _ref$canFilter = _ref.canFilter,
     canFilter = _ref$canFilter === void 0 ? true : _ref$canFilter,
     _ref$canExport = _ref.canExport,
-    canExport = _ref$canExport === void 0 ? false : _ref$canExport,
+    canExport = _ref$canExport === void 0 ? true : _ref$canExport,
     _ref$defaultEnableFil = _ref.defaultEnableFilters,
     defaultEnableFilters = _ref$defaultEnableFil === void 0 ? false : _ref$defaultEnableFil,
     _ref$defaultHeaderRow = _ref.defaultHeaderRowNum,

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

@@ -30,7 +30,7 @@ var ExportComp = function ExportComp(_ref) {
         case 0:
           _context.next = 2;
           return exportTableData(datas, _objectSpread(_objectSpread({}, exportConfig), {}, {
-            fileName: (_ref3 = (_exportConfig$fileNam = exportConfig.fileName) !== null && _exportConfig$fileNam !== void 0 ? _exportConfig$fileNam : tableTitle) !== null && _ref3 !== void 0 ? _ref3 : '数据导出'
+            fileName: (_ref3 = (_exportConfig$fileNam = exportConfig === null || exportConfig === void 0 ? void 0 : exportConfig.fileName) !== null && _exportConfig$fileNam !== void 0 ? _exportConfig$fileNam : tableTitle) !== null && _ref3 !== void 0 ? _ref3 : '数据导出'
           }));
         case 2:
         case "end":

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

@@ -1,23 +1,14 @@
 import { TableMaxColumnType } from '../../type';
-interface TableColumnType {
-    header: string;
-    id: string;
-    accessorKey: string;
-    filterType?: any;
-    cell?: any;
-    accessorFn?: (originalRow: any) => any;
-    filterOptions?: Array<{
-        label: string;
-        value: any;
-    }>;
-    unitsChangeFn?: (value: number) => number;
-}
 export interface ExportOptions {
+    /**导出文件名称 */
     fileName?: string;
+    /**导出sheet名称 */
     sheetName?: string;
-    applyCellLogic?: (value: any, columnId: string, originalRow: any, column: TableColumnType) => any;
+    /**自定义cell显示 */
+    applyCellLogic?: (value: any, columnId: string, originalRow: any, column: TableMaxColumnType) => any;
     /**是否导出合计行 */
     isIncludeTotalRow?: boolean;
+    /**根据接口获取导出数据，函数返回值是需要导出的数据 */
     getExportDataList?: (params?: any) => Promise<any[]>;
 }
 /**
@@ -27,4 +18,3 @@ export declare const useTableExport: (columns: TableMaxColumnType[], hasTotalRow
     exporting: boolean;
     exportTableData: (data: any[], customOptions: ExportOptions) => Promise<void>;
 };
-export {};

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

@@ -1,4 +1,3 @@
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
@@ -13,13 +12,63 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 // hooks/useTableExport.ts
 import { useCallback, useState } from 'react';
 import * as XLSX from 'xlsx';
 import { message } from 'antd';
 import { ColumnType } from "../../TableMax";
-
-// 类型定义
+/**
+ * 默认的单元格逻辑转换函数
+ */
+var defaultApplyCellLogic = function defaultApplyCellLogic(value, columnId, originalRow, column) {
+  var cell = column.cell,
+    accessorKey = column.accessorKey,
+    id = column.id;
+
+  // 如果有自定义的cell渲染函数，需要执行它来获取显示值
+  if (cell) {
+    try {
+      var cellInfo = {
+        getValue: function getValue() {
+          return value;
+        },
+        row: {
+          original: originalRow
+        },
+        column: {
+          id: columnId
+        }
+      };
+      var cellResult = cell(cellInfo);
+      if (cellResult === null || cellResult === undefined) {
+        return '';
+      }
+      if (cellResult && _typeof(cellResult) === 'object') {
+        console.log(cellResult, 'cellResult');
+        // 如果是 BadgeComponent，提取 label 属性
+        // if (cellResult.type && (cellResult.type.name === 'BadgeComponent' || cellResult.type.displayName === 'BadgeComponent')) {
+        //   return cellResult.props.label || value;
+        // }
+
+        // // 如果是带有className的span元素，返回原始数值
+        // if (cellResult.props.className && (cellResult.props.className.includes('hasAlarm') || cellResult.props.className.includes('hasWarning'))) {
+        //   return value;
+        // }
+
+        // // 如果是其他React元素，尝试获取children
+        // if (cellResult.props.children !== undefined) {
+        //   return cellResult.props.children;
+        // }
+      }
+      return cellResult !== null && cellResult !== void 0 ? cellResult : '';
+    } catch (error) {
+      console.warn("\u5904\u7406\u5217 ".concat(columnId, " \u7684cell\u51FD\u6570\u65F6\u51FA\u9519:"), error);
+      return value !== null && value !== void 0 ? value : '';
+    }
+  }
+  return value !== null && value !== void 0 ? value : '';
+};
 
 /**
  * 表格导出Hook - 专门适配你的列配置结构
@@ -44,6 +93,7 @@ export var useTableExport = function useTableExport(columns, hasTotalRow, totalD
     return data.map(function (item, dataIndex) {
       var processedItem = {};
       var isTotalData = dataIndex === (data === null || data === void 0 ? void 0 : data.length) - 1 && includeTotal;
+      console.log(isTotalData, dataIndex, (data === null || data === void 0 ? void 0 : data.length) - 1, includeTotal, '555555');
       columns.filter(function (col) {
         return !EnableExportColumnTypeList.includes(col === null || col === void 0 ? void 0 : col.id) && !(col !== null && col !== void 0 && col.disabledExport);
       }).forEach(function (column, index) {
@@ -54,22 +104,28 @@ export var useTableExport = function useTableExport(columns, hasTotalRow, totalD
           cell = column.cell,
           unitsChangeFn = column.unitsChangeFn;
         var value;
-
         // 1. 优先使用 accessorFn 获取值
-        if (!isTotalData && accessorFn) {
-          value = accessorFn(item, index);
-        }
-        // 2. 使用 accessorKey 获取值
-        else if (accessorKey) {
-          value = item[accessorKey];
-        }
-        // 3. 使用 id 获取值
-        else {
-          value = item[id];
-        }
 
-        // 4. 应用单元格渲染逻辑（转换为文本）
-        value = applyCellLogic ? applyCellLogic(value, id, item, column) : value;
+        if (isTotalData) {
+          var _item$accessorKey;
+          value = value = (_item$accessorKey = item[accessorKey]) !== null && _item$accessorKey !== void 0 ? _item$accessorKey : item[id];
+        } else {
+          var _value;
+          if (accessorFn) {
+            value = accessorFn(item, index);
+          }
+          // 2. 使用 accessorKey 获取值
+          else if (accessorKey) {
+            value = item[accessorKey];
+          }
+          // 3. 使用 id 获取值
+          else {
+            value = item[id];
+          }
+          // 4. 应用单元格渲染逻辑（转换为文本）
+          // const finalApplyCellLogic = applyCellLogic || defaultApplyCellLogic;
+          value = applyCellLogic ? applyCellLogic(value, id, item, column) : (_value = value) !== null && _value !== void 0 ? _value : '';
+        }
         processedItem[typeof header === "string" ? header : accessorKey !== null && accessorKey !== void 0 ? accessorKey : id] = value;
       });
       return processedItem;
@@ -180,21 +236,6 @@ export var useTableExport = function useTableExport(columns, hasTotalRow, totalD
 //       const statusValue = originalRow.status as keyof typeof statusMap;
 //       return statusMap[statusValue]?.label || value;
 
-//     case 'ingot':
-//       // 吨位列：应用单位转换
-//       if (value === null || value === undefined) return '-';
-//       return convertUnitUp(value);
-
-//     case 'onlineTime':
-//     case 'setupTime':
-//       // 时间列：格式化日期
-//       return formatDate(value);
-
-//     case 'usageCount':
-//     case 'currentUsageCount':
-//       // 使用次数列：确保显示数字
-//       return value ?? 0;
-
 //     default:
 //       // 其他列：直接返回值或空字符串
 //       return value ?? '';

package/package.json

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