From c0454f2f232b9254a5c5a5b6830d30411509744b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com>
Date: Mon, 4 Dec 2023 14:08:17 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=B8=9C=E9=98=B3-=E4=B8=BB=E5=AD=90?=
 =?UTF-8?q?=E8=A1=A8=E3=80=91=E8=A1=A8=E6=A0=BC=E5=A4=9A=E9=80=89=E5=8F=8A?=
 =?UTF-8?q?=E6=9D=83=E9=99=90=E6=8C=89=E9=92=AE=E4=BC=98=E5=8C=96=E5=BC=80?=
 =?UTF-8?q?=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/tablePagination/index.vue  | 19 ++++++++-------
 .../src/components/umyTable/index.vue         | 23 +++++++++++++++++--
 .../src/utils/defaultButtons.js               | 12 +++++++---
 3 files changed, 41 insertions(+), 13 deletions(-)

diff --git a/WinIn.FasterZ.Wms.Fe/src/components/tablePagination/index.vue b/WinIn.FasterZ.Wms.Fe/src/components/tablePagination/index.vue
index fafa8dc1f..02030256a 100644
--- a/WinIn.FasterZ.Wms.Fe/src/components/tablePagination/index.vue
+++ b/WinIn.FasterZ.Wms.Fe/src/components/tablePagination/index.vue
@@ -62,6 +62,7 @@
         :firstFixed="true"
         :cellStyle = "cellStyle"
         :showOverflowTooltip="showOverflowTooltip"
+        :selectionColumnHandle="selectionColumnHandle"
       >
         <template>
           <slot></slot>
@@ -93,13 +94,6 @@ export default {
     rowDrop
   },
   props: {
-    // 不使用权限的按钮
-    noUsePermissionBtn:{
-      type: Array,
-      default: () => {
-        return ['refresh','field','filterForDetail','export','filter']//刷新，字段设置，明细查询，导出，筛选
-      }
-    },
     rowMaxHeight:{
       type:String,
       default:'calc(90vh - 280px)'
@@ -232,6 +226,11 @@ export default {
     rowSource:{
       type:String,
       default:'list_api'
+    },
+    // 多选列处理
+    selectionColumnHandle:{
+      type: Function,
+      default: null
     }
   },
   data () {
@@ -300,13 +299,17 @@ export default {
     })
   },
   methods: {
+    // 清除已选(外部使用，勿删)
+    clearTableSelection(){
+      this.$refs.tablePaginationTableRef.clearTableSelection();
+    },
     initButttondata(){
       let _list = []
       this.currenButtonData.forEach(item=>{
         if(item.permission){
           _list.push(item)
         }else{
-          if(this.noUsePermissionBtn.indexOf(item.name) < 0){
+          if(!item.isNoPermission){
             let _scope = item.clientScope || localStorage.getItem('appClientScope')
             item.permission =  [_scope + '.' +this.$route.name+'.'+(item.permissionName || item.name)]
           }else{
diff --git a/WinIn.FasterZ.Wms.Fe/src/components/umyTable/index.vue b/WinIn.FasterZ.Wms.Fe/src/components/umyTable/index.vue
index 9c51902c8..97acb21a7 100644
--- a/WinIn.FasterZ.Wms.Fe/src/components/umyTable/index.vue
+++ b/WinIn.FasterZ.Wms.Fe/src/components/umyTable/index.vue
@@ -18,7 +18,13 @@
     header-row-class-name="uTableHeader"
   >
     <!-- :tree-props="treeProps" 与 “height”  不能共存， 此组件暂不支持tree的格式-->
-    <u-table-column v-if="selectionTable" fixed="left" type="selection" :reserve-selection="true" />
+    <u-table-column 
+      v-if="selectionTable" 
+      fixed="left" 
+      type="selection" 
+      :reserve-selection="true" 
+      :selectable="selectionHandle"
+    />
     <u-table-column v-if="isShowIndex" type="index" fixed="left" label="序号" width="50" />
     <template v-for="(item, index) in TableSize">
     <u-table-column
@@ -333,6 +339,11 @@ export default {
       default: () => {
         return 280;
       }
+    },
+    // 多选列处理
+    selectionColumnHandle:{
+      type: Function,
+      default: null
     }
   },
   data() {
@@ -399,6 +410,14 @@ export default {
     this.setTableHeightHandle()
   },
   methods: {
+    // 多选列处理
+    selectionHandle(row,index){
+      return this.selectionColumnHandle(row,index)
+    },
+    // 清除已选(外部使用，勿删)
+    clearTableSelection(){
+      this.$refs.multipleTable.clearSelection();
+    },
     // 左侧操作列宽度适应
     operationLeftColumnWidth(){
       if(this.buttonOperationList_left.length == 1){return 120}
@@ -420,7 +439,7 @@ export default {
         this.$refs.multipleTable.$forceUpdate()
       });
     },
-    // 获取表格高度 误删 业务当中有用
+    // 获取表格高度 勿删 业务当中有用
     getTableHeight(){
       return this.uTableHeight
     },
diff --git a/WinIn.FasterZ.Wms.Fe/src/utils/defaultButtons.js b/WinIn.FasterZ.Wms.Fe/src/utils/defaultButtons.js
index 85e47d7d5..34b122374 100644
--- a/WinIn.FasterZ.Wms.Fe/src/utils/defaultButtons.js
+++ b/WinIn.FasterZ.Wms.Fe/src/utils/defaultButtons.js
@@ -39,6 +39,7 @@ export function defaultExportBtn(option) {
         label: i18n.t('btns.export'),
         name: "export",
         size: "mini",
+        isNoPermission:true
     })
 }
 
@@ -69,7 +70,8 @@ export function defaultFieldSettingBtn(option,source) {
         name: "field",
         size: "mini",
         float: 'right',
-        class: "rowDropNotHideItem"
+        class: "rowDropNotHideItem",
+        isNoPermission:true
     })
 }
 
@@ -80,7 +82,8 @@ export function defaultFreshBtn(option) {
         label: i18n.t('btns.fresh'),
         name: "refresh",
         size: "mini",
-        float: 'right'
+        float: 'right',
+        isNoPermission:true
     })
 }
 
@@ -92,7 +95,8 @@ export function defaultFilterBtn(option) {
         label: i18n.t('btns.filter'),
         name: "filter",
         size: "mini",
-        float: 'left'
+        float: 'left',
+        isNoPermission:true
     })
 }
 
@@ -105,6 +109,7 @@ export function defaultFilterForDetailBtn(option) {
         name: "filterForDetail",
         size: "mini",
         float: 'left',
+        isNoPermission:true
     })
 }
 
@@ -126,5 +131,6 @@ function __defaultBtnOption(option,specific){
         permission:option && option.permission ? option.permission : null,
         clientScope:option && option.clientScope ? option.clientScope : null,
         permissionName:option && option.permissionName ? option.permissionName : specific.permissionName,
+        isNoPermission:option && option.isNoPermission ? option.isNoPermission : specific.isNoPermission
     }
 }
\ No newline at end of file