@teamix/pro 1.2.16 → 1.2.17

package/dist/pro.js

@@ -57960,8 +57960,8 @@ var _excluded = ["type"],
     _excluded3 = ["loading"],
     _excluded4 = ["icon", "iconSize", "label", "actions", "children", "context", "type"],
     _excluded5 = ["context", "text"],
-    _excluded6 = ["actions"],
-    _excluded7 = ["config"],
+    _excluded6 = ["key", "actions"],
+    _excluded7 = ["key", "config"],
     _excluded8 = ["type", "divider", "max", "moreText", "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); }
@@ -58150,8 +58150,8 @@ function renderCommonActionButtonMenuItem(action, key, context) {
     return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_2__.Menu.SubMenu, {
       key: key,
       label: menuBtn.label || menuBtn.children
-    }, menuBtn.actions.map(function (a, j) {
-      return renderCommonActionButtonMenuItem(a, String(j), context);
+    }, menuBtn.actions.map(function (a) {
+      return renderCommonActionButtonMenuItem(a, a.key, context);
     }));
   }
 
@@ -58186,7 +58186,7 @@ var ProActionMenuButton = function ProActionMenuButton(props) {
     type: type,
     label: buttonContent(label || children, icon, iconSize, context)
   }, others), actions.map(function (action, i) {
-    return renderCommonActionButtonMenuItem(action, String(i), context);
+    return renderCommonActionButtonMenuItem(action, action.key || i, context);
   }));
 };
 
@@ -58198,7 +58198,9 @@ function formatGroupActions(actions, max, moreConfig) {
     return actions;
   }
 
-  return [].concat(actions.slice(0, MAX - 1), [_objectSpread(_objectSpread({}, moreConfig), {}, {
+  return [].concat(actions.slice(0, MAX - 1), [_objectSpread(_objectSpread({
+    key: '__teamix_pro_action_group_more_btn'
+  }, moreConfig), {}, {
     actions: actions.slice(MAX - 1)
   })]);
 } // 渲染一个 button 或者 menu button
@@ -58244,24 +58246,36 @@ function getDefaultMoreButton(type, moreText) {
 
 var MAX_ACTTIONS = 4;
 
-function getActionConfig(action, context) {
+function getKey(index, key) {
+  if (key !== undefined) {
+    return key;
+  }
+
+  return "__teamix_pro_action_key_" + index;
+}
+
+function getActionConfig(action, index, context) {
   if (action.actions) {
     var _ref = action,
+        _key = _ref.key,
         actions = _ref.actions,
         _others = _objectWithoutPropertiesLoose(_ref, _excluded6);
 
     return _objectSpread({
-      actions: actions.map(function (a) {
-        return getActionConfig(a, context);
+      key: getKey(index, _key),
+      actions: actions.map(function (a, j) {
+        return getActionConfig(a, j, context);
       })
     }, (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_4__.getTargetValue)(_others, context));
   }
 
   var _ref2 = action,
+      key = _ref2.key,
       config = _ref2.config,
       others = _objectWithoutPropertiesLoose(_ref2, _excluded7);
 
   return _objectSpread({
+    key: getKey(index, key),
     config: config
   }, (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_4__.getTargetValue)(others, context));
 }
@@ -58281,8 +58295,8 @@ function ProActionGroup(props) {
       containerProps = _objectWithoutPropertiesLoose(props, _excluded8);
 
   var isTypeText = type === 'text';
-  var filteredActions = actions.map(function (action) {
-    return getActionConfig(action, context);
+  var filteredActions = actions.map(function (action, index) {
+    return getActionConfig(action, index, context);
   }).filter(function (action) {
     return action.visible !== false;
   });
@@ -58294,7 +58308,7 @@ function ProActionGroup(props) {
   }, containerProps), formatedActions.map(function (actionBtn, i) {
     var isLastOne = i === formatedActions.length - 1;
     return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), {
-      key: i
+      key: actionBtn.key
     }, renderCommonActionButton(actionBtn, context, isTypeText), isTypeText && divider && !isLastOne && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_2__.Divider, {
       direction: "ver"
     }));
@@ -62353,7 +62367,7 @@ _teamix_icon__WEBPACK_IMPORTED_MODULE_13__/* ["default"].setConfig */ .Z.setConf
 
  // export * from './sidebar';
 
-var version = '1.2.15';
+var version = '1.2.16';
 
 
 /***/ }),
@@ -63963,6 +63977,7 @@ var initialValues = {
   },
   mainAction: {
     actions: [{
+      key: 'action',
       children: '操作按钮'
     }]
   }
@@ -65593,7 +65608,7 @@ var Filter = function Filter(props) {
   return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_2__.Dropdown, {
     trigger: /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_teamix_icon__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z, {
       size: "small",
-      type: "filter-line",
+      type: selected.length > 0 && visible === false ? 'filter-fill' : 'filter-line',
       className: cls({
         icon: true,
         'icon-selected': selected.length > 0
@@ -65601,7 +65616,9 @@ var Filter = function Filter(props) {
       onClick: function onClick() {
         setVisible(!visible);
       }
-    }),
+    }) //@ts-ignore
+    ,
+    v2: true,
     triggerType: ['click'],
     align: "tl bl",
     visible: visible,
@@ -65624,7 +65641,7 @@ var Filter = function Filter(props) {
       btn: true
     }),
     onClick: function onClick() {
-      var _actionRef$current2, _actionRef$current$ge4, _actionRef$current3, _actionRef$current3$g, _actionRef$current4, _actionRef$current5, _objectSpread2, _actionRef$current6, _objectSpread3, _actionRef$current7, _actionRef$current8;
+      var _actionRef$current2, _actionRef$current$ge4, _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
 
@@ -65649,24 +65666,30 @@ var Filter = function Filter(props) {
         return null;
       }), [[column.dataIndex, param]]).filter(function (item) {
         return item && (item == null ? void 0 : item[1]);
-      }));
-      var targetPageKey = 'currentPage';
-      var pageInfo = (_actionRef$current4 = actionRef.current) == null ? void 0 : _actionRef$current4.pageInfo;
-
-      if (pageInfo && pageInfo != null && pageInfo.targetPageKey) {
-        targetPageKey = pageInfo == null ? void 0 : pageInfo.targetPageKey;
-      } // 再设置所有的列筛选状态
+      })); // 再设置所有的列筛选状态
 
-
-      (_actionRef$current5 = actionRef.current) == null ? void 0 : _actionRef$current5.setFilterRules == null ? void 0 : _actionRef$current5.setFilterRules(_objectSpread(_objectSpread({}, rules), {}, (_objectSpread2 = {}, _objectSpread2[column.dataIndex] = {
+      (_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,
         params: param
-      }, _objectSpread2))); // 发送请求
+      }, _objectSpread2)));
+
+      if (selected.length > 0) {
+        var _actionRef$current5, _actionRef$current6, _objectSpread3, _actionRef$current7, _actionRef$current8;
+
+        var targetPageKey = 'currentPage';
+        var pageInfo = (_actionRef$current5 = actionRef.current) == null ? void 0 : _actionRef$current5.pageInfo;
 
-      (_actionRef$current6 = actionRef.current) == null ? void 0 : _actionRef$current6.request == null ? void 0 : _actionRef$current6.request(_objectSpread(_objectSpread({}, params), {}, (_objectSpread3 = {}, _objectSpread3[targetPageKey] = 1, _objectSpread3)));
-      (_actionRef$current7 = actionRef.current) == null ? void 0 : _actionRef$current7.resetPage == null ? void 0 : _actionRef$current7.resetPage(); // 清空表格选择
+        if (pageInfo && pageInfo != null && pageInfo.targetPageKey) {
+          targetPageKey = pageInfo == null ? void 0 : pageInfo.targetPageKey;
+        } // 发送请求
+
+
+        (_actionRef$current6 = actionRef.current) == null ? void 0 : _actionRef$current6.request == null ? void 0 : _actionRef$current6.request(_objectSpread(_objectSpread({}, params), {}, (_objectSpread3 = {}, _objectSpread3[targetPageKey] = 1, _objectSpread3)));
+        (_actionRef$current7 = actionRef.current) == null ? void 0 : _actionRef$current7.resetPage == null ? void 0 : _actionRef$current7.resetPage(); // 清空表格选择
+
+        (_actionRef$current8 = actionRef.current) == null ? void 0 : _actionRef$current8.clearRowSelection == null ? void 0 : _actionRef$current8.clearRowSelection();
+      }
 
