@teamix/pro 1.2.28 → 1.2.32

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)),
@@ -53122,7 +53126,7 @@ var FieldSelectGroup = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default()
       value: fieldVal,
       onChange: function onChange(value) {
         setFieldVal(value);
-        _onChange === null || _onChange === void 0 ? void 0 : _onChange(value);
+        _onChange === null || _onChange === void 0 ? void 0 : _onChange((0,_utils__WEBPACK_IMPORTED_MODULE_6__/* .formatterOnchangeValue */ .WO)(value));
       },
       valueAlias: valueAlias
     }, others));
@@ -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;
 
@@ -55546,7 +55553,8 @@ var cls = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_2__.baseClass)('teamix-pro-f
 
 var Copy = function Copy(props) {
   var result = props.result,
-      value = props.value; // copy 的显隐状态
+      value = props.value,
+      render = props.render; // copy 的显隐状态
 
   var _useState = (0,react__WEBPACK_IMPORTED_MODULE_4__.useState)(false),
       _useState2 = _slicedToArray(_useState, 2),
@@ -55576,7 +55584,19 @@ var Copy = function Copy(props) {
       style: {
         opacity: copyVisible ? 1 : 0
       },
-      onClick: function onClick() {
+      onClick: function onClick(e) {
+        if (render === null || render === void 0 ? void 0 : render.stopPropagation) {
+          var _e$stopPropagation;
+
+          e === null || e === void 0 ? void 0 : (_e$stopPropagation = e.stopPropagation) === null || _e$stopPropagation === void 0 ? void 0 : _e$stopPropagation.call(e);
+        }
+
+        if (render === null || render === void 0 ? void 0 : render.preventDefault) {
+          var _e$preventDefault;
+
+          e === null || e === void 0 ? void 0 : (_e$preventDefault = e.preventDefault) === null || _e$preventDefault === void 0 ? void 0 : _e$preventDefault.call(e);
+        }
+
         if (copy_to_clipboard__WEBPACK_IMPORTED_MODULE_3___default()((value !== null && value !== void 0 ? value : '').toString())) {
           _alicloudfe_components__WEBPACK_IMPORTED_MODULE_0__.Message.success((0,_teamix_utils__WEBPACK_IMPORTED_MODULE_2__.getMessage)('copySucceeded'));
         } else {
@@ -55623,7 +55643,8 @@ var Description = function Description(props) {
     if (render === null || render === void 0 ? void 0 : render.descriptionCopy) {
       return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_Copy__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z, {
         result: /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, description),
-        value: copyText
+        value: copyText,
+        render: render
       });
     }
 
@@ -55647,7 +55668,8 @@ var Description = function Description(props) {
     if (render.descriptionCopy) {
       result = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_Copy__WEBPACK_IMPORTED_MODULE_2__/* ["default"] */ .Z, {
         result: result,
-        value: copyText
+        value: copyText,
+        render: render
       });
     }
 
@@ -55824,7 +55846,8 @@ var Edit = function Edit(props) {
       value = props.value,
       renderEdit = props.renderEdit,
       editPopConfirmProps = props.editPopConfirmProps,
-      editOnClick = props.editOnClick; // 设置浮层打开关闭 暴露给外层组件
+      editOnClick = props.editOnClick,
+      render = props.render; // 设置浮层打开关闭 暴露给外层组件
 
   var setPopConfirmVisibleFunc = function setPopConfirmVisibleFunc(status) {
     if (!status) {
@@ -55845,6 +55868,18 @@ var Edit = function Edit(props) {
         opacity: editVisible || popConfirmVisible ? 1 : 0
       },
       onClick: function onClick(e) {
+        if (render === null || render === void 0 ? void 0 : render.stopPropagation) {
+          var _e$stopPropagation;
+
+          e === null || e === void 0 ? void 0 : (_e$stopPropagation = e.stopPropagation) === null || _e$stopPropagation === void 0 ? void 0 : _e$stopPropagation.call(e);
+        }
+
+        if (render === null || render === void 0 ? void 0 : render.preventDefault) {
+          var _e$preventDefault;
+
+          e === null || e === void 0 ? void 0 : (_e$preventDefault = e.preventDefault) === null || _e$preventDefault === void 0 ? void 0 : _e$preventDefault.call(e);
+        }
+
         if (editOnClick) {
           editOnClick === null || editOnClick === void 0 ? void 0 : editOnClick(value, e);
           return;
@@ -56237,7 +56272,8 @@ function individualization(dom, render, value, fieldValue) {
     var copyText = typeof (render === null || render === void 0 ? void 0 : render.copy) === 'string' ? render === null || render === void 0 ? void 0 : render.copy : value;
     result = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_Copy__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z, {
       result: result,
-      value: copyText
+      value: copyText,
+      render: render
     });
   } // 主文本 编辑
 
@@ -57584,8 +57620,6 @@ var CheckboxItem = _alicloudfe_components__WEBPACK_IMPORTED_MODULE_0__.Menu.Chec
 var cls = (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_2__.baseClass)('teamix-select-group');
 
 var SelectGroup = function SelectGroup(props) {
-  var _dataSource$0$dataSou, _dataSource$;
-
   var trigger = props.trigger,
       _props$triggerType = props.triggerType,
       triggerType = _props$triggerType === void 0 ? 'click' : _props$triggerType,
@@ -57640,7 +57674,21 @@ var SelectGroup = function SelectGroup(props) {
       _ref2$label = _ref2.label,
       dataSourceAliasLabel = _ref2$label === void 0 ? 'label' : _ref2$label,
       _ref2$children = _ref2.children,
-      dataSourceAliasChildren = _ref2$children === void 0 ? 'children' : _ref2$children; // 搜索框绑定值
+      dataSourceAliasChildren = _ref2$children === void 0 ? 'children' : _ref2$children; // 获取 dataSource Value 值
+
+
+  var getDataSourceValue = function getDataSourceValue(item) {
+    var _ref3, _item$dataSourceAlias;
+
+    return (_ref3 = (_item$dataSourceAlias = item === null || item === void 0 ? void 0 : item[dataSourceAliasValue]) !== null && _item$dataSourceAlias !== void 0 ? _item$dataSourceAlias : item === null || item === void 0 ? void 0 : item[dataSourceAliasLabel]) !== null && _ref3 !== void 0 ? _ref3 : item === null || item === void 0 ? void 0 : item.toString();
+  }; // 获取 dataSource Value 值
+
+
+  var getDataSourceLabel = function getDataSourceLabel(item) {
+    var _ref4, _item$dataSourceAlias2;
+
+    return (_ref4 = (_item$dataSourceAlias2 = item === null || item === void 0 ? void 0 : item[dataSourceAliasLabel]) !== null && _item$dataSourceAlias2 !== void 0 ? _item$dataSourceAlias2 : item === null || item === void 0 ? void 0 : item[dataSourceAliasValue]) !== null && _ref4 !== void 0 ? _ref4 : item === null || item === void 0 ? void 0 : item.toString();
+  }; // 搜索框绑定值
 
 
   var _useState3 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(defaultSearchValue),
@@ -57655,7 +57703,7 @@ var SelectGroup = function SelectGroup(props) {
       setDataSource = _useState6[1]; // 右侧 values 列表 展示当前的 key
 
 
-  var _useState7 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)((_dataSource$0$dataSou = dataSource === null || dataSource === void 0 ? void 0 : (_dataSource$ = dataSource[0]) === null || _dataSource$ === void 0 ? void 0 : _dataSource$[dataSourceAliasValue]) !== null && _dataSource$0$dataSou !== void 0 ? _dataSource$0$dataSou : ''),
+  var _useState7 = (0,react__WEBPACK_IMPORTED_MODULE_1__.useState)(getDataSourceValue(dataSource === null || dataSource === void 0 ? void 0 : dataSource[0])),
       _useState8 = _slicedToArray(_useState7, 2),
       activeKey = _useState8[0],
       setActiveKey = _useState8[1];
@@ -57749,39 +57797,38 @@ var SelectGroup = function SelectGroup(props) {
   }, [valueProp]);
   (0,react__WEBPACK_IMPORTED_MODULE_1__.useEffect)(function () {
     setDataSource(dataSourceProp !== null && dataSourceProp !== void 0 ? dataSourceProp : []);
+    setActiveKey(getDataSourceValue(dataSourceProp === null || dataSourceProp === void 0 ? void 0 : dataSourceProp[0]));
   }, [dataSourceProp]); // 搜索值变化回调 过滤数据
 
   var onSearch = function onSearch(value) {
     setSearchValue(value);
     var searchHandle = lodash_debounce__WEBPACK_IMPORTED_MODULE_5___default()(function () {
-      var _newDataSource, _newDataSource$0$data, _newDataSource2, _newDataSource2$;
+      var _newDataSource, _newDataSource2;
 
       if (!value) {
-        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 : '');
+        setActiveKey(getDataSourceValue(dataSourceProp === null || dataSourceProp === void 0 ? void 0 : dataSourceProp[0]));
         onSearchChange === null || onSearchChange === void 0 ? void 0 : onSearchChange(value);
         return;
       }
 
       var newDataSource = lodash_clonedeep__WEBPACK_IMPORTED_MODULE_4___default()(dataSourceProp !== null && dataSourceProp !== void 0 ? dataSourceProp : []);
       (_newDataSource = newDataSource) === null || _newDataSource === void 0 ? void 0 : _newDataSource.forEach(function (item) {
-        if (!(item[dataSourceAliasLabel] && item[dataSourceAliasLabel].toString().includes(value.toString()))) {
-          var _item$dataSourceAlias, _item$dataSourceAlias2;
+        if (!(getDataSourceLabel(item) && getDataSourceLabel(item).toString().toLocaleLowerCase().includes(value.toString().toLocaleLowerCase()))) {
+          var _item$dataSourceAlias3, _item$dataSourceAlias4;
 
-          item[dataSourceAliasChildren] = (_item$dataSourceAlias = (_item$dataSourceAlias2 = item[dataSourceAliasChildren]) === null || _item$dataSourceAlias2 === void 0 ? void 0 : _item$dataSourceAlias2.filter(function (valueItem) {
-            var _valueItem$dataSource;
+          item[dataSourceAliasChildren] = (_item$dataSourceAlias3 = (_item$dataSourceAlias4 = item[dataSourceAliasChildren]) === null || _item$dataSourceAlias4 === void 0 ? void 0 : _item$dataSourceAlias4.filter(function (valueItem) {
+            var _getDataSourceLabel;
 
-            return ((_valueItem$dataSource = valueItem[dataSourceAliasLabel]) !== null && _valueItem$dataSource !== void 0 ? _valueItem$dataSource : '').toString().includes(value.toString());
-          })) !== null && _item$dataSourceAlias !== void 0 ? _item$dataSourceAlias : [];
+            return ((_getDataSourceLabel = getDataSourceLabel(valueItem)) !== null && _getDataSourceLabel !== void 0 ? _getDataSourceLabel : '').toString().toLocaleLowerCase().includes(value.toString().toLocaleLowerCase());
+          })) !== null && _item$dataSourceAlias3 !== void 0 ? _item$dataSourceAlias3 : [];
         }
       });
       newDataSource = newDataSource.filter(function (item) {
         return item[dataSourceAliasChildren] && item[dataSourceAliasChildren].length > 0;
       });
       setDataSource(newDataSource);
-      setActiveKey((_newDataSource$0$data = (_newDataSource2 = newDataSource) === null || _newDataSource2 === void 0 ? void 0 : (_newDataSource2$ = _newDataSource2[0]) === null || _newDataSource2$ === void 0 ? void 0 : _newDataSource2$[dataSourceAliasValue]) !== null && _newDataSource$0$data !== void 0 ? _newDataSource$0$data : '');
+      setActiveKey(getDataSourceValue((_newDataSource2 = newDataSource) === null || _newDataSource2 === void 0 ? void 0 : _newDataSource2[0]));
       onSearchChange === null || onSearchChange === void 0 ? void 0 : onSearchChange(value);
     }, 100);
     searchHandle();
@@ -57792,10 +57839,10 @@ var SelectGroup = function SelectGroup(props) {
     var _dataSourceValues$dat, _values$valueAliasVal;
 
     var dataSourceValues = dataSource === null || dataSource === void 0 ? void 0 : dataSource.find(function (item) {
-      return item[dataSourceAliasValue] === keyItem[dataSourceAliasValue];
+      return getDataSourceValue(item) === getDataSourceValue(keyItem);
     });
     var values = value === null || value === void 0 ? void 0 : value.find(function (item) {
-      return item[valueAliasKey] === keyItem[dataSourceAliasValue];
+      return item[valueAliasKey] === getDataSourceValue(keyItem);
     });
     return (dataSourceValues === null || dataSourceValues === void 0 ? void 0 : (_dataSourceValues$dat = dataSourceValues[dataSourceAliasChildren]) === null || _dataSourceValues$dat === void 0 ? void 0 : _dataSourceValues$dat.length) === (values === null || values === void 0 ? void 0 : (_values$valueAliasVal = values[valueAliasValue]) === null || _values$valueAliasVal === void 0 ? void 0 : _values$valueAliasVal.length);
   }; // key 值 checkbox 全选状态改变
@@ -57806,21 +57853,19 @@ var SelectGroup = function SelectGroup(props) {
       var _cloneDeep$filter, _cloneDeep;
 
       var allValues = dataSource === null || dataSource === void 0 ? void 0 : dataSource.find(function (item) {
-        return item[dataSourceAliasValue] === keyItem[dataSourceAliasValue];
+        return getDataSourceValue(item) === getDataSourceValue(keyItem);
       });
       var newValues = (_cloneDeep$filter = (_cloneDeep = lodash_clonedeep__WEBPACK_IMPORTED_MODULE_4___default()(value)) === null || _cloneDeep === void 0 ? void 0 : _cloneDeep.filter(function (item) {
-        return item[valueAliasKey] !== keyItem[dataSourceAliasValue];
+        return item[valueAliasKey] !== getDataSourceValue(keyItem);
       })) !== null && _cloneDeep$filter !== void 0 ? _cloneDeep$filter : [];
 
       if ((allValues === null || allValues === void 0 ? void 0 : allValues[dataSourceAliasChildren]) && allValues[dataSourceAliasChildren].length > 0) {
         var _newValues$push;
 
         var childrenValues = allValues === null || allValues === void 0 ? void 0 : allValues[dataSourceAliasChildren].map(function (item) {
-          var _item$dataSourceAlias3;
-
-          return (_item$dataSourceAlias3 = item === null || item === void 0 ? void 0 : item[dataSourceAliasValue]) !== null && _item$dataSourceAlias3 !== void 0 ? _item$dataSourceAlias3 : '';
+          return getDataSourceValue(item);
         });
-        newValues === null || newValues === void 0 ? void 0 : newValues.push((_newValues$push = {}, _defineProperty(_newValues$push, valueAliasKey, allValues[dataSourceAliasValue]), _defineProperty(_newValues$push, valueAliasValue, childrenValues), _newValues$push));
+        newValues === null || newValues === void 0 ? void 0 : newValues.push((_newValues$push = {}, _defineProperty(_newValues$push, valueAliasKey, getDataSourceValue(allValues)), _defineProperty(_newValues$push, valueAliasValue, childrenValues), _newValues$push));
       }
 
       setValue(newValues);
@@ -57829,7 +57874,7 @@ var SelectGroup = function SelectGroup(props) {
       var _cloneDeep$filter2, _cloneDeep2;
 
       var _newValues = (_cloneDeep$filter2 = (_cloneDeep2 = lodash_clonedeep__WEBPACK_IMPORTED_MODULE_4___default()(value)) === null || _cloneDeep2 === void 0 ? void 0 : _cloneDeep2.filter(function (item) {
-        return item[valueAliasKey] !== keyItem[dataSourceAliasValue];
+        return item[valueAliasKey] !== getDataSourceValue(keyItem);
       })) !== null && _cloneDeep$filter2 !== void 0 ? _cloneDeep$filter2 : [];
 
       setValue(_newValues);
@@ -57840,7 +57885,7 @@ var SelectGroup = function SelectGroup(props) {
 
   var onKeyCheckboxClick = function onKeyCheckboxClick(keyItem, event) {
     event.stopPropagation();
-    setActiveKey(keyItem[dataSourceAliasValue]);
+    setActiveKey(getDataSourceValue(keyItem));
   }; // 获取 key 对应的 values
 
 
@@ -57852,7 +57897,7 @@ var SelectGroup = function SelectGroup(props) {
     }
 
     return (_dataSource$find$data = dataSource === null || dataSource === void 0 ? void 0 : (_dataSource$find = dataSource.find(function (item) {
-      return item[dataSourceAliasValue] === key;
+      return getDataSourceValue(item) === key;
     })) === null || _dataSource$find === void 0 ? void 0 : _dataSource$find[dataSourceAliasChildren]) !== null && _dataSource$find$data !== void 0 ? _dataSource$find$data : [];
   }; // 获取 key 对应的中间态
 
@@ -57861,12 +57906,12 @@ var SelectGroup = function SelectGroup(props) {
     var _value$find$valueAlia, _value$find, _dataSource$find$data2, _dataSource$find2, _dataSource$find2$dat;
 
     var valueItem = (_value$find$valueAlia = value === null || value === void 0 ? void 0 : (_value$find = value.find(function (item) {
-      return item[valueAliasKey] === keyItem[dataSourceAliasValue];
+      return item[valueAliasKey] === getDataSourceValue(keyItem);
     })) === null || _value$find === void 0 ? void 0 : _value$find[valueAliasValue]) !== null && _value$find$valueAlia !== void 0 ? _value$find$valueAlia : [];
     var dataSourceValueItem = (_dataSource$find$data2 = dataSource === null || dataSource === void 0 ? void 0 : (_dataSource$find2 = dataSource.find(function (item) {
-      return item[dataSourceAliasValue] === keyItem[dataSourceAliasValue];
+      return getDataSourceValue(item) === getDataSourceValue(keyItem);
     })) === null || _dataSource$find2 === void 0 ? void 0 : (_dataSource$find2$dat = _dataSource$find2[dataSourceAliasChildren]) === null || _dataSource$find2$dat === void 0 ? void 0 : _dataSource$find2$dat.map(function (item) {
-      return item[dataSourceAliasValue];
+      return getDataSourceValue(item);
     })) !== null && _dataSource$find$data2 !== void 0 ? _dataSource$find$data2 : [];
     return valueItem.length !== 0 && valueItem.length < dataSourceValueItem.length;
   }; // 获取 value 对应的 checkbox 选中状态
@@ -57878,7 +57923,7 @@ var SelectGroup = function SelectGroup(props) {
     var values = (_value$find$valueAlia2 = value === null || value === void 0 ? void 0 : (_value$find2 = value.find(function (item) {
       return item[valueAliasKey] === key;
     })) === null || _value$find2 === void 0 ? void 0 : _value$find2[valueAliasValue]) !== null && _value$find$valueAlia2 !== void 0 ? _value$find$valueAlia2 : [];
-    return values === null || values === void 0 ? void 0 : values.includes(valueItem[dataSourceAliasValue]);
+    return values === null || values === void 0 ? void 0 : values.includes(getDataSourceValue(valueItem));
   }; // value 对应的 checkbox 状态修改
 
 
@@ -57896,14 +57941,14 @@ var SelectGroup = function SelectGroup(props) {
       var _activeKeyItem$valueA, _activeKeyItem, _activeKeyItem2;
 
       var keyValues = (_activeKeyItem$valueA = (_activeKeyItem = activeKeyItem) === null || _activeKeyItem === void 0 ? void 0 : _activeKeyItem[valueAliasValue]) !== null && _activeKeyItem$valueA !== void 0 ? _activeKeyItem$valueA : [];
-      keyValues.push(valueItem[dataSourceAliasValue]);
+      keyValues.push(getDataSourceValue(valueItem));
       var newKeyValues = Array.from(new Set(keyValues));
 
       if (!((_activeKeyItem2 = activeKeyItem) === null || _activeKeyItem2 === void 0 ? void 0 : _activeKeyItem2[valueAliasKey])) {
         var dataSourceActiveKeyItem = lodash_clonedeep__WEBPACK_IMPORTED_MODULE_4___default()(dataSource === null || dataSource === void 0 ? void 0 : dataSource.find(function (item) {
-          return item[dataSourceAliasValue] === key;
+          return getDataSourceValue(item) === key;
         }));
-        activeKeyItem = _defineProperty({}, valueAliasKey, dataSourceActiveKeyItem === null || dataSourceActiveKeyItem === void 0 ? void 0 : dataSourceActiveKeyItem[dataSourceAliasValue]);
+        activeKeyItem = _defineProperty({}, valueAliasKey, getDataSourceValue(dataSourceActiveKeyItem));
       }
 
       activeKeyItem[valueAliasValue] = newKeyValues;
@@ -57914,15 +57959,15 @@ var SelectGroup = function SelectGroup(props) {
       var _activeKeyItem$valueA2, _activeKeyItem4, _activeKeyItem5;
 
       var _keyValues = ((_activeKeyItem$valueA2 = (_activeKeyItem4 = activeKeyItem) === null || _activeKeyItem4 === void 0 ? void 0 : _activeKeyItem4[valueAliasValue]) !== null && _activeKeyItem$valueA2 !== void 0 ? _activeKeyItem$valueA2 : []).filter(function (item) {
-        return item !== valueItem[dataSourceAliasValue];
+        return item !== getDataSourceValue(valueItem);
       });
 
       if (!((_activeKeyItem5 = activeKeyItem) === null || _activeKeyItem5 === void 0 ? void 0 : _activeKeyItem5[valueAliasKey])) {
         var _dataSourceActiveKeyItem = lodash_clonedeep__WEBPACK_IMPORTED_MODULE_4___default()(dataSource === null || dataSource === void 0 ? void 0 : dataSource.find(function (item) {
-          return item[dataSourceAliasValue] === key;
+          return getDataSourceValue(item) === key;
         }));
 
-        activeKeyItem = _defineProperty({}, valueAliasKey, _dataSourceActiveKeyItem === null || _dataSourceActiveKeyItem === void 0 ? void 0 : _dataSourceActiveKeyItem[dataSourceAliasValue]);
+        activeKeyItem = _defineProperty({}, valueAliasKey, getDataSourceValue(_dataSourceActiveKeyItem));
       }
 
       if (_keyValues.length > 0) {
@@ -57968,7 +58013,7 @@ var SelectGroup = function SelectGroup(props) {
     return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement(CheckboxItem, {
       className: cls({
         checkbox: true,
-        'checkbox-active': item[dataSourceAliasValue] === activeKey
+        'checkbox-active': getDataSourceValue(item) === activeKey
       }),
       key: index,
       checked: hasChecked(item),
@@ -57988,8 +58033,8 @@ var SelectGroup = function SelectGroup(props) {
       className: cls('checkbox-before-icon'),
       size: "small"
     }), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement(_teamix_utils__WEBPACK_IMPORTED_MODULE_2__.Ellipsis, {
-      tooltip: item[dataSourceAliasLabel]
-    }, item[dataSourceAliasLabel])), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement("div", null, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement(_teamix_icon__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z, {
+      tooltip: getDataSourceLabel(item)
+    }, getDataSourceLabel(item))), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement("div", null, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement(_teamix_icon__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z, {
       type: "right-line",
       className: cls('checkbox-after-icon'),
       size: "small"
@@ -58010,8 +58055,8 @@ var SelectGroup = function SelectGroup(props) {
         onValueItemChange(activeKey, item, status);
       }
     }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement(_teamix_utils__WEBPACK_IMPORTED_MODULE_2__.Ellipsis, {
-      tooltip: item[dataSourceAliasLabel]
-    }, item[dataSourceAliasLabel]));
+      tooltip: getDataSourceLabel(item)
+    }, getDataSourceLabel(item)));
   }))), (!dataSource || dataSource.length === 0) && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement("div", {
     className: cls('no-data')
   }, (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_2__.getMessage)('noData'))), (showFooter || renderFooter) && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_1___default().createElement(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_0__.Divider, {
@@ -58768,8 +58813,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 +58853,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 +58865,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
   }));
@@ -63195,7 +63250,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;
@@ -63264,6 +63319,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,
@@ -66278,7 +66340,7 @@ _teamix_icon__WEBPACK_IMPORTED_MODULE_14__/* ["default"].setConfig */ .Z.setConf
  // export * from './sidebar';
 
 
-var version = '1.2.28';
+var version = '1.2.32';
 
 
 /***/ }),
@@ -66408,7 +66470,7 @@ var ProInfoGroup = function ProInfoGroup(props) {
 /* harmony import */ var _alicloudfe_components__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(33049);
 /* harmony import */ var _alicloudfe_components__WEBPACK_IMPORTED_MODULE_6___default = /*#__PURE__*/__webpack_require__.n(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_6__);
 /* harmony import */ var _actions__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(28758);
-var _excluded = ["type", "value", "render", "infoItem", "record", "actionRef", "dataSource", "context"];
+var _excluded = ["type", "value", "render", "infoItem", "record", "actionRef", "dataSource", "context", "props"];
 
 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); }
 
@@ -66442,6 +66504,7 @@ var InfoValueItem = function InfoValueItem(props) {
       actionRef = props.actionRef,
       dataSource = props.dataSource,
       context = props.context,
+      fieldProps = props.props,
       others = _objectWithoutPropertiesLoose(props, _excluded);
 
   var dataIndex = infoItem.dataIndex,
@@ -66455,7 +66518,8 @@ var InfoValueItem = function InfoValueItem(props) {
       _infoItem$successMess = infoItem.successMessage,
       successMessage = _infoItem$successMess === void 0 ? 'success' : _infoItem$successMess,
       actions = infoItem.actions,
-      extra = infoItem.extra; // 获取处理过的 render
+      extra = infoItem.extra,
+      valueType = infoItem.valueType; // 获取处理过的 render
 
   var getRender = function getRender() {
     var _ref, _ref2;
@@ -66467,7 +66531,31 @@ var InfoValueItem = function InfoValueItem(props) {
     }
 
     var newRender = processBuriedPoint((_ref = processRenderFunction((_ref2 = render) != null ? _ref2 : {}, value, record)) != null ? _ref : {}, value, record);
+
+    if (valueType === 'selectGroup') {
+      newRender = _objectSpread(_objectSpread({
+        maxShowNumber: 'auto',
+        foldText: 'more'
+      }, newRender), {}, {
+        ellipsis: false
+      });
+    }
+
     return newRender;
+  };
+
+  var getFieldProps = function getFieldProps() {
+    if (valueType === 'selectGroup') {
+      return _objectSpread({
+        valueAlias: {
+          value: 'TagValue',
+          key: 'TagKey'
+        },
+        layout: 'compact'
+      }, fieldProps);
+    }
+
+    return fieldProps;
   }; // 获取处理过的 dataSource
 
 
@@ -66664,7 +66752,7 @@ var InfoValueItem = function InfoValueItem(props) {
       value: value,
       render: getRender(),
       dataSource: getDataSource()
-    }, others)), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_4___default().createElement(_teamix_pop_confirm__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z, {
+    }, others, getFieldProps())), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_4___default().createElement(_teamix_pop_confirm__WEBPACK_IMPORTED_MODULE_3__/* ["default"] */ .Z, {
       visible: popConfirmVisible,
       content: renderContent(),
       triggerType: "click",
@@ -66696,7 +66784,7 @@ var InfoValueItem = function InfoValueItem(props) {
     value: value,
     render: getRender(),
     dataSource: getDataSource()
-  }, others)), renderAction(), extra && extra);
+  }, others, getFieldProps())), renderAction(), extra && extra);
 };
 
 /* harmony default export */ const __WEBPACK_DEFAULT_EXPORT__ = (InfoValueItem);
