@teamix/pro 1.5.33 → 1.5.34

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.
Files changed (59) hide show
  1. package/dist/pro.all.min.css +1 -1
  2. package/dist/pro.css +1 -1
  3. package/dist/pro.js +755 -208
  4. package/dist/pro.min.css +1 -1
  5. package/dist/pro.min.js +1 -1
  6. package/dist/pro.xconsole.min.css +1 -1
  7. package/es/form/Components/FormItem2/index.js +0 -1
  8. package/es/form/Components/SelectTable2/index.d.ts +97 -0
  9. package/es/form/Components/SelectTable2/index.js +39 -0
  10. package/es/form/ProForm/index.js +3 -1
  11. package/es/form/SchemaForm/adapterDecorator.js +1 -1
  12. package/es/form/SchemaForm/adapterType.js +2 -1
  13. package/es/global.scss +9 -0
  14. package/es/index.d.ts +1 -1
  15. package/es/index.js +1 -1
  16. package/es/table/components/Cell/index.d.ts +17 -0
  17. package/es/table/components/Cell/index.js +219 -0
  18. package/es/table/components/Layout/index.js +9 -7
  19. package/es/table/components/Pagination/index.d.ts +5 -4
  20. package/es/table/components/Pagination/index.js +5 -3
  21. package/es/table/components/TableContent/index.d.ts +7 -0
  22. package/es/table/components/TableContent/index.js +23 -0
  23. package/es/table/index.js +118 -126
  24. package/es/table/index.scss +1 -1
  25. package/es/table/typing.d.ts +9 -2
  26. package/es/table/utils/genAutoWidthColumns.d.ts +2 -2
  27. package/es/table/utils/genAutoWidthColumns.js +65 -16
  28. package/es/table/utils/genProColumnToColumn.js +39 -4
  29. package/es/table/utils/processColumns.d.ts +8 -0
  30. package/es/table/utils/processColumns.js +39 -0
  31. package/es/table/utils/useTableSelection.js +54 -5
  32. package/es/xconsole.scss +4 -4
  33. package/lib/form/Components/FormItem2/index.js +0 -1
  34. package/lib/form/Components/SelectTable2/index.d.ts +97 -0
  35. package/lib/form/Components/SelectTable2/index.js +47 -0
  36. package/lib/form/ProForm/index.js +3 -1
  37. package/lib/form/SchemaForm/adapterDecorator.js +1 -1
  38. package/lib/form/SchemaForm/adapterType.js +2 -1
  39. package/lib/global.scss +9 -0
  40. package/lib/index.d.ts +1 -1
  41. package/lib/index.js +1 -1
  42. package/lib/table/components/Cell/index.d.ts +17 -0
  43. package/lib/table/components/Cell/index.js +224 -0
  44. package/lib/table/components/Layout/index.js +8 -6
  45. package/lib/table/components/Pagination/index.d.ts +5 -4
  46. package/lib/table/components/Pagination/index.js +4 -2
  47. package/lib/table/components/TableContent/index.d.ts +7 -0
  48. package/lib/table/components/TableContent/index.js +34 -0
  49. package/lib/table/index.js +120 -128
  50. package/lib/table/index.scss +1 -1
  51. package/lib/table/typing.d.ts +9 -2
  52. package/lib/table/utils/genAutoWidthColumns.d.ts +2 -2
  53. package/lib/table/utils/genAutoWidthColumns.js +64 -15
  54. package/lib/table/utils/genProColumnToColumn.js +38 -3
  55. package/lib/table/utils/processColumns.d.ts +8 -0
  56. package/lib/table/utils/processColumns.js +46 -0
  57. package/lib/table/utils/useTableSelection.js +57 -5
  58. package/lib/xconsole.scss +4 -4
  59. package/package.json +1 -1
package/dist/pro.js CHANGED
@@ -82853,6 +82853,7 @@ var Description = function Description(props) {
82853
82853
  /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_3__);
82854
82854
  /* harmony import */ var _alicloudfe_components__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(33049);
82855
82855
  /* harmony import */ var _alicloudfe_components__WEBPACK_IMPORTED_MODULE_4___default = /*#__PURE__*/__webpack_require__.n(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_4__);
82856
+ var _excluded = ["onConfirm"];
82856
82857
  function ownKeys(object, enumerableOnly) {
82857
82858
  var keys = Object.keys(object);
82858
82859
  if (Object.getOwnPropertySymbols) {
@@ -82887,6 +82888,33 @@ function _defineProperty(obj, key, value) {
82887
82888
  }
82888
82889
  return obj;
82889
82890
  }
82891
+ function _objectWithoutProperties(source, excluded) {
82892
+ if (source == null) return {};
82893
+ var target = _objectWithoutPropertiesLoose(source, excluded);
82894
+ var key, i;
82895
+ if (Object.getOwnPropertySymbols) {
82896
+ var sourceSymbolKeys = Object.getOwnPropertySymbols(source);
82897
+ for (i = 0; i < sourceSymbolKeys.length; i++) {
82898
+ key = sourceSymbolKeys[i];
82899
+ if (excluded.indexOf(key) >= 0) continue;
82900
+ if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue;
82901
+ target[key] = source[key];
82902
+ }
82903
+ }
82904
+ return target;
82905
+ }
82906
+ function _objectWithoutPropertiesLoose(source, excluded) {
82907
+ if (source == null) return {};
82908
+ var target = {};
82909
+ var sourceKeys = Object.keys(source);
82910
+ var key, i;
82911
+ for (i = 0; i < sourceKeys.length; i++) {
82912
+ key = sourceKeys[i];
82913
+ if (excluded.indexOf(key) >= 0) continue;
82914
+ target[key] = source[key];
82915
+ }
82916
+ return target;
82917
+ }
82890
82918
  function _slicedToArray(arr, i) {
82891
82919
  return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest();
82892
82920
  }
@@ -83000,6 +83028,9 @@ var Edit = function Edit(props) {
83000
83028
  }
83001
83029
  })
83002
83030
  }, (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_1__.getMessage)('edit'));
83031
+ var _ref = (_editPopConfirmProps = editPopConfirmProps === null || editPopConfirmProps === void 0 ? void 0 : editPopConfirmProps(setPopConfirmVisibleFunc)) !== null && _editPopConfirmProps !== void 0 ? _editPopConfirmProps : {},
83032
+ onConfirmProp = _ref.onConfirm,
83033
+ others = _objectWithoutProperties(_ref, _excluded);
83003
83034
  // 渲染 popConfirm
83004
83035
  var renderPopConfirm = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default().createElement(_teamix_pop_confirm__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z, _objectSpread({
83005
83036
  visible: popConfirmVisible,
@@ -83009,8 +83040,15 @@ var Edit = function Edit(props) {
83009
83040
  trigger: renderTrigger,
83010
83041
  onCancel: function onCancel() {
83011
83042
  setPopConfirmVisibleFunc(false);
83043
+ },
83044
+ onConfirm: function onConfirm() {
83045
+ for (var _len = arguments.length, confirmProps = new Array(_len), _key = 0; _key < _len; _key++) {
83046
+ confirmProps[_key] = arguments[_key];
83047
+ }
83048
+ onConfirmProp === null || onConfirmProp === void 0 ? void 0 : onConfirmProp.apply(void 0, confirmProps);
83049
+ setPopConfirmVisibleFunc(false);
83012
83050
  }
83013
- }, (_editPopConfirmProps = editPopConfirmProps === null || editPopConfirmProps === void 0 ? void 0 : editPopConfirmProps(setPopConfirmVisibleFunc)) !== null && _editPopConfirmProps !== void 0 ? _editPopConfirmProps : {}));
83051
+ }, others));
83014
83052
  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default().createElement("div", {
83015
83053
  className: cls(),
83016
83054
  onMouseEnter: function onMouseEnter() {
@@ -84996,6 +85034,11 @@ var SelectGroup = function SelectGroup(props) {
84996
85034
  setDataSource(dataSourceProp !== null && dataSourceProp !== void 0 ? dataSourceProp : []);
84997
85035
  setActiveKey(getDataSourceValue(dataSourceProp === null || dataSourceProp === void 0 ? void 0 : dataSourceProp[0]));
84998
85036
  }, [dataSourceProp]);
85037
+ /** 这个 useEffect 是解决 dataSourceProp跟新了但是render没跟更新 */
85038
+ (0,react__WEBPACK_IMPORTED_MODULE_1__.useEffect)(function () {
85039
+ setDataSource(dataSourceProp !== null && dataSourceProp !== void 0 ? dataSourceProp : []);
85040
+ setActiveKey(getDataSourceValue(dataSourceProp === null || dataSourceProp === void 0 ? void 0 : dataSourceProp[0]));
85041
+ }, [dataSourceProp]);
84999
85042
  // 搜索值变化回调 过滤数据
85000
85043
  var onSearch = function onSearch(value) {
85001
85044
  // 拷贝一份最新的 dataSource
@@ -100275,7 +100318,6 @@ var ICON_MAP = {
100275
100318
  };
100276
100319
  var BaseItem = function BaseItem(props) {
100277
100320
  var _cls, _cls3, _cls4, _cls5, _cls6;
100278
- console.log('FormItem2');
100279
100321
  var children = props.children,
100280
100322
  others = _objectWithoutPropertiesLoose(props, _excluded);
100281
100323
  var _useState2 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false),
@@ -100680,6 +100722,56 @@ var componentBuilder = function componentBuilder(type) {
100680
100722
 
100681
100723
  /***/ }),
100682
100724
 
100725
+ /***/ 71661:
100726
+ /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
100727
+
100728
+ "use strict";
100729
+ /* harmony export */ __webpack_require__.d(__webpack_exports__, {
100730
+ /* harmony export */ "Z": () => (__WEBPACK_DEFAULT_EXPORT__)
100731
+ /* harmony export */ });
100732
+ /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(59787);
100733
+ /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__);
100734
+ /* harmony import */ var _formily_react__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(61006);
100735
+ /* harmony import */ var _table__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(18119);
100736
+ var _excluded = ["columns", "field"];
100737
+ function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
100738
+ 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; }
100739
+
100740
+
100741
+
100742
+ var Component = (0,_formily_react__WEBPACK_IMPORTED_MODULE_1__.observer)(function (props) {
100743
+ var _props$columns = props.columns,
100744
+ columns = _props$columns === void 0 ? [] : _props$columns,
100745
+ field = props.field,
100746
+ others = _objectWithoutPropertiesLoose(props, _excluded);
100747
+ var onChange = function onChange(value) {
100748
+ field.setValue(value);
100749
+ };
100750
+ return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_table__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z, _extends({
100751
+ toolBar: false,
100752
+ showPagination: false,
100753
+ columns: columns,
100754
+ useRowSelection: true,
100755
+ rowSelection: {
100756
+ defaultSelectedRowKeys: field.value
100757
+ },
100758
+ onChangeRowSelection: onChange,
100759
+ loading: field.loading,
100760
+ showSkeleton: false,
100761
+ dataSource: field.dataSource
100762
+ }, others));
100763
+ });
100764
+ var SelectTable2 = (0,_formily_react__WEBPACK_IMPORTED_MODULE_1__.connect)(Component, (0,_formily_react__WEBPACK_IMPORTED_MODULE_1__.mapProps)(function (props, field) {
100765
+ var dataSource = field.dataSource;
100766
+ return _extends({}, props, {
100767
+ dataSource: dataSource,
100768
+ field: field
100769
+ });
100770
+ }));
100771
+ /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (SelectTable2);
100772
+
100773
+ /***/ }),
100774
+
100683
100775
  /***/ 70041:
100684
100776
  /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
100685
100777
 
@@ -102921,6 +103013,7 @@ var customComponent = function customComponent(component) {
102921
103013
  /* harmony import */ var _useInitialRequest__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(8550);
102922
103014
  /* harmony import */ var _locales_validate__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(67315);
102923
103015
  /* harmony import */ var _Components_FormItem2__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(54778);
103016
+ /* harmony import */ var _Components_SelectTable2__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(71661);
102924
103017
  var _excluded = ["form", "initialValues", "initialRequest", "scope", "context", "components", "onChange", "onChangeType", "onSubmit", "onSubmitFailed", "onInitialComplete", "className", "validateFirst", "schema", "children"];
102925
103018
  function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
102926
103019
  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; }
