🐛 fix ui bugs about theme idx

Hanwn · Dec 17, 2023 · 4a1dc75 · 4a1dc75
1 parent 608f7cb
commit 4a1dc75
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/src/themes/mi/mi.js b/src/themes/mi/mi.js
@@ -13,7 +13,7 @@ import { defineRender } from "@/store/defineRender";
 import { getIconSrc } from "@/utils/getIcon";
 import { readSettings } from "@/store/defineSettings";
 import { ConvertConfig2Exif } from "@/utils/readExif";
-import { defineThemeParameter } from "@/store/defineThemes";
+import { defineThemeParameter, themeIdx } from "@/store/defineThemes";
 
 const { iconInfoConfig, verticalBarInfoConfig } = defineCanvasConfig();
 const { currentRenderUid, marshal, unMarshal } = defineRender();
@@ -31,7 +31,6 @@ function PreviewRenderMi(uid) {
   const factor = imgScaleInfo.imgH > imgScaleInfo.imgW ? 0.1 : 0.125;
   const genMarkInfo = getMarkInfo(exifData, img, iconImg, factor, imgScaleInfo);
   const renderItem = genRenderItem(img, genMarkInfo, factor, imgScaleInfo);
-
   const { privacyMode, whiteBoard } = defineThemeParameter();
   // whiteBoard.value = false;
   return renderItem;

diff --git a/src/themes/renderReouter.js b/src/themes/renderReouter.js
@@ -11,9 +11,11 @@ import {
 const { currentRenderUid, marshal, unMarshal } = defineRender();
 import { allCanvasConfigMap } from "@/store/defineCanvasConfig";
 import { defineRender } from "@/store/defineRender";
+import { uid2Src } from "@/store/defineImg";
 
 function PreviewRender(uid) {
-  const themeIdxValue = themeIdx.value;
+  // const themeIdxValue = themeIdx.value;
+  const themeIdxValue = uid2Src.get(uid).renderThemeIdx;
   let renderItem = {};
   switch (themeIdxValue) {
     case 1:
@@ -31,7 +33,8 @@ function PreviewRender(uid) {
 }
 
 async function SelectIcon(iconSrc) {
-  const themeIdxValue = themeIdx.value;
+  // const themeIdxValue = themeIdx.value;
+  const themeIdxValue = uid2Src.get(uid).renderThemeIdx;
   switch (themeIdxValue) {
     case 1:
       await SelectIconForMiTheme(iconSrc);

diff --git a/src/views/PreviewCard.vue b/src/views/PreviewCard.vue
@@ -103,7 +103,7 @@
       <el-pagination
         background
         layout="prev, pager, next"
-        :total="30"
+        :total="20"
         @current-change="sizeChange"
         :disabled="parameterDisable"
         :current-page="themeIdx"