@teamix/pro 1.2.27 → 1.2.31

package/dist/pro.js

@@ -52875,7 +52875,7 @@ var FieldSelect = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().forw
 /* harmony import */ var _output__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(90405);
 /* harmony import */ var _utils__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(72326);
 /* harmony import */ var _selectGroup__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(47363);
-var _excluded = ["dataSource", "type", "value", "onChange", "mode", "render", "valueAlias"];
+var _excluded = ["dataSource", "type", "value", "onChange", "mode", "render", "valueAlias", "fieldRef"];
 
 function ownKeys(object, enumerableOnly) {
   var keys = Object.keys(object);
@@ -53041,7 +53041,10 @@ function _arrayLikeToArray(arr, len) {
 
  // 处理 value
 
-var precessValue = function precessValue(value, valueAlias) {
+var precessValue = function precessValue() {
+  var value = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+  var valueAlias = arguments.length > 1 ? arguments[1] : undefined;
+
   var _ref = valueAlias !== null && valueAlias !== void 0 ? valueAlias : {},
       _ref$value = _ref.value,
       valueAliasValue = _ref$value === void 0 ? 'value' : _ref$value,
@@ -53088,6 +53091,7 @@ var FieldSelectGroup = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default()
       mode = props.mode,
       render = props.render,
       valueAlias = props.valueAlias,
+      fieldRef = props.fieldRef,
       others = _objectWithoutProperties(props, _excluded);
 
   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()
     return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default().createElement(_teamix_utils__WEBPACK_IMPORTED_MODULE_2__.ProTagGroup, {
       tag: tags,
       maxShowNumber: (_outputRender$maxShow = outputRender.maxShowNumber) !== null && _outputRender$maxShow !== void 0 ? _outputRender$maxShow : 'all',
+      // 右侧小笔的宽度
+      otherOccupiedSpace: 26,
+      target: fieldRef,
       renderMore: function renderMore(count, _, ref) {
         var _ref$current$querySel, _ref$current, _tagsDom$children, _outputRender2, _outputRender$foldTex, _outputRender3, _outputRender4;
 
@@ -57748,7 +57755,10 @@ var SelectGroup = function SelectGroup(props) {
     setValue(valueProp);
   }, [valueProp]);
   (0,react__WEBPACK_IMPORTED_MODULE_1__.useEffect)(function () {
+    var _dataSourceProp$0$dat, _dataSourceProp$;
+
     setDataSource(dataSourceProp !== null && dataSourceProp !== void 0 ? dataSourceProp : []);
+    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 : '');
   }, [dataSourceProp]); // 搜索值变化回调 过滤数据
 
   var onSearch = function onSearch(value) {
@@ -57757,10 +57767,10 @@ var SelectGroup = function SelectGroup(props) {
       var _newDataSource, _newDataSource$0$data, _newDataSource2, _newDataSource2$;
 
       if (!value) {
-        var _dataSourceProp$0$dat, _dataSourceProp$;
+        var _dataSourceProp$0$dat2, _dataSourceProp$2;
 
         setDataSource(dataSourceProp !== null && dataSourceProp !== void 0 ? dataSourceProp : []);
-        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 : '');
+        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 : '');
         onSearchChange === null || onSearchChange === void 0 ? void 0 : onSearchChange(value);
         return;
       }
@@ -58768,8 +58778,9 @@ var ProField = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().forward
       tooltipLabel = props.tooltipLabel,
       tooltipIcon = props.tooltipIcon,
       tooltipIconSize = props.tooltipIconSize,
-      others = _objectWithoutProperties(props, _excluded); // 注册全局自定义组件
+      others = _objectWithoutProperties(props, _excluded);
 
+  var proFieldRef = (0,react__WEBPACK_IMPORTED_MODULE_0__.useRef)(); // 注册全局自定义组件
 
   var globalProField = (_getGlobalConfig = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_3__.getGlobalConfig)('ProField')) !== null && _getGlobalConfig !== void 0 ? _getGlobalConfig : {};
   registerComponent(globalProField);
@@ -58807,10 +58818,11 @@ var ProField = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().forward
   return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", _objectSpread({
     className: classnames__WEBPACK_IMPORTED_MODULE_1___default()((_cls = {
       'teamix-pro-field': true
-    }, _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))
+    }, _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)),
+    ref: proFieldRef
   }, (0,_utils__WEBPACK_IMPORTED_MODULE_24__/* .hasProps */ .s_)({
     style: transparentBase === null || transparentBase === void 0 ? void 0 : transparentBase.style
-  })), renderField(type, newProps, ref), !!tooltip && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_teamix_utils__WEBPACK_IMPORTED_MODULE_3__.LabelIconTip, {
+  })), renderField(type, newProps, ref, proFieldRef), !!tooltip && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_teamix_utils__WEBPACK_IMPORTED_MODULE_3__.LabelIconTip, {
     label: tooltipLabel,
     tooltip: tooltip,
     icon: tooltipIcon,
@@ -58818,10 +58830,18 @@ var ProField = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().forward
   }));
 });
 