@@ -102943,6 +103036,7 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
102943
103036
 
102944
103037
 
102945
103038
 
103039
+
102946
103040
  (0,_formily_core__WEBPACK_IMPORTED_MODULE_2__.registerValidateLocale)(_locales_validate__WEBPACK_IMPORTED_MODULE_16__/* ["default"] */ .Z);
102947
103041
  var formilyComponents = {
102948
103042
  FormLayout: _teamix_formily__WEBPACK_IMPORTED_MODULE_4__.FormLayout,
@@ -102971,7 +103065,8 @@ var formilyComponents = {
102971
103065
  Affix: _alicloudfe_components__WEBPACK_IMPORTED_MODULE_5__.Affix,
102972
103066
  LightFilter: _Components_LightFilter__WEBPACK_IMPORTED_MODULE_10__/* ["default"] */ .Z,
102973
103067
  Text: _Components_Text_index__WEBPACK_IMPORTED_MODULE_11__/* ["default"] */ .Z,
102974
- FormItem2: _Components_FormItem2__WEBPACK_IMPORTED_MODULE_17__/* ["default"] */ .ZP
103068
+ FormItem2: _Components_FormItem2__WEBPACK_IMPORTED_MODULE_17__/* ["default"] */ .ZP,
103069
+ SelectTable2: _Components_SelectTable2__WEBPACK_IMPORTED_MODULE_18__/* ["default"] */ .Z
102975
103070
  };
102976
103071
  var ProForm = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(function (_ref) {
102977
103072
  var outerForm = _ref.form,
@@ -103390,7 +103485,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
103390
103485
  if (decorator !== undefined) {
103391
103486
  return decorator;
103392
103487
  }
103393
- if ([].concat(_toConsumableArray(Object.keys(_fieldTypeMap__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .ZP)), ['Upload', 'SelectTable', 'ArrayCards', 'ArrayCollapse', 'ArrayTable', 'ArrayItems']).includes(component)) {
103488
+ if ([].concat(_toConsumableArray(Object.keys(_fieldTypeMap__WEBPACK_IMPORTED_MODULE_0__/* ["default"] */ .ZP)), ['Upload', 'SelectTable', 'SelectTable2', 'ArrayCards', 'ArrayCollapse', 'ArrayTable', 'ArrayItems']).includes(component)) {
103394
103489
  return 'FormItem';
103395
103490
  }
103396
103491
  return decorator;
@@ -103455,7 +103550,8 @@ var typeMap = (_typeMap = {
103455
103550
  Range: 'string',
103456
103551
  Search: 'array',
103457
103552
  SelectGroup: 'array',
103458
- SelectTable: 'array'
103553
+ SelectTable: 'array',
103554
+ SelectTable2: 'array'
103459
103555
  }, _typeMap['SelectTable.Column'] = 'string', _typeMap.ArrayCollapse = 'array', _typeMap.ArrayCards = 'array', _typeMap.ArrayTable = 'array', _typeMap.ArrayItems = 'array', _typeMap['Editable.Popover'] = 'object', _typeMap['Editable.Dialog'] = 'object', _typeMap['Editable.Drawer'] = 'object', _typeMap);
103460
103556
  /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (function (type, component) {
103461
103557
  return type || typeMap[component] || 'void';
@@ -105527,7 +105623,7 @@ if (!((_window = window) != null && _window.TEAMIXPRO_WITHOUT_ICON)) {
105527
105623
 
105528
105624
 
105529
105625
 
105530
- var version = '1.5.33';
105626
+ var version = '1.5.34';
105531
105627
 
105532
105628
  // By TeamixTest
105533
105629
  window.postMessage({
@@ -110398,6 +110494,238 @@ var CardView = function CardView(props) {
110398
110494
 
110399
110495
  /***/ }),
110400
110496
 
110497
+ /***/ 24978:
110498
+ /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
110499
+
110500
+ "use strict";
110501
+ /* harmony export */ __webpack_require__.d(__webpack_exports__, {
110502
+ /* harmony export */ "Z": () => (__WEBPACK_DEFAULT_EXPORT__)
110503
+ /* harmony export */ });
110504
+ /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(59787);
110505
+ /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__);
110506
+ /* harmony import */ var _teamix_utils__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(80653);
110507
+ /* harmony import */ var _actions__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(28758);
110508
+ /* harmony import */ var _field__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(75241);
110509
+ function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
110510
+ 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."); }
110511
+ 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); }
110512
+ function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
110513
+ function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
110514
+ 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; }
110515
+ function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
110516
+ /**
110517
+ * 渲染列的逻辑函数
110518
+ */
110519
+
110520
+
110521
+
110522
+
110523
+ /**
110524
+ * 负责单元格的具体渲染
110525
+ */
110526
+ var Cell = function Cell(props) {
110527
+ var _actionSchema$actions;
110528
+ var recordValue = props.value,
110529
+ record = props.record,
110530
+ index = props.index,
110531
+ item = props.item,
110532
+ actionRef = props.actionRef,
110533
+ context = props.context,
110534
+ dataTeamixSpm = props.dataTeamixSpm;
110535
+ var _item$valueType = item.valueType,
110536
+ valueType = _item$valueType === void 0 ? 'text' : _item$valueType,
110537
+ render = item.render,
110538
+ actionSchema = item.actionSchema,
110539
+ dataIndex = item.dataIndex,
110540
+ format = item.format;
110541
+ var value = recordValue;
110542
+ // return JSON.stringify(value)
110543
+
110544
+ // 如果没传 dataIndex,返回 null
110545
+ if (!dataIndex) {
110546
+ value = null;
110547
+ }
110548
+
110549
+ // 处理 dataIndex 为数组的情况
110550
+ if (Array.isArray(dataIndex)) {
110551
+ value = dataIndex.map(function (item) {
110552
+ return (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_1__.getTargetValue)("{{" + item + "}}", _extends({}, record, {
110553
+ record: record
110554
+ }));
110555
+ });
110556
+ }
110557
+ var newRender = null;
110558
+ var newDataSource = null;
110559
+ var itemProps = item.props;
110560
+ // 如果 render 直接传函数
110561
+ if (typeof render === 'function') {
110562
+ newRender = function newRender() {
110563
+ return render == null ? void 0 : render(value, index, record);
110564
+ };
110565
+ } else {
110566
+ newRender = processBuriedPoint(processRenderFunction(render, value, index, record), record, value, index, context);
110567
+ if (valueType === 'selectGroup') {
110568
+ newRender = _extends({
110569
+ maxShowNumber: 'auto',
110570
+ foldText: 'more',
110571
+ editOnClick: function editOnClick() {},
110572
+ edit: true
110573
+ }, newRender, {
110574
+ ellipsis: false
110575
+ });
110576
+ itemProps = _extends({
110577
+ valueAlias: {
110578
+ value: 'TagValue',
110579
+ key: 'TagKey'
110580
+ }
110581
+ }, itemProps);
110582
+ }
110583
+ if ((render == null ? void 0 : render.type) === 'step') {
110584
+ newRender = _extends({}, newRender, {
110585
+ ellipsis: false
110586
+ });
110587
+ }
110588
+ }
110589
+
110590
+ // 渲染操作组
110591
+ if (actionSchema && (_actionSchema$actions = actionSchema.actions) != null && _actionSchema$actions.length) {
110592
+ // 默认 context
110593
+ var defaultContext = _extends({
110594
+ value: value,
110595
+ index: index,
110596
+ record: record,
110597
+ action: actionRef.current
110598
+ }, context);
110599
+ return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_actions__WEBPACK_IMPORTED_MODULE_2__/* .ProActionGroup */ .d5, _extends({
110600
+ type: "text"
110601
+ }, actionSchema, {
110602
+ context: _extends({}, defaultContext, actionSchema.context),
110603
+ "data-teamix-spm": dataTeamixSpm ? dataTeamixSpm + "-columnAction" : undefined
110604
+ }));
110605
+ }
110606
+
110607
+ // dataSource可传函数
110608
+ if (typeof item.dataSource === 'function') {
110609
+ newDataSource = item.dataSource == null ? void 0 : item.dataSource(value, index, record);
110610
+ } else {
110611
+ var _item$dataSource;
110612
+ newDataSource = ((_item$dataSource = item.dataSource) != null ? _item$dataSource : []).map(function (item) {
110613
+ return Object.fromEntries(Object.entries(item).map(function (_ref) {
110614
+ var k = _ref[0],
110615
+ v = _ref[1];
110616
+ return [k, (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_1__.getTargetValue)(v, _extends({}, record, {
110617
+ record: record,
110618
+ value: value,
110619
+ index: index
110620
+ }))];
110621
+ }));
110622
+ });
110623
+ }
110624
+
110625
+ // 渲染 ProField
110626
+ return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_field__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .ZP, _extends({
110627
+ type: valueType || 'text',
110628
+ value: value,
110629
+ render: newRender,
110630
+ dataSource: newDataSource,
110631
+ format: format
110632
+ // 预留 context 位置
110633
+ ,
110634
+ context: context
110635
+ }, itemProps));
110636
+ };
110637
+
110638
+ /**
110639
+ * 处理 render 配置项是函数的情况
110640
+ * @param render ProFieldRender
110641
+ * @param value table cell value
110642
+ * @param index table cell index
110643
+ * @param record table cell record
110644
+ * @returns
110645
+ */
110646
+ var processRenderFunction = function processRenderFunction(render, value, index, record) {
110647
+ if (render === void 0) {
110648
+ render = {};
110649
+ }
110650
+ // 当 ProField render 类型为 function 时。需要表格预先处理以塞入 record
110651
+ var external = ['linkOnClick', 'link', 'value', 'renderEdit', 'descriptionRenderEdit', 'editPopConfirmProps', 'descriptionEditPopConfirmProps', 'editOnClick', 'descriptionEditOnClick', 'extra', 'prefixExtra'];
110652
+ return Object.fromEntries(Object.entries(render).map(function (_ref2) {
110653
+ var k = _ref2[0],
110654
+ v = _ref2[1];
110655
+ if (typeof v === 'function') {
110656
+ var _v;
110657
+ if (external.includes(k)) {
110658
+ return [k, function () {
110659
+ for (var _len = arguments.length, others = new Array(_len), _key = 0; _key < _len; _key++) {
110660
+ others[_key] = arguments[_key];
110661
+ }
110662
+ return v == null ? void 0 : v.apply(void 0, [value, index, record].concat(others));
110663
+ }];
110664
+ }
110665
+ return [k, (_v = v == null ? void 0 : v(value, index, record)) != null ? _v : ''];
110666
+ }
110667
+ return [k, v];
110668
+ }));
110669
+ };
110670
+
110671
+ /**
110672
+ * 处理 render 数据,取出 {{xxx}} 匹配值
110673
+ * @param render ProFieldRender
110674
+ * @param record table cell record
110675
+ * @returns
110676
+ */
110677
+ var processBuriedPoint = function processBuriedPoint(render, record, value, index, context) {
110678
+ if (render === void 0) {
110679
+ render = {};
110680
+ }
110681
+ return Object.fromEntries([
110682
+ // 默认 ellipsis、descriptionEllipsis 为 true
110683
+ // emptyText 默认为 '-'
110684
+ ['ellipsis', true], ['descriptionEllipsis', true], ['emptyText', '-']].concat(_toConsumableArray(Object.entries(render).map(function (_ref3) {
110685
+ var k = _ref3[0],
110686
+ v = _ref3[1];
110687
+ return [k, (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_1__.getTargetValue)(v, _extends({}, record, {
110688
+ record: record,
110689
+ value: value,
110690
+ index: index
110691
+ }, context))];
110692
+ }))));
110693
+ };
110694
+ var equalColumns = function equalColumns(prevProps, nextProps) {
110695
+ var preValue = prevProps.value;
110696
+ var nextValue = nextProps.value;
110697
+
110698
+ // columns 强制更新参数
110699
+ if (nextProps != null && nextProps.forcedUpdate) {
110700
+ return false;
110701
+ }
110702
+
110703
+ // 操作列的时候强制刷新
110704
+ if (preValue === false && nextValue === false) {
110705
+ return false;
110706
+ }
110707
+ if (preValue === nextValue) {
110708
+ return true;
110709
+ }
110710
+
110711
+ // 针对 value 是数组类型的判断 value 是否和原来相等,相等则不渲染
110712
+ if (Array.isArray(nextValue) && Array.isArray(preValue)) {
110713
+ var nextValueStr = nextValue.map(function (item) {
110714
+ return item.TagValue;
110715
+ });
110716
+ var preValueStr = preValue.map(function (item) {
110717
+ return item.TagValue;
110718
+ });
110719
+ if (nextValueStr.toString() === preValueStr.toString()) {
110720
+ return true;
110721
+ }
110722
+ }
110723
+ return false;
110724
+ };
110725
+ /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (/*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().memo(Cell, equalColumns));
110726
+
110727
+ /***/ }),
110728
+
110401
110729
  /***/ 34166:
110402
110730
  /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
110403
110731
 
@@ -110748,7 +111076,7 @@ var Layout = function Layout(props) {
110748
111076
  };
110749
111077
 
110750
111078
  // 渲染新版 QueryFilter
110751
- var renderQueryFilter = function renderQueryFilter() {
111079
+ var renderQueryFilter = (0,react__WEBPACK_IMPORTED_MODULE_0__.useMemo)(function () {
110752
111080
  var _dataFilter$schema;
110753
111081
  if (dataFilter != null && (_dataFilter$schema = dataFilter.schema) != null && _dataFilter$schema.length) {
110754
111082
  var _dataFilter$schema2;
@@ -110810,7 +111138,13 @@ var Layout = function Layout(props) {
110810
111138
  }, afterDataFilter) : null
110811
111139
  }));
110812
111140
  }
