@arim-aisdc/public-components 2.3.6 → 2.3.8

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.
@@ -17,7 +17,7 @@ export declare const foramtBaseInfoField: (data: any, dataField: BaseInfoFieldTy
17
17
  value: any;
18
18
  field: string;
19
19
  label?: string;
20
- text: string | Element | JSX.Element;
20
+ text: string | JSX.Element | Element;
21
21
  units?: string;
22
22
  width?: string;
23
23
  labelWidth?: string;
@@ -135,7 +135,8 @@ var Cell = function Cell(_ref) {
135
135
  }), !cannotDragColumn.includes(header.column.id) ? /*#__PURE__*/_jsxs("div", {
136
136
  className: "cell-right",
137
137
  children: [canSorting && header.column.getCanSort() ? /*#__PURE__*/_jsx(Sort, {
138
- sort: header.column.getIsSorted()
138
+ sort: header.column.getIsSorted(),
139
+ onClick: header.column.getToggleSortingHandler()
139
140
  }) : null, canFilter && columnDef.enableColumnFilter !== false ? /*#__PURE__*/_jsx(ColumnFilter, {
140
141
  column: header.column,
141
142
  manualFiltering: manualFiltering
@@ -102,6 +102,15 @@ table {
102
102
  height: 60%;
103
103
  top: 20%;
104
104
  }
105
+
106
+ &:hover {
107
+ .sort-flag {
108
+ display: inline-block;
109
+ }
110
+ .filter-icon {
111
+ display: inline-block;
112
+ }
113
+ }
105
114
  }
106
115
 
107
116
  .table-thead-tr:nth-last-child(2) {
@@ -1,8 +1,8 @@
1
- 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); }
2
1
  var _this = this;
3
2
  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; }
4
3
  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); } }
5
4
  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); }); }; }
5
+ 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); }
6
6
  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; }
7
7
  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; }
8
8
  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; }
@@ -366,13 +366,19 @@ var TableMax = function TableMax(_ref) {
366
366
  compactMode = _useState38[0],
367
367
  setCompactMode = _useState38[1];
368
368
  var onColumnVisibilityChange = function onColumnVisibilityChange(data) {
369
- var _Object$values, _Object$keys;
370
- var isColumnVisible = (_Object$values = Object.values(data === null || data === void 0 ? void 0 : data())) === null || _Object$values === void 0 ? void 0 : _Object$values[0];
371
- var columnKey = (_Object$keys = Object.keys(data === null || data === void 0 ? void 0 : data())) === null || _Object$keys === void 0 ? void 0 : _Object$keys[0];
372
- handleVisibleConfigChange(columnKey, isColumnVisible);
373
- setColumnVisibility(function (prev) {
374
- return _objectSpread(_objectSpread({}, prev || {}), data === null || data === void 0 ? void 0 : data());
375
- });
369
+ if (typeof data === 'function') {
370
+ var _Object$values, _Object$keys;
371
+ var isColumnVisible = (_Object$values = Object.values(data === null || data === void 0 ? void 0 : data())) === null || _Object$values === void 0 ? void 0 : _Object$values[0];
372
+ var columnKey = (_Object$keys = Object.keys(data === null || data === void 0 ? void 0 : data())) === null || _Object$keys === void 0 ? void 0 : _Object$keys[0];
373
+ handleVisibleConfigChange(columnKey, isColumnVisible);
374
+ setColumnVisibility(function (prev) {
375
+ return _objectSpread(_objectSpread({}, prev || {}), data === null || data === void 0 ? void 0 : data());
376
+ });
377
+ } else if (_typeof(data) === 'object') {
378
+ setColumnVisibility(function (prev) {
379
+ return _objectSpread(_objectSpread({}, prev || {}), data);
380
+ });
381
+ }
376
382
  };
377
383
 
378
384
  // table
@@ -1169,7 +1175,8 @@ var TableMax = function TableMax(_ref) {
1169
1175
  !checked && table.resetColumnFilters();
1170
1176
  },
1171
1177
  headerRowNum: headerRowNum,
1172
- onHeaderRowNumChange: setheaderRowNum
1178
+ onHeaderRowNumChange: setheaderRowNum,
1179
+ setColumnVisibility: setColumnVisibility
1173
1180
  })]
1174
1181
  })]
1175
1182
  }), /*#__PURE__*/_jsx("div", {
@@ -4,11 +4,11 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
4
4
  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; }
5
5
  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; } }
6
6
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
7
+ import { useTranslation } from "../../../../../hooks/useTranslation";
7
8
  import { DatePicker } from 'antd';
8
9
  import dayjs from 'dayjs';
9
10
  import { defaultDateFormat } from "../index";
