From ee70523026b8e1c0a12078a92c629bf7154edd12 Mon Sep 17 00:00:00 2001
From: Xwite <1797350009@qq.com>
Date: Sun, 7 May 2023 11:40:33 +0800
Subject: [PATCH] =?UTF-8?q?perf(web):=20=E4=BD=BF=E7=94=A8map=E6=9F=A5?=
 =?UTF-8?q?=E6=89=BE=E6=8E=A8=E9=80=81=E5=A4=B1=E8=B4=A5=E7=9A=84=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/web/src/components/SourceItem.vue | 10 +++++--
 modules/web/src/components/SourceList.vue |  7 +++--
 modules/web/src/store/sourceStore.js      | 36 ++++++++++-------------
 3 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/modules/web/src/components/SourceItem.vue b/modules/web/src/components/SourceItem.vue
index 1073956c7..22f932bbe 100644
--- a/modules/web/src/components/SourceItem.vue
+++ b/modules/web/src/components/SourceItem.vue
@@ -4,7 +4,7 @@
     border
     :label="sourceUrl"
     :class="{
-      error: errorPushSources.includes(source),
+      error: isSaveError,
       edit: sourceUrl == currentSourceUrl,
     }"
   >
@@ -17,12 +17,16 @@
 import { Edit } from "@element-plus/icons-vue";
 
 const props = defineProps(["source"]);
-const sourceUrl = props.source.bookSourceUrl || props.source.sourceUrl;
 const store = useSourceStore();
-const { errorPushSources, currentSourceUrl } = storeToRefs(store);
+const { savedSourcesMap, currentSourceUrl, sourceUrlKey } = storeToRefs(store);
+const sourceUrl = computed(() => props.source[sourceUrlKey.value]);
 const handleSourceClick = (source) => {
   store.changeCurrentSource(source);
 };
+const isSaveError = computed(() => {
+  if (savedSourcesMap.value.size == 0) return false;
+  return !savedSourcesMap.value.has(sourceUrl.value);
+});
 </script>
 <style lang="scss" scoped>
 :deep(.el-checkbox__label) {
diff --git a/modules/web/src/components/SourceList.vue b/modules/web/src/components/SourceList.vue
index bae4bf4d9..7024fbf3b 100644
--- a/modules/web/src/components/SourceList.vue
+++ b/modules/web/src/components/SourceList.vue
@@ -50,14 +50,15 @@ import SourceItem from "./SourceItem.vue";
 const store = useSourceStore();
 const sourceUrlSelect = ref([]);
 const searchKey = ref("");
-const { sources, sourcesMap, sourceUrlKey } = storeToRefs(store);
+const { sources, sourcesMap } = storeToRefs(store);
 const isBookSource = computed(() => {
   return /bookSource/.test(window.location.href);
 });
 const sourceSelect = computed(() => {
   if (sourceUrlSelect.value.length == 0) return [];
-  let searchKey = sourceUrlKey.value;
-  return sourceUrlSelect.value.map(sourceUrl => sourcesMap.value.get(sourceUrl));
+  return sourceUrlSelect.value.map(
+    (sourceUrl) => sourcesMap.value.get(sourceUrl) ?? {}
+  );
 });
 const deleteSelectSources = () => {
   API.deleteSource(sourceSelect.value).then(({ data }) => {
diff --git a/modules/web/src/store/sourceStore.js b/modules/web/src/store/sourceStore.js
index 4dcca89a4..4bc5a0760 100644
--- a/modules/web/src/store/sourceStore.js
+++ b/modules/web/src/store/sourceStore.js
@@ -11,7 +11,8 @@ export const useSourceStore = defineStore("source", {
       bookSources: [], // 临时存放所有书源,
       /** @type {import("@/source").RssSource[]} */
       rssSources: [], // 临时存放所有订阅源
-      errorPushSources: [], // 保存到阅读app出错的源
+      /** @type {import("@/source").Source[]} */
+      savedSources: [], // 批量保存到阅读app成功的源
       /** @type {import("@/source").Source} */
       currentSource: emptySource, // 当前编辑的源
       currentTab: localStorage.getItem("tabName") || "editTab",
@@ -21,11 +22,16 @@ export const useSourceStore = defineStore("source", {
   },
   getters: {
     sources: (state) => (isBookSource ? state.bookSources : state.rssSources),
-    sourceUrlKey: (state) => isBookSource ? "bookSourceUrl" : "sourceUrl",
+    sourceUrlKey: () => isBookSource ? "bookSourceUrl" : "sourceUrl",
     sourcesMap: (state) => {
-        let map = new Map();
-        state.sources.forEach(source => map.set(source[state.sourceUrlKey], source));
-        return map;
+      let map = new Map();
+      state.sources.forEach(source => map.set(source[state.sourceUrlKey], source));
+      return map;
+    },
+    savedSourcesMap: (state) => {
+      let map = new Map();
+      state.savedSources.forEach(source => map.set(source[state.sourceUrlKey], source));
+      return map;
     },
     currentSourceUrl: (state) =>
       isBookSource
@@ -53,6 +59,10 @@ export const useSourceStore = defineStore("source", {
         this.rssSources = data;
       }
     },
+    //批量推送
+    setPushReturnSources(returnSoures) {
+      this.savedSources = returnSoures;
+    },
     //删除源
     deleteSources(data) {
       let sources = isBookSource ? this.bookSources : this.rssSources;
@@ -71,21 +81,6 @@ export const useSourceStore = defineStore("source", {
     changeCurrentSource(source) {
       this.currentSource = JSON.parse(JSON.stringify((source)));
     },
-    async setPushReturnSources(returnSoures) {
-      if (isBookSource) {
-        // @ts-ignore
-        this.errorPushSources = this.sources.filter((source) =>
-          returnSoures.every(
-            (item) => item.bookSourceUrl !== source.bookSourceUrl
-          )
-        );
-      } else {
-        // @ts-ignore
-        this.errorPushSources = this.sources.filter((source) =>
-          returnSoures.every((item) => item.sourceUrl !== source.sourceUrl)
-        );
-      }
-    },
     // update editTab tabName and editTab info
     changeTabName(tabName) {
       this.currentTab = tabName;
@@ -133,6 +128,7 @@ export const useSourceStore = defineStore("source", {
     clearAllSource() {
       this.bookSources = [];
       this.rssSources = [];
+      this.savedSources = [];
     },
   },
 });