@@ -66755,7 +66843,7 @@ var ProInfoItem = function ProInfoItem(prop) {
       className: cls('value')
     }, loading && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default().createElement("div", {
       className: cls('base-skeleton-box')
-    }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default().createElement(___WEBPACK_IMPORTED_MODULE_1__.ProSkeletonRaw.Info.Item, null)), !loading && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default().createElement("div", null, value))));
+    }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default().createElement(___WEBPACK_IMPORTED_MODULE_1__.ProSkeletonRaw.Info.Item, null)), !loading && value)));
   }
 
   if (headerInfoLayout) {
@@ -66763,7 +66851,9 @@ var ProInfoItem = function ProInfoItem(prop) {
         labelGutter = _headerInfoLayout$lab === void 0 ? '16px' : _headerInfoLayout$lab;
     return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default().createElement("div", {
       className: cls()
-    }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default().createElement(Row, null, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default().createElement("div", {
+    }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default().createElement(Row, {
+      className: cls('header-row')
+    }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default().createElement("div", {
       className: cls('header-label')
     }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_3___default().createElement(_teamix_utils__WEBPACK_IMPORTED_MODULE_2__.LabelIconTip, {
       label: label,
@@ -66877,7 +66967,8 @@ var ProBaseInfo = function ProBaseInfo(props) {
           infoItem: item,
           record: dataSource != null ? dataSource : result,
           actionRef: actionRef,
-          context: context
+          context: context,
+          props: item.props
         }),
         baseInfoLayout: getFormItemLayout((_item$colSpan = item == null ? void 0 : item.colSpan) != null ? _item$colSpan : 0),
         tooltip: item.tooltip,
@@ -66888,7 +66979,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()));
 };
 
@@ -66964,7 +67056,8 @@ var ProHeaderInfo = function ProHeaderInfo(props) {
           dataSource: item.dataSource,
           infoItem: item,
           record: dataSource != null ? dataSource : result,
-          actionRef: actionRef
+          actionRef: actionRef,
+          props: item.props
         }),
         headerInfoLayout: layout != null ? layout : defaultLayout,
         tooltip: item.tooltip,
@@ -67054,7 +67147,8 @@ var ProTableInfo = function ProTableInfo(props) {
       dataSource: item.dataSource,
       infoItem: item,
       record: dataSource != null ? dataSource : result,
-      actionRef: actionRef
+      actionRef: actionRef,
+      props: item.props
     });
   };
 
@@ -70149,10 +70243,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);
   }, []); // 获取过滤项
 