10
11
  import "./index.less";
11
- import { useTranslation } from "../../../../../hooks/useTranslation";
12
12
  import { jsx as _jsx } from "react/jsx-runtime";
13
13
  var defaultRangePresets = [{
14
14
  label: '最近7天',
@@ -129,6 +129,7 @@ export function ColumnFilter(_ref) {
129
129
  setFilterPanelVisible(false);
130
130
  }, []);
131
131
  return /*#__PURE__*/_jsxs("div", {
132
+ className: "filter-icon-wrapper",
132
133
  children: [/*#__PURE__*/_jsx("i", {
133
134
  className: "iconfont-table icon-table-filter filter-icon ".concat(!!column.getFilterValue() ? 'height-light-filter' : ''),
134
135
  onClick: onFilterIconClick
@@ -1,9 +1,11 @@
1
1
  .filter-icon {
2
2
  cursor: pointer;
3
+ display: none;
3
4
  }
4
5
 
5
6
  .height-light-filter {
6
7
  color: @global-primary-color;
8
+ display: inline-block !important;
7
9
  }
8
10
 
9
11
  .filter-panel-wrapper {
@@ -21,3 +23,8 @@
21
23
  padding: 8px 12px;
22
24
  border-radius: 2px;
23
25
  }
26
+
27
+ .filter-icon-wrapper {
28
+ line-height: 32px;
29
+ height: 32px;
30
+ }
@@ -16,6 +16,7 @@ type ColumnSettingProps = {
16
16
  enableFilters: boolean;
17
17
  headerRowNum: number;
18
18
  getRowCanExpand?: () => void;
19
+ setColumnVisibility?: Function;
19
20
  };
20
21
  declare const _default: React.NamedExoticComponent<ColumnSettingProps>;
21
22
  export default _default;
@@ -243,7 +243,8 @@ var ColumnSetting = function ColumnSetting(_ref3) {
243
243
  onFilterSwitchChange = _ref3.onFilterSwitchChange,
244
244
  headerRowNum = _ref3.headerRowNum,
245
245
  onHeaderRowNumChange = _ref3.onHeaderRowNumChange,
246
- getRowCanExpand = _ref3.getRowCanExpand;
246
+ getRowCanExpand = _ref3.getRowCanExpand,
247
+ setColumnVisibility = _ref3.setColumnVisibility;
247
248
  var _useTranslation = useTranslation(),
248
249
  _useTranslation2 = _slicedToArray(_useTranslation, 1),
249
250
  t = _useTranslation2[0];
@@ -253,8 +254,7 @@ var ColumnSetting = function ColumnSetting(_ref3) {
253
254
  _useState2 = _slicedToArray(_useState, 2),
254
255
  settingVisible = _useState2[0],
255
256
  setSettingVisible = _useState2[1];
256
- var setColumnVisibility = table.setColumnVisibility,
257
- setColumnOrder = table.setColumnOrder,
257
+ var setColumnOrder = table.setColumnOrder,
258
258
  setColumnPinning = table.setColumnPinning;
259
259
  var _table$getState = table.getState(),
260
260
  columnOrder = _table$getState.columnOrder,
@@ -1,5 +1,6 @@
1
1
  import './index.less';
2
- declare const Sort: ({ sort }: {
2
+ declare const Sort: ({ sort, onClick }: {
3
3
  sort: string | boolean;
4
+ onClick: (e: any) => void;
4
5
  }) => import("react/jsx-runtime").JSX.Element;
5
6
  export default Sort;
@@ -2,10 +2,12 @@ import "./index.less";
2
2
  import { jsx as _jsx } from "react/jsx-runtime";
3
3
  import { jsxs as _jsxs } from "react/jsx-runtime";
4
4
  var Sort = function Sort(_ref) {
5
- var sort = _ref.sort;
5
+ var sort = _ref.sort,
6
+ onClick = _ref.onClick;
6
7
  if (sort === 'asc') {
7
8
  return /*#__PURE__*/_jsxs("span", {
8
- className: "sort-flag",
9
+ className: "sort-flag show-sort-flag",
10
+ onClick: onClick,
9
11
  children: [/*#__PURE__*/_jsx("i", {
10
12
  className: "triangle-up triangle-up-red"
11
13
  }), /*#__PURE__*/_jsx("i", {
@@ -14,7 +16,8 @@ var Sort = function Sort(_ref) {
14
16
  });
15
17
  } else if (sort === 'desc') {
16
18
  return /*#__PURE__*/_jsxs("span", {
17
- className: "sort-flag",
19
+ className: "sort-flag show-sort-flag",
20
+ onClick: onClick,
18
21
  children: [/*#__PURE__*/_jsx("i", {
19
22
  className: "triangle-up"
20
23
  }), /*#__PURE__*/_jsx("i", {
@@ -24,6 +27,7 @@ var Sort = function Sort(_ref) {
24
27
  }
25
28
  return /*#__PURE__*/_jsxs("span", {
26
29
  className: "sort-flag",
30
+ onClick: onClick,
27
31
  children: [/*#__PURE__*/_jsx("i", {
28
32
  className: "triangle-up"
29
33
  }), /*#__PURE__*/_jsx("i", {
@@ -5,6 +5,7 @@
5
5
  flex-direction: column;
6
6
  width: 16px;
7
7
  cursor: pointer;
8
+ display: none;
8
9
 
9
10
  .triangle-up {
10
11
  display: block;
@@ -33,3 +34,7 @@
33
34
  }
34
35
  }
35
36
  }
37
+
38
+ .show-sort-flag {
39
+ display: inline-block !important;
40
+ }
@@ -14,7 +14,8 @@ import { useCallback, useEffect, useMemo, useState } from 'react';
14
14
  import { getSizeInfo } from "../utils";
15
15
  import { debounce } from 'lodash';
16
16
  var CACHE_MAX_AGE = 1 * 60 * 60 * 1000; // 1小时
17
-
17
+ var defaultMinSize = 120;
18
+ var defaultMaxSize = 240;
18
19
  export var useColumnWidth = function useColumnWidth(_ref) {
19
20
  var tableContentRef = _ref.tableContentRef,
20
21
  tableId = _ref.tableId,
@@ -28,7 +29,8 @@ export var useColumnWidth = function useColumnWidth(_ref) {
28
29
  allColumnSizing: {},
29
30
  //所有列的列宽
30
31
  allColumnCount: 0,
31
- tableContainerWidth: undefined
32
+ tableContainerWidth: undefined,
33
+ initColumnsSizeMap: {}
32
34
  }),
33
35
  _useState2 = _slicedToArray(_useState, 2),
34
36
  state = _useState2[0],
@@ -43,7 +45,10 @@ export var useColumnWidth = function useColumnWidth(_ref) {
43
45
 
44
46
  /**
45
47
  * 处理容器宽度变化的逻辑
46
- * 1.容器变小,不重新计算其他列
48
+ * 1.容器变小:
49
+ * 找到原始columns设置列宽度的第一列
50
+ * 如果当前列的宽度大于初始宽度,则按照容器变化的总宽度,除选择列和展开列外,其他列平分容器减小的宽度
51
+ * 如果当前列的宽度小于等于初始宽度,则列宽均不变
47
52
  * 2.容器变大:
48
53
  * 列宽之和大于容器宽度,不重新计算
49
54
  * 列宽之和小于容器宽度,除选择列和展开列外,其他列平分 列宽之和与容器宽度的差值
@@ -63,7 +68,7 @@ export var useColumnWidth = function useColumnWidth(_ref) {
63
68
  }, 0);
64
69
 
65
70
  // 容器变大时的逻辑
66
- if (newWidth > prevState.tableContainerWidth) {
71
+ if (prevState.tableContainerWidth > 0 && newWidth > prevState.tableContainerWidth) {
67
72
  if (totalVisibleWidth < newWidth) {
68
73
  // 计算剩余宽度
69
74
  var remainWidth = newWidth - totalVisibleWidth - 10;
@@ -84,8 +89,23 @@ export var useColumnWidth = function useColumnWidth(_ref) {
84
89
  });
85
90
  }
86
91
  }
92
+ } else if (prevState.tableContainerWidth > 0 && JSON.stringify(prevState.initColumnsSizeMap) !== '{}') {
93
+ // 容器变小时,重新计算
94
+ var reducedWidth = newWidth - totalVisibleWidth - 10;
95
+ var _unselectedCount = visibleColumns.length;
96
+ if (_unselectedCount > 0) {
97
+ var _averageWidth = reducedWidth / _unselectedCount;
98
+ var _newVisibleColumnsSizing = _objectSpread({}, prevState.columnSizing);
99
+ visibleColumns.forEach(function (key) {
100
+ _newVisibleColumnsSizing[key] = Math.max((_newVisibleColumnsSizing[key] || 0) + _averageWidth, Math.max(state.initColumnsSizeMap[visibleColumns[0]], defaultMinSize));
101
+ });
102
+ return _objectSpread(_objectSpread({}, prevState), {}, {
103
+ columnSizing: _newVisibleColumnsSizing,
104
+ allColumnSizing: _objectSpread(_objectSpread({}, prevState.allColumnSizing || {}), _newVisibleColumnsSizing),
105
+ tableContainerWidth: newWidth
106
+ });
107
+ }
87
108
  }
88
- // 容器变小时,列宽保持不变
89
109
  return _objectSpread(_objectSpread({}, prevState), {}, {
90
110
  tableContainerWidth: newWidth
91
111
  });
@@ -185,8 +205,6 @@ export var useColumnWidth = function useColumnWidth(_ref) {
185
205
 
186
206
  // 处理未设置宽度的列
187
207
  if (remainColumnCount > 0) {
188
- var defaultMinSize = 120;
189
- var defaultMaxSize = 240;
190
208
  var averageSize = Math.max(Math.min(remainTableContainerWidth / remainColumnCount, defaultMaxSize), defaultMinSize);
191
209
  Object.keys(columnsSizeMap).forEach(function (key) {
192
210
  if (!newColumnSizeMap[key]) {
@@ -243,7 +261,8 @@ export var useColumnWidth = function useColumnWidth(_ref) {
243
261
  columnSizing: columnSizing,
244
262
  allColumnCount: _newAllColumnCount,
245
263
  allColumnSizing: _objectSpread(_objectSpread({}, _initColumnsSizeMap), columnSizing),
246
- tableContainerWidth: prevState.tableContainerWidth
264
+ tableContainerWidth: prevState.tableContainerWidth,
265
+ initColumnsSizeMap: columnSizeMap
247
266
  };
248
267
  });
249
268
  return;
@@ -269,7 +288,8 @@ export var useColumnWidth = function useColumnWidth(_ref) {
269
288
  columnSizing: columnSizing,
270
289
  allColumnSizing: _objectSpread(_objectSpread({}, initColumnsSizeMap), columnSizing),
271
290
  allColumnCount: newAllColumnCount,
272
- tableContainerWidth: prevState.tableContainerWidth
291
+ tableContainerWidth: prevState.tableContainerWidth,
292
+ initColumnsSizeMap: columnSizeMap
273
293
  };
274
294
  });
275
295
  }, [columnVisibleConfig, tableId, tableKey, tableKeyPrefixCls, calculateColumnSizing]);
@@ -10,6 +10,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
10
10
  import * as React from 'react';
11
11
  import { FormItemType } from "../components/QueryFilter";
12
12
  import { useConfig } from "../components/ConfigProvider";
13
+ import dayjs from 'dayjs';
13
14
  function deepMerge(obj1, obj2) {
14
15
  // 创建一个新对象,避免直接修改原始对象
15
16
  var result = _objectSpread({}, obj1);
@@ -96,7 +97,7 @@ export var useTranslation = function useTranslation(locales) {
96
97
  groupPrefix = _options$groupPrefix === void 0 ? "" : _options$groupPrefix;
97
98
  var processArray = function processArray(array) {
98
99
  return array.map(function (item) {
99
- if (_typeof(item) === "object" && !Array.isArray(item)) {
100
+ if (_typeof(item) === "object" && !(item instanceof Date) && !(item instanceof dayjs) && !Array.isArray(item)) {
100
101
  var newItem = _objectSpread({}, item);
101
102
  if (fieldKey in newItem) {
102
103
  // 如果有分组前缀,动态拼接键
@@ -291,7 +291,7 @@ export var PublicThemeVariablesConfigTwo = {
291
291
  // 表格列设置区列表元素边框颜色
292
292
  '--tableColor8': '#F5F6F7',
293
293
  // 表格列设置区列表元素-hover背景色
294
- '--tableTooltipBgc': '#243D65',
294
+ '--tableTooltipBgc': '#E8E8E8',
295
295
  // 表格tooltip背景色,#000000bf修改为#243D65
296
296
  '--global-desc-text-disabled-color': '#d9d9d9',
297
297
  // 全局默认 禁用/选中 字体颜色,#d3e7fa3f修改为#d9d9d9
@@ -377,7 +377,7 @@ export var PublicThemeVariablesConfigTwo = {
377
377
  // 表格列设置区列表元素边框颜色
378
378
  '--tableColor8': '#010c31ff',
379
379
  // 表格列设置区列表元素-hover背景色,#838695修改为#010c31ff
380
- '--tableTooltipBgc': '#243D65',
380
+ '--tableTooltipBgc': '#475569',
381
381
  // 表格tooltip背景色,#5e6175修改为#243D65
382
382
  '--global-desc-text-disabled-color': '#d3e7fa3f',
383
383
  // 全局默认 禁用/选中 字体颜色
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@arim-aisdc/public-components",
3
- "version": "2.3.6",
3
+ "version": "2.3.8",
4
4
  "description": "前端组件库",
5
5
  "license": "MIT",
6
6
  "main": "dist/index.js",