From 55c2629862ec684b6679bd60aa2a3d15134320e4 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 16:33:43 +0800
Subject: [PATCH] =?UTF-8?q?table=E7=BB=84=E4=BB=B6=E5=B7=A6=E5=8F=B3?=
 =?UTF-8?q?=E4=BE=A7=E6=93=8D=E4=BD=9C=E5=88=97=E5=8C=BA=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Code/Fe/README.md                                  |  2 +-
 .../components/commonTabel-drawer copy/index.vue   | 10 +++++-----
 .../Fe/src/components/commonTabel-drawer/index.vue | 10 +++++-----
 Code/Fe/src/components/tablePagination/index.vue   | 14 +++++---------
 Code/Fe/src/components/umyTable/index.vue          | 12 ++++++------
 Code/Fe/src/mixins/TableMixins.js                  |  2 +-
 .../views/basicConfig/ExportCustomUserSetting.vue  |  2 +-
 Code/Fe/src/views/interfaceBoard/TestSchool.vue    |  6 +++---
 8 files changed, 27 insertions(+), 31 deletions(-)

diff --git a/Code/Fe/README.md b/Code/Fe/README.md
index df3021f..4208571 100644
--- a/Code/Fe/README.md
+++ b/Code/Fe/README.md
@@ -46,7 +46,7 @@ alertoldSkipCount       主列表-分页-当前页条数
 alterResultCount        主列表-分页-每页最大页数
 handleSelectionChange   主列表-选择-行数据方法 tablePagination ==> currenTable
 <----20230207添加  begin---->
-buttonOperationClick    主列表-操作列按钮点击事件
+buttonOperationClick_left    主列表-操作列按钮点击事件
 currentPageProps        主列表-当前页码值
                         使用的是@/mixins/TableMixins的oldSkipCount值
 quicklySearchOption     主表查询-快速搜索数据配置 ==> 通用配置在@/utils/quicklySearchOption/index
diff --git a/Code/Fe/src/components/commonTabel-drawer copy/index.vue b/Code/Fe/src/components/commonTabel-drawer copy/index.vue
index bef3003..02d2a5c 100644
--- a/Code/Fe/src/components/commonTabel-drawer copy/index.vue	
+++ b/Code/Fe/src/components/commonTabel-drawer copy/index.vue	
@@ -117,8 +117,8 @@
             @handleSelectionChange="handleSelectionChange"
             @inlineDialog="inlineDialog"
             @buttonClick="buttonClick"
-            :buttonOperationList="buttonOperationList"
-            @buttonOperationClick="buttonOperationClick"
+            :buttonOperationList_left="buttonOperationList_left"
+            @buttonOperationClick_left="buttonOperationClick_left"
           >
             <template>
               <slot></slot>
