From e3a36267f37126eac074c1f2788441e53f93313a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A6=99=E7=A0=81=E7=94=9F=E8=8A=B1?= <18523774412@qq.com>
Date: Tue, 5 Sep 2023 12:22:09 +0800
Subject: [PATCH] =?UTF-8?q?feat(baTable):=E7=8B=AC=E7=AB=8B=E5=87=BA?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E5=86=85=E9=83=A8=E7=BB=84=E4=BB=B6=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E8=B0=83=E7=94=A8=E7=9A=84=E9=89=B4=E6=9D=83=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=EF=BC=8C=E4=BE=BF=E4=BA=8E=E5=BC=80=E5=8F=91=E8=80=85?=
 =?UTF-8?q?=E9=87=8D=E5=86=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/table/fieldRender/index.vue    | 57 ++++---------------
 web/src/components/table/header/index.vue     |  8 +--
 web/src/utils/baTable.ts                      | 11 +++-
 3 files changed, 25 insertions(+), 51 deletions(-)

diff --git a/web/src/components/table/fieldRender/index.vue b/web/src/components/table/fieldRender/index.vue
index c71aba22..89883af2 100644
--- a/web/src/components/table/fieldRender/index.vue
+++ b/web/src/components/table/fieldRender/index.vue
@@ -114,9 +114,11 @@
     />
 
     <!-- 按钮组 -->
+    <!-- 只对默认的编辑、删除、排序按钮进行鉴权，其他按钮请通过 display 属性控制按钮是否显示 -->
     <div v-if="field.render == 'buttons' && field.buttons">
         <template v-for="(btn, idx) in field.buttons" :key="idx">
             <template v-if="btn.display ? btn.display(row, field) : true">
+                <!-- 常规按钮 -->
                 <el-button
                     v-if="btn.render == 'basicButton'"
                     v-blur
@@ -130,28 +132,15 @@
                     <Icon :name="btn.icon" />
                     <div v-if="btn.text" class="table-operate-text">{{ btn.text }}</div>
                 </el-button>
+
+                <!-- 带提示信息的按钮 -->
                 <el-tooltip
-                    v-if="btn.render == 'tipButton'"
+                    v-if="btn.render == 'tipButton' && ((btn.name == 'edit' && baTable.auth('edit')) || btn.name != 'edit')"
                     :disabled="btn.title && !btn.disabledTip ? false : true"
                     :content="btn.title ? t(btn.title) : ''"
                     placement="top"
                 >
                     <el-button
-                        v-if="btn.name == 'edit'"
-                        v-auth="'edit'"
-                        v-blur
-                        @click="onButtonClick(btn)"
-                        :class="btn.class"
-                        class="table-operate"
-                        :type="btn.type"
-                        :disabled="btn.disabled && btn.disabled(row, field)"
-                        v-bind="btn.attr"
-                    >
-                        <Icon :name="btn.icon" />
-                        <div v-if="btn.text" class="table-operate-text">{{ btn.text }}</div>
-                    </el-button>
-                    <el-button
-                        v-else
                         v-blur
                         @click="onButtonClick(btn)"
                         :class="btn.class"
@@ -164,8 +153,10 @@
                         <div v-if="btn.text" class="table-operate-text">{{ btn.text }}</div>
                     </el-button>
                 </el-tooltip>
+
+                <!-- 带确认框的按钮 -->
                 <el-popconfirm
-                    v-if="btn.render == 'confirmButton'"
+                    v-if="btn.render == 'confirmButton' && ((btn.name == 'delete' && baTable.auth('del')) || btn.name != 'delete')"
                     :disabled="btn.disabled && btn.disabled(row, field)"
                     v-bind="btn.popconfirm"
                     @confirm="onButtonClick(btn)"
@@ -174,20 +165,6 @@
                         <div class="ml-6">
                             <el-tooltip :disabled="btn.title ? false : true" :content="btn.title ? t(btn.title) : ''" placement="top">
                                 <el-button
-                                    v-if="btn.name == 'delete'"
-                                    v-auth="'del'"
-                                    v-blur
-                                    :class="btn.class"
-                                    class="table-operate"
-                                    :type="btn.type"
-                                    :disabled="btn.disabled && btn.disabled(row, field)"
-                                    v-bind="btn.attr"
-                                >
-                                    <Icon :name="btn.icon" />
-                                    <div v-if="btn.text" class="table-operate-text">{{ btn.text }}</div>
-                                </el-button>
-                                <el-button
-                                    v-else
                                     v-blur
                                     :class="btn.class"
                                     class="table-operate"
