同步6/16

src/components/Holder/user.vue

@@ -1,7 +1,7 @@
 <template>
   <slot name="default" />
   <el-dialog append-to-body v-model="dialog.dialogVisible" :title="dialog.dialogTitle" width="1050">
-    <el-table @row-click="handleRowClick" ref="multipleTableRef" :data="tableData" border @selection-change="handleSelectionChange">
+    <el-table ref="multipleTableRef" :data="tableData" border @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" align="center" width="55" type="index" />
       <el-table-column label="业主" align="center">
@@ -49,7 +49,7 @@ const { sys_user_sex } = toRefs<any>(proxy?.useDict('sys_user_sex'));
 const props = defineProps({
   returnvalue: {
     type: String,
-    default: 'houseId'
+    default: 'residentId'
   },
   titleName: {
     type: String,
@@ -84,7 +84,7 @@ const multipleTableRef = ref();
 const tableData = ref<BillUserlist[]>([]);
 const total = ref(0);
 const loading = ref(false);
-
+const isFetching = ref(false);
 // 存储选中项
 const multipleSelection = ref<BillUserlist[]>([]);
 
@@ -92,29 +92,32 @@ const isMultiple = computed(() => props.isMultiple ?? false);
 
 // 优化 handleUserSelection，避免重复查找
 const handleUserSelection = () => {
-  if (!tableData.value.length) return;
-
-  multipleSelection.value = [];
-  const arr = userid.value;
-  if (!arr.length) return;
-  arr.forEach((item) => {
-    const target = tableData.value.find((row) => row.residentId == item);
-    target && multipleSelection.value.push(target);
+  isFetching.value = true;
+  if (!multipleTableRef.value || !tableData.value.length) {
+    isFetching.value = false;
+    return;
+  }
+  const rowsToSelect = tableData.value.filter((row) => {
+    return multipleSelection.value.some((selected) => selected.residentId === row.residentId);
   });
-  nextTick(() => {
-    if (multipleTableRef.value) {
-      multipleTableRef.value.clearSelection();
-      multipleSelection.value.forEach((item) => {
-        multipleTableRef.value.toggleRowSelection(item, true);
+  multipleTableRef.value.clearSelection();
+  if (rowsToSelect.length > 0) {
+    nextTick(() => {
+      rowsToSelect.forEach((row) => {
+        multipleTableRef.value?.toggleRowSelection(row, true);
       });
-    }
-  });
+      isFetching.value = false;
+    });
+  } else {
+    isFetching.value = false;
+  }
 };
 
 // ====================== 方法 ======================
 
 // 获取列表
 function getlist() {
+  isFetching.value = true; // 加锁
   loading.value = true;
   queryResidentList_holder(queryParams.value)
     .then((res) => {
@@ -127,6 +130,7 @@ function getlist() {
     })
     .finally(() => {
       loading.value = false;
+      isFetching.value = false; // 加锁
     });
 }
 
@@ -152,8 +156,31 @@ function handleChangebuilding(val: string) {
 // ✅ 新增：处理 selection-change（多选专用）
 // ==============================================
 function handleSelectionChange(selection: BillUserlist[]) {
+  if (isFetching.value) return;
   if (isMultiple.value) {
-    multipleSelection.value = selection;
+    const currentSelectedIds = new Set(selection.map((item) => item.residentId));
+    const otherPageSelections = multipleSelection.value.filter((item) => {
+      const isCurrentPageItem = tableData.value.some((row) => row.residentId === item.residentId);
+      if (isCurrentPageItem) {
+        return currentSelectedIds.has(item.residentId);
+      } else {
+        return true;
+      }
+    });
+    // 3. 合并：其他页保留的 + 当前页新选中的
+    const finalSelection = [...otherPageSelections, ...selection];
+    // 4. 去重（以防万一）
+    const uniqueMap = new Map();
+    finalSelection.forEach((item) => uniqueMap.set(item.residentId, item));
+    multipleSelection.value = Array.from(uniqueMap.values());
+    console.log(multipleSelection.value.map((item) => item.residentId));
+  } else {
+    // --- 单选逻辑 ---
+    if (selection.length > 0) {
+      multipleSelection.value = [selection[selection.length - 1]];
+    } else {
+      multipleSelection.value = [];
+    }
   }
 }
 // ==============================================
@@ -232,6 +259,17 @@ function confirm() {
 defineExpose({
   open: (arr: string[] = []) => {
     userid.value = arr;
+    if (arr && arr.length > 0) {
+      multipleSelection.value = arr.map(
+        (id) =>
+          ({
+            residentId: id
+          }) as BillUserlist
+      );
+    } else {
+      multipleSelection.value = [];
+    }
+
     getlist();
     dialog.value.dialogVisible = true;
   }