-      (_actionRef$current8 = actionRef.current) == null ? void 0 : _actionRef$current8.clearRowSelection == null ? void 0 : _actionRef$current8.clearRowSelection();
       setVisible(false);
     }
   }, (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_3__.getMessage)('ok')), /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_alicloudfe_components__WEBPACK_IMPORTED_MODULE_2__.Button, {
@@ -65684,7 +65707,25 @@ var Filter = function Filter(props) {
         rules: [],
         params: ''
       }, _objectSpread4)));
-      (_actionRef$current11 = actionRef.current) == null ? void 0 : _actionRef$current11.filterDataSource == null ? void 0 : _actionRef$current11.filterDataSource(column.dataIndex); // setVisible(!visible);
+      (_actionRef$current11 = actionRef.current) == null ? void 0 : _actionRef$current11.filterDataSource == null ? void 0 : _actionRef$current11.filterDataSource(column.dataIndex);
+
+      if (selected.length > 0) {
+        var _actionRef$current12, _actionRef$current13, _actionRef$current13$, _actionRef$current14, _actionRef$current15;
+
+        var targetPageKey = 'currentPage';
+        var pageInfo = (_actionRef$current12 = actionRef.current) == null ? void 0 : _actionRef$current12.pageInfo;
+
+        if (pageInfo && pageInfo != null && pageInfo.targetPageKey) {
+          targetPageKey = pageInfo == null ? void 0 : pageInfo.targetPageKey;
+        } // 发送请求
+
+
+        (_actionRef$current13 = actionRef.current) == null ? void 0 : _actionRef$current13.request == null ? void 0 : _actionRef$current13.request((_actionRef$current13$ = {}, _actionRef$current13$[targetPageKey] = 1, _actionRef$current13$));
+        (_actionRef$current14 = actionRef.current) == null ? void 0 : _actionRef$current14.resetPage == null ? void 0 : _actionRef$current14.resetPage(); // 清空表格选择
+
+        (_actionRef$current15 = actionRef.current) == null ? void 0 : _actionRef$current15.clearRowSelection == null ? void 0 : _actionRef$current15.clearRowSelection();
+      } // setVisible(!visible);
+
     }
   }, (0,_teamix_utils__WEBPACK_IMPORTED_MODULE_3__.getMessage)('reset'))))));
 };
@@ -67717,7 +67758,7 @@ var renderColumnsTitle = function renderColumnsTitle(item, actionRef) {
   };
 
   return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_teamix_utils__WEBPACK_IMPORTED_MODULE_1__.LabelIconTip, {
-    label: getItemLabel(),
+    label: item.title,
     tooltip: item.tooltip,
     icon: item.tooltipIcon
   }), item.filters && /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_0___default().createElement(_components_Filter__WEBPACK_IMPORTED_MODULE_4__/* ["default"] */ .Z, {