@teamix/pro 1.2.30 → 1.2.31

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 (35) hide show
  1. package/dist/pro.js +193 -165
  2. package/dist/pro.min.js +1 -1
  3. package/es/form/Filter/SimpleFilter.js +10 -3
  4. package/es/form/typing.d.ts +1 -1
  5. package/es/index.d.ts +1 -1
  6. package/es/index.js +1 -1
  7. package/es/info/components/baseInfo/index.js +2 -1
  8. package/es/table/components/Filter/index.js +6 -6
  9. package/es/table/index.js +67 -17
  10. package/es/table/typing.d.ts +2 -2
  11. package/es/table/utils/columnRender.js +1 -1
  12. package/es/table/utils/index.d.ts +2 -1
  13. package/es/table/utils/index.js +62 -113
  14. package/lib/form/Filter/SimpleFilter.js +8 -1
  15. package/lib/form/typing.d.ts +1 -1
  16. package/lib/index.d.ts +1 -1
  17. package/lib/index.js +1 -1
  18. package/lib/info/components/baseInfo/index.js +2 -1
  19. package/lib/table/components/Filter/index.js +6 -6
  20. package/lib/table/index.js +66 -16
  21. package/lib/table/typing.d.ts +2 -2
  22. package/lib/table/utils/columnRender.js +1 -1
  23. package/lib/table/utils/index.d.ts +2 -1
  24. package/lib/table/utils/index.js +63 -112
  25. package/package.json +1 -1
  26. package/es/form/Components/SelectTable/index.d.ts +0 -24
  27. package/es/form/Components/SelectTable/index.js +0 -135
  28. package/es/form/Components/SelectTable/index.scss +0 -28
  29. package/es/form/Components/SelectTable/table.d.ts +0 -6
  30. package/es/form/Components/SelectTable/table.js +0 -64
  31. package/lib/form/Components/SelectTable/index.d.ts +0 -24
  32. package/lib/form/Components/SelectTable/index.js +0 -157
  33. package/lib/form/Components/SelectTable/index.scss +0 -28
  34. package/lib/form/Components/SelectTable/table.d.ts +0 -6
  35. package/lib/form/Components/SelectTable/table.js +0 -76
package/dist/pro.js CHANGED
@@ -52875,7 +52875,7 @@ var FieldSelect = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().forw
52875
52875
  /* harmony import */ var _output__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(90405);
52876
52876
  /* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(72326);
52877
52877
  /* harmony import */ var _selectGroup__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(47363);
52878
- var _excluded = ["dataSource", "type", "value", "onChange", "mode", "render", "valueAlias"];
52878
+ var _excluded = ["dataSource", "type", "value", "onChange", "mode", "render", "valueAlias", "fieldRef"];
52879
52879
 
