@arim-aisdc/public-components 2.3.44 → 2.3.45

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -26,6 +26,7 @@ var RemoteSelect = function RemoteSelect(_ref) {
26
26
  options = _useState4[0],
27
27
  setOptions = _useState4[1];
28
28
  var fetchRef = useRef(0);
29
+ var searchValueRef = useRef("first");
29
30
  var debounceFetcher = useMemo(function () {
30
31
  var loadOptions = function loadOptions(value) {
31
32
  fetchRef.current += 1;
@@ -33,6 +34,7 @@ var RemoteSelect = function RemoteSelect(_ref) {
33
34
  if (!getOptionsFn) return;
34
35
  setOptions([]);
35
36
  setFetching(true);
37
+ searchValueRef.current = value;
36
38
  getOptionsFn(value).then(function (newOptions) {
37
39
  if (fetchId !== fetchRef.current) {
38
40
  // for fetch callback order
@@ -46,8 +48,11 @@ var RemoteSelect = function RemoteSelect(_ref) {
46
48
  return debounce(loadOptions, 500);
47
49
  }, [getOptionsFn]);
48
50
  useEffect(function () {
51
+ if (!searchValueRef.current) {
52
+ return;
53
+ }
49
54
  debounceFetcher();
50
- }, []);
55
+ }, [value]);
51
56
  return /*#__PURE__*/_jsx(Select, {
52
57
  className: "customForm-remoteSelect",
53
58
  mode: item.mode ? item.mode : undefined,
@@ -10,6 +10,7 @@ function _asyncToGenerator(fn) { return function () { var self = this, args = ar
10
10
  import { Spin, Tooltip } from "antd";
11
11
  import React, { useCallback } from "react";
12
12
  import { useTableExport } from "./useTableExport";
13
+ import { debounce } from 'lodash';
13
14
  import { jsx as _jsx } from "react/jsx-runtime";
14
15
  import { Fragment as _Fragment } from "react/jsx-runtime";
15
16
  var ExportComp = function ExportComp(_ref) {
@@ -20,16 +21,17 @@ var ExportComp = function ExportComp(_ref) {
20
21
  exportConfig = _ref.exportConfig,
21
22
  hasTotalRow = _ref.hasTotalRow,
22
23
  totalDatas = _ref.totalDatas;
23
- var _useTableExport = useTableExport(columns, hasTotalRow, totalDatas),
24
+ var _useTableExport = useTableExport(),
24
25
  exporting = _useTableExport.exporting,
25
26
  exportTableData = _useTableExport.exportTableData;
27
+ console.log(columns, datas, '4444555555');
26
28
  var handleExport = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
27
29
  var _ref3, _exportConfig$fileNam;
28
30
  return _regeneratorRuntime().wrap(function _callee$(_context) {
29
31
  while (1) switch (_context.prev = _context.next) {
30
32
  case 0:
31
33
  _context.next = 2;
32
- return exportTableData(datas, _objectSpread(_objectSpread({}, exportConfig), {}, {
34
+ return exportTableData(datas, columns, hasTotalRow, totalDatas, _objectSpread(_objectSpread({}, exportConfig), {}, {
33
35
  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 : '数据导出'
34
36
  }));
35
37
  case 2:
@@ -37,7 +39,7 @@ var ExportComp = function ExportComp(_ref) {
37
39
  return _context.stop();
38
40
  }
39
41
  }, _callee);
40
- })), [datas, tableTitle, exportConfig]);
42
+ })), [datas, tableTitle, exportConfig, columns, hasTotalRow, totalDatas]);
41
43
  return /*#__PURE__*/_jsx(_Fragment, {
42
44
  children: canExport && /*#__PURE__*/_jsx(Tooltip, {
43
45
  placement: "top",
@@ -48,7 +50,7 @@ var ExportComp = function ExportComp(_ref) {
48
50
  fontSize: '16px',
49
51
  marginRight: 0
50
52
  },
51
- onClick: handleExport
53
+ onClick: debounce(handleExport, 500)
52
54
  })
53
55
  })
54
56
  });
@@ -1,4 +1,3 @@
1
- import { TableMaxColumnType } from '../../type';
2
1
  export interface ExportOptions {
3
2
  /**导出文件名称 */
4
3
  fileName?: string;
@@ -12,7 +11,7 @@ export interface ExportOptions {
12
11
  /**
13
12
  * 表格导出Hook - 专门适配你的列配置结构
14
13
  */
15
- export declare const useTableExport: (columns: TableMaxColumnType[], hasTotalRow?: boolean, totalDatas?: any[], options?: ExportOptions) => {
14
+ export declare const useTableExport: () => {
16
15
  exporting: boolean;
17
- exportTableData: (data: any[], customOptions: ExportOptions) => Promise<void>;
16
+ exportTableData: (data: any[], columns: any, hasTotalRow: any, totalDatas: any, customOptions: ExportOptions) => Promise<void>;
18
17
  };
@@ -1,15 +1,15 @@
1
1
  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; }
2
+ function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
3
+ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
4
+ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
5
+ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
6
+ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
2
7
  function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
3
8
  function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
4
9
  function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
5
10
  function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
6
11
  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); } }
7
12
  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); }); }; }