110813
- };
111141
+ }, [
111142
+ //todo: 重复render 问题都在这里
111143
+ dataFilter,
111144
+ // todo: 有问题
111145
+ mainAction,
111146
+ // todo: 有问题
111147
+ dataFilterFormRef, afterDataFilter]);
110814
111148
 
110815
111149
  // 区域组合渲染
110816
111150
  var renderLayout = function renderLayout() {
@@ -110825,7 +111159,7 @@ var Layout = function Layout(props) {
110825
111159
  actionRef: actionRef,
110826
111160
  quickAction: extra,
110827
111161
  rowSelection: rowSelection
110828
- }))), renderQueryFilter());
111162
+ }))), renderQueryFilter);
110829
111163
  } else if (header && !mainAction) {
110830
111164
  var _dataFilter$schema3, _dataFilter$schema4;
110831
111165
  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
@@ -110838,14 +111172,14 @@ var Layout = function Layout(props) {
110838
111172
  actionRef: actionRef,
110839
111173
  quickAction: extra,
110840
111174
  rowSelection: rowSelection
110841
- }), !(dataFilter != null && (_dataFilter$schema3 = dataFilter.schema) != null && _dataFilter$schema3.length) && renderQueryFilter())), (dataFilter == null ? void 0 : (_dataFilter$schema4 = dataFilter.schema) == null ? void 0 : _dataFilter$schema4.length) && renderQueryFilter());
111175
+ }), !(dataFilter != null && (_dataFilter$schema3 = dataFilter.schema) != null && _dataFilter$schema3.length) && renderQueryFilter)), (dataFilter == null ? void 0 : (_dataFilter$schema4 = dataFilter.schema) == null ? void 0 : _dataFilter$schema4.length) && renderQueryFilter);
110842
111176
  } else if (!header && mainAction) {
110843
- return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, renderQueryFilter());
111177
+ return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, renderQueryFilter);
110844
111178
  } else if (!header && !mainAction) {
110845
111179
  if (!dataFilterFormRef && !extra) {
110846
111180
  return null;
110847
111181
  }
110848
- return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, renderQueryFilter());
111182
+ return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, renderQueryFilter);
110849
111183
  }
110850
111184
  };
110851
111185
  if (dataFilter != null && dataFilter.schema || mainAction || header || extra || toolBar !== false) {
@@ -110981,13 +111315,14 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
110981
111315
 
110982
111316
 
110983
111317
 
110984
- /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (function (props) {
111318
+ var ProPagination = function ProPagination(props) {
110985
111319
  var className = props.className,
110986
111320
  propsOnChange = props.onChange,
110987
111321
  total = props.total,
110988
111322
  pageSize = props.pageSize,
110989
111323
  current = props.current,
110990
- pageSizeList = props.pageSizeList,
111324
+ _props$pageSizeList = props.pageSizeList,
111325
+ pageSizeList = _props$pageSizeList === void 0 ? [5, 10, 20, 50, 100] : _props$pageSizeList,
110991
111326
  pageSizeSelector = props.pageSizeSelector,
110992
111327
  onPageSizeChange = props.onPageSizeChange,
110993
111328
  responsivePaginationType = props.responsivePaginationType,
@@ -111210,7 +111545,8 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
111210
111545
  className: prefixCls('wrapper')
111211
111546
  }, renderPagination())
111212
111547
  );
111213
- });
111548
+ };
111549
+ /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (/*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().memo(ProPagination));
111214
111550
 
111215
111551
  /***/ }),
111216
111552
 
@@ -111271,6 +111607,42 @@ var QuickAction = function QuickAction(props) {
111271
111607
 
111272
111608
  /***/ }),
111273
111609
 
111610
+ /***/ 84372:
111611
+ /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
111612
+
111613
+ "use strict";
111614
+ /* harmony export */ __webpack_require__.d(__webpack_exports__, {
111615
+ /* harmony export */ "Z": () => (__WEBPACK_DEFAULT_EXPORT__)
111616
+ /* harmony export */ });
111617
+ /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(59787);
111618
+ /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__);
111619
+ /* harmony import */ var _alicloudfe_components__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(33049);
111620
+ /* harmony import */ var _alicloudfe_components__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_1__);
111621
+ /* harmony import */ var _teamix_pro_field__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(35511);
111622
+ /* harmony import */ var _utils_getTableSortIcons__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(98806);
111623
+ var _excluded = ["emptyProps"];
111624
+ function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
111625
+ 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; }
111626
+
111627
+
111628
+
111629
+
111630
+ var TableContent = function TableContent(props) {
111631
+ var emptyProps = props.emptyProps,
111632
+ rest = _objectWithoutPropertiesLoose(props, _excluded);
111633
+ var memorizedEmptyContent = (0,react__WEBPACK_IMPORTED_MODULE_0__.useMemo)(function () {
111634
+ return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_teamix_pro_field__WEBPACK_IMPORTED_MODULE_2__/* .EmptyContent */ .z1, emptyProps);
111635
+ }, [emptyProps]);
111636
+ var memorizedGetTableSortIcons = (0,react__WEBPACK_IMPORTED_MODULE_0__.useMemo)(_utils_getTableSortIcons__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z, []);
111637
+ return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_1__.Table.StickyLock, _extends({
111638
+ sortIcons: memorizedGetTableSortIcons,
111639
+ emptyContent: memorizedEmptyContent
111640
+ }, rest));
111641
+ };
111642
+ /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (TableContent);
111643
+
111644
+ /***/ }),
111645
+
111274
111646
  /***/ 18418:
111275
111647
  /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
111276
111648
 
@@ -112398,26 +112770,25 @@ var ToolBar = function ToolBar(props) {
112398
112770
  /* harmony import */ var _alicloudfe_components__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(33049);
112399
112771
  /* harmony import */ var _alicloudfe_components__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_1__);
112400
112772
  /* harmony import */ var _components_Pagination__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(33977);
112401
- /* harmony import */ var _utils_genProColumnToColumn__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(40339);
112402
- /* harmony import */ var _teamix_utils__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(80653);
112403
- /* harmony import */ var _skeleton__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(53277);
112773
+ /* harmony import */ var _components_TableContent__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(84372);
112774
+ /* harmony import */ var _utils_genProColumnToColumn__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(40339);
112775
+ /* harmony import */ var _teamix_utils__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(80653);
112404
112776
  /* harmony import */ var _components_Layout__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(9458);
112405
112777
  /* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(90450);
112406
- /* harmony import */ var _utils_getTableProps__WEBPACK_IMPORTED_MODULE_20__ = __webpack_require__(78964);
112407
- /* harmony import */ var _utils_getTableSortIcons__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(98806);
112408
- /* harmony import */ var _utils_useTableSelection__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(23779);
112409
- /* harmony import */ var _components_ToolBar_Fullscreen__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(21630);
112410
- /* harmony import */ var _teamix_pro_field__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(35511);
112411
- /* harmony import */ var _actions__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(28758);
112412
- /* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(28266);
112413
- /* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_13___default = /*#__PURE__*/__webpack_require__.n(classnames__WEBPACK_IMPORTED_MODULE_13__);
112414
- /* harmony import */ var _page_container__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(2781);
112415
- /* harmony import */ var _utils_genAutoWidthColumns__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(79389);
112416
- /* harmony import */ var lodash_debounce__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(39339);
112417
- /* harmony import */ var lodash_debounce__WEBPACK_IMPORTED_MODULE_16___default = /*#__PURE__*/__webpack_require__.n(lodash_debounce__WEBPACK_IMPORTED_MODULE_16__);
112418
- /* harmony import */ var _components_CardView__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(9285);
112419
- /* harmony import */ var _teamix_hooks__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(42341);
112420
- /* harmony import */ var _utils_util__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(49618);
112778
+ /* harmony import */ var _utils_getTableProps__WEBPACK_IMPORTED_MODULE_19__ = __webpack_require__(78964);
112779
+ /* harmony import */ var _utils_useTableSelection__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(45458);
112780
+ /* harmony import */ var _components_ToolBar_Fullscreen__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(21630);
112781
+ /* harmony import */ var _actions__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(28758);
112782
+ /* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(28266);
112783
+ /* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_11___default = /*#__PURE__*/__webpack_require__.n(classnames__WEBPACK_IMPORTED_MODULE_11__);
112784
+ /* harmony import */ var _page_container__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(2781);
112785
+ /* harmony import */ var _utils_genAutoWidthColumns__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(79389);
112786
+ /* harmony import */ var lodash_debounce__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(39339);
112787
+ /* harmony import */ var lodash_debounce__WEBPACK_IMPORTED_MODULE_14___default = /*#__PURE__*/__webpack_require__.n(lodash_debounce__WEBPACK_IMPORTED_MODULE_14__);
112788
+ /* harmony import */ var _components_CardView__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(9285);
112789
+ /* harmony import */ var _teamix_hooks__WEBPACK_IMPORTED_MODULE_16__ = __webpack_require__(42341);
112790
+ /* harmony import */ var _utils_util__WEBPACK_IMPORTED_MODULE_18__ = __webpack_require__(49618);
112791
+ /* harmony import */ var _utils_processColumns__WEBPACK_IMPORTED_MODULE_17__ = __webpack_require__(90807);
112421
112792
  var _excluded = ["header", "className", "tableClassName", "mainAction", "extra", "dataFilter", "afterDataFilter", "toolBar", "columns", "useRowSelection", "rowSelection", "onChangeRowSelection", "getRowSelection", "primaryKey", "footerAction", "footer", "url", "pageKey", "pageSizeKey", "method", "params", "formatSort", "formatParams", "formatResult", "requestConfig", "requestWhenMount", "showPagination", "pageSizeList", "responsivePaginationType", "showSkeleton", "skeletonSize", "actionRef", "dataSource", "filterDebounce", "footerSuction", "autoRefresh", "autoRefreshProps", "customRequest", "filterColumnType", "defaultFilterParams", "reserveSelectedRecords", "size", "disableSelectAll", "context", "autoWidth", "fixedTableBody", "isTree", "toolBarAutoWidth", "data-teamix-spm", "switchCardView", "cardViewProps", "defaultView", "emptyProps", "bindUrlProps", "bindUrl", "autoRedirect", "useMaxData"],
112422
112793
  _excluded2 = ["onChange", "onPageSizeChange"];
112423
112794
  function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
@@ -112426,8 +112797,8 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
112426
112797
  function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
112427
112798
  function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