@@ -257,7 +257,7 @@ export default {
   ],
   props: {
     // 操作列按钮
-    buttonOperationList:{
+    buttonOperationList_left:{
       type: Array,
       default: null,
     },
@@ -479,7 +479,7 @@ export default {
       this.displayDialog.detailInfoDialog = val || false
     },
     // 明细-操作列事件
-    buttonOperationClick(row, item, index){
+    buttonOperationClick_left(row, item, index){
       // 查看详情
       if(item.name == "info"){
         this.displayDialog.detailInfoDialog = true
@@ -487,7 +487,7 @@ export default {
         let _name = allUrlOption[this.$route.name].detailInfoName
         this.detailInfoTitle = _name ? row[_name] + ' 详情' : '详情'
       }
-      this.$emit('buttonOperationClick',row, item, index)
+      this.$emit('buttonOperationClick_left',row, item, index)
     },
     rowDrop(data,type) {
       this.$emit('rowDrop',data,type)
diff --git a/Code/Fe/src/components/commonTabel-drawer/index.vue b/Code/Fe/src/components/commonTabel-drawer/index.vue
index 0fabe3d..d93c568 100644
--- a/Code/Fe/src/components/commonTabel-drawer/index.vue
+++ b/Code/Fe/src/components/commonTabel-drawer/index.vue
@@ -78,8 +78,8 @@
             :currentPageProps="oldSkipCount"
             @overallSearchFormClick="overallSearchClickForDetail"
             :httpOverallSearchData="httpOverallSearchData"
-            @buttonOperationClick="buttonOperationClick"
-            :buttonOperationList="buttonOperationList"
+            @buttonOperationClick_left="buttonOperationClick_left"
+            :buttonOperationList_left="buttonOperationList_left"
             :tableLoading="Loading.tableLoading"
           ></tablePagination>
           <!-- 新增汇总 表头 区分明细表头使用 summaryTableColumns -->
@@ -205,7 +205,7 @@ export default {
   ],
   props: {
     // 操作列按钮
-    buttonOperationList:{
+    buttonOperationList_left:{
       type: Array,
       default: null,
     },
@@ -531,7 +531,7 @@ export default {
       this.displayDialog.detailInfoDialog = val || false
     },
     // 明细-操作列事件
-    buttonOperationClick(row, item, index){
+    buttonOperationClick_left(row, item, index){
       // 查看详情
       if(item.name == "info"){
         this.displayDialog.detailInfoDialog = true
@@ -539,7 +539,7 @@ export default {
         let _name = allUrlOption[this.$route.name].detailInfoName
         this.detailInfoTitle = _name ? row[_name] + ' 详情' : '详情'
       }
-      this.$emit('buttonOperationClick',row, item, index)
+      this.$emit('buttonOperationClick_left',row, item, index)
     },
     rowDrop(data,type) {
       this.$emit('rowDrop',data,type)
diff --git a/Code/Fe/src/components/tablePagination/index.vue b/Code/Fe/src/components/tablePagination/index.vue
index f850392..05d4c0c 100644
--- a/Code/Fe/src/components/tablePagination/index.vue
+++ b/Code/Fe/src/components/tablePagination/index.vue
@@ -51,8 +51,8 @@
         @sortChange="sortChange"
         @handleSelectionChange="handleSelectionChange"
         @inlineDialog="inlineDialog"
-        :buttonOperationList="buttonOperationList"
-        @buttonOperationClick="buttonOperationClick"
+        :buttonOperationList_left="buttonOperationList_left"
+        @buttonOperationClick_left="buttonOperationClick_left"
         :tableBorder="true"
         :firstFixed="true"
         :cellStyle = "cellStyle"
@@ -116,7 +116,7 @@ export default {
       }
     },
     // 操作列按钮
-    buttonOperationList:{
+    buttonOperationList_left:{
       type: Array,
       default: null,
     },
@@ -342,12 +342,8 @@ export default {
       this.$emit('sortChange', data)
     },
     //点击table操作列按钮
-    buttonOperationClick(row, index, label) {
-      this.$emit("buttonOperationClick", row, index, label);
-    },
-    //点击table操作列按钮
-    buttonOperationClick(row, item, index) {
-      this.$emit("buttonOperationClick", row, item, index);
+    buttonOperationClick_left(row, index, label) {
+      this.$emit("buttonOperationClick_left", row, index, label);
     },
     // 全面筛选组件配置
     // 全面筛选组件内部显示/隐藏更改触发，同步当前的showSearchOverall值
diff --git a/Code/Fe/src/components/umyTable/index.vue b/Code/Fe/src/components/umyTable/index.vue
index 1a4beb5..b9c9275 100644
--- a/Code/Fe/src/components/umyTable/index.vue
+++ b/Code/Fe/src/components/umyTable/index.vue
@@ -21,7 +21,7 @@
     <!-- :tree-props="treeProps" 与 “height”  不能共存， 此组件暂不支持tree的格式-->
     <!-- 操作列 -->
     <u-table-column
-      v-if="buttonOperationList"
+      v-if="buttonOperationList_left"
       :fixed="'left'"
       :width="120"
       :align="'center'"
@@ -32,11 +32,11 @@
       </template>
       <template slot-scope="scope">
         <el-button
-          v-for="(itemButton, indexButton) in buttonOperationList"
+          v-for="(itemButton, indexButton) in buttonOperationList_left"
           :key="indexButton"
           type="text"
           size="mini"
-          @click="buttonOperationClick(scope.row, itemButton, indexButton)"
+          @click="buttonOperationClick_left(scope.row, itemButton, indexButton)"
         >{{itemButton.label}}</el-button>
       </template>
     </u-table-column>
@@ -442,7 +442,7 @@ export default {
   },
   props: {
     // 操作列按钮
-    buttonOperationList:{
+    buttonOperationList_left:{
       type: Array,
       default: null,
     },
@@ -881,8 +881,8 @@ export default {
       this.$emit("buttonClick", row, index, label);
     },
     //点击table操作列按钮
-    buttonOperationClick(row, item, index) {
-      this.$emit("buttonOperationClick", row, item, index);
+    buttonOperationClick_left(row, item, index) {
+      this.$emit("buttonOperationClick_left", row, item, index);
     },
   },
 };
diff --git a/Code/Fe/src/mixins/TableMixins.js b/Code/Fe/src/mixins/TableMixins.js
index 0404865..a4618d6 100644
--- a/Code/Fe/src/mixins/TableMixins.js
+++ b/Code/Fe/src/mixins/TableMixins.js
@@ -240,7 +240,7 @@ export const tableMixins = {
      * @param {*} item 按钮信息
      * @param {*} index 按钮索引
      */
-    buttonOperationClick(row, item, index) {
+    buttonOperationClick_left(row, item, index) {
       // 获取当前行数据，赋值给 propsData
       this.propsData = row
       // 查看详情
diff --git a/Code/Fe/src/views/basicConfig/ExportCustomUserSetting.vue b/Code/Fe/src/views/basicConfig/ExportCustomUserSetting.vue
index 989a7d8..0c56330 100644
--- a/Code/Fe/src/views/basicConfig/ExportCustomUserSetting.vue
+++ b/Code/Fe/src/views/basicConfig/ExportCustomUserSetting.vue
@@ -17,7 +17,7 @@
       @alertoldSkipCount="alertoldSkipCount"
       @alterResultCount="alterResultCount"
       @handleSelectionChange="handleSelectionChange"
-      @buttonOperationClick="buttonOperationClick"
+      @buttonOperationClick_left="buttonOperationClick_left"
       :currentPageProps="oldSkipCount"
       :quicklySearchOption="quicklySearchOption"
       @quicklySearchClick="quicklySearchClick"
diff --git a/Code/Fe/src/views/interfaceBoard/TestSchool.vue b/Code/Fe/src/views/interfaceBoard/TestSchool.vue
index 16b0b82..4aa4757 100644
--- a/Code/Fe/src/views/interfaceBoard/TestSchool.vue
+++ b/Code/Fe/src/views/interfaceBoard/TestSchool.vue
@@ -23,8 +23,8 @@
       :primarySearchOption="primarySearchOption"
       @overallSearchFormClick="overallSearchFormClick"
       :httpOverallSearchData="httpOverallSearchData"
-      @buttonOperationClick="buttonOperationClick"
-      :buttonOperationList="operationButtonsTable"
+      @buttonOperationClick_left="buttonOperationClick_left"
+      :buttonOperationList_left="operationButtonsTable"
     ></tablePagination>
     <curren-Drawer
       ref="currenDrawer_Ref"
@@ -46,7 +46,7 @@
       :MaxResultCount="MaxResultCountDetails"
       @alterResultCountDetails="alterResultCountDetails"
       @alertoldSkipCountDetails="alertoldSkipCountDetails"
-      :buttonOperationList="operationButtonsDetail"
+      :buttonOperationList_left="operationButtonsDetail"
     ></curren-Drawer>
     <!-- 新增与编辑 -->
     <newAndEdiDialog