n20-common-lib 3.0.86 → 3.0.88

package/src/components/v3/TablePro/index.vue

@@ -320,11 +320,19 @@
             :type="btn.type || 'primary'"
             :size="btn.size || 'mini'"
             :icon="btn.icon"
-            :disabled="btn.disabled"
+            :disabled="resolveDisabled(btn)"
             :class="[btn.class]"
             @click.stop="handleHoverBtnClick(btn, $event)"
           >
-            {{ btn.label }}
+            <el-badge
+              v-if="resolveBadge(btn)"
+              :value="resolveBadge(btn)"
+              :max="btn.badgeMax || 99"
+              class="hover-btn-badge"
+            >
+              {{ btn.label }}
+            </el-badge>
+            <template v-else>{{ btn.label }}</template>
           </el-button>
           <!-- 更多按钮下拉菜单 -->
           <el-dropdown
@@ -341,9 +349,14 @@
                 v-for="(btn, idx) in moreHoverBtns"
                 :key="'more-' + idx"
                 :command="btn"
-                :disabled="btn.disabled"
+                :disabled="resolveDisabled(btn)"
               >
-                <span :class="btn.type === 'danger' ? 'color-danger' : ''">
+                <el-badge v-if="resolveBadge(btn)" :value="resolveBadge(btn)" :max="btn.badgeMax || 99">
+                  <span :class="btn.type === 'danger' ? 'color-danger' : ''">
+                    {{ btn.label }}
+                  </span>
+                </el-badge>
+                <span v-else :class="btn.type === 'danger' ? 'color-danger' : ''">
                   {{ btn.label }}
                 </span>
               </el-dropdown-item>
@@ -751,7 +764,7 @@ export default {
     // 处理固定操作列的按钮事件
     handleOperateCommand(command, row, rowIndex) {
       this.$emit(command, row, rowIndex)
-      this.$emit('hover-btn-click', { btn: { command }, row, rowIndex })
+      this.$emit('hover-btn-click', { btn, row, rowIndex })
     },
     // 处理 tableOperate 固定/取消固定切换
     handleToggleOperateFixed(fixed) {
@@ -773,6 +786,26 @@ export default {
         return isHas(row)
       }
     },
+    // 解析 badge 值，支持 number、string、function
+    resolveBadge(btn) {
+      if (!btn.badge) return null
+      if (typeof btn.badge === 'function') {
+        const val = btn.badge(this.hoverRowData)
+        return val || val === 0 ? val : null
+      }
+      return btn.badge
+    },
+    // 解析 disabled 值，支持 boolean 和 function
+    resolveDisabled(btn) {
+      if (btn.disabled === undefined || btn.disabled === null) {
+        return false
+      } else if (typeof btn.disabled === 'boolean') {
+        return btn.disabled
+      } else if (typeof btn.disabled === 'function') {
+        return btn.disabled(this.hoverRowData)
+      }
+      return false
+    },
     // 全选/反选
     toggleAllSelection() {
       if (!this.$refs.vxeTable) return
@@ -1158,7 +1191,7 @@ export default {
     },
     // 处理悬浮按钮点击
     handleHoverBtnClick(btn, $event) {
-      if (btn.disabled) return
+      if (this.resolveDisabled(btn)) return
 
       if (typeof btn.command === 'function') {
         btn.command(this.hoverRowData, this.hoverRowIndex, $event)
@@ -1175,7 +1208,7 @@ export default {
     },
     // 处理"更多"下拉菜单命令
     handleMoreBtnCommand(btn) {
-      if (!btn || btn.disabled) return
+      if (!btn || this.resolveDisabled(btn)) return
       this.handleHoverBtnClick(btn, null)
     },
     // 表格滚动时隐藏按钮组

package/src/index.js

@@ -6,6 +6,7 @@ import ProFilterView from './components/ProFilterView/index.vue'
 import AnchorItem from './components/Anchor/AnchorItem.vue'
 import Anchor from './components/Anchor/index.vue'
 import ApprovalButtons from './components/ApprovalButtons/index.vue'
+import ShowAppOpi from './components/ApprovalButtons/showAppOpi.vue'
 import ApproveCard from './components/ApprovalCard/ApproveCard.vue'
 import ApprovalCard from './components/ApprovalCard/index.vue'
 import ApprovalImg from './components/ApprovalRecord/approvalImg.vue'
@@ -190,6 +191,7 @@ const components = [
   ApproveCard,
   ApprovalRecord,
   ApprovalButtons,
+  ShowAppOpi,
   Expandable,
   ExpandablePane,
   Empty,
@@ -315,6 +317,7 @@ export {
   Anchor,
   AnchorItem,
   ApprovalButtons,
+  ShowAppOpi,
   ApprovalCard,
   /* 中建科 */
   ApprovalCardZjk,