112428
112799
  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; }
112429
- 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; }
112430
112800
  function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
112801
+ 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; }
112431
112802
 
112432
112803
 
112433
112804
 
@@ -112450,43 +112821,7 @@ function _extends() { _extends = Object.assign ? Object.assign.bind() : function
112450
112821
 
112451
112822
 
112452
112823
 
112453
-
112454
- var cls = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_4__.usePrefixCls)('teamix-pro-table');
112455
-
112456
- /**
112457
- * 处理原生传入的 columns 以便于 选择列 方便处理
112458
- * @param columns 原生传入的 columns
112459
- * @returns
112460
- */
112461
- var processColumns = function processColumns(columns, initialColumns) {
112462
- var _getGlobalConfig;
112463
- var globalFilterColumns = (_getGlobalConfig = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_4__.getGlobalConfig)('ProTable')) == null ? void 0 : _getGlobalConfig.filterColumns;
112464
- var filterColumns = columns.filter(function (item) {
112465
- return item.columnFilters !== false && (item == null ? void 0 : item.hidden) !== true && (!globalFilterColumns || globalFilterColumns(_extends({}, item)));
112466
- });
112467
- // 处理只剩一列批量选择的情况下宽度错乱问题
112468
- if (filterColumns != null && filterColumns.length) {
112469
- var _initialColumns$;
112470
- if ((filterColumns == null ? void 0 : filterColumns.length) === 1) {
112471
- var _filterColumns$, _filterColumns$2;
112472
- if ((_filterColumns$ = filterColumns[0]) != null && _filterColumns$.width) {
112473
- delete filterColumns[0].width;
112474
- }
112475
- if ((_filterColumns$2 = filterColumns[0]) != null && _filterColumns$2.lock) {
112476
- filterColumns[0].lock = false;
112477
- }
112478
- } else if (((_initialColumns$ = initialColumns[0]) == null ? void 0 : _initialColumns$.columnFilters) !== false) {
112479
- var _initialColumns$2, _initialColumns$3;
112480
- if ((_initialColumns$2 = initialColumns[0]) != null && _initialColumns$2.width) {
112481
- filterColumns[0].width = initialColumns[0].width;
112482
- }
112483
- if ((_initialColumns$3 = initialColumns[0]) != null && _initialColumns$3.lock) {
112484
- filterColumns[0].lock = initialColumns[0].lock;
112485
- }
112486
- }
112487
- }
112488
- return filterColumns;
112489
- };
112824
+ var cls = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_5__.usePrefixCls)('teamix-pro-table');
112490
112825
 
112491
112826
  /** 默认请求翻页参数 */
112492
112827
  var globalPageKey = 'currentPage';
@@ -112584,7 +112919,7 @@ var ProTable = function ProTable(props) {
112584
112919
  var targetPageKey = pageKey || globalPageKey;
112585
112920
  var targetPageSizeKey = pageSizeKey || globalPageSizeKey;
112586
112921
  var targetFormatSort = formatSort || globalFormatSort;
112587
- var _ref = bindUrl ? (0,_teamix_hooks__WEBPACK_IMPORTED_MODULE_18__.useUrlState)() : [],
112922
+ var _ref = bindUrl ? (0,_teamix_hooks__WEBPACK_IMPORTED_MODULE_16__.useUrlState)() : [],
112588
112923
  urlState = _ref[0],
112589
112924
  setUrlState = _ref[1];
112590
112925
  var _useState = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)((_urlState$currentPage = urlState == null ? void 0 : urlState.currentPage) != null ? _urlState$currentPage : 1),
@@ -112605,7 +112940,9 @@ var ProTable = function ProTable(props) {
112605
112940
  var _useState6 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(!propsDataSource && requestWhenMount && propsShowSkeleton),
112606
112941
  showSkeleton = _useState6[0],
112607
112942
  setShowSkeleton = _useState6[1]; // 首次加载,渲染骨架屏
112608
- var skeletonDataSource = new Array(skeletonSize).fill({});
112943
+ var skeletonDataSource = (0,react__WEBPACK_IMPORTED_MODULE_0__.useMemo)(function () {
112944
+ return new Array(skeletonSize).fill({});
112945
+ }, [skeletonSize]);
112609
112946
  var requestDataKey = method.toLowerCase() === 'get' ? 'params' : 'data';
112610
112947
  // 如果使用 customRequest 的话,内置 loading
112611
112948
  var _useState7 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(requestWhenMount),
@@ -112614,14 +112951,14 @@ var ProTable = function ProTable(props) {
112614
112951
  var tableRef = (0,react__WEBPACK_IMPORTED_MODULE_0__.useRef)(null);
112615
112952
  var actionRef = (0,react__WEBPACK_IMPORTED_MODULE_0__.useRef)();
112616
112953
  // 传给 table 的过滤后的 columns
112617
- var _useState8 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(processColumns(propsColumns != null ? propsColumns : [], propsColumns)),
112954
+ var _useState8 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)((0,_utils_processColumns__WEBPACK_IMPORTED_MODULE_17__/* ["default"] */ .Z)(propsColumns != null ? propsColumns : [], propsColumns)),
112618
112955
  filteredColumns = _useState8[0],
112619
112956
  setFilteredColumns = _useState8[1];
112620
112957
 
112621
112958
  // 全局状态 : 自适应表格
112622
112959
  var autoWidth = (0,react__WEBPACK_IMPORTED_MODULE_0__.useMemo)(function () {
112623
- var _getGlobalConfig2;
112624
- return ((_getGlobalConfig2 = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_4__.getGlobalConfig)('ProTable')) == null ? void 0 : _getGlobalConfig2.autoWidth) || autoWidthProp;
112960
+ var _getGlobalConfig;
112961
+ return ((_getGlobalConfig = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_5__.getGlobalConfig)('ProTable')) == null ? void 0 : _getGlobalConfig.autoWidth) || autoWidthProp;
112625
112962
  }, [autoWidthProp]);
112626
112963
 
112627
112964
  // 判断是否有操作列,有的话则渲染一个 shadow dom
