From a4e35a89bdd3026136743f911814288860092ae1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Thu, 20 Jul 2023 17:35:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0=E5=8F=B3?=
 =?UTF-8?q?=E4=BE=A7=E6=93=8D=E4=BD=9C=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/tablePagination/index.vue  | 15 +++++++-
 Code/Fe/src/components/umyTable/index.vue     | 37 +++++++++++++++++--
 2 files changed, 47 insertions(+), 5 deletions(-)

diff --git a/Code/Fe/src/components/tablePagination/index.vue b/Code/Fe/src/components/tablePagination/index.vue
index 05d4c0c..80178e1 100644
--- a/Code/Fe/src/components/tablePagination/index.vue
+++ b/Code/Fe/src/components/tablePagination/index.vue
@@ -53,6 +53,8 @@
         @inlineDialog="inlineDialog"
         :buttonOperationList_left="buttonOperationList_left"
         @buttonOperationClick_left="buttonOperationClick_left"
+        :buttonOperationList_right="buttonOperationList_right"
+        @buttonOperationClick_right="buttonOperationClick_right"
         :tableBorder="true"
         :firstFixed="true"
         :cellStyle = "cellStyle"
@@ -115,11 +117,16 @@ export default {
         return []
       }
     },
-    // 操作列按钮
+    // 操作列按钮(左侧)
     buttonOperationList_left:{
       type: Array,
       default: null,
     },
+    // 操作列按钮(右侧)
+    buttonOperationList_right:{
+      type: Function,
+      default: null,
+    },
     // 列表数据
     tableData: {
       type: Array,
@@ -341,10 +348,14 @@ export default {
     sortChange (data) {
       this.$emit('sortChange', data)
     },
-    //点击table操作列按钮
+    //点击table操作列(左侧)按钮
     buttonOperationClick_left(row, index, label) {
       this.$emit("buttonOperationClick_left", row, index, label);
     },
+    //点击table操作列(右侧)按钮
+    buttonOperationClick_right(row, item, index) {
+      this.$emit("buttonOperationClick_right", row, item, index);
+    },
     // 全面筛选组件配置
     // 全面筛选组件内部显示/隐藏更改触发，同步当前的showSearchOverall值
     getShowSearchOverall(val){
diff --git a/Code/Fe/src/components/umyTable/index.vue b/Code/Fe/src/components/umyTable/index.vue
index b9c9275..bd17d53 100644
--- a/Code/Fe/src/components/umyTable/index.vue
+++ b/Code/Fe/src/components/umyTable/index.vue
@@ -19,7 +19,7 @@
     header-row-class-name="uTableHeader"
   >
     <!-- :tree-props="treeProps" 与 “height”  不能共存， 此组件暂不支持tree的格式-->
-    <!-- 操作列 -->
+    <!-- 操作列 （左侧）-->
     <u-table-column
       v-if="buttonOperationList_left"
       :fixed="'left'"
@@ -40,6 +40,28 @@
         >{{itemButton.label}}</el-button>
       </template>
     </u-table-column>
+    <!-- 操作列 （右侧）-->
+    <u-table-column
+      v-if="buttonOperationList_right"
+      :fixed="'right'"
+      :width="120"
+      :align="'center'"
+      :header-align="'center'"
+    >
+      <template #header>
+        <span>操作</span>
+      </template>
+      <template slot-scope="scope">
+        <el-button
+          v-for="(itemButton, indexButton) in buttonOperationList_right(scope.row)"
+          v-show="!itemButton.hide"
+          :key="indexButton"
+          type="text"
+          size="mini"
+          @click="buttonOperationClick_right(scope.row, itemButton, indexButton)"
+        >{{itemButton.label}}</el-button>
+      </template>
+    </u-table-column>
     <u-table-column v-if="selectionTable" fixed="left" type="selection" :reserve-selection="true" />
     <u-table-column v-if="isShowIndex" type="index" fixed="left" label="序号" width="50" />
     <template v-for="(item, index) in TableSize">
@@ -441,11 +463,16 @@ export default {
     },
   },
   props: {
-    // 操作列按钮
+    // 操作列按钮（左侧）
     buttonOperationList_left:{
       type: Array,
       default: null,
     },
+    // 操作列按钮(右侧)
+    buttonOperationList_right:{
+      type: Function,
+      default: null,
+    },
     // 超出内容是否提示
     showOverflowTooltip:{
       type: Boolean,
@@ -880,10 +907,14 @@ export default {
     buttonClick(row, index, label) {
       this.$emit("buttonClick", row, index, label);
     },
-    //点击table操作列按钮
+    //点击table操作列(左侧)按钮
     buttonOperationClick_left(row, item, index) {
       this.$emit("buttonOperationClick_left", row, item, index);
     },
+    //点击table操作列(右侧)按钮
+    buttonOperationClick_right(row, item, index) {
+      this.$emit("buttonOperationClick_right", row, item, index);
+    },
   },
 };
 </script>