@ccs-ui/rc-pro 2.3.6-beta-13 → 2.3.6-beta-14

package/es/button/group.js

@@ -1,7 +1,7 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _excluded = ["onDisabled", "onHidden"],
+var _excluded = ["onDisabled", "onHidden", "auth"],
   _excluded2 = ["key", "label", "auth", "confirm", "showRowsCount", "onDisabled", "onHidden"],
-  _excluded3 = ["key", "label", "disabled", "auth", "confirm", "showRowsCount", "onDisabled", "onHidden"];
+  _excluded3 = ["key", "label", "disabled", "auth", "confirm", "showRowsCount"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
@@ -33,35 +33,35 @@ export default function CssButtonGroup(_ref) {
   var modalRef = useRef(null);
   var _ref3 = useContext(TableSelectionContext) || {},
     selectedRows = _ref3.selectedRows;
+
+  // 有权限的按钮
   var authButtons = [];
 
-  // 过滤隐藏按钮
-  authButtons = items.filter(function (item) {
-    return !item.hidden && !(item.onHidden && item.onHidden(selectedRows || []));
-  });
+  // 变量按钮
+  items.forEach(function (_ref4) {
+    var onDisabled = _ref4.onDisabled,
+      onHidden = _ref4.onHidden,
+      auth = _ref4.auth,
+      item = _objectWithoutProperties(_ref4, _excluded);
+    // 权限校验
+    if (onAuth && auth && !onAuth(auth)) {
+      return;
+    }
 
-  // link按钮删除无用参数
-  if (isLink) {
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    authButtons = authButtons.map(function (_ref4) {
-      var onDisabled = _ref4.onDisabled,
-        onHidden = _ref4.onHidden,
-        b = _objectWithoutProperties(_ref4, _excluded);
-      return _objectSpread({}, b);
-    });
-  }
+    // 隐藏按钮
+    if (onHidden && onHidden(selectedRows || [])) {
+      return;
+    }
 
-  // 需要判断权限
-  if (onAuth) {
-    authButtons = authButtons.filter(function (b) {
-      if (b.auth) return onAuth(b.auth);
-      return true;
-    });
-  }
-  if (!items || items.length === 0) return null;
+    // 禁用按钮
+    if (onDisabled && onDisabled(selectedRows || [])) {
+      item.disabled = true;
+    }
+    authButtons.push(item);
+  });
+  if (!authButtons || items.length === 0) return null;
 
-  // 当前菜单下查找按钮权限
-  var showBtns = authButtons.splice(0, showCount || items.length);
+  // 按钮点击
   var handleOnClick = function handleOnClick(key) {
     if (!onClick) return;
     var item = items.find(function (i) {
@@ -84,6 +84,10 @@ export default function CssButtonGroup(_ref) {
     }
     onClick(key, selectedRows);
   };
+
+  // 显示的按钮
+  var showBtns = authButtons.splice(0, showCount || items.length);
+
   // link类型按钮
   if (isLink) {
     return /*#__PURE__*/_jsxs(_Fragment, {
@@ -146,12 +150,7 @@ export default function CssButtonGroup(_ref) {
           auth = _ref6.auth,
           confirm = _ref6.confirm,
           showRowsCount = _ref6.showRowsCount,
-          onDisabled = _ref6.onDisabled,
-          onHidden = _ref6.onHidden,
           restProps = _objectWithoutProperties(_ref6, _excluded3);
-        // 按钮禁用
-        var isDisabled = disabled || onDisabled && onDisabled(selectedRows || []);
-
         // 更多按钮
         if (index === showBtns.length - 1 && authButtons.length > 0) {
           return /*#__PURE__*/_jsxs(Space.Compact, {
@@ -160,7 +159,7 @@ export default function CssButtonGroup(_ref) {
               onClick: function onClick() {
                 return handleOnClick(key);
               },
-              disabled: isDisabled,
+              disabled: disabled,
               children: [label, showRowsCount && selectedRows !== null && selectedRows !== void 0 && selectedRows.length ? "(".concat(selectedRows === null || selectedRows === void 0 ? void 0 : selectedRows.length, ")") : '']
             })), /*#__PURE__*/_jsx(Dropdown, {
               menu: {
@@ -178,7 +177,7 @@ export default function CssButtonGroup(_ref) {
         }
         return /*#__PURE__*/_jsxs(Button, _objectSpread(_objectSpread({}, restProps), {}, {
           size: size,
-          disabled: isDisabled,
+          disabled: disabled,
           onClick: function onClick() {
             return handleOnClick(key);
           },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ccs-ui/rc-pro",
-  "version": "2.3.6-beta-13",
+  "version": "2.3.6-beta-14",
   "description": "",
   "license": "MIT",
   "author": {