@@ -112698,7 +113035,7 @@ var ProTable = function ProTable(props) {
112698
113035
  getFooterSuctionState();
112699
113036
  if (window.onresize) {
112700
113037
  onResize = window.onresize;
112701
- window.onresize = lodash_debounce__WEBPACK_IMPORTED_MODULE_16___default()(function () {
113038
+ window.onresize = lodash_debounce__WEBPACK_IMPORTED_MODULE_14___default()(function () {
112702
113039
  onResize == null ? void 0 : onResize();
112703
113040
  if (footerSuction) {
112704
113041
  getFooterSuctionState();
@@ -112708,7 +113045,7 @@ var ProTable = function ProTable(props) {
112708
113045
  }
112709
113046
  }, 500);
112710
113047
  } else {
112711
- window.onresize = lodash_debounce__WEBPACK_IMPORTED_MODULE_16___default()(function () {
113048
+ window.onresize = lodash_debounce__WEBPACK_IMPORTED_MODULE_14___default()(function () {
112712
113049
  if (footerSuction) {
112713
113050
  getFooterSuctionState();
112714
113051
  }
@@ -112745,7 +113082,7 @@ var ProTable = function ProTable(props) {
112745
113082
  }
112746
113083
  var tableDom = tableRef.current;
112747
113084
  var headerDom = tableDom == null ? void 0 : (_tableDom$getElements = tableDom.getElementsByClassName('teamix-pro-table-layout')) == null ? void 0 : _tableDom$getElements[0];
112748
- var basePrefix = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_4__.usePrefixCls)('', {
113085
+ var basePrefix = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_5__.usePrefixCls)('', {
112749
113086
  base: true
112750
113087
  });
112751
113088
  var tableHeaderDom = tableDom == null ? void 0 : (_tableDom$getElements2 = tableDom.getElementsByClassName(basePrefix('table-header-inner'))) == null ? void 0 : _tableDom$getElements2[0];
@@ -112819,8 +113156,8 @@ var ProTable = function ProTable(props) {
112819
113156
 
112820
113157
  // 全局状态 : 大数据截断
112821
113158
  var globalUseMaxData = (0,react__WEBPACK_IMPORTED_MODULE_0__.useMemo)(function () {
112822
- var _getGlobalConfig3;
112823
- return (_getGlobalConfig3 = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_4__.getGlobalConfig)('ProTable')) == null ? void 0 : _getGlobalConfig3.useMaxData;
113159
+ var _getGlobalConfig2;
113160
+ return (_getGlobalConfig2 = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_5__.getGlobalConfig)('ProTable')) == null ? void 0 : _getGlobalConfig2.useMaxData;
112824
113161
  }, []);
112825
113162
 
112826
113163
  // 非全屏状态下的
@@ -112861,7 +113198,7 @@ var ProTable = function ProTable(props) {
112861
113198
  };
112862
113199
 
112863
113200
  // rowSelection 相关
112864
- var rowSelectionHook = (0,_utils_useTableSelection__WEBPACK_IMPORTED_MODULE_9__/* ["default"] */ .Z)(_extends({}, propsRowSelection, {
113201
+ var rowSelectionHook = (0,_utils_useTableSelection__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z)(_extends({}, propsRowSelection, {
112865
113202
  // 当初始出现骨架屏的时候,不可选择
112866
113203
  getProps: function getProps(record, index) {
112867
113204
  var result = {};
@@ -112871,7 +113208,9 @@ var ProTable = function ProTable(props) {
112871
113208
  if (showSkeleton && result) {
112872
113209
  result.disabled = true;
112873
113210
  }
112874
- return result;
113211
+ return _extends({
113212
+ _primaryKey: props.primaryKey
113213
+ }, result);
112875
113214
  },
112876
113215
  titleProps: function titleProps() {
112877
113216
  var result = {};
@@ -112906,7 +113245,7 @@ var ProTable = function ProTable(props) {
112906
113245
  var _getProps;
112907
113246
  return getProps ? !((_getProps = getProps(d, i)) != null && _getProps.disabled) : true;
112908
113247
  }).map(function (d) {
112909
- return (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_4__.getDeepValue)(primaryKey || 'id', d);
113248
+ return (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_5__.getDeepValue)(primaryKey || 'id', d);
112910
113249
  });
112911
113250
  var nowCheckedKeys = allRowKeys.filter(function (k) {
112912
113251
  return selectedRowKeys.includes(k);
@@ -112940,15 +113279,26 @@ var ProTable = function ProTable(props) {
112940
113279
  }, [propsActionRef]);
112941
113280
  (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
112942
113281
  var _actionRef$current;
112943
- var columns = processColumns(propsColumns != null ? propsColumns : [], propsColumns);
113282
+ var columns = (0,_utils_processColumns__WEBPACK_IMPORTED_MODULE_17__/* ["default"] */ .Z)(propsColumns != null ? propsColumns : [], propsColumns);
112944
113283
  setFilteredColumns(columns);
112945
113284
  (_actionRef$current = actionRef.current) == null ? void 0 : _actionRef$current.setState == null ? void 0 : _actionRef$current.setState('filterColumns', columns);
113285
+ if (autoWidth) {
113286
+ reGenFilteredColumnsByAutoWidth(columns);
113287
+ }
112946
113288
  }, [propsColumns]);
112947
113289
 
112948
113290
  // dataSource 受控
112949
113291
  (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
112950
113292
  if (propsDataSource) {
112951
113293
  _setData(propsDataSource);
113294
+ if (autoWidth) {
113295
+ (0,_utils_genAutoWidthColumns__WEBPACK_IMPORTED_MODULE_13__/* .shadowContainer */ .yV)({
113296
+ columns: filteredColumns,
113297
+ data: propsDataSource,
113298
+ shadowContainerRef: shadowContainerRef
113299
+ });
113300
+ reGenFilteredColumnsByAutoWidth();
113301
+ }
112952
113302
  }
112953
113303
  }, [propsDataSource]);
112954
113304
 
@@ -113002,7 +113352,7 @@ var ProTable = function ProTable(props) {
113002
113352
  if (update === void 0) {
113003
113353
  update = true;
113004
113354
  }
113005
- var columns = processColumns(newColumns, propsColumns);
113355
+ var columns = (0,_utils_processColumns__WEBPACK_IMPORTED_MODULE_17__/* ["default"] */ .Z)(newColumns, propsColumns);
113006
113356
  setFilteredColumns(columns);
113007
113357
  (_actionRef$current3 = actionRef.current) == null ? void 0 : _actionRef$current3.setState == null ? void 0 : _actionRef$current3.setState('filterColumns', columns);
113008
113358
  if (update) {
@@ -113138,7 +113488,7 @@ var ProTable = function ProTable(props) {
113138
113488
  return;
113139
113489
  }
113140
113490
  setShowShadowContainer(true);
113141
- var authWidthedColumns = (0,_utils_genAutoWidthColumns__WEBPACK_IMPORTED_MODULE_15__/* .genAutoWidthColumns */ .ie)(columns != null ? columns : filteredColumns, shadowContainerRef, data, size, useRowSelection, shadowActionColumnContainerRef);
113491
+ var authWidthedColumns = (0,_utils_genAutoWidthColumns__WEBPACK_IMPORTED_MODULE_13__/* .genAutoWidthColumns */ .ie)(columns != null ? columns : filteredColumns, shadowContainerRef, data, size, useRowSelection, shadowActionColumnContainerRef);
113142
113492
  setFilteredColumns(authWidthedColumns);
113143
113493
  // 移除 shadow dom
113144
113494
  // setTimeout(() => {
@@ -113173,7 +113523,9 @@ var ProTable = function ProTable(props) {
113173
113523
  if (Number.isInteger(time) && time >= 1000) {
113174
113524
  autoRefreshTimerRef.current = setTimeout(function () {
113175
113525
  // 自动刷新不显示 loading
113176
- _request({}, true);
113526
+ // 当表格自适应时,自动刷新要显示 loading ,否则表格自适应会出问题
113527
+ // setShowLoading(true)
113528
+ _request({}, !autoWidth);
113177
113529
  }, Number(time));
113178
113530
  (0,_utils__WEBPACK_IMPORTED_MODULE_7__/* .emit */ .j8)('PRO_TABLE_REFRESH_TIMER_FLAG', Number(time));
113179
113531
  }
@@ -113195,7 +113547,7 @@ var ProTable = function ProTable(props) {
113195
113547
  }
113196
113548
 
113197
113549
  // 请求表格数据工具函数
113198
- var getData = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_4__.useRequest)(function (params) {
113550
+ var getData = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_5__.useRequest)(function (params) {
113199
113551
  var _ref5;
113200
113552
  return _ref5 = {
113201
113553
  url: url,
@@ -113205,7 +113557,7 @@ var ProTable = function ProTable(props) {
113205
113557
  // 使用 request 方法代替 fetch
113206
113558
  requestMethod: function requestMethod(params) {
113207
113559
  // 支持使用 requestConfig 自定义请求配置
113208
- return (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_4__.request)(_extends({}, params, requestConfig));
113560
+ return (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_5__.request)(_extends({}, params, requestConfig));
113209
113561
  },
113210
113562
  manual: true,
113211
113563
  onSuccess: function onSuccess(result) {
@@ -113215,13 +113567,13 @@ var ProTable = function ProTable(props) {
113215
113567
  if (typeof formatResult === 'function') {
113216
113568
  nextData = formatResult(result) || {};
113217
113569
  } else if (typeof formatResult === 'object') {
113218
- var dataTotal = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_4__.getDeepValue)(formatResult.total, result);
113570
+ var dataTotal = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_5__.getDeepValue)(formatResult.total, result);
113219
113571
  nextData = {
113220
- data: (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_4__.getDeepValue)(formatResult.data, result) || [],
113572
+ data: (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_5__.getDeepValue)(formatResult.data, result) || [],
113221
113573
  total: isNaN(dataTotal) ? 0 : Number(dataTotal)
113222
113574
  };
113223
113575
  } else if (typeof formatResult === 'string') {
113224
- nextData = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_4__.getTargetValue)(formatResult, {
113576
+ nextData = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_5__.getTargetValue)(formatResult, {
113225
113577
  res: result
113226
113578
  });
113227
113579
  }
@@ -113261,11 +113613,11 @@ var ProTable = function ProTable(props) {
113261
113613
  });
113262
113614
 
113263
113615
  // 请求函数
113264
- function _request(params, noLoading, filterParams, isReset) {
113616
+ var _request = (0,react__WEBPACK_IMPORTED_MODULE_0__.useCallback)(function (params, noLoading, filterParams, isReset) {
113265
113617
  var _dataFilterFormRef$cu2, _actionRef$current$ge, _actionRef$current6, _extends3;
113266
113618
  // 首次渲染表格,获取 urlState 上的 表头 filter 数据
113267
113619
  if (bindUrl && (bindUrlProps == null ? void 0 : bindUrlProps.headerFilters) !== false && dataRef.current.flag) {
113268
- (0,_utils_util__WEBPACK_IMPORTED_MODULE_19__/* .getUrlStateFilter */ .a)(urlState != null ? urlState : {}, actionRef);
113620
+ (0,_utils_util__WEBPACK_IMPORTED_MODULE_18__/* .getUrlStateFilter */ .a)(urlState != null ? urlState : {}, actionRef);
113269
113621
  dataRef.current.flag = false;
113270
113622
  }
113271
113623
 
@@ -113287,7 +113639,7 @@ var ProTable = function ProTable(props) {
113287
113639
  var requestData = {};
113288
113640
  var preParams = _extends({}, !showPagination ? _extends({}, dataFilterParams, propsParams, sortParams, columnsFilterParams) : _extends((_extends3 = {}, _extends3[targetPageKey] = currentPage, _extends3[targetPageSizeKey] = pageSize, _extends3), dataFilterParams, propsParams, sortParams, columnsFilterParams), params);
113289
113641
  if (typeof formatParams === 'string') {
113290
- requestData = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_4__.getTargetValue)(formatParams, {
113642
+ requestData = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_5__.getTargetValue)(formatParams, {
113291
113643
  params: preParams
113292
113644
  });
113293
113645
  } else {
@@ -113371,7 +113723,7 @@ var ProTable = function ProTable(props) {
113371
113723
  if (Number.isInteger(time) && time >= 1000) {
113372
113724
  autoRefreshTimerRef.current = setTimeout(function () {
113373
113725
  // 自动刷新不显示 loading
113374
- _request(params, true);
113726
+ _request(params, !autoWidth);
113375
113727
  }, Number(time));
113376
113728
  (0,_utils__WEBPACK_IMPORTED_MODULE_7__/* .emit */ .j8)('PRO_TABLE_REFRESH_TIMER_FLAG', Number(time));
113377
113729
  }
@@ -113382,62 +113734,73 @@ var ProTable = function ProTable(props) {
113382
113734
  getData.run(requestData);
113383
113735
  }
113384
113736
  }
113385
- }
113386
- function onSort(dataIndex, order) {
113737
+ }, [bindUrl, bindUrlProps, dataRef, url, customRequest, currentPage, pageSize, propsParams]);
113738
+ var onSort = (0,react__WEBPACK_IMPORTED_MODULE_0__.useCallback)(function (dataIndex, order) {
113387
113739
  var _nextSort;
113388
113740
  var nextSort = (_nextSort = {}, _nextSort[dataIndex] = order, _nextSort);
113389
113741
  setSort(nextSort);
113390
113742
  _request(targetFormatSort(nextSort));
113391
- }
113743
+ }, [_request, targetFormatSort]);
113392
113744
 
113393
113745
  // 处理 dataFilter 中的 onFilter、onReset
113394
- var dataFilter = _extends({
113395
- mode: 'inline',
113396
- forceClear: true
113397
- }, propsDataFilter, {
113398
- onInit: propsDataFilter != null && propsDataFilter.onInit || requestWhenMount ? function (values) {
113399
- // 表单初始化请求处理
113400
- propsDataFilter == null ? void 0 : propsDataFilter.onInit == null ? void 0 : propsDataFilter.onInit(values);
113401
- !fullscreenState && requestWhenMount && _request({}, false, values);
113402
- return true;
113403
- } : undefined,
113404
- onFilter: function onFilter(values) {
113405
- var _actionRef$current7, _request8;
113406
- // 全屏状态,判断全屏表单onFilter是否禁用
113407
- if (fullscreenState && !filterEnableRef.current.fullscreen) {
113408
- filterEnableRef.current.fullscreen = true;
113409
- return;
113410
- }
113411
- // 非全屏状态,判断普通表单onFiler是否禁用
113412
- if (!fullscreenState && !filterEnableRef.current.normal) {
113413
- filterEnableRef.current.normal = true;
113414
- return;
113746
+ var dataFilter = (0,react__WEBPACK_IMPORTED_MODULE_0__.useMemo)(function () {
113747
+ return _extends({
113748
+ mode: 'inline',
113749
+ forceClear: true
113750
+ }, propsDataFilter, {
113751
+ onInit: propsDataFilter != null && propsDataFilter.onInit || requestWhenMount ? function (values) {
113752
+ // 表单初始化请求处理
113753
+ propsDataFilter == null ? void 0 : propsDataFilter.onInit == null ? void 0 : propsDataFilter.onInit(values);
113754
+ !fullscreenState && requestWhenMount && _request({}, false, values);
113755
+ return true;
113756
+ } : undefined,
113757
+ onFilter: function onFilter(values) {
113758
+ var _actionRef$current7, _request8;
113759
+ // 全屏状态,判断全屏表单onFilter是否禁用
113760
+ if (fullscreenState && !filterEnableRef.current.fullscreen) {
113761
+ filterEnableRef.current.fullscreen = true;
113762
+ return;
113763
+ }
113764
+ // 非全屏状态,判断普通表单onFiler是否禁用
113765
+ if (!fullscreenState && !filterEnableRef.current.normal) {
113766
+ filterEnableRef.current.normal = true;
113767
+ return;
113768
+ }
113769
+ (propsDataFilter == null ? void 0 : propsDataFilter.onFilter) && (propsDataFilter == null ? void 0 : propsDataFilter.onFilter(values));
113770
+ // 搜索变化时,暂时先清空选择
113771
+ (_actionRef$current7 = actionRef.current) == null ? void 0 : _actionRef$current7.clearRowSelection == null ? void 0 : _actionRef$current7.clearRowSelection();
113772
+ setCurrentPage(1);
113773
+ _request((_request8 = {}, _request8[targetPageKey] = 1, _request8), false, values);
113774
+ },
113775
+ onReset: function onReset(values) {
113776
+ var _dataFilterFormRef$cu3, _request9;
113777
+ (propsDataFilter == null ? void 0 : propsDataFilter.onReset) && (propsDataFilter == null ? void 0 : propsDataFilter.onReset());
113778
+ (_dataFilterFormRef$cu3 = dataFilterFormRef.current) == null ? void 0 : _dataFilterFormRef$cu3.reset();
113779
+ setCurrentPage(1);
113780
+ _request((_request9 = {}, _request9[targetPageKey] = 1, _request9), false, values);
113415
113781
  }
113416
- (propsDataFilter == null ? void 0 : propsDataFilter.onFilter) && (propsDataFilter == null ? void 0 : propsDataFilter.onFilter(values));
113417
- // 搜索变化时,暂时先清空选择
113418
- (_actionRef$current7 = actionRef.current) == null ? void 0 : _actionRef$current7.clearRowSelection == null ? void 0 : _actionRef$current7.clearRowSelection();
113419
- setCurrentPage(1);
113420
- _request((_request8 = {}, _request8[targetPageKey] = 1, _request8), false, values);
113421
- },
113422
- onReset: function onReset(values) {
113423
- var _dataFilterFormRef$cu3, _request9;
113424
- (propsDataFilter == null ? void 0 : propsDataFilter.onReset) && (propsDataFilter == null ? void 0 : propsDataFilter.onReset());
113425
- (_dataFilterFormRef$cu3 = dataFilterFormRef.current) == null ? void 0 : _dataFilterFormRef$cu3.reset();
113426
- setCurrentPage(1);
113427
- _request((_request9 = {}, _request9[targetPageKey] = 1, _request9), false, values);
113428
- }
113429
- });
113430
- var getTableLoading = function getTableLoading() {
113782
+ });
113783
+ }, [propsDataFilter, fullscreenState, filterEnableRef, actionRef]);
113784
+ var isLoading = (0,react__WEBPACK_IMPORTED_MODULE_0__.useMemo)(function () {
113431
113785
  if (!customRequest) {
113432
113786
  return showLoading && !showSkeleton && (getData.loading || props.loading);
113433
113787
  } else {
113434
113788
  return showLoading && !showSkeleton && (customTableLoading || props.loading);
113435
113789
  }
113436
- };
113790
+ }, [customRequest, showLoading, showSkeleton, customTableLoading, props.loading, getData]);
113791
+ (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
113792
+ if (autoWidth) {
113793
+ reGenFilteredColumnsByAutoWidth();
113794
+ }
113795
+ }, [shadowContainerRef == null ? void 0 : shadowContainerRef.current]);
113796
+ var memorizedGenProColumnToColumn = (0,react__WEBPACK_IMPORTED_MODULE_0__.useMemo)(function () {
113797
+ var result = (0,_utils_genProColumnToColumn__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(filteredColumns, showSkeleton, actionRef, context, dataTeamixSpm, bindUrl, bindUrlProps);
113798
+ return result;
113799
+ }, [filteredColumns, showSkeleton, actionRef, context, dataTeamixSpm, bindUrl, bindUrlProps]);
113437
113800
  var renderTable = function renderTable(isFullScreen) {
113438
113801
  if (propsColumns) {
113439
113802
  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
113440
- className: classnames__WEBPACK_IMPORTED_MODULE_13___default()('teamix-pro-table-container', className),
113803
+ className: classnames__WEBPACK_IMPORTED_MODULE_11___default()('teamix-pro-table-container', className),
113441
113804
  "data-teamix-spm": dataTeamixSpm
113442
113805
  }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_components_Layout__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .Z, {
113443
113806
  header: header,
@@ -113460,12 +113823,16 @@ var ProTable = function ProTable(props) {
113460
113823
  autoRefreshProps: autoRefreshProps,
113461
113824
  bindUrlProps: bindUrlProps,
113462
113825
  bindUrl: bindUrl
113463
- }), switchViewState === 'table' && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_1__.Table.StickyLock, _extends({
113826
+ }), autoWidth && (0,_utils_genAutoWidthColumns__WEBPACK_IMPORTED_MODULE_13__/* .shadowContainer */ .yV)({
113827
+ columns: filteredColumns,
113828
+ data: data,
113829
+ shadowContainerRef: shadowContainerRef
113830
+ }), hasActionColumn && (0,_utils_genAutoWidthColumns__WEBPACK_IMPORTED_MODULE_13__/* .shadowActionColumnContainer */ .tG)(filteredColumns, shadowActionColumnContainerRef), switchViewState === 'table' && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_components_TableContent__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z, _extends({
113464
113831
  hasBorder: false,
113465
113832
  dataSource: showSkeleton ? skeletonDataSource : data || props.dataSource,
113466
- columns: (0,_utils_genProColumnToColumn__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(filteredColumns, showSkeleton, actionRef, context, dataTeamixSpm, bindUrl, bindUrlProps),
113467
- loading: getTableLoading(),
113468
- className: classnames__WEBPACK_IMPORTED_MODULE_13___default()('teamix-pro-table', tableClassName, {
113833
+ columns: memorizedGenProColumnToColumn,
113834
+ loading: isLoading,
113835
+ className: classnames__WEBPACK_IMPORTED_MODULE_11___default()('teamix-pro-table', tableClassName, {
113469
113836
  'with-row-select': rowSelection,
113470
113837
  'teamix-pro-tree-table': isTree
113471
113838
  }),
@@ -113475,21 +113842,19 @@ var ProTable = function ProTable(props) {
113475
113842
  sort: sort,
113476
113843
  primaryKey: primaryKey,
113477
113844
  rowSelection: rowSelection,
113478
- emptyContent: /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_teamix_pro_field__WEBPACK_IMPORTED_MODULE_11__/* .EmptyContent */ .z1, emptyProps),
113479
- sortIcons: (0,_utils_getTableSortIcons__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z)(),
113480
113845
  fixedHeader: fullscreenState || fixedTableBody,
113481
113846
  maxBodyHeight: "calc(100vh - " + headerHeight + "px)"
113482
113847
  // 过滤出可以传到 Table 的 Props
113483
- }, (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_4__.pickProps)((0,_utils_getTableProps__WEBPACK_IMPORTED_MODULE_20__/* ["default"] */ .Z)(), otherProps))), switchViewState === 'card' && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_components_CardView__WEBPACK_IMPORTED_MODULE_17__/* ["default"] */ .Z, {
113848
+ }, (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_5__.pickProps)((0,_utils_getTableProps__WEBPACK_IMPORTED_MODULE_19__/* ["default"] */ .Z)(), otherProps))), switchViewState === 'card' && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_components_CardView__WEBPACK_IMPORTED_MODULE_15__/* ["default"] */ .Z, {
113484
113849
  dataSource: showSkeleton ? skeletonDataSource : data || props.dataSource,
113485
113850
  showSkeleton: showSkeleton,
113486
- loading: getTableLoading(),
113851
+ loading: isLoading,
113487
113852
  originColumns: propsColumns,
113488
113853
  cardViewProps: cardViewProps,
113489
113854
  scrollHeight: fullscreenState || fixedTableBody ? "calc(100vh - " + headerHeight + "px)" : undefined,
113490
113855
  actionRef: actionRef,
113491
113856
  context: context,
113492
- columns: (0,_utils_genProColumnToColumn__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z)(filteredColumns, showSkeleton, actionRef, context),
113857
+ columns: (0,_utils_genProColumnToColumn__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(filteredColumns, showSkeleton, actionRef, context),
113493
113858
  emptyProps: emptyProps,
113494
113859
  emptyContent: otherProps == null ? void 0 : otherProps.emptyContent
113495
113860
  }));
@@ -113497,7 +113862,7 @@ var ProTable = function ProTable(props) {
113497
113862
  // 不传 columns 直接返回原始 Table
113498
113863
  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_1__.Table, _extends({
113499
113864
  className: cls()
113500
- }, (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_4__.pickProps)((0,_utils_getTableProps__WEBPACK_IMPORTED_MODULE_20__/* ["default"] */ .Z)(), otherProps)));
113865
+ }, (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_5__.pickProps)((0,_utils_getTableProps__WEBPACK_IMPORTED_MODULE_19__/* ["default"] */ .Z)(), otherProps)));
113501
113866
  }
113502
113867
  };
113503
113868
  var renderFooterAction = function renderFooterAction() {
@@ -113519,43 +113884,41 @@ var ProTable = function ProTable(props) {
113519
113884
  });
113520
113885
  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
113521
113886
  className: cls('footer-action')
113522
- }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_actions__WEBPACK_IMPORTED_MODULE_12__/* .ProActionGroup */ .d5, _extends({}, targetFooterActions, {
113887
+ }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_actions__WEBPACK_IMPORTED_MODULE_10__/* .ProActionGroup */ .d5, _extends({}, targetFooterActions, {
113523
113888
  context: _extends({}, defaultContext, targetFooterActions == null ? void 0 : targetFooterActions.context),
113524
113889
  "data-teamix-spm": dataTeamixSpm ? dataTeamixSpm + "-footerAction" : undefined
113525
113890
  })));
113526
113891
  } else return footerAction;
113527
113892
  };
113893
+ var onChangePagination = (0,react__WEBPACK_IMPORTED_MODULE_0__.useCallback)(function (currentPage, params) {
113894
+ var _extends4;
113895
+ if (params === void 0) {
113896
+ params = {};
113897
+ }
113898
+ // 翻页默认清空选择
113899
+ if (!reserveSelectedRecords) {
113900
+ var _actionRef$current8;
113901
+ (_actionRef$current8 = actionRef.current) == null ? void 0 : _actionRef$current8.clearRowSelection == null ? void 0 : _actionRef$current8.clearRowSelection();
113902
+ }
113903
+ setCurrentPage(currentPage);
113904
+ _request(_extends((_extends4 = {}, _extends4[targetPageKey] = currentPage, _extends4.pageSize = pageSize, _extends4), params));
113905
+ }, [reserveSelectedRecords, targetPageKey, actionRef, pageSize]);
113906
+ var onChangePaginationSize = (0,react__WEBPACK_IMPORTED_MODULE_0__.useCallback)(function (currentPageSize) {
113907
+ var _request10;
113908
+ // 翻页默认清空选择
113909
+ if (!reserveSelectedRecords) {
113910
+ var _actionRef$current9;
113911
+ (_actionRef$current9 = actionRef.current) == null ? void 0 : _actionRef$current9.clearRowSelection == null ? void 0 : _actionRef$current9.clearRowSelection();
113912
+ }
113913
+ setPageSize(currentPageSize);
113914
+ setCurrentPage(1);
113915
+ _request((_request10 = {}, _request10[targetPageSizeKey] = currentPageSize, _request10[targetPageKey] = 1, _request10));
113916
+ }, [reserveSelectedRecords, actionRef, targetPageSizeKey, targetPageKey, currentPage]);
113528
113917
  var renderFooter = function renderFooter() {
113529
- function onChangePagination(currentPage, params) {
113530
- var _extends4;
113531
- if (params === void 0) {
113532
- params = {};
113533
- }
113534
- // 翻页默认清空选择
113535
- if (!reserveSelectedRecords) {
113536
- var _actionRef$current8;
113537
- (_actionRef$current8 = actionRef.current) == null ? void 0 : _actionRef$current8.clearRowSelection == null ? void 0 : _actionRef$current8.clearRowSelection();
113538
- }
113539
- setCurrentPage(currentPage);
113540
- _request(_extends((_extends4 = {}, _extends4[targetPageKey] = currentPage, _extends4), params));
113541
- }
113542
- function onChangePaginationSize(currentPageSize) {
113543
- var _request10;
113544
- // 翻页默认清空选择
113545
- if (!reserveSelectedRecords) {
113546
- var _actionRef$current9;
113547
- (_actionRef$current9 = actionRef.current) == null ? void 0 : _actionRef$current9.clearRowSelection == null ? void 0 : _actionRef$current9.clearRowSelection();
113548
- }
113549
- setPageSize(currentPageSize);
113550
- setCurrentPage(1);
113551
- _request((_request10 = {}, _request10[targetPageSizeKey] = currentPageSize, _request10[targetPageKey] = 1, _request10));
113552
- }
113553
113918
  function renderRowSelection() {
113554
113919
  if (rowSelection) {
113555
113920
  if (showSkeleton) {
113556
- return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
113557
- className: cls('footer-left-wrapper')
113558
- }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_skeleton__WEBPACK_IMPORTED_MODULE_5__/* .ProSkeletonRaw.Footer.Operation */ .vR.Footer.Operation, null));
113921
+ return null;
113559
113922
  } else {
113560
113923
  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
113561
113924
  className: cls('footer-left-wrapper')
@@ -113563,15 +113926,13 @@ var ProTable = function ProTable(props) {
113563
113926
  className: cls("footer-checkbox-" + size)
113564
113927
  }, getCheckAllProps())), footerAction && renderFooterAction(), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("span", {
113565
113928
  className: cls('selected-msg')
113566
- }, (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_4__.getMessage)('selected', {
113929
+ }, (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_5__.getMessage)('selected', {
113567
113930
  count: selectedCount
113568
113931
  }))));
113569
113932
  }
113570
113933
  } else if (footerAction) {
113571
113934
  if (showSkeleton) {
113572
- return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
113573
- className: cls('footer-left-wrapper')
113574
- }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_skeleton__WEBPACK_IMPORTED_MODULE_5__/* .ProSkeletonRaw.Footer.Operation */ .vR.Footer.Operation, null));
113935
+ return null;
113575
113936
  } else {
113576
113937
  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
113577
113938
  className: cls('footer-left-wrapper')
@@ -113592,7 +113953,7 @@ var ProTable = function ProTable(props) {
113592
113953
  })
113593
113954
  }, renderRowSelection(), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
113594
113955
  className: cls('footer-right-wrapper')
113595
- }, showSkeleton ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_skeleton__WEBPACK_IMPORTED_MODULE_5__/* .ProSkeletonRaw.Footer.Pagination */ .vR.Footer.Pagination, null) : /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, data.length > 0 && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_components_Pagination__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z, _extends({
113956
+ }, showSkeleton ? null : /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, data.length > 0 && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_components_Pagination__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z, _extends({
113596
113957
  className: cls('pagination'),
113597
113958
  onChange: function onChange(number, e) {
113598
113959
  onChangePagination(number);
@@ -113621,7 +113982,7 @@ var ProTable = function ProTable(props) {
113621
113982
  })
113622
113983
  }, renderRowSelection(), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
113623
113984
  className: cls('footer-right-wrapper')
113624
- }, showSkeleton ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_skeleton__WEBPACK_IMPORTED_MODULE_5__/* .ProSkeletonRaw.Footer.Pagination */ .vR.Footer.Pagination, null) : footer));
113985
+ }, showSkeleton ? null : footer));
113625
113986
  }