@@ -70268,7 +70362,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
 
@@ -70281,7 +70375,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,
@@ -70314,10 +70408,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: ''
@@ -70423,8 +70517,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)) {
         // 自定义渲染内容
@@ -70452,7 +70548,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) {
@@ -70478,6 +70574,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)))
+      });
     }
   }; // 区域组合渲染
 
@@ -71444,25 +71553,21 @@ var FullScreen = function FullScreen(props) {
       normalDataFilterForm = _actionRef$current.normalDataFilterForm,
       fullscreenDataFilterForm = _actionRef$current.fullscreenDataFilterForm;
 
-  function closeByESC(e) {
+  var closeByESC = function closeByESC(e) {
     if (visible && e.code === 'Escape') {
-      var _actionRef$current2, _actionRef$current3;
+      var _actionRef$current2;
 
-      actionRef == null ? void 0 : (_actionRef$current2 = actionRef.current) == null ? void 0 : _actionRef$current2.setFullScreenState == null ? void 0 : _actionRef$current2.setFullScreenState(false);
-      actionRef == null ? void 0 : (_actionRef$current3 = actionRef.current) == null ? void 0 : _actionRef$current3.fullScreen == null ? void 0 : _actionRef$current3.fullScreen();
+      actionRef == null ? void 0 : (_actionRef$current2 = actionRef.current) == null ? void 0 : _actionRef$current2.fullScreen == null ? void 0 : _actionRef$current2.fullScreen();
     }
-  } // 监听esc按钮
+  }; // 监听esc按钮
 
 
   (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
-    var _actionRef$current4;
-
-    actionRef == null ? void 0 : (_actionRef$current4 = actionRef.current) == null ? void 0 : _actionRef$current4.setFullScreenState == null ? void 0 : _actionRef$current4.setFullScreenState(visible);
     window.addEventListener('keydown', closeByESC);
     return function () {
       window.removeEventListener('keydown', closeByESC);
     };
-  }, [visible]);
+  }, [visible, actionRef]);
 
   var afterClose = function afterClose() {
     normalDataFilterForm == null ? void 0 : normalDataFilterForm.setValues(fullscreenDataFilterForm.values);
@@ -71500,9 +71605,9 @@ var FullScreen = function FullScreen(props) {
       zIndex: 999
     },
     onRequestClose: function onRequestClose() {
-      var _actionRef$current5;
+      var _actionRef$current3;
 
-      actionRef == null ? void 0 : (_actionRef$current5 = actionRef.current) == null ? void 0 : _actionRef$current5.fullScreen == null ? void 0 : _actionRef$current5.fullScreen();
+      actionRef == null ? void 0 : (_actionRef$current3 = actionRef.current) == null ? void 0 : _actionRef$current3.fullScreen == null ? void 0 : _actionRef$current3.fullScreen();
     }
   }, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
     className: "teamix-pro-table-full-screen"
