diff --git a/src/components/scTable/index.vue b/src/components/scTable/index.vue
index 7056b838..4349fab9 100644
--- a/src/components/scTable/index.vue
+++ b/src/components/scTable/index.vue
@@ -13,7 +13,7 @@
       <el-table v-bind="$attrs" :data="tableData" :row-key="rowKey || undefined" :key="toggleIndex" ref="scTable"
         :height="height == 'auto' ? null : '100%'" :size="config.size" :border="config.border" :stripe="config.stripe"
         :summary-method="remoteSummary ? remoteSummaryMethod : summaryMethod" :expand-row-keys="rowKey ? expandRowKeys : undefined" @sort-change="sortChange"
-        @filter-change="filterChange" @selection-change="selectionChange">
+        @filter-change="filterChange" @selection-change="selectionChange" @expand-change="handleExpandChange">
         <slot></slot>
         <template v-for="(item, index) in userColumn" :key="index">
           <el-table-column v-if="!item.hide" :column-key="item.prop" :label="item.label" :prop="item.prop"
@@ -562,16 +562,19 @@ export default {
     },
     // 控制展开/收起所有行
     toggleExpandAll() {
-      const isExpandAll = this.expandRowKeys.length === this.$refs.scTable.data.length;
+      const rows = this.tableData || [];
+      const key = this.rowKey || "id";
+      const isExpandAll = rows.length > 0 && rows.every(item => this.expandRowKeys.includes(item[key]));
       if (isExpandAll) {
         this.expandRowKeys = [];  // 收起所有
       } else {
-        this.expandRowKeys = this.$refs.scTable.data.map(item => item.id); // 展开所有
+        this.expandRowKeys = rows.map(item => item[key]); // 展开所有
       }
     },
     // 每次展开状态变化时更新 expandRowKeys
     handleExpandChange(row, expandedRows) {
-      this.expandRowKeys = expandedRows.map(row => row.is); // 根据实际的唯一标识
+      const key = this.rowKey || "id";
+      this.expandRowKeys = expandedRows.map(item => item[key]); // 根据实际的唯一标识
     }
   },
 };