113626
113987
  };
113627
113988
 
@@ -113638,7 +113999,7 @@ var ProTable = function ProTable(props) {
113638
113999
  }
113639
114000
  return false;
113640
114001
  }, [fullscreenState, fixedTableBody, footerSuction, footerSuctionState]);
113641
- return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_components_ToolBar_Fullscreen__WEBPACK_IMPORTED_MODULE_10__/* ["default"] */ .Z, {
114002
+ return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_components_ToolBar_Fullscreen__WEBPACK_IMPORTED_MODULE_9__/* ["default"] */ .Z, {
113642
114003
  visible: fullscreenState,
113643
114004
  actionRef: actionRef
113644
114005
  }, function (isFullScreen) {
@@ -113650,11 +114011,11 @@ var ProTable = function ProTable(props) {
113650
114011
  }),
113651
114012
 
113652
114013
  ref: tableRef
113653
- }, showShadowContainer && (0,_utils_genAutoWidthColumns__WEBPACK_IMPORTED_MODULE_15__/* .shadowContainer */ .yV)({
114014
+ }, autoWidth && (0,_utils_genAutoWidthColumns__WEBPACK_IMPORTED_MODULE_13__/* .shadowContainer */ .yV)({
113654
114015
  columns: filteredColumns,
113655
114016
  data: data,
113656
114017
  shadowContainerRef: shadowContainerRef
113657
- }), hasActionColumn && (0,_utils_genAutoWidthColumns__WEBPACK_IMPORTED_MODULE_15__/* .shadowActionColumnContainer */ .tG)(filteredColumns, shadowActionColumnContainerRef), renderTable(isFullScreen), fixFooterState && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_page_container__WEBPACK_IMPORTED_MODULE_14__/* ["default"].FixedFooter */ .ZP.FixedFooter, null, renderFooter()), !fixFooterState && renderFooter());
114018
+ }), hasActionColumn && (0,_utils_genAutoWidthColumns__WEBPACK_IMPORTED_MODULE_13__/* .shadowActionColumnContainer */ .tG)(filteredColumns, shadowActionColumnContainerRef), renderTable(isFullScreen), fixFooterState && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_page_container__WEBPACK_IMPORTED_MODULE_12__/* ["default"].FixedFooter */ .ZP.FixedFooter, null, renderFooter()), !fixFooterState && renderFooter());
113658
114019
  });