-var renderField = function renderField(type, props, ref) {
+var renderField = function renderField(type, props, ref, fieldRef) {
   var allComponents = _objectSpread(_objectSpread({}, innerComponents), externalComponents);
 
   var Component = allComponents[type === null || type === void 0 ? void 0 : type.toLowerCase()] || _components_FieldText__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z;
+
+  if ((type === null || type === void 0 ? void 0 : type.toLowerCase()) === 'selectgroup') {
+    return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(Component, _objectSpread(_objectSpread({}, props), {}, {
+      ref: ref,
+      fieldRef: fieldRef
+    }));
+  }
+
   return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(Component, _objectSpread(_objectSpread({}, props), {}, {
     ref: ref
   }));
@@ -61184,12 +61204,11 @@ function useErrorAction(action, context) {
 var _excluded = ["type"],
     _excluded2 = ["config", "icon", "iconSize", "type", "context", "children", "visible", "onClick"],
     _excluded3 = ["loading"],
-    _excluded4 = ["icon", "iconSize", "label", "actions", "children", "context", "type"],
+    _excluded4 = ["icon", "iconSize", "label", "actions", "children", "context", "type", "className", "noArrow"],
     _excluded5 = ["context", "text"],
-    _excluded6 = ["noArrow", "className"],
-    _excluded7 = ["key", "actions"],
-    _excluded8 = ["key", "config"],
-    _excluded9 = ["type", "divider", "max", "moreText", "more", "context", "actions", "className"];
+    _excluded6 = ["key", "actions"],
+    _excluded7 = ["key", "config"],
+    _excluded8 = ["type", "divider", "max", "moreText", "more", "context", "actions", "className"];
 
 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); }
 
@@ -61414,6 +61433,8 @@ var ProActionMenuButton = function ProActionMenuButton(props) {
       context = props.context,
       _props$type2 = props.type,
       type = _props$type2 === void 0 ? 'primary' : _props$type2,
+      className = props.className,
+      noArrow = props.noArrow,
       others = _objectWithoutPropertiesLoose(props, _excluded4);
 
   return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_2__.MenuButton, _extends({
@@ -61427,7 +61448,10 @@ var ProActionMenuButton = function ProActionMenuButton(props) {
       v2: true
     },
     type: type,
-    label: buttonContent(label || children, icon, iconSize, context)
+    label: buttonContent(label || children, icon, iconSize, context),
+    className: classnames__WEBPACK_IMPORTED_MODULE_1___default()(className, {
+      'teamix-pro-actions-text-menu-btn-no-arrow': noArrow
+    })
   }, others), actions.map(function (action, i) {
     return renderCommonActionButtonMenuItem(action, action.key || i, context);
   }));
@@ -61489,16 +61513,12 @@ function renderCommonActionButton(button, context, isTypeText) {
 }
 
 function getDefaultMoreButton(type, more) {
-  var _cls;
-
-  var noArrowClassName = 'teamix-pro-actions-text-menu-btn-no-arrow';
   var defaultConfig = type === 'button' ? {
     children: (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_4__.getMessage)('more')
   } : {
     icon: 'more-line',
-    // iconSize: 'small',
     autoWidth: false,
-    className: noArrowClassName
+    noArrow: true
   };
 
   if (!more) {
@@ -61513,13 +61533,7 @@ function getDefaultMoreButton(type, more) {
     return Object.assign(defaultConfig, moreConfig);
   }
 
-  var noArrow = moreConfig.noArrow,
-      className = moreConfig.className,
-      others = _objectWithoutPropertiesLoose(moreConfig, _excluded6);
-
-  return _objectSpread({
-    className: classnames__WEBPACK_IMPORTED_MODULE_1___default()(className, (_cls = {}, _cls["" + noArrowClassName] = noArrow, _cls))
-  }, others);
+  return moreConfig;
 }
 
 var MAX_ACTTIONS = 4;
@@ -61537,7 +61551,7 @@ function getActionConfig(action, index, context) {
     var _ref2 = action,
         _key = _ref2.key,
         actions = _ref2.actions,
-        _others = _objectWithoutPropertiesLoose(_ref2, _excluded7);
+        _others = _objectWithoutPropertiesLoose(_ref2, _excluded6);
 
     return _objectSpread({
       key: getKey(index, _key),
@@ -61550,7 +61564,7 @@ function getActionConfig(action, index, context) {
   var _ref3 = action,
       key = _ref3.key,
       config = _ref3.config,
-      others = _objectWithoutPropertiesLoose(_ref3, _excluded8);
+      others = _objectWithoutPropertiesLoose(_ref3, _excluded7);
 
   return _objectSpread({
     key: getKey(index, key),
@@ -61571,7 +61585,7 @@ function ProActionGroup(props) {
       _props$actions = props.actions,
       actions = _props$actions === void 0 ? [] : _props$actions,
       className = props.className,
-      containerProps = _objectWithoutPropertiesLoose(props, _excluded9);
+      containerProps = _objectWithoutPropertiesLoose(props, _excluded8);
 
   var isTypeText = type === 'text';
   var filteredActions = actions.map(function (action, index) {
@@ -63201,7 +63215,7 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 
 // 初始化Search组件，内置部分属性
 var initializeSearch = function initializeSearch(schema) {
-  var searchName;
+  var searchName = '';
   var initializedSchema = schema.map(function (item) {
     if (item.component === 'Search') {
       searchName = item.name;
@@ -63270,6 +63284,13 @@ var SimpleFilter = /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.memo)(func
       onChange == null ? void 0 : onChange(values, name, value);
     }
   }, [searchName, searchValue.current]);
+  (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
+    var _props$form$initialVa, _props$form$initialVa2;
+
+    // 处理Search组件，缓存input的默认值
+    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];
+    searchValue.current = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_2__.isValid)(searchDefaultValue) ? searchDefaultValue : '';
+  }, []);
   return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_ProForm__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z, _extends({}, otherProps, {
     className: classnames__WEBPACK_IMPORTED_MODULE_1___default()(prefixCls, props.className),
     schema: simpleSchema,
@@ -66284,7 +66305,7 @@ _teamix_icon__WEBPACK_IMPORTED_MODULE_14__/* ["default"].setConfig */ .Z.setConf
  // export * from './sidebar';
 
 
-var version = '1.2.27';
+var version = '1.2.31';
 
 
 /***/ }),
@@ -66894,7 +66915,8 @@ var ProBaseInfo = function ProBaseInfo(props) {
 
   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, {
     wrap: true,
-    className: "teamix-pro-info-content-row"
+    className: "teamix-pro-info-content-row",
+    gutter: 20
   }, renderContent()));
 };
 
@@ -70155,10 +70177,10 @@ var Filter = function Filter(props) {
       setVisible = _useState2[1];
 
   (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
-    var _actionRef$current$ge, _actionRef$current, _actionRef$current$ge2, _actionRef$current$ge3;
+    var _actionRef$current$ge, _actionRef$current, _actionRef$current$ge2, _actionRef$current$ge3, _actionRef$current$ge4;
 
     // 从全局状态中读取上次存储的条件
-    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 : [];
+    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 : [];
     setSelected(rules);
   }, []); // 获取过滤项
 
@@ -70274,7 +70296,7 @@ var Filter = function Filter(props) {
       btn: true
     }),
     onClick: function onClick() {
-      var _actionRef$current2, _actionRef$current$ge4, _actionRef$current3, _actionRef$current3$g, _actionRef$current4, _objectSpread2;
+      var _actionRef$current2, _actionRef$current$ge5, _actionRef$current3, _actionRef$current3$g, _actionRef$current4, _objectSpread2;
 
       (_actionRef$current2 = actionRef.current) == null ? void 0 : _actionRef$current2.filterDataSource == null ? void 0 : _actionRef$current2.filterDataSource(column.dataIndex); // 先获取此列的param
 
@@ -70287,7 +70309,7 @@ var Filter = function Filter(props) {
       } // 需要带上其他所有的信息
 
 
-      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 : {}; // 再设置所有的列筛选状态
+      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 : {}; // 再设置所有的列筛选状态
 
       (_actionRef$current4 = actionRef.current) == null ? void 0 : _actionRef$current4.setFilterRules == null ? void 0 : _actionRef$current4.setFilterRules(_objectSpread(_objectSpread({}, rules), {}, (_objectSpread2 = {}, _objectSpread2[column.dataIndex] = {
         rules: selected,
@@ -70320,10 +70342,10 @@ var Filter = function Filter(props) {
       btn: true
     }),
     onClick: function onClick() {
-      var _actionRef$current$ge5, _actionRef$current9, _actionRef$current9$g, _actionRef$current10, _objectSpread3, _actionRef$current11;
+      var _actionRef$current$ge6, _actionRef$current9, _actionRef$current9$g, _actionRef$current10, _objectSpread3, _actionRef$current11;
 
       setSelected([]);
-      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 : {};
+      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 : {};
       (_actionRef$current10 = actionRef.current) == null ? void 0 : _actionRef$current10.setFilterRules == null ? void 0 : _actionRef$current10.setFilterRules(_objectSpread(_objectSpread({}, rules), {}, (_objectSpread3 = {}, _objectSpread3[column.dataIndex] = {
         rules: [],
         params: ''
@@ -70429,8 +70451,10 @@ var Layout = function Layout(props) {
 
 
   var renderQueryFilter = function renderQueryFilter() {
-    if (dataFilter) {
-      var _dataFilter$schema;
+    var _dataFilter$schema;
+
+    if (dataFilter != null && (_dataFilter$schema = dataFilter.schema) != null && _dataFilter$schema.length) {
+      var _dataFilter$schema2;
 
       if ( /*#__PURE__*/(0,react__WEBPACK_IMPORTED_MODULE_0__.isValidElement)(dataFilter == null ? void 0 : dataFilter.content)) {
         // 自定义渲染内容
@@ -70458,7 +70482,7 @@ var Layout = function Layout(props) {
             actionRef: actionRef
           }, otherProps)))
         }, dataFilter));
-      } else if ((dataFilter == null ? void 0 : (_dataFilter$schema = dataFilter.schema) == null ? void 0 : _dataFilter$schema.length) >= 0) {
+      } else if ((dataFilter == null ? void 0 : (_dataFilter$schema2 = dataFilter.schema) == null ? void 0 : _dataFilter$schema2.length) >= 0) {
         return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_form__WEBPACK_IMPORTED_MODULE_3__/* .QueryFilter */ .ti, _extends({
           formRef: dataFilterFormRef,
           onExpand: function onExpand(expand) {
@@ -70484,6 +70508,19 @@ var Layout = function Layout(props) {
           }, otherProps)))
         }, dataFilter));
       }
+    } else if (mainAction) {
+      // 没传 dataFilter 但是传了 mainAction
+      return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_form__WEBPACK_IMPORTED_MODULE_3__/* .QueryFilterLayout */ .rx, {
+        className: "mb8",
+        addonBefore: renderMainAction(),
+        addonAfter: /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, extra && !header && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_QuickAction__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z, {
+          actionRef: actionRef,
+          quickAction: extra,
+          rowSelection: rowSelection
+        }), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_ToolBar__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z, _extends({
+          actionRef: actionRef
+        }, otherProps)))
+      });
     }
   }; // 区域组合渲染
 
@@ -71801,7 +71838,7 @@ var globalFormatSort = function globalFormatSort(sort) {
 };
 
 var ProTable = function ProTable(props) {
-  var _rowSelection$selecte;
+  var _rowSelection$selecte, _dataFilterForm4;
 
   var header = props.header,
       className = props.className,
@@ -71907,7 +71944,22 @@ var ProTable = function ProTable(props) {
 
   var _useState10 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(true),
       showLoading = _useState10[0],
-      setShowLoading = _useState10[1]; // 存储定时器 id
+      setShowLoading = _useState10[1]; // 存储能够被 on 监听到的 ProTable 状态
+  // 因为只做存储用。不需要更新视图以及需要同步更改。所以不使用 setState 更新
+
+
+  var _useState11 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)({
+    fullScreenState: false,
+    filterRules: {},
+    filterColumns: []
+  }),
+      actionRefState = _useState11[0]; // 存储 on 监听事件
+
+
+  var _useState12 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)({
+    fullScreenState: {}
+  }),
+      actionRefCallback = _useState12[0]; // 存储定时器 id
 
 
   var autoRefreshTimerRef = (0,react__WEBPACK_IMPORTED_MODULE_0__.useRef)(); // 获取header高度，用作全屏吸底吸底高度计算
@@ -71931,14 +71983,14 @@ var ProTable = function ProTable(props) {
   }; // header 区域高度。用作全屏计算吸顶吸底高度。默认不做计算
 
 
-  var _useState11 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(0),
-      headerHeight = _useState11[0],
-      setHeaderHeight = _useState11[1]; // 全屏显示 className
+  var _useState13 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(0),
+      headerHeight = _useState13[0],
+      setHeaderHeight = _useState13[1]; // 全屏显示 className
 
 
-  var _useState12 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false),
-      fullscreenState = _useState12[0],
-      setFullscreenState = _useState12[1]; // 非全屏状态下的
+  var _useState14 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false),
+      fullscreenState = _useState14[0],
+      setFullscreenState = _useState14[1]; // 非全屏状态下的
 
 
   var normalDataFilterFormRef = (0,react__WEBPACK_IMPORTED_MODULE_0__.useRef)();
@@ -71946,12 +71998,12 @@ var ProTable = function ProTable(props) {
   var normalDataFilterForm = normalDataFilterFormRef.current;
   var fullscreenDataFilterForm = fullscreenDataFilterFormRef.current; // 传给 QueryFilter 的 formRef
 
-  var dataFilterFormRef = fullscreenState ? normalDataFilterFormRef : fullscreenDataFilterFormRef;
+  var dataFilterFormRef = !fullscreenState ? normalDataFilterFormRef : fullscreenDataFilterFormRef;
   var dataFilterForm = dataFilterFormRef.current; // 整个内容区是否超过一屏。用于表格在非全屏模式下的吸底
 
-  var _useState13 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false),
-      footerSuctionState = _useState13[0],
-      setFooterSuctionState = _useState13[1]; // TODO 获取内容区是否超出一屏（暂时仅支持全家桶）
+  var _useState15 = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(false),
+      footerSuctionState = _useState15[0],
+      setFooterSuctionState = _useState15[1]; // TODO 获取内容区是否超出一屏（暂时仅支持全家桶）
 
 
   var getFooterSuctionState = function getFooterSuctionState() {
@@ -72075,7 +72127,38 @@ var ProTable = function ProTable(props) {
     if (propsDataSource) {
       setData(propsDataSource);
     }
-  }, [propsDataSource]); // 绑定 Actions
+  }, [propsDataSource]); // 初始化 ActionRef。
+
+  (0,_utils__WEBPACK_IMPORTED_MODULE_7__/* .initActionRef */ .rf)(actionRef, {
+    getState: function getState() {
+      return actionRefState;
+    },
+    getCallback: function getCallback() {
+      return actionRefCallback;
+    },
+    setState: function setState(key, value) {
+      actionRefState[key] = value;
+      (0,_utils__WEBPACK_IMPORTED_MODULE_7__/* .actionRefUseStateOn */ .So)(actionRefCallback, key, value);
+    },
+    on: function on(fun, state, name) {
+      if (!actionRefCallback[state]) {
+        actionRefCallback[state] = {};
+      }
+
+      actionRefCallback[state][name] = fun;
+    },
+    off: function off(name) {
+      actionRefCallback = Object.fromEntries(Object.entries(actionRefCallback).map(function (_ref2) {
+        var k = _ref2[0],
+            v = _ref2[1];
+        var filterV = Object.fromEntries(Object.entries(v).filter(function (_ref3) {
+          var k = _ref3[0];
+          return k !== name;
+        }));
+        return [k, filterV];
+      }));
+    }
+  }); // 绑定 Actions
 
   (0,_utils__WEBPACK_IMPORTED_MODULE_7__/* .useActionType */ .tx)(actionRef, {
     fullScreen: function fullScreen() {
@@ -72121,12 +72204,12 @@ var ProTable = function ProTable(props) {
       _request(params);
     },
     reset: function reset() {
-      var _actionRef$current3, _request2;
+      var _actionRef$current3, _dataFilterForm, _request2;
 
       (propsDataFilter == null ? void 0 : propsDataFilter.onReset) && (propsDataFilter == null ? void 0 : propsDataFilter.onReset()); // 清空列过滤参数
 
       (_actionRef$current3 = actionRef.current) == null ? void 0 : _actionRef$current3.setFilterRules == null ? void 0 : _actionRef$current3.setFilterRules({});
-      dataFilterForm == null ? void 0 : dataFilterForm.reset();
+      (_dataFilterForm = dataFilterForm) == null ? void 0 : _dataFilterForm.reset();
       setCurrentPage(1);
 
       _request((_request2 = {}, _request2[targetPageKey] = 1, _request2));
@@ -72183,12 +72266,12 @@ var ProTable = function ProTable(props) {
 
 
   var getData = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_4__.useRequest)(function (params) {
-    var _ref2;
+    var _ref4;
 
-    return _ref2 = {
+    return _ref4 = {
       url: url,
       method: method
-    }, _ref2[requestDataKey] = params, _ref2;
+    }, _ref4[requestDataKey] = params, _ref4;
   }, {
     // 使用 request 方法代替 fetch
     requestMethod: function requestMethod(params) {
@@ -72242,7 +72325,7 @@ var ProTable = function ProTable(props) {
   }); // 请求函数
 
   function _request(params, noLoading) {
-    var _actionRef$current$ge, _actionRef$current4, _objectSpread2;
+    var _dataFilterForm2, _actionRef$current$ge, _actionRef$current4, _objectSpread2;
 
     // 如果没有传 url 且没有 customRequest，直接返回
     if (!url && !customRequest) {
@@ -72255,7 +72338,7 @@ var ProTable = function ProTable(props) {
 
     var sortParams = targetFormatSort(sort); // 筛选区请求参数
 
-    var dataFilterParams = toJS(dataFilterForm == null ? void 0 : dataFilterForm.values); // 列过滤请求参数
+    var dataFilterParams = toJS((_dataFilterForm2 = dataFilterForm) == null ? void 0 : _dataFilterForm2.values); // 列过滤请求参数
 
     var columnsFilterParams = (_actionRef$current$ge = (_actionRef$current4 = actionRef.current) == null ? void 0 : _actionRef$current4.getFilterRules == null ? void 0 : _actionRef$current4.getFilterRules()) != null ? _actionRef$current$ge : {}; // 格式化后的请求参数
 
@@ -72306,8 +72389,7 @@ var ProTable = function ProTable(props) {
   }
 
   (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
-    // 初始化 actionRef state、callback 此时 actionRef 已初始化完成
-    (0,_utils__WEBPACK_IMPORTED_MODULE_7__/* .initActionRef */ .rf)(); // 监听 浏览器变化 更吸底状态
+    dataFilterForm = dataFilterFormRef.current; // 监听 浏览器变化 更吸底状态
 
     if (footerSuction) {
       getFooterSuctionState();
@@ -72317,11 +72399,21 @@ var ProTable = function ProTable(props) {
       };
     }
 
-    if (requestWhenMount) {
-      // 在请求发送之前 处理漏斗默认数据
-      (0,_utils__WEBPACK_IMPORTED_MODULE_7__/* .processDefaultFilter */ .aP)(propsColumns, actionRef, defaultFilterParams);
+    if (propsDataFilter) {
+      var _dataFilterForm3;
+
+      if (requestWhenMount && (_dataFilterForm3 = dataFilterForm) != null && _dataFilterForm3.id) {
+        // 在请求发送之前 处理漏斗默认数据
+        (0,_utils__WEBPACK_IMPORTED_MODULE_7__/* .processDefaultFilter */ .aP)(propsColumns, actionRef, defaultFilterParams);
+
+        _request();
+      }
+    } else {
+      if (requestWhenMount) {
+        (0,_utils__WEBPACK_IMPORTED_MODULE_7__/* .processDefaultFilter */ .aP)(propsColumns, actionRef, defaultFilterParams);
 
-      _request();
+        _request();
+      }
     }
 
     return function () {
@@ -72335,7 +72427,7 @@ var ProTable = function ProTable(props) {
 
       actionRef.current = undefined;
     };
-  }, []);
+  }, [(_dataFilterForm4 = dataFilterForm) == null ? void 0 : _dataFilterForm4.id]);
 
   function onSort(dataIndex, order) {
     var _nextSort;
@@ -72361,10 +72453,10 @@ var ProTable = function ProTable(props) {
       _request((_request3 = {}, _request3[targetPageKey] = 1, _request3));
     },
     onReset: function onReset() {
-      var _request4;
+      var _dataFilterForm5, _request4;
 
       (propsDataFilter == null ? void 0 : propsDataFilter.onReset) && (propsDataFilter == null ? void 0 : propsDataFilter.onReset());
-      dataFilterForm == null ? void 0 : dataFilterForm.reset();
+      (_dataFilterForm5 = dataFilterForm) == null ? void 0 : _dataFilterForm5.reset();
       setCurrentPage(1);
 
       _request((_request4 = {}, _request4[targetPageKey] = 1, _request4));
@@ -72700,7 +72792,7 @@ var renderCell = function renderCell(value, item, index, record, actionRef) {
 
     if (valueType === 'selectGroup') {
       newRender = _objectSpread(_objectSpread({
-        maxShowNumber: 1,
+        maxShowNumber: 'auto',
         foldText: 'more',
         editOnClick: function editOnClick() {},
         edit: true
@@ -72943,10 +73035,11 @@ showSkeleton, actionRef) {
 
 "use strict";
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   "rf": () => (/* binding */ initActionRef),
+/* harmony export */   "So": () => (/* binding */ actionRefUseStateOn),
 /* harmony export */   "on": () => (/* binding */ on),
 /* harmony export */   "S1": () => (/* binding */ off),
 /* harmony export */   "j8": () => (/* binding */ emit),
+/* harmony export */   "rf": () => (/* binding */ initActionRef),
 /* harmony export */   "tx": () => (/* binding */ useActionType),
 /* harmony export */   "Xh": () => (/* binding */ cloneDeep),
 /* harmony export */   "aP": () => (/* binding */ processDefaultFilter)
@@ -72960,123 +73053,74 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 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; }
 
 
-// 组件内全局状态 每次初始化 ActionRef 会重新深拷贝对象
-var state = {
-  fullScreenState: false,
-  filterRules: {},
-  filterColumns: []
-};
-
-var _initState = lodash_clonedeep__WEBPACK_IMPORTED_MODULE_0___default()(state); // state监听事件 每次初始化 ActionRef 会重新深拷贝对象
+// 所有 ProTable 组件公用一套组件内事件转发机制
+var tableCallback = {}; // 组件内对全局状态的更改
 
+var getMutations = function getMutations(actionRef) {
+  var _actionRef$current2, _actionRef$current2$g;
 
-var callback = {
-  fullScreenState: {}
-};
-var initCallback = lodash_clonedeep__WEBPACK_IMPORTED_MODULE_0___default()(callback); // 所有 ProTable 组件公用一套组件内事件转发机制
-
-var tableCallback = {}; // 组件内监听事件
-// 组件内对全局状态的更改
+  return {
+    setFullScreenState: function setFullScreenState(fullScreenState) {
+      var _actionRef$current;
 
-var mutations = {
-  getState: function getState() {
-    return state;
-  },
-  setState: function setState(key, value) {
-    state[key] = value;
-    useOn(key, value);
+      (_actionRef$current = actionRef.current) == null ? void 0 : _actionRef$current.setState == null ? void 0 : _actionRef$current.setState('fullScreenState', fullScreenState);
+    },
+    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,
 
-    if (mutations.hasOwnProperty(key)) {
-      mutations[key] = value;
-    }
-  },
-  initState: function initState() {
-    state = lodash_clonedeep__WEBPACK_IMPORTED_MODULE_0___default()(_initState);
-  },
-  filterColumns: state.filterColumns,
-  setFullScreenState: function setFullScreenState(fullScreenState) {
-    state.fullScreenState = fullScreenState;
-    useOn('fullScreenState', fullScreenState);
-  },
+    /**
+     * 设置筛选列规则
+     * @param rules 规则
+     * @param dataIndex column.dataIndex
+     */
+    setFilterRules: function setFilterRules(rules) {
+      var _actionRef$current3;
 
-  /**
-   * 设置筛选列规则
-   * @param rules 规则
-   * @param dataIndex column.dataIndex
-   */
-  setFilterRules: function setFilterRules(rules) {
-    state.filterRules = rules;
-  },
+      (_actionRef$current3 = actionRef.current) == null ? void 0 : _actionRef$current3.setState == null ? void 0 : _actionRef$current3.setState('filterRules', rules);
+    },
 
-  /**
-   * 获取筛选规则。为params
-   */
-  getFilterRules: function getFilterRules() {
-    var result = {};
+    /**
+     * 获取筛选规则。为params
+     */
+    getFilterRules: function getFilterRules() {
+      var _actionRef$current4;
 
-    if (state.filterRules) {
-      result = Object.entries(state.filterRules).map(function (_ref) {
-        var _ref2;
+      var result = {};
+      var filterRules = (_actionRef$current4 = actionRef.current) == null ? void 0 : _actionRef$current4.getState == null ? void 0 : _actionRef$current4.getState().filterRules;
 
-        var k = _ref[0],
-            v = _ref[1];
-        return _ref2 = {}, _ref2[k] = v.params, _ref2;
-      }).reduce(function (acc, cur) {
-        acc = _objectSpread(_objectSpread({}, acc), cur);
-        return acc;
-      }, {});
-    }
+      if (filterRules) {
+        result = Object.entries(filterRules).map(function (_ref) {
+          var _ref2;
 
-    return result;
-  },
+          var k = _ref[0],
+              v = _ref[1];
+          return _ref2 = {}, _ref2[k] = v.params, _ref2;
+        }).reduce(function (acc, cur) {
+          acc = _objectSpread(_objectSpread({}, acc), cur);
+          return acc;
+        }, {});
+      }
 
-  /**
-   * 绑定监听函数
-   * @param fun 监听函数
-   * @param state 需要监听的state
-   * @param name 监听名（作为销毁唯一id使用）
-   */
-  on: function on(fun, state, name) {
-    if (!callback[state]) {
-      callback[state] = {};
+      return result;
     }
-
-    callback[state][name] = fun;
-  },
-  off: function off(name) {
-    callback = Object.fromEntries(Object.entries(callback).map(function (_ref3) {
-      var k = _ref3[0],
-          v = _ref3[1];
-      var filterV = Object.fromEntries(Object.entries(v).filter(function (_ref4) {
-        var k = _ref4[0];
-        return k !== name;
-      }));
-      return [k, filterV];
-    }));
-  }
+  };
 }; // 调用绑定的监听函数
 
-var useOn = function useOn(state) {
-  for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-    args[_key - 1] = arguments[_key];
+
+function actionRefUseStateOn(callback, state) {
+  for (var _len = arguments.length, args = new Array(_len > 2 ? _len - 2 : 0), _key = 2; _key < _len; _key++) {
+    args[_key - 2] = arguments[_key];
   }
 
   if (callback[state]) {
-    Object.entries(callback[state]).forEach(function (_ref5) {
-      var k = _ref5[0],
-          v = _ref5[1];
+    Object.entries(callback[state]).forEach(function (_ref3) {
+      var k = _ref3[0],
+          v = _ref3[1];
 
       if (v) {
         v == null ? void 0 : v.apply(void 0, args);
       }
     });
   }
-}; // 初始化 actionRef
-
-
-function initActionRef() {
-  state = lodash_clonedeep__WEBPACK_IMPORTED_MODULE_0___default()(_initState);
-  callback = lodash_clonedeep__WEBPACK_IMPORTED_MODULE_0___default()(initCallback);
 }
 /** table 组件内监听 不对外暴露 */
 
@@ -73103,12 +73147,14 @@ function emit(key) {
     fun.apply(void 0, args);
   }
 }
-function useActionType(ref, action) {
-  // 合并自定义事件
-  var userAction = _objectSpread(_objectSpread({}, action), mutations);
+function initActionRef(ref, action) {
+  var userAction = _objectSpread(_objectSpread({}, action), getMutations(ref));
 
   ref.current = userAction;
 }
+function useActionType(ref, action) {
+  ref.current = _objectSpread(_objectSpread({}, ref.current), action);
+}
 function cloneDeep(obj) {
   return lodash_clonedeep__WEBPACK_IMPORTED_MODULE_0___default()(obj);
 }
@@ -74009,7 +74055,8 @@ function doCommonRequest(config, context, history, extraParams) {
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(react__WEBPACK_IMPORTED_MODULE_1__);
 /* harmony import */ var _alicloudfe_components__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(33049);
 /* harmony import */ var _alicloudfe_components__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var ahooks__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(26245);
+/* harmony import */ var ahooks__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(56766);
+/* harmony import */ var ahooks__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(26245);
 /* harmony import */ var lodash_debounce__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(39339);
 /* harmony import */ var lodash_debounce__WEBPACK_IMPORTED_MODULE_3___default = /*#__PURE__*/__webpack_require__.n(lodash_debounce__WEBPACK_IMPORTED_MODULE_3__);
 var _excluded = ["children", "className", "ellipsisPosition", "endCharCount", "tooltipProps", "rows", "tooltip", "style"];
@@ -74047,11 +74094,11 @@ var Ellipsis = function Ellipsis(props) {
   var textRef = (0,react__WEBPACK_IMPORTED_MODULE_1__.useRef)();
   var contentRef = (0,react__WEBPACK_IMPORTED_MODULE_1__.useRef)();
 
-  var _useState = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(false),
-      tooltipVisible = _useState[0],
-      setTooltipVisible = _useState[1];
+  var _useSafeState = (0,ahooks__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(false),
+      tooltipVisible = _useSafeState[0],
+      setTooltipVisible = _useSafeState[1];
 
-  var contentSize = (0,ahooks__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(contentRef);
+  var contentSize = (0,ahooks__WEBPACK_IMPORTED_MODULE_5__/* ["default"] */ .Z)(contentRef);
   (0,react__WEBPACK_IMPORTED_MODULE_1__.useEffect)(lodash_debounce__WEBPACK_IMPORTED_MODULE_3___default()(function () {
     var _textRef$current$offs, _textRef$current, _textRef$current$scro, _textRef$current2, _textRef$current$offs2, _textRef$current3, _textRef$current$scro2, _textRef$current4;
 
@@ -74301,9 +74348,8 @@ var LabelIconTip = function LabelIconTip(_ref) {
 /* harmony import */ var lodash_clonedeep__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(52308);
 /* harmony import */ var lodash_clonedeep__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(lodash_clonedeep__WEBPACK_IMPORTED_MODULE_2__);
 /* harmony import */ var ___WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(80653);
-var _excluded = ["tag", "renderMore", "maxShowNumber", "moreTagProps", "moreTagWidth"],
-    _excluded2 = ["className"],
-    _excluded3 = ["className"];
+var _excluded = ["tag", "renderMore", "maxShowNumber", "moreTagProps", "moreTagWidth", "otherOccupiedSpace", "target"],
+    _excluded2 = ["className"];
 
 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); }
 
@@ -74325,6 +74371,7 @@ var cls = (0,___WEBPACK_IMPORTED_MODULE_3__.baseClass)('teamix-pro-tag-group');
 
 var ProTagGroup = function ProTagGroup(props) {
   var ref = (0,react__WEBPACK_IMPORTED_MODULE_0__.useRef)(null);
+  var hiddenRef = (0,react__WEBPACK_IMPORTED_MODULE_0__.useRef)(null);
   var size = (0,ahooks__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z)(ref);
 
   var _props$tag = props.tag,
@@ -74336,6 +74383,9 @@ var ProTagGroup = function ProTagGroup(props) {
       moreTagProps = _props$moreTagProps === void 0 ? {} : _props$moreTagProps,
       _props$moreTagWidth = props.moreTagWidth,
       moreTagWidth = _props$moreTagWidth === void 0 ? 30 : _props$moreTagWidth,
+      _props$otherOccupiedS = props.otherOccupiedSpace,
+      otherOccupiedSpace = _props$otherOccupiedS === void 0 ? 0 : _props$otherOccupiedS,
+      target = props.target,
       others = _objectWithoutPropertiesLoose(props, _excluded);
 
   var _useState = (0,react__WEBPACK_IMPORTED_MODULE_0__.useState)(tagProp),
@@ -74368,15 +74418,15 @@ var ProTagGroup = function ProTagGroup(props) {
 
 
     if (maxShowNumber === 'auto') {
-      var _ref$current$scrollWi, _ref$current, _ref$current$offsetWi, _ref$current2;
+      var _hiddenRef$current$of, _hiddenRef$current, _ref, _target$current$offse, _target$current, _ref$current;
 
-      var scrollWidth = (_ref$current$scrollWi = ref == null ? void 0 : (_ref$current = ref.current) == null ? void 0 : _ref$current.scrollWidth) != null ? _ref$current$scrollWi : 0;
-      var offsetWidth = (_ref$current$offsetWi = ref == null ? void 0 : (_ref$current2 = ref.current) == null ? void 0 : _ref$current2.offsetWidth) != null ? _ref$current$offsetWi : 0;
+      var scrollWidth = (_hiddenRef$current$of = hiddenRef == null ? void 0 : (_hiddenRef$current = hiddenRef.current) == null ? void 0 : _hiddenRef$current.offsetWidth) != null ? _hiddenRef$current$of : 0;
+      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;
 
       if (offsetWidth < scrollWidth) {
-        var _ref$current$querySel, _ref$current3, _tagsDom$children;
+        var _ref2, _target$current$query, _target$current2, _ref$current2, _tagsDom$children;
 
-        var tagsDom = (_ref$current$querySel = (_ref$current3 = ref.current) == null ? void 0 : _ref$current3.querySelector('.teamix-pro-tags')) != null ? _ref$current$querySel : null;
+        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;
         var tagList = (_tagsDom$children = tagsDom == null ? void 0 : tagsDom.children) != null ? _tagsDom$children : [];
         var width = 0;
         var flag = 0;
@@ -74396,36 +74446,33 @@ var ProTagGroup = function ProTagGroup(props) {
       } else {
         count = tag.length;
       }
-    } // 指定tag显示数量
+    } // // 指定tag显示数量
+    // if (count === 0 && tag.length > 0) {
+    //   const { className, ...others } = moreTagProps;
+    //   const countTag = {
+    //     children: `+${tag.length}`,
+    //     className: `${cls('remain')} teamix-pro-tag`,
+    //     ...others,
+    //   };
+    //   return [countTag];
+    // }
+    // tag 显示不下。进行折叠
 
 
-    if (count === 0 && tag.length > 0) {
+    if (tag.length > count) {
       var className = moreTagProps.className,
           _others = _objectWithoutPropertiesLoose(moreTagProps, _excluded2);
 
       var countTag = _objectSpread({
-        children: "+" + tag.length,
-        className: cls('remain') + " teamix-pro-tag"
-      }, _others);
-
-      return [countTag];
-    } // tag 显示不下。进行折叠
-
-
-    if (tag.length > count) {
-      var _className = moreTagProps.className,
-          _others2 = _objectWithoutPropertiesLoose(moreTagProps, _excluded3);
-
-      var _countTag = _objectSpread({
         children: "+" + (tag.length - count),
         className: cls('remain') + " teamix-pro-tag"
-      }, _others2);
+      }, _others);
 
-      var customRenderMore = renderMore == null ? void 0 : renderMore(count, tag, ref);
+      var customRenderMore = renderMore == null ? void 0 : renderMore(count, tag, target != null ? target : ref);
       var remainTags = tag.filter(function (_item, index) {
         return index < count;
       });
-      return [].concat(remainTags, [customRenderMore != null ? customRenderMore : _countTag]);
+      return [].concat(remainTags, [customRenderMore != null ? customRenderMore : countTag]);
     }
 
     return tag;
@@ -74438,7 +74485,8 @@ var ProTagGroup = function ProTagGroup(props) {
     }),
     ref: ref
   }, others), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
-    className: cls('hidden')
+    className: cls('hidden'),
+    ref: hiddenRef
   }, (0,___WEBPACK_IMPORTED_MODULE_1__/* .renderTags */ .a)(tag)), realTag.length > 0 && (0,___WEBPACK_IMPORTED_MODULE_1__/* .renderTags */ .a)(realTag));
 };