@@ -202,27 +179,15 @@
                         </div>
                     </template>
                 </el-popconfirm>
+
+                <!-- 带提示的可拖拽按钮 -->
                 <el-tooltip
-                    v-if="btn.render == 'moveButton'"
+                    v-if="btn.render == 'moveButton' && ((btn.name == 'weigh-sort' && baTable.auth('sortable')) || btn.name != 'weigh-sort')"
                     :disabled="btn.title && !btn.disabledTip ? false : true"
                     :content="btn.title ? t(btn.title) : ''"
                     placement="top"
                 >
                     <el-button
-                        v-if="btn.name == 'weigh-sort'"
-                        v-auth="'sortable'"
-                        :class="btn.class"
-                        class="table-operate move-button"
-                        :type="btn.type"
-                        :disabled="btn.disabled && btn.disabled(row, field)"
-                        v-bind="btn.attr"
-                    >
-                        <Icon :name="btn.icon" />
-                        <div v-if="btn.text" class="table-operate-text">{{ btn.text }}</div>
-                    </el-button>
-                    <el-button
-                        v-else
-                        v-blur
                         :class="btn.class"
                         class="table-operate move-button"
                         :type="btn.type"
diff --git a/web/src/components/table/header/index.vue b/web/src/components/table/header/index.vue
index dba1d0ff..e5032994 100644
--- a/web/src/components/table/header/index.vue
+++ b/web/src/components/table/header/index.vue
@@ -17,20 +17,20 @@
             </el-button>
         </el-tooltip>
         <slot name="refreshAppend"></slot>
-        <el-tooltip v-if="props.buttons.includes('add') && auth('add')" :content="t('Add')" placement="top">
+        <el-tooltip v-if="props.buttons.includes('add') && baTable.auth('add')" :content="t('Add')" placement="top">
             <el-button v-blur @click="onAction('add')" class="table-header-operate" type="primary">
                 <Icon name="fa fa-plus" />
                 <span class="table-header-operate-text">{{ t('Add') }}</span>
             </el-button>
         </el-tooltip>
-        <el-tooltip v-if="props.buttons.includes('edit') && auth('edit')" :content="t('Edit selected row')" placement="top">
+        <el-tooltip v-if="props.buttons.includes('edit') && baTable.auth('edit')" :content="t('Edit selected row')" placement="top">
             <el-button v-blur @click="onAction('edit')" :disabled="!enableBatchOpt" class="table-header-operate" type="primary">
                 <Icon name="fa fa-pencil" />
                 <span class="table-header-operate-text">{{ t('Edit') }}</span>
             </el-button>
         </el-tooltip>
         <el-popconfirm
-            v-if="props.buttons.includes('delete') && auth('del')"
+            v-if="props.buttons.includes('delete') && baTable.auth('del')"
             @confirm="onAction('delete')"
             :confirm-button-text="t('Delete')"
             :cancel-button-text="t('Cancel')"
@@ -125,7 +125,7 @@
 
 <script setup lang="ts">
 import { reactive, computed, inject } from 'vue'
-import { debounce, auth } from '/@/utils/common'
+import { debounce } from '/@/utils/common'
 import type baTableClass from '/@/utils/baTable'
 import ComSearch from '/@/components/table/comSearch/index.vue'
 import { useI18n } from 'vue-i18n'
diff --git a/web/src/utils/baTable.ts b/web/src/utils/baTable.ts
index bebb3671..f83da674 100644
--- a/web/src/utils/baTable.ts
+++ b/web/src/utils/baTable.ts
@@ -1,5 +1,5 @@
 import { reactive } from 'vue'
-import { getArrayKey } from '/@/utils/common'
+import { auth, getArrayKey } from '/@/utils/common'
 import type { baTableApi } from '/@/api/common'
 import Sortable from 'sortablejs'
 import { findIndexRow } from '/@/components/table'
@@ -69,6 +69,15 @@ export default class baTable {
         this.initComSearch(!isUndefined(route) ? route.query : {})
     }
 
+    /**
+     * 表格内部鉴权方法
+     * 此方法在表头或表行组件内部自动调用，传递权限节点名，如：add、edit
+     * 若需自定义表格内部鉴权，重写此方法即可
+     */
+    auth(node: string) {
+        return auth(node)
+    }
+
     /**
      * 运行前置函数
      * @param funName 函数名