52880
52880
  function ownKeys(object, enumerableOnly) {
52881
52881
  var keys = Object.keys(object);
@@ -53041,7 +53041,10 @@ function _arrayLikeToArray(arr, len) {
53041
53041
 
53042
53042
  // 处理 value
53043
53043
 
53044
- var precessValue = function precessValue(value, valueAlias) {
53044
+ var precessValue = function precessValue() {
53045
+ var value = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
53046
+ var valueAlias = arguments.length > 1 ? arguments[1] : undefined;
53047
+
53045
53048
  var _ref = valueAlias !== null && valueAlias !== void 0 ? valueAlias : {},
53046
53049
  _ref$value = _ref.value,
53047
53050
  valueAliasValue = _ref$value === void 0 ? 'value' : _ref$value,
@@ -53088,6 +53091,7 @@ var FieldSelectGroup = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default()
53088
53091
  mode = props.mode,
53089
53092
  render = props.render,
53090
53093
  valueAlias = props.valueAlias,
53094
+ fieldRef = props.fieldRef,
53091
53095
  others = _objectWithoutProperties(props, _excluded);
53092
53096
 
53093
53097
  var _useState = (0,react__WEBPACK_IMPORTED_MODULE_3__.useState)(precessValue(value, valueAlias)),
@@ -53165,6 +53169,9 @@ var FieldSelectGroup = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default()
53165
53169
  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default().createElement(_teamix_utils__WEBPACK_IMPORTED_MODULE_2__.ProTagGroup, {
53166
53170
  tag: tags,
53167
53171
  maxShowNumber: (_outputRender$maxShow = outputRender.maxShowNumber) !== null && _outputRender$maxShow !== void 0 ? _outputRender$maxShow : 'all',
53172
+ // 右侧小笔的宽度
53173
+ otherOccupiedSpace: 26,
53174
+ target: fieldRef,
53168
53175
  renderMore: function renderMore(count, _, ref) {
53169
53176
  var _ref$current$querySel, _ref$current, _tagsDom$children, _outputRender2, _outputRender$foldTex, _outputRender3, _outputRender4;
53170
53177
 
@@ -57748,7 +57755,10 @@ var SelectGroup = function SelectGroup(props) {
57748
57755
  setValue(valueProp);
57749
57756
  }, [valueProp]);
57750
57757
  (0,react__WEBPACK_IMPORTED_MODULE_1__.useEffect)(function () {
57758
+ var _dataSourceProp$0$dat, _dataSourceProp$;
57759
+
57751
57760
  setDataSource(dataSourceProp !== null && dataSourceProp !== void 0 ? dataSourceProp : []);
57761
+ setActiveKey((_dataSourceProp$0$dat = dataSourceProp === null || dataSourceProp === void 0 ? void 0 : (_dataSourceProp$ = dataSourceProp[0]) === null || _dataSourceProp$ === void 0 ? void 0 : _dataSourceProp$[dataSourceAliasValue]) !== null && _dataSourceProp$0$dat !== void 0 ? _dataSourceProp$0$dat : '');
57752
57762
  }, [dataSourceProp]); // 搜索值变化回调 过滤数据
57753
57763
 
57754
57764
  var onSearch = function onSearch(value) {
@@ -57757,10 +57767,10 @@ var SelectGroup = function SelectGroup(props) {
57757
57767
  var _newDataSource, _newDataSource$0$data, _newDataSource2, _newDataSource2$;
57758
57768
 
57759
57769
  if (!value) {
57760
- var _dataSourceProp$0$dat, _dataSourceProp$;
57770
+ var _dataSourceProp$0$dat2, _dataSourceProp$2;
57761
57771
 
57762
57772
  setDataSource(dataSourceProp !== null && dataSourceProp !== void 0 ? dataSourceProp : []);
57763
- setActiveKey((_dataSourceProp$0$dat = dataSourceProp === null || dataSourceProp === void 0 ? void 0 : (_dataSourceProp$ = dataSourceProp[0]) === null || _dataSourceProp$ === void 0 ? void 0 : _dataSourceProp$[dataSourceAliasValue]) !== null && _dataSourceProp$0$dat !== void 0 ? _dataSourceProp$0$dat : '');
57773
+ setActiveKey((_dataSourceProp$0$dat2 = dataSourceProp === null || dataSourceProp === void 0 ? void 0 : (_dataSourceProp$2 = dataSourceProp[0]) === null || _dataSourceProp$2 === void 0 ? void 0 : _dataSourceProp$2[dataSourceAliasValue]) !== null && _dataSourceProp$0$dat2 !== void 0 ? _dataSourceProp$0$dat2 : '');
57764
57774
  onSearchChange === null || onSearchChange === void 0 ? void 0 : onSearchChange(value);
57765
57775
  return;
57766
57776
  }
@@ -58768,8 +58778,9 @@ var ProField = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().forward
58768
58778
  tooltipLabel = props.tooltipLabel,
58769
58779
  tooltipIcon = props.tooltipIcon,
58770
58780
  tooltipIconSize = props.tooltipIconSize,
58771
- others = _objectWithoutProperties(props, _excluded); // 注册全局自定义组件
58781
+ others = _objectWithoutProperties(props, _excluded);
58772
58782
 
58783
+ var proFieldRef = (0,react__WEBPACK_IMPORTED_MODULE_0__.useRef)(); // 注册全局自定义组件
58773
58784
 
58774
58785
  var globalProField = (_getGlobalConfig = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_3__.getGlobalConfig)('ProField')) !== null && _getGlobalConfig !== void 0 ? _getGlobalConfig : {};
58775
58786
  registerComponent(globalProField);
@@ -58807,10 +58818,11 @@ var ProField = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().forward
58807
58818
  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", _objectSpread({
58808
58819
  className: classnames__WEBPACK_IMPORTED_MODULE_1___default()((_cls = {
58809
58820
  'teamix-pro-field': true
58810
- }, _defineProperty(_cls, "teamix-pro-field-".concat(type === null || type === void 0 ? void 0 : type.toLowerCase()), true), _defineProperty(_cls, 'teamix-pro-field-compact', layout === 'compact'), _defineProperty(_cls, (_transparentBase$clas = transparentBase.className) !== null && _transparentBase$clas !== void 0 ? _transparentBase$clas : '', true), _defineProperty(_cls, 'teamix-pro-field-tooltip', tooltip), _cls))
58821
+ }, _defineProperty(_cls, "teamix-pro-field-".concat(type === null || type === void 0 ? void 0 : type.toLowerCase()), true), _defineProperty(_cls, 'teamix-pro-field-compact', layout === 'compact'), _defineProperty(_cls, (_transparentBase$clas = transparentBase.className) !== null && _transparentBase$clas !== void 0 ? _transparentBase$clas : '', true), _defineProperty(_cls, 'teamix-pro-field-tooltip', tooltip), _cls)),
58822
+ ref: proFieldRef
58811
58823
  }, (0,_utils__WEBPACK_IMPORTED_MODULE_24__/* .hasProps */ .s_)({
58812
58824
  style: transparentBase === null || transparentBase === void 0 ? void 0 : transparentBase.style
58813
- })), renderField(type, newProps, ref), !!tooltip && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_teamix_utils__WEBPACK_IMPORTED_MODULE_3__.LabelIconTip, {
58825
+ })), renderField(type, newProps, ref, proFieldRef), !!tooltip && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_teamix_utils__WEBPACK_IMPORTED_MODULE_3__.LabelIconTip, {
58814
58826
  label: tooltipLabel,
58815
58827
  tooltip: tooltip,
58816
58828
  icon: tooltipIcon,
@@ -58818,10 +58830,18 @@ var ProField = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().forward
58818
58830
  }));
58819
58831
  });
58820
58832
 
