Explorar el Código

importedKeySet

tangning hace 2 semanas
padre
commit
c99fbdcbc7
Se han modificado 1 ficheros con 13 adiciones y 9 borrados
  1. 13 9
      src/view/newFireCase/newFireDetails/components/scene.vue

+ 13 - 9
src/view/newFireCase/newFireDetails/components/scene.vue

@@ -213,13 +213,17 @@ let titleDebounceTimer: any = null;
 
 // 已导入场景集合与辅助判断
 const importedKeySet = computed(() => {
-  const set = new Set<string>();
-  (scenes.value || []).forEach((s: any) => {
-    set.add(`${Number(s?.sceneType)}__${String(s?.num)}`);
-  });
-  console.log(scenes.value, 'importedKeySet', set);
-  return set;
+  return scenes.value.length ? scenes.value.map(s => `${Number(s?.sceneType)}__${String(s?.num)}`) : [];
 });
+// {
+//   const set = new Set<string>();
+//     console.log(scenes.value, 'importedKeySet');
+//   (scenes.value || []).forEach((s: any) => {
+//     set.add(`${Number(s?.sceneType)}__${String(s?.num)}`);
+//   });
+//   console.log(scenes.value, 'importedKeySet', set);
+//   return set;
+// });
 const selectedKeySet = computed(() => {
   const set = new Set<string>();
   (selectedRows.value || []).forEach((r: any) => {
@@ -228,7 +232,7 @@ const selectedKeySet = computed(() => {
   return set;
 });
 const rowKey = (row: any) => `${Number(row?.type)}__${String(row?.num)}`;
-const isRowImported = (row: any) =>  importedKeySet.value.has(rowKey(row));
+const isRowImported = (row: any) =>  importedKeySet.value.includes(rowKey(row));
 const isRowSelectable = (row: any) => row.status != 2 ? false : !isRowImported(row);
 const rowClassName = ({ row }: { row: any }) => (isRowImported(row) ? 'is-imported-row' : '');
 const preselectRows = () => {
@@ -238,8 +242,8 @@ const preselectRows = () => {
       tableRef.value?.clearSelection?.();
       (tableData.value || []).forEach((r: any) => {
         const key = rowKey(r);
-        console.log(key, importedKeySet.value, selectedKeySet.value,selectedRows.value, 'toggleRowSelection');
-        if (importedKeySet.value.has(key) || selectedKeySet.value.has(key)) {
+        console.log(key, importedKeySet.value, selectedKeySet.value,scenes.value, 'toggleRowSelection');
+        if (importedKeySet.value.includes(key) || selectedKeySet.value.has(key)) {
           tableRef.value?.toggleRowSelection?.(r, true);
         }
       });