fix: 🐛 修复使用含中文的图片 url 时的加载异常

https://sleazyfork.org/zh-CN/scripts/374903/discussions/254841
hymbz · Aug 10, 2024 · 739e008 · 739e008
1 parent b87b024
commit 739e008
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/components/Manga/actions/imageLoad.ts b/src/components/Manga/actions/imageLoad.ts
@@ -19,7 +19,7 @@ export const handleImgLoaded = (i: number, e: HTMLImageElement) => {
   setState((state) => {
     const img = state.imgList[i];
     // 与图片全载一起使用时会出现 src 不一样的情况，需要跳过
-    if (!img || e.src !== img.src) return;
+    if (!img || e.src !== encodeURI(img.src)) return;
     if (img.width !== e.naturalWidth || img.height !== e.naturalHeight)
       updateImgSize(state, i, e.naturalWidth, e.naturalHeight);
     img.loadType = 'loaded';

diff --git a/src/components/Manga/actions/memo/common.ts b/src/components/Manga/actions/memo/common.ts
@@ -1,4 +1,3 @@
-import { createMemo } from 'solid-js';
 import { createRootMemo, createThrottleMemo } from 'helper';
 
 import { store } from '../../store';
@@ -66,7 +65,9 @@ export const autoPageNum = createThrottleMemo(() =>
   store.rootSize.width >= store.rootSize.height ? 2 : 1,
 );
 
-export const pageNum = createMemo(() => store.option.pageNum || autoPageNum());
+export const pageNum = createRootMemo(
+  () => store.option.pageNum || autoPageNum(),
+);
 
 /** 是否为单页模式 */
 export const isOnePageMode = createRootMemo(