@teamix/pro 1.2.27 → 1.2.28

package/dist/pro.js

@@ -61184,12 +61184,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 +61413,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 +61428,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 +61493,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 +61513,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 +61531,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 +61544,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 +61565,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) {
@@ -66284,7 +66278,7 @@ _teamix_icon__WEBPACK_IMPORTED_MODULE_14__/* ["default"].setConfig */ .Z.setConf
  // export * from './sidebar';
 
 
-var version = '1.2.27';
+var version = '1.2.28';
 
 
 /***/ }),
@@ -71801,7 +71795,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,
@@ -71946,7 +71940,7 @@ 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),
@@ -72121,12 +72115,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));
@@ -72242,7 +72236,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 +72249,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 +72300,11 @@ 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)(); // 监听 浏览器变化 更吸底状态
+    (0,_utils__WEBPACK_IMPORTED_MODULE_7__/* .initActionRef */ .rf)();
+    dataFilterForm = dataFilterFormRef.current; // 监听 浏览器变化 更吸底状态
 
     if (footerSuction) {
       getFooterSuctionState();
@@ -72317,7 +72314,7 @@ var ProTable = function ProTable(props) {
       };
     }
 
-    if (requestWhenMount) {
+    if (requestWhenMount && (_dataFilterForm3 = dataFilterForm) != null && _dataFilterForm3.id) {
       // 在请求发送之前 处理漏斗默认数据
       (0,_utils__WEBPACK_IMPORTED_MODULE_7__/* .processDefaultFilter */ .aP)(propsColumns, actionRef, defaultFilterParams);
 
@@ -72335,7 +72332,7 @@ var ProTable = function ProTable(props) {
 
       actionRef.current = undefined;
     };
-  }, []);
+  }, [(_dataFilterForm4 = dataFilterForm) == null ? void 0 : _dataFilterForm4.id]);
 
   function onSort(dataIndex, order) {
     var _nextSort;
@@ -72361,10 +72358,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));