ztxkui 4.2.23-609 → 4.2.23-610

package/dist/components/business/OperationBtnGroup/index.js

@@ -64,24 +64,18 @@ var BTN_GROUP_CONFIG = {
     ],
 };
 var OperationBtnGroup = function (_a) {
-    var _b, _c, _d, _e, _f;
-    var status = _a.status, id = _a.id, callback = _a.callback, userBtns = _a.userBtns, record = _a.record, statusBtnConfig = _a.statusBtnConfig, canOperations = _a.canOperations, userId = _a.userId, compact = _a.compact, _g = _a.defaultShowNum, defaultShowNum = _g === void 0 ? 2 : _g, defaultShowMore = _a.defaultShowMore;
+    var _b;
+    var status = _a.status, id = _a.id, callback = _a.callback, userBtns = _a.userBtns, record = _a.record, statusBtnConfig = _a.statusBtnConfig, canOperations = _a.canOperations, userId = _a.userId, compact = _a.compact, _c = _a.defaultShowNum, defaultShowNum = _c === void 0 ? 2 : _c, defaultShowMore = _a.defaultShowMore;
     var isOperationBtnGroupShowMoreDefault = useBaseContext().isOperationBtnGroupShowMoreDefault;
     var isShowMore = getFinalValue(isOperationBtnGroupShowMoreDefault, defaultShowMore);
     var containerRef = useRef(null);
     // 当前按钮组
     var btnConfigs = __assign(__assign({}, BTN_GROUP_CONFIG), statusBtnConfig);
-    var onClickHandle = function (type, id, isAuth) {
-        if (isAuth) {
-            callback && callback(type, id, record);
-        }
+    var onClickHandle = function (type, id) {
+        callback && callback(type, id, record);
     };
-    /**
-     * @func
-     * @desc 得到具体按钮
-     * @param {string} type 当前按钮对应得类型
-     */
-    function getBtnDom(btnConfig, id) {
+    /** 无权限的按钮直接隐藏 */
+    function isShowBtn(btnConfig) {
         var isAuth = isBtnAuth(userBtns, btnConfig.authority || '');
         if (Array.isArray(canOperations) && canOperations.length > 0) {
             isAuth = !!canOperations.includes(userId || '');
@@ -89,25 +83,35 @@ var OperationBtnGroup = function (_a) {
         if (typeof canOperations === 'boolean') {
             isAuth = canOperations;
         }
+        return isAuth;
+    }
+    /**
+     * @func
+     * @desc 得到具体按钮
+     * @param {string} type 当前按钮对应得类型
+     */
+    function getBtnDom(btnConfig, id) {
         if (btnConfig.confirmMsg) {
-            return (React.createElement(Popconfirm, { key: btnConfig.type, title: btnConfig.confirmMsg, cancelText: i18next.t('否'), okText: i18next.t('是'), onConfirm: function () { return onClickHandle(btnConfig.type, id, isAuth); } },
+            return (React.createElement(Popconfirm, { key: btnConfig.type, title: btnConfig.confirmMsg, cancelText: i18next.t('否'), okText: i18next.t('是'), onConfirm: function () { return onClickHandle(btnConfig.type, id); } },
                 React.createElement(Button, { type: "link", style: {
                         height: 28,
-                    }, disabled: !isAuth, compact: compact }, btnConfig.name)));
+                    }, compact: compact }, btnConfig.name)));
         }
-        return (React.createElement(Button, { key: btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.type, type: "link", onClick: function () { return onClickHandle(btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.type, id, isAuth); }, style: {
+        return (React.createElement(Button, { key: btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.type, type: "link", onClick: function () { return onClickHandle(btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.type, id); }, style: {
                 height: 28,
-            }, disabled: !isAuth, compact: compact }, btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.name));
+            }, compact: compact }, btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.name));
     }
+    // 当前状态下有权限的按钮
+    var authedBtnConfigs = (btnConfigs[status] || []).filter(isShowBtn);
     // 切割按钮显示
     var defaultBtnConfigs = isShowMore
-        ? (_c = (_b = btnConfigs[status]) === null || _b === void 0 ? void 0 : _b.slice) === null || _c === void 0 ? void 0 : _c.call(_b, 0, defaultShowNum)
-        : btnConfigs[status];
+        ? authedBtnConfigs.slice(0, defaultShowNum)
+        : authedBtnConfigs;
     // 其他按钮
     var otherBtnConfigs = isShowMore
-        ? (_e = (_d = btnConfigs[status]) === null || _d === void 0 ? void 0 : _d.slice) === null || _e === void 0 ? void 0 : _e.call(_d, defaultShowNum)
+        ? authedBtnConfigs.slice(defaultShowNum)
         : [];
-    var _h = useState(false), showMore = _h[0], setShowMore = _h[1];
+    var _d = useState(false), showMore = _d[0], setShowMore = _d[1];
     var moreBtn = function () {
         return (otherBtnConfigs === null || otherBtnConfigs === void 0 ? void 0 : otherBtnConfigs.length) ? (React.createElement(Button, { type: "link", style: {
                 height: 28,
@@ -133,7 +137,7 @@ var OperationBtnGroup = function (_a) {
             operation_btn_group_popover_en: isEnglish(),
         }), content: React.createElement("div", { className: classNames({
                 operation_btn_group_popover_content_en: isEnglish(),
-            }), style: { width: ((_f = containerRef.current) === null || _f === void 0 ? void 0 : _f.offsetWidth) + "px" } }, renderBtnGroup(otherBtnConfigs)), visible: showMore, onVisibleChange: function (visible) {
+            }), style: { width: ((_b = containerRef.current) === null || _b === void 0 ? void 0 : _b.offsetWidth) + "px" } }, renderBtnGroup(otherBtnConfigs)), visible: showMore, onVisibleChange: function (visible) {
             if (!visible) {
                 setShowMore(visible);
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ztxkui",
-  "version": "4.2.23-609",
+  "version": "4.2.23-610",
   "private": false,
   "description": "React components library",
   "author": "zt-front-end",
@@ -112,4 +112,4 @@
     "react-dom": ">=16.9.0",
     "ztxkutils": ">=2.1.1"
   }
-}
+}