@@ -71901,7 +72006,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高度，用作全屏吸底吸底高度计算
@@ -71925,14 +72045,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)();
@@ -71943,9 +72063,9 @@ var ProTable = function ProTable(props) {
   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() {
@@ -72069,20 +72189,54 @@ 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() {
+      var _actionRef$current2;
+
       var state = !fullscreenState; // 全屏时需要重新计算header高度
 
       getHeaderHeight().then(function (height) {
         setHeaderHeight(height);
       });
       setFullscreenState(state);
+      actionRef == null ? void 0 : (_actionRef$current2 = actionRef.current) == null ? void 0 : _actionRef$current2.setState == null ? void 0 : _actionRef$current2.setState('fullScreenState', state);
       return state;
     },
     setColumn: function setColumn(newColumns, update) {
-      var _actionRef$current2;
+      var _actionRef$current3;
 
       if (update === void 0) {
         update = true;
@@ -72090,7 +72244,7 @@ var ProTable = function ProTable(props) {
 
       var columns = processColumns(newColumns, propsColumns);
       setFilteredColumns(columns);
-      (_actionRef$current2 = actionRef.current) == null ? void 0 : _actionRef$current2.setState == null ? void 0 : _actionRef$current2.setState('filterColumns', columns);
+      (_actionRef$current3 = actionRef.current) == null ? void 0 : _actionRef$current3.setState == null ? void 0 : _actionRef$current3.setState('filterColumns', columns);
 
       if (update) {
         (0,_utils__WEBPACK_IMPORTED_MODULE_7__/* .emit */ .j8)('refreshFilterState', newColumns);
@@ -72115,11 +72269,11 @@ var ProTable = function ProTable(props) {
       _request(params);
     },
     reset: function reset() {
-      var _actionRef$current3, _dataFilterForm, _request2;
+      var _actionRef$current4, _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({});
+      (_actionRef$current4 = actionRef.current) == null ? void 0 : _actionRef$current4.setFilterRules == null ? void 0 : _actionRef$current4.setFilterRules({});
       (_dataFilterForm = dataFilterForm) == null ? void 0 : _dataFilterForm.reset();
       setCurrentPage(1);
 
@@ -72177,12 +72331,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) {
@@ -72236,7 +72390,7 @@ var ProTable = function ProTable(props) {
   }); // 请求函数
 
   function _request(params, noLoading) {
-    var _dataFilterForm2, _actionRef$current$ge, _actionRef$current4, _objectSpread2;
+    var _dataFilterForm2, _actionRef$current$ge, _actionRef$current5, _objectSpread2;
 
     // 如果没有传 url 且没有 customRequest，直接返回
     if (!url && !customRequest) {
@@ -72251,7 +72405,7 @@ var ProTable = function ProTable(props) {
 
     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 : {}; // 格式化后的请求参数
+    var columnsFilterParams = (_actionRef$current$ge = (_actionRef$current5 = actionRef.current) == null ? void 0 : _actionRef$current5.getFilterRules == null ? void 0 : _actionRef$current5.getFilterRules()) != null ? _actionRef$current$ge : {}; // 格式化后的请求参数
 
     var requestData = formatParams(_objectSpread(_objectSpread({}, !showPagination ? _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, dataFilterParams), propsParams), sortParams), columnsFilterParams) : _objectSpread(_objectSpread(_objectSpread(_objectSpread((_objectSpread2 = {}, _objectSpread2[targetPageKey] = currentPage, _objectSpread2[targetPageSizeKey] = pageSize, _objectSpread2), dataFilterParams), propsParams), sortParams), columnsFilterParams)), params));
 
@@ -72300,10 +72454,6 @@ var ProTable = function ProTable(props) {
   }
 
   (0,react__WEBPACK_IMPORTED_MODULE_0__.useEffect)(function () {
-    var _dataFilterForm3;
-
-    // 初始化 actionRef state、callback 此时 actionRef 已初始化完成
-    (0,_utils__WEBPACK_IMPORTED_MODULE_7__/* .initActionRef */ .rf)();
     dataFilterForm = dataFilterFormRef.current; // 监听 浏览器变化 更吸底状态
 
     if (footerSuction) {
@@ -72314,11 +72464,21 @@ var ProTable = function ProTable(props) {
       };
     }
 
-    if (requestWhenMount && (_dataFilterForm3 = dataFilterForm) != null && _dataFilterForm3.id) {
-      // 在请求发送之前 处理漏斗默认数据
-      (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();
+        _request();
+      }
+    } else {
+      if (requestWhenMount) {
+        (0,_utils__WEBPACK_IMPORTED_MODULE_7__/* .processDefaultFilter */ .aP)(propsColumns, actionRef, defaultFilterParams);
+
+        _request();
+      }
     }
 
     return function () {
@@ -72348,11 +72508,11 @@ var ProTable = function ProTable(props) {
     mode: 'inline'
   }, propsDataFilter), {}, {
     onFilter: function onFilter(values) {
-      var _actionRef$current5, _request3;
+      var _actionRef$current6, _request3;
 
       (propsDataFilter == null ? void 0 : propsDataFilter.onFilter) && (propsDataFilter == null ? void 0 : propsDataFilter.onFilter(values)); // 搜索变化时，暂时先清空选择
 
-      (_actionRef$current5 = actionRef.current) == null ? void 0 : _actionRef$current5.clearRowSelection == null ? void 0 : _actionRef$current5.clearRowSelection();
+      (_actionRef$current6 = actionRef.current) == null ? void 0 : _actionRef$current6.clearRowSelection == null ? void 0 : _actionRef$current6.clearRowSelection();
       setCurrentPage(1);
 
       _request((_request3 = {}, _request3[targetPageKey] = 1, _request3));
@@ -72449,24 +72609,24 @@ var ProTable = function ProTable(props) {
 
   var renderFooter = function renderFooter() {
     function onChangePagination(currentPage, params) {
-      var _actionRef$current6, _objectSpread3;
+      var _actionRef$current7, _objectSpread3;
 
       if (params === void 0) {
         params = {};
       }
 
       // 翻页暂时先清空选择
-      (_actionRef$current6 = actionRef.current) == null ? void 0 : _actionRef$current6.clearRowSelection == null ? void 0 : _actionRef$current6.clearRowSelection();
+      (_actionRef$current7 = actionRef.current) == null ? void 0 : _actionRef$current7.clearRowSelection == null ? void 0 : _actionRef$current7.clearRowSelection();
       setCurrentPage(currentPage);
 
       _request(_objectSpread((_objectSpread3 = {}, _objectSpread3[targetPageKey] = currentPage, _objectSpread3), params));
     }
 
     function onChangePaginationSize(currentPageSize) {
-      var _actionRef$current7, _request5;
+      var _actionRef$current8, _request5;
 
       // 翻页暂时先清空选择
-      (_actionRef$current7 = actionRef.current) == null ? void 0 : _actionRef$current7.clearRowSelection == null ? void 0 : _actionRef$current7.clearRowSelection();
+      (_actionRef$current8 = actionRef.current) == null ? void 0 : _actionRef$current8.clearRowSelection == null ? void 0 : _actionRef$current8.clearRowSelection();
       setPageSize(currentPageSize);
       setCurrentPage(1);
 
@@ -72697,7 +72857,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
@@ -72940,10 +73100,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)
@@ -72957,123 +73118,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: []
-};
+// 所有 ProTable 组件公用一套组件内事件转发机制
+var tableCallback = {}; // 组件内对全局状态的更改
 
-var _initState = lodash_clonedeep__WEBPACK_IMPORTED_MODULE_0___default()(state); // state监听事件 每次初始化 ActionRef 会重新深拷贝对象
+var getMutations = function getMutations(actionRef) {
+  var _actionRef$current2, _actionRef$current2$g;
 
+  return {
+    setFullScreenState: function setFullScreenState(fullScreenState) {
+      var _actionRef$current;
 
-var callback = {
-  fullScreenState: {}
-};
-var initCallback = lodash_clonedeep__WEBPACK_IMPORTED_MODULE_0___default()(callback); // 所有 ProTable 组件公用一套组件内事件转发机制
-
-var tableCallback = {}; // 组件内监听事件
-// 组件内对全局状态的更改
+      (_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,
 
-var mutations = {
-  getState: function getState() {
-    return state;
-  },
-  setState: function setState(key, value) {
-    state[key] = value;
-    useOn(key, value);
+    /**
+     * 设置筛选列规则
+     * @param rules 规则
+     * @param dataIndex column.dataIndex
+     */
+    setFilterRules: function setFilterRules(rules) {
+      var _actionRef$current3;
 
-    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);
-  },
+      (_actionRef$current3 = actionRef.current) == null ? void 0 : _actionRef$current3.setState == null ? void 0 : _actionRef$current3.setState('filterRules', rules);
+    },
 
-  /**
-   * 设置筛选列规则
-   * @param rules 规则
-   * @param dataIndex column.dataIndex
-   */
-  setFilterRules: function setFilterRules(rules) {
-    state.filterRules = rules;
-  },
+    /**
+     * 获取筛选规则。为params
+     */
+    getFilterRules: function getFilterRules() {
+      var _actionRef$current4;
 
-  /**
-   * 获取筛选规则。为params
-   */
-  getFilterRules: function getFilterRules() {
-    var result = {};
+      var result = {};
+      var filterRules = (_actionRef$current4 = actionRef.current) == null ? void 0 : _actionRef$current4.getState == null ? void 0 : _actionRef$current4.getState().filterRules;
 
-    if (state.filterRules) {
-      result = Object.entries(state.filterRules).map(function (_ref) {
-        var _ref2;
+      if (filterRules) {
+        result = Object.entries(filterRules).map(function (_ref) {
+          var _ref2;
 
-        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;
-      }, {});
-    }
-
-    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 组件内监听 不对外暴露 */
 
@@ -73100,12 +73212,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);
 }
@@ -74006,7 +74120,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"];
@@ -74044,11 +74159,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;
 
@@ -74298,9 +74413,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); }
 
@@ -74322,6 +74436,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,
@@ -74333,6 +74448,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),
@@ -74365,15 +74483,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;
@@ -74393,36 +74511,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;
@@ -74435,7 +74550,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));
 };