fix: 🐛 图片颜色处理中,页面显示错误

meetqy · Feb 1, 2023 · 430e17c · 430e17c
1 parent 086d67d
commit 430e17c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/components/JustifyLayout/index.tsx b/components/JustifyLayout/index.tsx
@@ -5,6 +5,7 @@ import { useEffect, useMemo, useState } from "react";
 import { handleImageAlt, handleImageUrl } from "@/hooks";
 import { useRecoilState } from "recoil";
 import { rightBasicState } from "@/store";
+import _ from "lodash";
 
 interface LayoutBox {
   aspectRatio: number;
@@ -94,7 +95,9 @@ const JustifyLayout = ({ infiniteScroll, header }: Props) => {
           {layoutPos.boxes.map((item, i: number) => {
             const image = images[i];
             if (!image) return null;
-            const palettes: EagleUse.ImagePalette = JSON.parse(image.palettes);
+            const palettes: EagleUse.ImagePalette = image.processingPalette
+              ? null
+              : JSON.parse(image.palettes);
 
             return (
               <Card
@@ -103,7 +106,9 @@ const JustifyLayout = ({ infiniteScroll, header }: Props) => {
                 style={{
                   ...item,
                   position: "absolute",
-                  background: `rgb(${palettes[0].color}, .25)`,
+                  background: !_.isEmpty(palettes)
+                    ? `rgb(${palettes[0].color}, .25)`
+                    : token.colorBgBase,
                   overflow: "hidden",
                   outline:
                     activeImage?.id === image.id

diff --git a/env.d.ts b/env.d.ts
@@ -28,12 +28,12 @@ namespace EagleUse {
     modificationTime: number;
     width: number;
     height: number;
+    // json字符串
     palettes: string;
     lastModified: number;
     isDeleted: boolean;
     deletedTime: number;
-    // json字符串
-    processingPalette: string;
+    processingPalette: boolean;
     noThumbnail: boolean;
     star: number;
     tags?: Tag[];