@ccs-ui/rc-pro 1.1.1-rc2 → 1.1.1-rc4

package/es/auth/index.d.ts

@@ -6,6 +6,7 @@ export interface ButtonItem {
     auth?: string;
     type?: ButtonProps['type'];
     disabled?: boolean;
+    hidden?: boolean;
     danger?: boolean;
     icon?: ReactNode;
     confirm?: string;
@@ -42,10 +43,10 @@ declare namespace CcsAuth {
         href: string;
         target?: import("react").HTMLAttributeAnchorTarget | undefined;
         onClick?: import("react").MouseEventHandler<HTMLAnchorElement> | undefined;
-    } & import("antd/es/button/button").BaseButtonProps & Omit<import("react").AnchorHTMLAttributes<HTMLAnchorElement | HTMLButtonElement>, "type" | "onClick"> & {
-        htmlType?: "button" | "submit" | "reset" | undefined;
+    } & import("antd/es/button/button").BaseButtonProps & Omit<import("react").AnchorHTMLAttributes<HTMLAnchorElement | HTMLButtonElement>, "onClick" | "type"> & {
+        htmlType?: "button" | "reset" | "submit" | undefined;
         onClick?: import("react").MouseEventHandler<HTMLButtonElement> | undefined;
-    } & Omit<import("react").ButtonHTMLAttributes<HTMLButtonElement>, "type" | "onClick">> & {
+    } & Omit<import("react").ButtonHTMLAttributes<HTMLButtonElement>, "onClick" | "type">> & {
         auth: string;
         text?: string | undefined;
         confirm?: string | undefined;

package/es/auth/index.js

@@ -8,10 +8,6 @@ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _ty
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -57,23 +53,28 @@ function AuthGroup(_ref4) {
     showCount = _ref4.showCount,
     moreIcon = _ref4.moreIcon,
     moreText = _ref4.moreText,
-    items = _ref4.items,
+    _ref4$items = _ref4.items,
+    items = _ref4$items === void 0 ? [] : _ref4$items,
     onClick = _ref4.onClick;
   var _ref5 = useCcsPage() || {},
     onAuth = _ref5.onAuth;
   var IsAuthButton = CCS.GlobalConfig.IsAuthButton;
   var modalRef = useRef(null);
-  if (!items || items.length === 0) return null;
   var authButtons = [];
+
+  // 过滤隐藏按钮
+  authButtons = items.filter(function (items) {
+    return !items.hidden;
+  });
+
   // 需要判断权限
   if (IsAuthButton && onAuth) {
-    authButtons = items.filter(function (b) {
+    authButtons = authButtons.filter(function (b) {
       if (b.auth) return onAuth(b.auth);
       return true;
     });
-  } else {
-    authButtons = _toConsumableArray(items);
   }
+  if (!items || items.length === 0) return null;
 
   // 当前菜单下查找按钮权限
   var showBtns = authButtons.splice(0, showCount || items.length);

package/es/dialog/HookDrawer.js

@@ -87,7 +87,7 @@ var HookDrawer = function HookDrawer(_ref, ref) {
     getContainer: isCrInProp ? innerConfig.getContainer : onGetContainer,
     children: /*#__PURE__*/_jsx(ModalContentContext.Provider, {
       value: {
-        closeDialog: close,
+        closeDialog: innerConfig.onClose || close,
         onHasButtons: function onHasButtons() {
           return setHasButtons(true);
         },

package/es/dialog/HookModal.js

@@ -163,7 +163,7 @@ var HookModal = function HookModal(_ref2, ref) {
     } : undefined,
     children: /*#__PURE__*/_jsx(ModalContentContext.Provider, {
       value: {
-        closeDialog: close,
+        closeDialog: innerConfig.onCancel || close,
         onHasButtons: function onHasButtons() {
           return setHasButtons(true);
         },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ccs-ui/rc-pro",
-  "version": "1.1.1-rc2",
+  "version": "1.1.1-rc4",
   "description": "A react pro components",
   "license": "MIT",
   "module": "es/index.js",