58821
- var renderField = function renderField(type, props, ref) {
58833
+ var renderField = function renderField(type, props, ref, fieldRef) {
58822
58834
  var allComponents = _objectSpread(_objectSpread({}, innerComponents), externalComponents);
58823
58835
 
58824
58836
  var Component = allComponents[type === null || type === void 0 ? void 0 : type.toLowerCase()] || _components_FieldText__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z;
58837
+
58838
+ if ((type === null || type === void 0 ? void 0 : type.toLowerCase()) === 'selectgroup') {
58839
+ return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(Component, _objectSpread(_objectSpread({}, props), {}, {
58840
+ ref: ref,
58841
+ fieldRef: fieldRef
58842
+ }));
58843
+ }
58844
+
58825
58845
  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(Component, _objectSpread(_objectSpread({}, props), {}, {
58826
58846
  ref: ref
58827
58847
  }));
@@ -63195,7 +63215,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
63195
63215
 
63196
63216
  // 初始化Search组件,内置部分属性
63197
63217
  var initializeSearch = function initializeSearch(schema) {
63198
- var searchName;
63218
+ var searchName = '';
63199
63219
  var initializedSchema = schema.map(function (item) {
63200
63220
  if (item.component === 'Search') {
63201
63221
  searchName = item.name;
@@ -63264,6 +63284,13 @@ var SimpleFilter = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(func
63264
63284
  onChange == null ? void 0 : onChange(values, name, value);
63265
63285
  }
63266
63286
  }, [searchName, searchValue.current]);
63287
+ (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
63288
+ var _props$form$initialVa, _props$form$initialVa2;
63289
+
63290
+ // 处理Search组件,缓存input的默认值
63291
+ var searchDefaultValue = (_props$form$initialVa = props.form.initialValues) == null ? void 0 : (_props$form$initialVa2 = _props$form$initialVa[searchName]) == null ? void 0 : _props$form$initialVa2[1];
63292
+ searchValue.current = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_2__.isValid)(searchDefaultValue) ? searchDefaultValue : '';
63293
+ }, []);
63267
63294
  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_ProForm__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z, _extends({}, otherProps, {
63268
63295
  className: classnames__WEBPACK_IMPORTED_MODULE_1___default()(prefixCls, props.className),
63269
63296
  schema: simpleSchema,
@@ -66278,7 +66305,7 @@ _teamix_icon__WEBPACK_IMPORTED_MODULE_14__/* ["default"].setConfig */ .Z.setConf
66278
66305
  // export * from './sidebar';
66279
66306
 
66280
66307
 
66281
- var version = '1.2.30';
66308
+ var version = '1.2.31';
66282
66309
 
66283
66310
 
66284
66311
  /***/ }),
@@ -66888,7 +66915,8 @@ var ProBaseInfo = function ProBaseInfo(props) {
66888
66915
 
66889
66916
  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement((react__WEBPACK_IMPORTED_MODULE_1___default().Fragment), null, (size == null ? void 0 : size.width) && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement(Row, {
66890
66917
  wrap: true,
66891
- className: "teamix-pro-info-content-row"
66918
+ className: "teamix-pro-info-content-row",
66919
+ gutter: 20
66892
66920
  }, renderContent()));
66893
66921
  };
66894
66922
 
@@ -70149,10 +70177,10 @@ var Filter = function Filter(props) {
70149
70177
  setVisible = _useState2[1];
70150
70178
 
70151
70179
  (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
70152
- var _actionRef$current$ge, _actionRef$current, _actionRef$current$ge2, _actionRef$current$ge3;
70180
+ var _actionRef$current$ge, _actionRef$current, _actionRef$current$ge2, _actionRef$current$ge3, _actionRef$current$ge4;
70153
70181
 
70154
70182
  // 从全局状态中读取上次存储的条件
70155
- var rules = (_actionRef$current$ge = (_actionRef$current = actionRef.current) == null ? void 0 : _actionRef$current.getState == null ? void 0 : (_actionRef$current$ge2 = _actionRef$current.getState().filterRules) == null ? void 0 : (_actionRef$current$ge3 = _actionRef$current$ge2[column.dataIndex]) == null ? void 0 : _actionRef$current$ge3.rules) != null ? _actionRef$current$ge : [];
70183
+ var rules = (_actionRef$current$ge = (_actionRef$current = actionRef.current) == null ? void 0 : _actionRef$current.getState == null ? void 0 : (_actionRef$current$ge2 = _actionRef$current.getState()) == null ? void 0 : (_actionRef$current$ge3 = _actionRef$current$ge2.filterRules) == null ? void 0 : (_actionRef$current$ge4 = _actionRef$current$ge3[column.dataIndex]) == null ? void 0 : _actionRef$current$ge4.rules) != null ? _actionRef$current$ge : [];
70156
70184
  setSelected(rules);
70157
70185
  }, []); // 获取过滤项
70158
70186
 
@@ -70268,7 +70296,7 @@ var Filter = function Filter(props) {
70268
70296
  btn: true
70269
70297
  }),
70270
70298
  onClick: function onClick() {
70271
- var _actionRef$current2, _actionRef$current$ge4, _actionRef$current3, _actionRef$current3$g, _actionRef$current4, _objectSpread2;
70299
+ var _actionRef$current2, _actionRef$current$ge5, _actionRef$current3, _actionRef$current3$g, _actionRef$current4, _objectSpread2;
70272
70300
 
70273
70301
  (_actionRef$current2 = actionRef.current) == null ? void 0 : _actionRef$current2.filterDataSource == null ? void 0 : _actionRef$current2.filterDataSource(column.dataIndex); // 先获取此列的param
70274
70302
 
@@ -70281,7 +70309,7 @@ var Filter = function Filter(props) {
70281
70309
  } // 需要带上其他所有的信息
70282
70310
 
70283
70311
 
70284
- var rules = (_actionRef$current$ge4 = (_actionRef$current3 = actionRef.current) == null ? void 0 : _actionRef$current3.getState == null ? void 0 : (_actionRef$current3$g = _actionRef$current3.getState()) == null ? void 0 : _actionRef$current3$g.filterRules) != null ? _actionRef$current$ge4 : {}; // 再设置所有的列筛选状态
70312
+ var rules = (_actionRef$current$ge5 = (_actionRef$current3 = actionRef.current) == null ? void 0 : _actionRef$current3.getState == null ? void 0 : (_actionRef$current3$g = _actionRef$current3.getState()) == null ? void 0 : _actionRef$current3$g.filterRules) != null ? _actionRef$current$ge5 : {}; // 再设置所有的列筛选状态
70285
70313
 
70286
70314
  (_actionRef$current4 = actionRef.current) == null ? void 0 : _actionRef$current4.setFilterRules == null ? void 0 : _actionRef$current4.setFilterRules(_objectSpread(_objectSpread({}, rules), {}, (_objectSpread2 = {}, _objectSpread2[column.dataIndex] = {
70287
70315
  rules: selected,
@@ -70314,10 +70342,10 @@ var Filter = function Filter(props) {
70314
70342
  btn: true
70315
70343
  }),
70316
70344
  onClick: function onClick() {
70317
- var _actionRef$current$ge5, _actionRef$current9, _actionRef$current9$g, _actionRef$current10, _objectSpread3, _actionRef$current11;
70345
+ var _actionRef$current$ge6, _actionRef$current9, _actionRef$current9$g, _actionRef$current10, _objectSpread3, _actionRef$current11;
70318
70346
 
70319
70347
  setSelected([]);
70320
- var rules = (_actionRef$current$ge5 = (_actionRef$current9 = actionRef.current) == null ? void 0 : _actionRef$current9.getState == null ? void 0 : (_actionRef$current9$g = _actionRef$current9.getState()) == null ? void 0 : _actionRef$current9$g.filterRules) != null ? _actionRef$current$ge5 : {};
70348
+ var rules = (_actionRef$current$ge6 = (_actionRef$current9 = actionRef.current) == null ? void 0 : _actionRef$current9.getState == null ? void 0 : (_actionRef$current9$g = _actionRef$current9.getState()) == null ? void 0 : _actionRef$current9$g.filterRules) != null ? _actionRef$current$ge6 : {};
70321
70349
  (_actionRef$current10 = actionRef.current) == null ? void 0 : _actionRef$current10.setFilterRules == null ? void 0 : _actionRef$current10.setFilterRules(_objectSpread(_objectSpread({}, rules), {}, (_objectSpread3 = {}, _objectSpread3[column.dataIndex] = {
70322
70350
  rules: [],
70323
70351
  params: ''
@@ -71916,7 +71944,22 @@ var ProTable = function ProTable(props) {
71916
71944
 
71917
71945
  var _useState10 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(true),
71918
71946
  showLoading = _useState10[0],
71919
- setShowLoading = _useState10[1]; // 存储定时器 id
71947
+ setShowLoading = _useState10[1]; // 存储能够被 on 监听到的 ProTable 状态
71948
+ // 因为只做存储用。不需要更新视图以及需要同步更改。所以不使用 setState 更新
71949
+
71950
+
71951
+ var _useState11 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)({
71952
+ fullScreenState: false,
71953
+ filterRules: {},
71954
+ filterColumns: []
71955
+ }),
71956
+ actionRefState = _useState11[0]; // 存储 on 监听事件
71957
+
71958
+
71959
+ var _useState12 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)({
71960
+ fullScreenState: {}
71961
+ }),
71962
+ actionRefCallback = _useState12[0]; // 存储定时器 id
71920
71963
 
71921
71964
 
71922
71965
  var autoRefreshTimerRef = (0,react__WEBPACK_IMPORTED_MODULE_0__.useRef)(); // 获取header高度,用作全屏吸底吸底高度计算
@@ -71940,14 +71983,14 @@ var ProTable = function ProTable(props) {
71940
71983
  }; // header 区域高度。用作全屏计算吸顶吸底高度。默认不做计算
71941
71984
 
71942
71985
 
71943
- var _useState11 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(0),
71944
- headerHeight = _useState11[0],
71945
- setHeaderHeight = _useState11[1]; // 全屏显示 className
71986
+ var _useState13 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(0),
71987
+ headerHeight = _useState13[0],
71988
+ setHeaderHeight = _useState13[1]; // 全屏显示 className
71946
71989
 
71947
71990
 
71948
- var _useState12 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false),
71949
- fullscreenState = _useState12[0],
71950
- setFullscreenState = _useState12[1]; // 非全屏状态下的
71991
+ var _useState14 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false),
71992
+ fullscreenState = _useState14[0],
71993
+ setFullscreenState = _useState14[1]; // 非全屏状态下的
71951
71994
 
71952
71995
 
71953
71996
  var normalDataFilterFormRef = (0,react__WEBPACK_IMPORTED_MODULE_0__.useRef)();
@@ -71958,9 +72001,9 @@ var ProTable = function ProTable(props) {
71958
72001
  var dataFilterFormRef = !fullscreenState ? normalDataFilterFormRef : fullscreenDataFilterFormRef;
71959
72002
  var dataFilterForm = dataFilterFormRef.current; // 整个内容区是否超过一屏。用于表格在非全屏模式下的吸底
71960
72003
 
71961
- var _useState13 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false),
71962
- footerSuctionState = _useState13[0],
71963
- setFooterSuctionState = _useState13[1]; // TODO 获取内容区是否超出一屏(暂时仅支持全家桶)
72004
+ var _useState15 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false),
72005
+ footerSuctionState = _useState15[0],
72006
+ setFooterSuctionState = _useState15[1]; // TODO 获取内容区是否超出一屏(暂时仅支持全家桶)
71964
72007
 
71965
72008
 
71966
72009
  var getFooterSuctionState = function getFooterSuctionState() {
@@ -72084,7 +72127,38 @@ var ProTable = function ProTable(props) {
72084
72127
  if (propsDataSource) {
72085
72128
  setData(propsDataSource);
72086
72129
  }
72087
- }, [propsDataSource]); // 绑定 Actions
72130
+ }, [propsDataSource]); // 初始化 ActionRef。
72131
+
72132
+ (0,_utils__WEBPACK_IMPORTED_MODULE_7__/* .initActionRef */ .rf)(actionRef, {
72133
+ getState: function getState() {
72134
+ return actionRefState;
72135
+ },
72136
+ getCallback: function getCallback() {
72137
+ return actionRefCallback;
72138
+ },
72139
+ setState: function setState(key, value) {
72140
+ actionRefState[key] = value;
72141
+ (0,_utils__WEBPACK_IMPORTED_MODULE_7__/* .actionRefUseStateOn */ .So)(actionRefCallback, key, value);
72142
+ },
72143
+ on: function on(fun, state, name) {
72144
+ if (!actionRefCallback[state]) {
72145
+ actionRefCallback[state] = {};
72146
+ }
72147
+
72148
+ actionRefCallback[state][name] = fun;
72149
+ },
72150
+ off: function off(name) {
72151
+ actionRefCallback = Object.fromEntries(Object.entries(actionRefCallback).map(function (_ref2) {
72152
+ var k = _ref2[0],
72153
+ v = _ref2[1];
72154
+ var filterV = Object.fromEntries(Object.entries(v).filter(function (_ref3) {
72155
+ var k = _ref3[0];
72156
+ return k !== name;
72157
+ }));
72158
+ return [k, filterV];
72159
+ }));
72160
+ }
72161
+ }); // 绑定 Actions
72088
72162
 
72089
72163
  (0,_utils__WEBPACK_IMPORTED_MODULE_7__/* .useActionType */ .tx)(actionRef, {
72090
72164
  fullScreen: function fullScreen() {
@@ -72192,12 +72266,12 @@ var ProTable = function ProTable(props) {
72192
72266
 
72193
72267
 
72194
72268
  var getData = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_4__.useRequest)(function (params) {
72195
- var _ref2;
72269
+ var _ref4;
72196
72270
 
72197
- return _ref2 = {
72271
+ return _ref4 = {
72198
72272
  url: url,
72199
72273
  method: method
72200
- }, _ref2[requestDataKey] = params, _ref2;
72274
+ }, _ref4[requestDataKey] = params, _ref4;
72201
72275
  }, {
72202
72276
  // 使用 request 方法代替 fetch
72203
72277
  requestMethod: function requestMethod(params) {
@@ -72315,8 +72389,6 @@ var ProTable = function ProTable(props) {
72315
72389
  }
72316
72390
 
72317
72391
  (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
72318
- // 初始化 actionRef state、callback 此时 actionRef 已初始化完成
72319
- (0,_utils__WEBPACK_IMPORTED_MODULE_7__/* .initActionRef */ .rf)();
72320
72392
  dataFilterForm = dataFilterFormRef.current; // 监听 浏览器变化 更吸底状态
72321
72393
 
72322
72394
  if (footerSuction) {
@@ -72720,7 +72792,7 @@ var renderCell = function renderCell(value, item, index, record, actionRef) {
72720
72792
 
72721
72793
  if (valueType === 'selectGroup') {
72722
72794
  newRender = _objectSpread(_objectSpread({
72723
- maxShowNumber: 1,
72795
+ maxShowNumber: 'auto',
72724
72796
  foldText: 'more',
72725
72797
  editOnClick: function editOnClick() {},
72726
72798
  edit: true
@@ -72963,10 +73035,11 @@ showSkeleton, actionRef) {
72963
73035
 
72964
73036
  "use strict";
72965
73037
  /* harmony export */ __webpack_require__.d(__webpack_exports__, {
72966
- /* harmony export */ "rf": () => (/* binding */ initActionRef),
73038
+ /* harmony export */ "So": () => (/* binding */ actionRefUseStateOn),
72967
73039
  /* harmony export */ "on": () => (/* binding */ on),
72968
73040
  /* harmony export */ "S1": () => (/* binding */ off),
72969
73041
  /* harmony export */ "j8": () => (/* binding */ emit),
73042
+ /* harmony export */ "rf": () => (/* binding */ initActionRef),
72970
73043
  /* harmony export */ "tx": () => (/* binding */ useActionType),
72971
73044
  /* harmony export */ "Xh": () => (/* binding */ cloneDeep),
72972
73045
  /* harmony export */ "aP": () => (/* binding */ processDefaultFilter)
@@ -72980,123 +73053,74 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
72980
73053
  function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
72981
73054
 
72982
73055
 
72983
- // 组件内全局状态 每次初始化 ActionRef 会重新深拷贝对象
72984
- var state = {
72985
- fullScreenState: false,
72986
- filterRules: {},
72987
- filterColumns: []
72988
- };
72989
-
72990
- var _initState = lodash_clonedeep__WEBPACK_IMPORTED_MODULE_0___default()(state); // state监听事件 每次初始化 ActionRef 会重新深拷贝对象
72991
-
73056
+ // 所有 ProTable 组件公用一套组件内事件转发机制
73057
+ var tableCallback = {}; // 组件内对全局状态的更改
72992
73058
 
72993
- var callback = {
72994
- fullScreenState: {}
72995
- };
72996
- var initCallback = lodash_clonedeep__WEBPACK_IMPORTED_MODULE_0___default()(callback); // 所有 ProTable 组件公用一套组件内事件转发机制
73059
+ var getMutations = function getMutations(actionRef) {
73060
+ var _actionRef$current2, _actionRef$current2$g;
72997
73061
 
72998
- var tableCallback = {}; // 组件内监听事件
72999
- // 组件内对全局状态的更改
73062
+ return {
73063
+ setFullScreenState: function setFullScreenState(fullScreenState) {
73064
+ var _actionRef$current;
73000
73065
 
73001
- var mutations = {
73002
- getState: function getState() {
73003
- return state;
73004
- },
73005
- setState: function setState(key, value) {
73006
- state[key] = value;
73007
- useOn(key, value);
73066
+ (_actionRef$current = actionRef.current) == null ? void 0 : _actionRef$current.setState == null ? void 0 : _actionRef$current.setState('fullScreenState', fullScreenState);
73067
+ },
73068
+ filterColumns: (_actionRef$current2 = actionRef.current) == null ? void 0 : _actionRef$current2.getState == null ? void 0 : (_actionRef$current2$g = _actionRef$current2.getState()) == null ? void 0 : _actionRef$current2$g.filterColumns,
73008
73069
 
73009
- if (mutations.hasOwnProperty(key)) {
73010
- mutations[key] = value;
73011
- }
73012
- },
73013
- initState: function initState() {
73014
- state = lodash_clonedeep__WEBPACK_IMPORTED_MODULE_0___default()(_initState);
73015
- },
73016
- filterColumns: state.filterColumns,
73017
- setFullScreenState: function setFullScreenState(fullScreenState) {
73018
- state.fullScreenState = fullScreenState;
73019
- useOn('fullScreenState', fullScreenState);
73020
- },
73070
+ /**
73071
+ * 设置筛选列规则
73072
+ * @param rules 规则
73073
+ * @param dataIndex column.dataIndex
73074
+ */
73075
+ setFilterRules: function setFilterRules(rules) {
73076
+ var _actionRef$current3;
73021
73077
 
73022
- /**
73023
- * 设置筛选列规则
73024
- * @param rules 规则
73025
- * @param dataIndex column.dataIndex
73026
- */
73027
- setFilterRules: function setFilterRules(rules) {
73028
- state.filterRules = rules;
73029
- },
73078
+ (_actionRef$current3 = actionRef.current) == null ? void 0 : _actionRef$current3.setState == null ? void 0 : _actionRef$current3.setState('filterRules', rules);
73079
+ },
73030
73080
 
73031
- /**
73032
- * 获取筛选规则。为params
73033
- */
73034
- getFilterRules: function getFilterRules() {
73035
- var result = {};
73081
+ /**
73082
+ * 获取筛选规则。为params
73083
+ */
73084
+ getFilterRules: function getFilterRules() {
73085
+ var _actionRef$current4;
73036
73086
 
73037
- if (state.filterRules) {
73038
- result = Object.entries(state.filterRules).map(function (_ref) {
73039
- var _ref2;
73087
+ var result = {};
73088
+ var filterRules = (_actionRef$current4 = actionRef.current) == null ? void 0 : _actionRef$current4.getState == null ? void 0 : _actionRef$current4.getState().filterRules;
73040
73089
 
73041
- var k = _ref[0],
73042
- v = _ref[1];
73043
- return _ref2 = {}, _ref2[k] = v.params, _ref2;
73044
- }).reduce(function (acc, cur) {
73045
- acc = _objectSpread(_objectSpread({}, acc), cur);
73046
- return acc;
73047
- }, {});
73048
- }
73090
+ if (filterRules) {
73091
+ result = Object.entries(filterRules).map(function (_ref) {
73092
+ var _ref2;
73049
73093
 
73050
- return result;
73051
- },
73094
+ var k = _ref[0],
73095
+ v = _ref[1];
73096
+ return _ref2 = {}, _ref2[k] = v.params, _ref2;
73097
+ }).reduce(function (acc, cur) {
73098
+ acc = _objectSpread(_objectSpread({}, acc), cur);
73099
+ return acc;
73100
+ }, {});
73101
+ }
73052
73102
 
73053
- /**
73054
- * 绑定监听函数
73055
- * @param fun 监听函数
73056
- * @param state 需要监听的state
73057
- * @param name 监听名(作为销毁唯一id使用)
73058
- */
73059
- on: function on(fun, state, name) {
73060
- if (!callback[state]) {
73061
- callback[state] = {};
73103
+ return result;
73062
73104
  }
73063
-
73064
- callback[state][name] = fun;
73065
- },
73066
- off: function off(name) {
73067
- callback = Object.fromEntries(Object.entries(callback).map(function (_ref3) {
73068
- var k = _ref3[0],
73069
- v = _ref3[1];
73070
- var filterV = Object.fromEntries(Object.entries(v).filter(function (_ref4) {
73071
- var k = _ref4[0];
73072
- return k !== name;
73073
- }));
73074
- return [k, filterV];
73075
- }));
73076
- }
73105
+ };
73077
73106
  }; // 调用绑定的监听函数
73078
73107
 
73079
- var useOn = function useOn(state) {
73080
- for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
73081
- args[_key - 1] = arguments[_key];
73108
+
73109
+ function actionRefUseStateOn(callback, state) {
73110
+ for (var _len = arguments.length, args = new Array(_len > 2 ? _len - 2 : 0), _key = 2; _key < _len; _key++) {
73111
+ args[_key - 2] = arguments[_key];
73082
73112
  }
73083
73113
 
73084
73114
  if (callback[state]) {
73085
- Object.entries(callback[state]).forEach(function (_ref5) {
73086
- var k = _ref5[0],
73087
- v = _ref5[1];
73115
+ Object.entries(callback[state]).forEach(function (_ref3) {
73116
+ var k = _ref3[0],
73117
+ v = _ref3[1];
73088
73118
 
73089
73119
  if (v) {
73090
73120
  v == null ? void 0 : v.apply(void 0, args);
73091
73121
  }
73092
73122
  });
73093
73123
  }
73094
- }; // 初始化 actionRef
73095
-
73096
-
73097
- function initActionRef() {
73098
- state = lodash_clonedeep__WEBPACK_IMPORTED_MODULE_0___default()(_initState);
73099
- callback = lodash_clonedeep__WEBPACK_IMPORTED_MODULE_0___default()(initCallback);
73100
73124
  }
73101
73125
  /** table 组件内监听 不对外暴露 */
73102
73126
 
@@ -73123,12 +73147,14 @@ function emit(key) {
73123
73147
  fun.apply(void 0, args);
73124
73148
  }
73125
73149
  }
73126
- function useActionType(ref, action) {
73127
- // 合并自定义事件
73128
- var userAction = _objectSpread(_objectSpread({}, action), mutations);
73150
+ function initActionRef(ref, action) {
73151
+ var userAction = _objectSpread(_objectSpread({}, action), getMutations(ref));
73129
73152
 
73130
73153
  ref.current = userAction;
73131
73154
  }
73155
+ function useActionType(ref, action) {
73156
+ ref.current = _objectSpread(_objectSpread({}, ref.current), action);
73157
+ }
73132
73158
  function cloneDeep(obj) {
73133
73159
  return lodash_clonedeep__WEBPACK_IMPORTED_MODULE_0___default()(obj);
73134
73160
  }
@@ -74029,7 +74055,8 @@ function doCommonRequest(config, context, history, extraParams) {
74029
74055
  /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_1__);
74030
74056
  /* harmony import */ var _alicloudfe_components__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(33049);
74031
74057
  /* harmony import */ var _alicloudfe_components__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_2__);
74032
- /* harmony import */ var ahooks__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(26245);
74058
+ /* harmony import */ var ahooks__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(56766);
74059
+ /* harmony import */ var ahooks__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(26245);
74033
74060
  /* harmony import */ var lodash_debounce__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(39339);
74034
74061
  /* harmony import */ var lodash_debounce__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(lodash_debounce__WEBPACK_IMPORTED_MODULE_3__);
74035
74062
  var _excluded = ["children", "className", "ellipsisPosition", "endCharCount", "tooltipProps", "rows", "tooltip", "style"];
@@ -74067,11 +74094,11 @@ var Ellipsis = function Ellipsis(props) {
74067
74094
  var textRef = (0,react__WEBPACK_IMPORTED_MODULE_1__.useRef)();
74068
74095
  var contentRef = (0,react__WEBPACK_IMPORTED_MODULE_1__.useRef)();
74069
74096
 
74070
- var _useState = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(false),
74071
- tooltipVisible = _useState[0],
74072
- setTooltipVisible = _useState[1];
74097
+ var _useSafeState = (0,ahooks__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(false),
74098
+ tooltipVisible = _useSafeState[0],
74099
+ setTooltipVisible = _useSafeState[1];
74073
74100
 
74074
- var contentSize = (0,ahooks__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(contentRef);
74101
+ var contentSize = (0,ahooks__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(contentRef);
74075
74102
  (0,react__WEBPACK_IMPORTED_MODULE_1__.useEffect)(lodash_debounce__WEBPACK_IMPORTED_MODULE_3___default()(function () {
74076
74103
  var _textRef$current$offs, _textRef$current, _textRef$current$scro, _textRef$current2, _textRef$current$offs2, _textRef$current3, _textRef$current$scro2, _textRef$current4;
74077
74104
 
@@ -74321,9 +74348,8 @@ var LabelIconTip = function LabelIconTip(_ref) {
74321
74348
  /* harmony import */ var lodash_clonedeep__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(52308);
74322
74349
  /* harmony import */ var lodash_clonedeep__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(lodash_clonedeep__WEBPACK_IMPORTED_MODULE_2__);
74323
74350
  /* harmony import */ var ___WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(80653);
74324
- var _excluded = ["tag", "renderMore", "maxShowNumber", "moreTagProps", "moreTagWidth"],
74325
- _excluded2 = ["className"],
74326
- _excluded3 = ["className"];
74351
+ var _excluded = ["tag", "renderMore", "maxShowNumber", "moreTagProps", "moreTagWidth", "otherOccupiedSpace", "target"],
74352
+ _excluded2 = ["className"];
74327
74353
 
74328
74354
  function _extends() { _extends = Object.assign || 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); }
74329
74355
 
@@ -74345,6 +74371,7 @@ var cls = (0,___WEBPACK_IMPORTED_MODULE_3__.baseClass)('teamix-pro-tag-group');
74345
74371
 
74346
74372
  var ProTagGroup = function ProTagGroup(props) {
74347
74373
  var ref = (0,react__WEBPACK_IMPORTED_MODULE_0__.useRef)(null);
74374
+ var hiddenRef = (0,react__WEBPACK_IMPORTED_MODULE_0__.useRef)(null);
74348
74375
  var size = (0,ahooks__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(ref);
74349
74376
 
74350
74377
  var _props$tag = props.tag,
@@ -74356,6 +74383,9 @@ var ProTagGroup = function ProTagGroup(props) {
74356
74383
  moreTagProps = _props$moreTagProps === void 0 ? {} : _props$moreTagProps,
74357
74384
  _props$moreTagWidth = props.moreTagWidth,
74358
74385
  moreTagWidth = _props$moreTagWidth === void 0 ? 30 : _props$moreTagWidth,
74386
+ _props$otherOccupiedS = props.otherOccupiedSpace,
74387
+ otherOccupiedSpace = _props$otherOccupiedS === void 0 ? 0 : _props$otherOccupiedS,
74388
+ target = props.target,
74359
74389
  others = _objectWithoutPropertiesLoose(props, _excluded);
74360
74390
 
74361
74391
  var _useState = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(tagProp),
@@ -74388,15 +74418,15 @@ var ProTagGroup = function ProTagGroup(props) {
74388
74418
 
74389
74419
 
74390
74420
  if (maxShowNumber === 'auto') {
74391
- var _ref$current$scrollWi, _ref$current, _ref$current$offsetWi, _ref$current2;
74421
+ var _hiddenRef$current$of, _hiddenRef$current, _ref, _target$current$offse, _target$current, _ref$current;
74392
74422
 
74393
- var scrollWidth = (_ref$current$scrollWi = ref == null ? void 0 : (_ref$current = ref.current) == null ? void 0 : _ref$current.scrollWidth) != null ? _ref$current$scrollWi : 0;
74394
- var offsetWidth = (_ref$current$offsetWi = ref == null ? void 0 : (_ref$current2 = ref.current) == null ? void 0 : _ref$current2.offsetWidth) != null ? _ref$current$offsetWi : 0;
74423
+ var scrollWidth = (_hiddenRef$current$of = hiddenRef == null ? void 0 : (_hiddenRef$current = hiddenRef.current) == null ? void 0 : _hiddenRef$current.offsetWidth) != null ? _hiddenRef$current$of : 0;
74424
+ var offsetWidth = ((_ref = (_target$current$offse = target == null ? void 0 : (_target$current = target.current) == null ? void 0 : _target$current.offsetWidth) != null ? _target$current$offse : ref == null ? void 0 : (_ref$current = ref.current) == null ? void 0 : _ref$current.offsetWidth) != null ? _ref : 0) - otherOccupiedSpace;
74395
74425
 
74396
74426
  if (offsetWidth < scrollWidth) {
74397
- var _ref$current$querySel, _ref$current3, _tagsDom$children;
74427
+ var _ref2, _target$current$query, _target$current2, _ref$current2, _tagsDom$children;
74398
74428
 
74399
- var tagsDom = (_ref$current$querySel = (_ref$current3 = ref.current) == null ? void 0 : _ref$current3.querySelector('.teamix-pro-tags')) != null ? _ref$current$querySel : null;
74429
+ var tagsDom = (_ref2 = (_target$current$query = target == null ? void 0 : (_target$current2 = target.current) == null ? void 0 : _target$current2.querySelector('.teamix-pro-tags')) != null ? _target$current$query : (_ref$current2 = ref.current) == null ? void 0 : _ref$current2.querySelector('.teamix-pro-tags')) != null ? _ref2 : null;
74400
74430
  var tagList = (_tagsDom$children = tagsDom == null ? void 0 : tagsDom.children) != null ? _tagsDom$children : [];
74401
74431
  var width = 0;
74402
74432
  var flag = 0;
@@ -74416,36 +74446,33 @@ var ProTagGroup = function ProTagGroup(props) {
74416
74446
  } else {
74417
74447
  count = tag.length;
74418
74448
  }
74419
- } // 指定tag显示数量
74449
+ } // // 指定tag显示数量
74450
+ // if (count === 0 && tag.length > 0) {
74451
+ // const { className, ...others } = moreTagProps;
74452
+ // const countTag = {
74453
+ // children: `+${tag.length}`,
74454
+ // className: `${cls('remain')} teamix-pro-tag`,
74455
+ // ...others,
74456
+ // };
74457
+ // return [countTag];
74458
+ // }
74459
+ // tag 显示不下。进行折叠
74420
74460
 
74421
74461
 
74422
- if (count === 0 && tag.length > 0) {
74462
+ if (tag.length > count) {
74423
74463
  var className = moreTagProps.className,
74424
74464
  _others = _objectWithoutPropertiesLoose(moreTagProps, _excluded2);
74425
74465
 
74426
74466
  var countTag = _objectSpread({
74427
- children: "+" + tag.length,
74428
- className: cls('remain') + " teamix-pro-tag"
74429
- }, _others);
74430
-
74431
- return [countTag];
74432
- } // tag 显示不下。进行折叠
74433
-
74434
-
74435
- if (tag.length > count) {
74436
- var _className = moreTagProps.className,
74437
- _others2 = _objectWithoutPropertiesLoose(moreTagProps, _excluded3);
74438
-
74439
- var _countTag = _objectSpread({
74440
74467
  children: "+" + (tag.length - count),
74441
74468
  className: cls('remain') + " teamix-pro-tag"
74442
- }, _others2);
74469
+ }, _others);
74443
74470
 
74444
- var customRenderMore = renderMore == null ? void 0 : renderMore(count, tag, ref);
74471
+ var customRenderMore = renderMore == null ? void 0 : renderMore(count, tag, target != null ? target : ref);
74445
74472
  var remainTags = tag.filter(function (_item, index) {
74446
74473
  return index < count;
74447
74474
  });
74448
- return [].concat(remainTags, [customRenderMore != null ? customRenderMore : _countTag]);
74475
+ return [].concat(remainTags, [customRenderMore != null ? customRenderMore : countTag]);
74449
74476
  }
74450
74477
 
74451
74478
  return tag;
@@ -74458,7 +74485,8 @@ var ProTagGroup = function ProTagGroup(props) {
74458
74485
  }),
74459
74486
  ref: ref
74460
74487
  }, others), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
74461
- className: cls('hidden')
74488
+ className: cls('hidden'),
74489
+ ref: hiddenRef
74462
74490
  }, (0,___WEBPACK_IMPORTED_MODULE_1__/* .renderTags */ .a)(tag)), realTag.length > 0 && (0,___WEBPACK_IMPORTED_MODULE_1__/* .renderTags */ .a)(realTag));
74463
74491
  };
74464
74492