8
- function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
9
- function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
10
- function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
11
- function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
12
- function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
13
13
  function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
14
14
  function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
15
15
  function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -49,7 +49,8 @@ var defaultApplyCellLogic = function defaultApplyCellLogic(value, columnId, orig
49
49
  }
50
50
  };
51
51
  var cellResult = cell(cellInfo);
52
- if (cellResult === null || cellResult === undefined) {
52
+ // cellResult === false 兼容 cell: (info: any) => typeof info.getValue() === 'number' && convertNumber(convertUnitUp(info.getValue()) as number)
53
+ if (cellResult === null || cellResult === undefined || cellResult === false) {
53
54
  return '';
54
55
  }
55
56
  if (cellResult && _typeof(cellResult) === 'object' && cellResult !== null && cellResult !== void 0 && cellResult.props) {
@@ -59,8 +60,6 @@ var defaultApplyCellLogic = function defaultApplyCellLogic(value, columnId, orig
59
60
  var _cellResult$props2;
60
61
  return (_cellResult$props2 = cellResult.props) === null || _cellResult$props2 === void 0 ? void 0 : _cellResult$props2.label;
61
62
  }
62
-
63
- // console.log(value, cellResult, 'cellResult')
64
63
  return value;
65
64
  }
66
65
  return cellResult !== null && cellResult !== void 0 ? cellResult : '';
@@ -75,29 +74,26 @@ var defaultApplyCellLogic = function defaultApplyCellLogic(value, columnId, orig
75
74
  /**
76
75
  * 表格导出Hook - 专门适配你的列配置结构
77
76
  */
78
- export var useTableExport = function useTableExport(columns, hasTotalRow, totalDatas) {
79
- var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
77
+ export var useTableExport = function useTableExport(
78
+ // columns: TableMaxColumnType[],
79
+ // hasTotalRow?: boolean,
80
+ // totalDatas?: any[],
81
+ // options: ExportOptions = {}
82
+ ) {
80
83
  var EnableExportColumnTypeList = [ColumnType.Selection, ColumnType.Darg, ColumnType.PlaceHolder, ColumnType.Expander];
81
84
  var _useState = useState(false),
82
85
  _useState2 = _slicedToArray(_useState, 2),
83
86
  exporting = _useState2[0],
84
87
  setExporting = _useState2[1];
85
- var defaultOptions = _objectSpread({
86
- fileName: '表格数据导出',
87
- sheetName: 'Sheet1'
88
- }, options);
89
88
 
90
89
  /**
91
90
  * 根据列配置处理数据
92
91
  */
93
- var processDataWithColumns = useCallback(function (data, includeTotal) {
92
+ var processDataWithColumns = useCallback(function (columns, data, includeTotal) {
94
93
  if (!data || !Array.isArray(data)) return [];
95
94
  return data.map(function (item, dataIndex) {
96
95
  var processedItem = {};
97
96
  var isTotalData = dataIndex === (data === null || data === void 0 ? void 0 : data.length) - 1 && includeTotal;
98
-
99
- // console.log(isTotalData, dataIndex, data?.length - 1, includeTotal, '555555')
100
-
101
97
  columns.filter(function (col) {
102
98
  return !EnableExportColumnTypeList.includes(col === null || col === void 0 ? void 0 : col.id) && !(col !== null && col !== void 0 && col.disabledExport);
103
99
  }).forEach(function (column, index) {
@@ -133,12 +129,12 @@ export var useTableExport = function useTableExport(columns, hasTotalRow, totalD
133
129
  });
134
130
  return processedItem;
135
131
  });
136
- }, [columns]);
132
+ }, []);
137
133
 
138
134
  /**
139
135
  * 设置列宽
140
136
  */
141
- var setColumnWidths = useCallback(function (worksheet) {
137
+ var setColumnWidths = useCallback(function (columns, worksheet) {
142
138
  if (!worksheet['!cols']) worksheet['!cols'] = [];
143
139
  columns.forEach(function (column, index) {
144
140
  var width = calculateColumnWidth(typeof column.header === 'string' ? column.header : '表格列宽');
@@ -146,7 +142,7 @@ export var useTableExport = function useTableExport(columns, hasTotalRow, totalD
146
142
  width: width
147
143
  };
148
144
  });
149
- }, [columns]);
145
+ }, []);
150
146
 
151
147
  /**
152
148
  * 计算列宽
@@ -155,14 +151,14 @@ export var useTableExport = function useTableExport(columns, hasTotalRow, totalD
155
151
  var chineseCharCount = (header.match(/[^\x00-\xff]/g) || []).length;
156
152
  var otherCharCount = header.length - chineseCharCount;
157
153
  var width = chineseCharCount * 2 + otherCharCount * 1.1 + 4;
158
- return Math.min(Math.max(width, 8), 50);
154
+ return Math.min(Math.max(width, 12), 50);
159
155
  };
160
156
 
161
157
  /**
162
158
  * 主导出函数
163
159
  */
164
160
  var exportTableData = useCallback( /*#__PURE__*/function () {
165
- var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(data, customOptions) {
161
+ var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(data, columns, hasTotalRow, totalDatas, customOptions) {
166
162
  var _customOptions$isIncl, isIncludeTotalRow, exportData, finalOptions, processedData, workbook, worksheet, timestamp, exportFilename;
167
163
  return _regeneratorRuntime().wrap(function _callee$(_context) {
168
164
  while (1) switch (_context.prev = _context.next) {
@@ -191,13 +187,11 @@ export var useTableExport = function useTableExport(columns, hasTotalRow, totalD
191
187
  }
192
188
  try {
193
189
  finalOptions = _objectSpread({}, customOptions); // 处理数据
194
- processedData = processDataWithColumns(exportData, isIncludeTotalRow && hasTotalRow);
195
- console.log(processedData, 'processedData');
196
-
190
+ processedData = processDataWithColumns(columns, exportData, isIncludeTotalRow && hasTotalRow); // console.log(processedData, 'processedData')
197
191
  // 创建工作簿
198
192
  workbook = XLSX.utils.book_new();
199
193
  worksheet = XLSX.utils.json_to_sheet(processedData); // 设置列宽
200
- setColumnWidths(worksheet);
194
+ setColumnWidths(columns, worksheet);
201
195
 
202
196
  // 添加到工作簿
203
197
  XLSX.utils.book_append_sheet(workbook, worksheet, finalOptions.sheetName);
@@ -219,10 +213,10 @@ export var useTableExport = function useTableExport(columns, hasTotalRow, totalD
219
213
  }
220
214
  }, _callee);
221
215
  }));
222
- return function (_x, _x2) {
216
+ return function (_x, _x2, _x3, _x4, _x5) {
223
217
  return _ref.apply(this, arguments);
224
218
  };
225
- }(), [exporting, processDataWithColumns, setColumnWidths, defaultOptions, hasTotalRow, totalDatas]);
219
+ }(), [exporting, processDataWithColumns, setColumnWidths]);
226
220
  return {
227
221
  exporting: exporting,
228
222
  exportTableData: exportTableData
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@arim-aisdc/public-components",
3
- "version": "2.3.44",
3
+ "version": "2.3.45",
4
4
  "description": "前端组件库",
5
5
  "license": "MIT",
6
6
  "main": "dist/index.js",