113659
114020
  };
113660
114021
  /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (ProTable);
@@ -114010,21 +114371,25 @@ var columnShrinkMaxWidth = 100;
114010
114371
  * @param data
114011
114372
  * @returns
114012
114373
  */
114013
- function genAutoWidthColumns(fileteredColumns, ref, data, size, useRowSelection, actionColumnRef) {
114014
- if (!ref.current) {
114015
- return fileteredColumns;
114374
+ function genAutoWidthColumns(columns, ref, data, size, useRowSelection, actionColumnRef) {
114375
+ if (!(ref != null && ref.current)) {
114376
+ return columns;
114016
114377
  }
114017
114378
  var hasLockFlag = false;
114018
114379
  var dom = ref.current;
114019
114380
  var actionColumnDom = actionColumnRef == null ? void 0 : actionColumnRef.current;
114020
114381
  var childNodes = dom.children;
114382
+ if (dom.children.length === 0) {
114383
+ return columns;
114384
+ }
114021
114385
  var finalColumns = [];
114022
- fileteredColumns.forEach(function (column, index) {
114386
+ var filterdColumnsResult = _teamix_utils__WEBPACK_IMPORTED_MODULE_1__._.cloneDeep(columns);
114387
+ filterdColumnsResult.forEach(function (column, index) {
114023
114388
  var render = column.render,
114024
114389
  _column$valueType = column.valueType,
114025
114390
  valueType = _column$valueType === void 0 ? 'text' : _column$valueType,
114026
- _column$autoWidth = column.autoWidth,
114027
- autoWidth = _column$autoWidth === void 0 ? true : _column$autoWidth,
114391
+ _column$isAutoWidth = column.isAutoWidth,
114392
+ isAutoWidth = _column$isAutoWidth === void 0 ? true : _column$isAutoWidth,
114028
114393
  actionSchema = column.actionSchema,
114029
114394
  sortable = column.sortable,
114030
114395
  lock = column.lock;
@@ -114036,6 +114401,17 @@ function genAutoWidthColumns(fileteredColumns, ref, data, size, useRowSelection,
114036
114401
  var finalType = type || valueType || '';
114037
114402
  var shrink = fieldTypeShrink[finalType];
114038
114403
  column.shrink = column.shrink || (shrink !== undefined ? shrink : 1);
114404
+ if ((column == null ? void 0 : column.isAutoWidth) === false) {
114405
+ // console.log(column.title, 'isAutoWidth')
114406
+ finalColumns.push(column);
114407
+ return;
114408
+ }
114409
+ ;
114410
+ if ((column == null ? void 0 : column.columnFilters) === false) {
114411
+ finalColumns.push(column);
114412
+ return;
114413
+ }
114414
+ // column.isAutoWidth = true
114039
114415
  //@ts-ignore
114040
114416
  // if (!autoWidth) {
114041
114417
  // finalColumns.push(column);
@@ -114056,13 +114432,21 @@ function genAutoWidthColumns(fileteredColumns, ref, data, size, useRowSelection,
114056
114432
  if (width >= 280) {
114057
114433
  width = 280;
114058
114434
  }
114435
+ column.isAutoWidth = false;
114059
114436
  column.width = defaultPaddingFixer(width, size, false);
114060
114437
  }
114061
114438
  finalColumns.push(column);
114062
114439
  return;
114063
114440
  }
114441
+
114442
+ // 当列没出来的时候不比较
114443
+ // @ts-ignore
114444
+ if ((column == null ? void 0 : column.columnFilters) === false) {
114445
+ finalColumns.push(column);
114446
+ return;
114447
+ }
114064
114448
  // @ts-ignore
114065
- var titleWidth = childNodes[index].children[0].scrollWidth;
114449
+ var titleWidth = _teamix_utils__WEBPACK_IMPORTED_MODULE_1__._.get(childNodes, '[index]?.children[0].scrollWidth', 0);
114066
114450
  // @ts-ignore
114067
114451
  if (fixedWidthTypeList[finalType]) {
114068
114452
  // console.log(
@@ -114070,20 +114454,38 @@ function genAutoWidthColumns(fileteredColumns, ref, data, size, useRowSelection,
114070
114454
  // fixedWidthTypeList[finalType],
114071
114455
  // );
114072
114456
  // 固定宽度
114457
+ // console.log(column.title, '固定宽度')
114458
+ column.isAutoWidth = false;
114073
114459
  column.width = defaultPaddingFixer(
114074
114460
  // @ts-ignore
114075
114461
  Math.max(titleWidth, fixedWidthTypeList[finalType]), size, index === 0 && useRowSelection);
114462
+
114076
114463
  // @ts-ignore
114077
114464
  } else if (computeableWidthTypeList[finalType]) {
114078
114465
  // 可计算宽度
114466
+ // console.log(column.title, '可计算宽度')
114467
+ column.isAutoWidth = false;
114079
114468
  column.width = defaultPaddingFixer(
114080
114469
  // @ts-ignore
114081
114470
  Math.max(titleWidth, computeableWidthTypeList[finalType](data, render)), size, index === 0 && useRowSelection);
114082
114471
  } else {
114472
+ var _column$render;
114083
114473
  // 直接根据 dom 计算
114474
+ // console.log(column.title, '可计算 dom')
114475
+ column.isAutoWidth = false;
114084
114476
  column.width = defaultPaddingFixer(Math.max(titleWidth,
114085
114477
  // @ts-ignore
114086
114478
  calcWidthWithParentDOM(childNodes[index], column.shrink)), size, index === 0 && useRowSelection);
114479
+ if (column != null && column.sortable && (column != null && column.tooltip || column != null && column.filters)) {
114480
+ // 检测有 sortable 和 tooltip 的时候增加宽度
114481
+ column.width = column.width + 40;
114482
+ } else if (column != null && column.sortable) {
114483
+ column.width = column.width + 24;
114484
+ }
114485
+ // @ts-ignore
114486
+ if (column != null && (_column$render = column.render) != null && _column$render.copy) {
114487
+ column.width = column.width + 16;
114488
+ }
114087
114489
  }
114088
114490
  if (index === 0) {
114089
114491
  // 首列不会被挤占
@@ -114104,6 +114506,7 @@ var shadowContainer = function shadowContainer(props) {
114104
114506
  var columns = props.columns,
114105
114507
  data = props.data,
114106
114508
  shadowContainerRef = props.shadowContainerRef;
114509
+ if (data.length === 0) return null;
114107
114510
  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
114108
114511
  ref: shadowContainerRef,
114109
114512
  className: "teamix-pro-table-shadow-container"
@@ -114120,8 +114523,12 @@ var shadowContainer = function shadowContainer(props) {
114120
114523
  //@ts-ignore
114121
114524
  !fixedWidthTypeList[valueType] && data.map(function (item, index) {
114122
114525
  // @ts-ignore
114123
- column.smartWidth = (0,_columnRender__WEBPACK_IMPORTED_MODULE_3__/* .renderCellSmartWidth */ .mn)(getValueFromRecord(dataIndex, item), column, index, item);
114124
- return (0,_pureColumnRender__WEBPACK_IMPORTED_MODULE_2__/* .renderCell */ .c)(getValueFromRecord(dataIndex, item), column, index, item);
114526
+ var newColumn = _teamix_utils__WEBPACK_IMPORTED_MODULE_1__._.cloneDeep(column);
114527
+ newColumn.smartWidth = (0,_columnRender__WEBPACK_IMPORTED_MODULE_3__/* .renderCellSmartWidth */ .mn)(getValueFromRecord(dataIndex, item), column, index, item);
114528
+ newColumn.render = _extends({}, column.render, {
114529
+ description: ''
114530
+ });
114531
+ return (0,_pureColumnRender__WEBPACK_IMPORTED_MODULE_2__/* .renderCell */ .c)(getValueFromRecord(dataIndex, item), newColumn, index, item);
114125
114532
  }));
114126
114533
  }
114127
114534
  }));
@@ -114208,11 +114615,15 @@ var fieldTypeShrink = {
114208
114615
  ip: 0
114209
114616
  };
114210
114617
  function calcWidthWithParentDOM(dom, shrink) {
114211
- var childNodes = _toConsumableArray(dom.children);
114212
- childNodes.shift();
114213
- return calcSingleColumnLength(childNodes.map(function (node) {
114214
- return node.scrollWidth;
114215
- }), shrink);
114618
+ if (dom) {
114619
+ var childNodes = _toConsumableArray(dom.children);
114620
+ childNodes.shift();
114621
+ return calcSingleColumnLength(childNodes.map(function (node) {
114622
+ return node.scrollWidth;
114623
+ }), shrink);
114624
+ } else {
114625
+ return 0;
114626
+ }
114216
114627
  }
114217
114628
  function calcSingleColumnLength(list, shrink) {
114218
114629
  if (list === void 0) {
@@ -114296,10 +114707,12 @@ function defaultPaddingFixer(width, size, half) {
114296
114707
  return size === 'medium' ? width + (half ? 16 : 32) + 0.5 : width + (half ? 8 : 16) + 0.5;
114297
114708
  }
114298
114709
  function sum(list) {
114710
+ var _list;
114299
114711
  if (list === void 0) {
114300
114712
  list = [];
114301
114713
  }
114302
- return list.reduce(function (a, b) {
114714
+ if (list.length === 0) return 0;
114715
+ return (_list = list) == null ? void 0 : _list.reduce(function (a, b) {
114303
114716
  return a + b;
114304
114717
  });
114305
114718
  }
@@ -114342,6 +114755,7 @@ function getConfidence90UpperBound(list) {
114342
114755
  /* harmony import */ var _columnRender__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(97332);
114343
114756
  /* harmony import */ var _skeleton__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(53277);
114344
114757
  /* harmony import */ var _teamix_utils__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(80653);
114758
+ /* harmony import */ var _components_Cell__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(24978);
114345
114759
  var _excluded = ["filters", "dataIndex", "children"];
114346
114760
  function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
114347
114761
  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; }
@@ -114349,6 +114763,7 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
114349
114763
 
114350
114764
 
114351
114765
 
114766
+
114352
114767
  /**
114353
114768
  * ProColumn => Column
114354
114769
  */
@@ -114370,8 +114785,24 @@ dataTeamixSpm, bindUrl, bindUrlProps) {
114370
114785
  sortable: false,
114371
114786
  dataIndex: dataIndex == null ? void 0 : dataIndex.toString(),
114372
114787
  title: /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_skeleton__WEBPACK_IMPORTED_MODULE_2__/* .ProSkeletonRaw.Table.TH */ .vR.Table.TH, null),
114373
- cell: function cell() {
114374
- return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_skeleton__WEBPACK_IMPORTED_MODULE_2__/* .ProSkeletonRaw.Table.TD */ .vR.Table.TD, null);
114788
+ cell: function cell(value, rowIndex) {
114789
+ var _columnProps$render;
114790
+ // 按默认5行做渐变
114791
+ var opacity = Math.min(Math.max(1 - rowIndex * 0.2, 0), 1);
114792
+ // 如果是field并且有descrition字段,就认为是两行,其他情况默认一行
114793
+ return typeof (columnProps == null ? void 0 : columnProps.render) === 'object' && columnProps != null && (_columnProps$render = columnProps.render) != null && _columnProps$render.description ? /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_skeleton__WEBPACK_IMPORTED_MODULE_2__/* .ProSkeletonRaw.Table.TD */ .vR.Table.TD, {
114794
+ style: {
114795
+ opacity: opacity
114796
+ }
114797
+ }), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_skeleton__WEBPACK_IMPORTED_MODULE_2__/* .ProSkeletonRaw.Table.TD */ .vR.Table.TD, {
114798
+ style: {
114799
+ opacity: opacity
114800
+ }
114801
+ })) : /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_skeleton__WEBPACK_IMPORTED_MODULE_2__/* .ProSkeletonRaw.Table.TD */ .vR.Table.TD, {
114802
+ style: {
114803
+ opacity: opacity
114804
+ }
114805
+ });
114375
114806
  }
114376
114807
  });
114377
114808
  }
@@ -114384,7 +114815,24 @@ dataTeamixSpm, bindUrl, bindUrlProps) {
114384
114815
  dataIndex: dataIndex == null ? void 0 : dataIndex.toString(),
114385
114816
  title: (0,_columnRender__WEBPACK_IMPORTED_MODULE_1__/* .renderColumnsTitle */ .pt)(columnProps, actionRef, bindUrl, bindUrlProps),
114386
114817
  cell: function cell(value, index, record) {
114387
- return (0,_columnRender__WEBPACK_IMPORTED_MODULE_1__/* .renderCell */ .cw)(value, columnProps, index, record, actionRef, context, dataTeamixSpm);
114818
+ return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_components_Cell__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z, {
114819
+ value: value,
114820
+ item: columnProps,
114821
+ index: index,
114822
+ record: record,
114823
+ actionRef: actionRef,
114824
+ context: context,
114825
+ dataTeamixSpm: dataTeamixSpm
114826
+ });
114827
+ // return renderCell(
114828
+ // value,
114829
+ // columnProps,
114830
+ // index,
114831
+ // record,
114832
+ // actionRef,
114833
+ // context,
114834
+ // dataTeamixSpm
114835
+ // )
114388
114836
  }
114389
114837
  });
