From 6203e202d8933d036d769ecb728ce7e345edabc1 Mon Sep 17 00:00:00 2001
From: zhangdaiscott <zhangdaiscott@163.com>
Date: Tue, 18 Jul 2023 21:16:16 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89checkbox=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E6=A0=91=E5=B1=95=E5=BC=80=E5=88=97=E8=A1=A8=EF=BC=8C?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=B9=B1=E4=BA=86=EF=BC=8C=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97=20expandIconColumnIndex?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Table/src/BasicTable.vue           |  3 +++
 .../Table/src/hooks/useCustomSelection.tsx        | 15 +++++++++++++++
 src/views/demo/table/TreeTable.vue                |  1 -
 src/views/system/category/index.vue               |  1 -
 src/views/system/menu/index.vue                   |  1 -
 5 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/components/Table/src/BasicTable.vue b/src/components/Table/src/BasicTable.vue
index 256e450..0c2fdc7 100644
--- a/src/components/Table/src/BasicTable.vue
+++ b/src/components/Table/src/BasicTable.vue
@@ -146,6 +146,7 @@
         handleCustomSelectColumn,
         clearSelectedRowKeys,
         deleteSelectRowByKey,
+        getExpandIconColumnIndex,
       } = useCustomSelection(
         getProps,
         emit,
@@ -248,6 +249,8 @@
           dataSource,
           footer: unref(getFooterProps),
           ...unref(getExpandOption),
+          // 【QQYUN-5837】动态计算 expandIconColumnIndex
+          expandIconColumnIndex: getExpandIconColumnIndex.value,
         };
 
         //update-begin---author:wangshuai ---date:20230214  for：[QQYUN-4237]代码生成 内嵌子表模式 没有滚动条------------
diff --git a/src/components/Table/src/hooks/useCustomSelection.tsx b/src/components/Table/src/hooks/useCustomSelection.tsx
index cce9161..3d36da6 100644
--- a/src/components/Table/src/hooks/useCustomSelection.tsx
+++ b/src/components/Table/src/hooks/useCustomSelection.tsx
@@ -435,6 +435,20 @@ export function useCustomSelection(
     }
   }
 
+  // 【QQYUN-5837】动态计算 expandIconColumnIndex
+  const getExpandIconColumnIndex = computed(() => {
+    const { expandIconColumnIndex } = unref(propsRef);
+    // 未设置选择列，则保持不变
+    if (getRowSelectionRef.value == null) {
+      return expandIconColumnIndex;
+    }
+    // 设置了选择列，并且未传入 index 参数，则返回 1
+    if (expandIconColumnIndex == null) {
+      return 1;
+    }
+    return expandIconColumnIndex;
+  });
+
   return {
     getRowSelection,
     getRowSelectionRef,
@@ -446,6 +460,7 @@ export function useCustomSelection(
     isCustomSelection,
     handleCustomSelectColumn,
     clearSelectedRowKeys,
+    getExpandIconColumnIndex,
   };
 }
 
diff --git a/src/views/demo/table/TreeTable.vue b/src/views/demo/table/TreeTable.vue
index 5196253..88afe63 100644
--- a/src/views/demo/table/TreeTable.vue
+++ b/src/views/demo/table/TreeTable.vue
@@ -19,7 +19,6 @@
       const [register, { expandAll, collapseAll }] = useTable({
         title: '树形表格',
         isTreeTable: true,
-        expandIconColumnIndex: 1,
         rowSelection: {
           type: 'checkbox',
           getCheckboxProps(record: Recordable) {
diff --git a/src/views/system/category/index.vue b/src/views/system/category/index.vue
index 87c85af..bb4a998 100644
--- a/src/views/system/category/index.vue
+++ b/src/views/system/category/index.vue
@@ -68,7 +68,6 @@
         schemas: searchFormSchema,
       },
       isTreeTable: true,
-      expandIconColumnIndex: 1,
     },
     exportConfig: {
       name: '分类字典列表',
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 92817e8..c83a432 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -52,7 +52,6 @@
       size: 'small',
       pagination: false,
       isTreeTable: true,
-      expandIconColumnIndex: 1,
       striped: true,
       useSearchForm: true,
       showTableSetting: true,