114390
114838
  });
@@ -114584,6 +115032,54 @@ function processDefaultFilter(columns, ref, defaultFilterParams) {
114584
115032
 
114585
115033
  /***/ }),
114586
115034
 
115035
+ /***/ 90807:
115036
+ /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
115037
+
115038
+ "use strict";
115039
+ /* harmony export */ __webpack_require__.d(__webpack_exports__, {
115040
+ /* harmony export */ "Z": () => (__WEBPACK_DEFAULT_EXPORT__)
115041
+ /* harmony export */ });
115042
+ /* harmony import */ var _teamix_utils__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(80653);
115043
+ function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
115044
+
115045
+ /**
115046
+ * 处理原生传入的 columns 以便于 选择列 方便处理
115047
+ * @param columns 原生传入的 columns
115048
+ * @returns
115049
+ */
115050
+ var processColumns = function processColumns(columns, initialColumns) {
115051
+ var _getGlobalConfig;
115052
+ var globalFilterColumns = (_getGlobalConfig = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_0__.getGlobalConfig)('ProTable')) == null ? void 0 : _getGlobalConfig.filterColumns;
115053
+ var filterColumns = columns.filter(function (item) {
115054
+ return item.columnFilters !== false && (item == null ? void 0 : item.hidden) !== true && (!globalFilterColumns || globalFilterColumns(_extends({}, item)));
115055
+ });
115056
+ // 处理只剩一列批量选择的情况下宽度错乱问题
115057
+ if (filterColumns != null && filterColumns.length) {
115058
+ var _initialColumns$;
115059
+ if ((filterColumns == null ? void 0 : filterColumns.length) === 1) {
115060
+ var _filterColumns$, _filterColumns$2;
115061
+ if ((_filterColumns$ = filterColumns[0]) != null && _filterColumns$.width) {
115062
+ delete filterColumns[0].width;
115063
+ }
115064
+ if ((_filterColumns$2 = filterColumns[0]) != null && _filterColumns$2.lock) {
115065
+ filterColumns[0].lock = false;
115066
+ }
115067
+ } else if (((_initialColumns$ = initialColumns[0]) == null ? void 0 : _initialColumns$.columnFilters) !== false) {
115068
+ var _initialColumns$2, _initialColumns$3;
115069
+ if ((_initialColumns$2 = initialColumns[0]) != null && _initialColumns$2.width) {
115070
+ filterColumns[0].width = initialColumns[0].width;
115071
+ }
115072
+ if ((_initialColumns$3 = initialColumns[0]) != null && _initialColumns$3.lock) {
115073
+ filterColumns[0].lock = initialColumns[0].lock;
115074
+ }
115075
+ }
115076
+ }
115077
+ return filterColumns;
115078
+ };
115079
+ /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (processColumns);
115080
+
115081
+ /***/ }),
115082
+
114587
115083
  /***/ 26370:
114588
115084
  /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
114589
115085
 
@@ -114799,7 +115295,7 @@ function genProColumnToColumn(columns) {
114799
115295
 
114800
115296
  /***/ }),
114801
115297
 
114802
- /***/ 23779:
115298
+ /***/ 45458:
114803
115299
  /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
114804
115300
 
114805
115301
  "use strict";
@@ -114809,7 +115305,11 @@ function genProColumnToColumn(columns) {
114809
115305
  /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(59787);
114810
115306
  /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_0__);
114811
115307
  /* harmony import */ var _teamix_utils__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(80653);
115308
+ /* harmony import */ var _alicloudfe_components__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(33049);
115309
+ /* harmony import */ var _alicloudfe_components__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_2__);
115310
+ var _excluded = ["primaryKey"];
114812
115311
  function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
115312
+ 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; }
114813
115313
  function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
114814
115314
  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."); }
114815
115315
  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); }
@@ -114822,17 +115322,24 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
114822
115322
  */
114823
115323
 
114824
115324
 
115325
+
115326
+ var Tooltip = _alicloudfe_components__WEBPACK_IMPORTED_MODULE_2__.Balloon.Tooltip;
114825
115327
  function useTableSelection(config, primaryKey) {
114826
115328
  if (config === void 0) {
114827
115329
  config = {};
114828
115330
  }
114829
- var _useState = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)([]),
115331
+ var _config = config,
115332
+ _config$defaultSelect = _config.defaultSelectedRecords,
115333
+ defaultSelectedRecords = _config$defaultSelect === void 0 ? [] : _config$defaultSelect,
115334
+ _config$defaultSelect2 = _config.defaultSelectedRowKeys,
115335
+ defaultSelectedRowKeys = _config$defaultSelect2 === void 0 ? [] : _config$defaultSelect2;
115336
+ var _useState = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(defaultSelectedRowKeys),
114830
115337
  selectedRowKeys = _useState[0],
114831
115338
  setSelectedRowKeys = _useState[1];
114832
- var _useState2 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)([]),
115339
+ var _useState2 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(defaultSelectedRecords),
114833
115340
  selectedRecords = _useState2[0],
114834
115341
  setSelectedRecords = _useState2[1];
114835
- function onChange(value, records) {
115342
+ function _onChange(value, records) {
114836
115343
  if (primaryKey) {
114837
115344
  var newValue = value.filter(function (v) {
114838
115345
  return !selectedRowKeys.includes(v);
@@ -114867,11 +115374,51 @@ function useTableSelection(config, primaryKey) {
114867
115374
  config.onChange(value, records);
114868
115375
  }
114869
115376
  }
115377
+ var renderCheckBox = function renderCheckBox(props) {
115378
+ var primaryKey = props.primaryKey,
115379
+ others = _objectWithoutPropertiesLoose(props, _excluded);
115380
+ return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_2__.Checkbox, _extends({
115381
+ checked: selectedRowKeys.includes(primaryKey),
115382
+ onChange: function onChange(checked) {
115383
+ if (checked) {
115384
+ _onChange == null ? void 0 : _onChange([].concat(_toConsumableArray(selectedRowKeys), [primaryKey]), [props]);
115385
+ } else {
115386
+ _onChange == null ? void 0 : _onChange(selectedRowKeys.filter(function (item) {
115387
+ return item !== primaryKey;
115388
+ }), [props]);
115389
+ }
115390
+ }
115391
+ }, others));
115392
+ };
115393
+ var getProps = function getProps(record, index) {
115394
+ var _config2;
115395
+ var propResult = (_config2 = config) == null ? void 0 : _config2.getProps == null ? void 0 : _config2.getProps(record, index);
115396
+ // console.log('propResult', propResult, selectedRowKeys);
115397
+ var resultProps = _extends({}, record, propResult);
115398
+ var primaryKey = record == null ? void 0 : record[resultProps == null ? void 0 : resultProps['_primaryKey']];
115399
+ return _extends({}, resultProps, {
115400
+ isPreview: true,
115401
+ renderPreview: function renderPreview() {
115402
+ if (resultProps.disabled === true && resultProps.disabledTooltip) {
115403
+ return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(Tooltip, {
115404
+ trigger: renderCheckBox(_extends({}, propResult, {
115405
+ primaryKey: primaryKey
115406
+ })),
115407
+ align: "t"
115408
+ }, propResult.disabledTooltip);
115409
+ }
115410
+ return renderCheckBox(_extends({}, propResult, {
115411
+ primaryKey: primaryKey
115412
+ }));
115413
+ }
115414
+ });
115415
+ };
114870
115416
  var rowSelection = _extends({
114871
115417
  selectedRowKeys: selectedRowKeys,
114872
115418
  selectedRecords: selectedRecords
114873
115419
  }, config, {
114874
- onChange: onChange
115420
+ onChange: _onChange,
115421
+ getProps: getProps
114875
115422
  });
114876
115423
  return {
114877
115424
  rowSelection: rowSelection,