From c599cab14a815d2c666925dabbb876e488178bbb Mon Sep 17 00:00:00 2001
From: jialin <jialinkuang@126.com>
Date: Wed, 15 Jan 2025 21:36:43 +0800
Subject: [PATCH] fix: image display new image

---
 src/components/image-editor/index.tsx         |  9 ++---
 .../components/deploy-builtin-modal.tsx       | 33 +++++--------------
 .../playground/components/image-edit.tsx      |  3 +-
 3 files changed, 14 insertions(+), 31 deletions(-)

diff --git a/src/components/image-editor/index.tsx b/src/components/image-editor/index.tsx
index af95f86c..3e3a0f28 100644
--- a/src/components/image-editor/index.tsx
+++ b/src/components/image-editor/index.tsx
@@ -79,7 +79,7 @@ const CanvasImageEditor: React.FC<CanvasImageEditorProps> = ({
   );
 
   const getTransformLineWidth = useCallback((lineWidth: number) => {
-    return lineWidth;
+    return lineWidth / autoScale.current;
   }, []);
 
   const setCanvasTransformOrigin = (e: React.MouseEvent<HTMLCanvasElement>) => {
@@ -518,7 +518,7 @@ const CanvasImageEditor: React.FC<CanvasImageEditorProps> = ({
     if (strokesRef.current.length) {
       redrawStrokes(strokesRef.current);
     }
-  }, [drawImage, onReset, redrawStrokes, imguid, imageStatus]);
+  }, [drawImage, onReset, redrawStrokes, imguid]);
 
   const updateZoom = (scaleChange: number, mouseX: number, mouseY: number) => {
     const newScale = _.round(autoScale.current + scaleChange, 2);
@@ -574,14 +574,15 @@ const CanvasImageEditor: React.FC<CanvasImageEditorProps> = ({
     setTransform();
     overlayCanvasRef.current!.style.transform = `scale(${autoScale.current})`;
     canvasRef.current!.style.transform = `scale(${autoScale.current})`;
+    setActiveScale(autoScale.current);
     updateCursorSize();
     redrawStrokes(strokesRef.current);
   };
 
   const handleBrushSizeChange = (value: number) => {
     setLineWidth(value);
-    cursorRef.current!.style.width = `${value * autoScale.current}px`;
-    cursorRef.current!.style.height = `${value * autoScale.current}px`;
+    cursorRef.current!.style.width = `${value}px`;
+    cursorRef.current!.style.height = `${value}px`;
   };
   useEffect(() => {
     initializeImage();
diff --git a/src/pages/llmodels/components/deploy-builtin-modal.tsx b/src/pages/llmodels/components/deploy-builtin-modal.tsx
index cb4cc288..144880b4 100644
--- a/src/pages/llmodels/components/deploy-builtin-modal.tsx
+++ b/src/pages/llmodels/components/deploy-builtin-modal.tsx
@@ -274,32 +274,15 @@ const AddModal: React.FC<AddModalProps> = (props) => {
         return groupList[item.value];
       });
 
-      const list72B =
-        _.toLower(current.name) === 'qwen2.5'
-          ? _.filter(res.items, (item: CatalogSpec) => {
-              return item.size === 72;
-            })
-          : [];
+      const list = _.sortBy(res.items, 'size');
 
-      let defaultSpec: any = {};
-
-      if (list72B.length) {
-        defaultSpec =
-          _.find(list72B, (item: CatalogSpec) => {
-            return getDefaultQuant({
-              category: _.get(current, 'categories.0', ''),
-              quantOption: item.quantization
-            });
-          }) || _.get(list72B, `0`, {});
-      } else {
-        defaultSpec =
-          _.find(res.items, (item: CatalogSpec) => {
-            return getDefaultQuant({
-              category: _.get(current, 'categories.0', ''),
-              quantOption: item.quantization
-            });
-          }) || _.get(res.items, `0`, {});
-      }
+      const defaultSpec =
+        _.find(list, (item: CatalogSpec) => {
+          return getDefaultQuant({
+            category: _.get(current, 'categories.0', ''),
+            quantOption: item.quantization
+          });
+        }) || _.get(res.items, `0`, {});
 
       selectSpecRef.current = defaultSpec;
       setSourceList(sources);
diff --git a/src/pages/playground/components/image-edit.tsx b/src/pages/playground/components/image-edit.tsx
index a1c33117..08ee58ec 100644
--- a/src/pages/playground/components/image-edit.tsx
+++ b/src/pages/playground/components/image-edit.tsx
@@ -218,7 +218,6 @@ const GroundImages: React.FC<MessageProps> = forwardRef((props, ref) => {
 
   const imageFile = useMemo(() => {
     if (!image) return null;
-    console.log('image>>>>>>>>>>>>>>', image);
     return base64ToFile(image, 'image');
   }, [image]);
 
@@ -283,6 +282,7 @@ const GroundImages: React.FC<MessageProps> = forwardRef((props, ref) => {
     try {
       await form.current?.form?.validateFields();
       if (!parameters.model) return;
+      doneImage.current = false;
       const size: any = setImageSize();
       setLoading(true);
       setMessageId();
@@ -688,7 +688,6 @@ const GroundImages: React.FC<MessageProps> = forwardRef((props, ref) => {
   }, [image, loading, imageStatus, handleOnSave, handleUpdateImageList]);
 
   const handleOnImgClick = useCallback((item: any, isOrigin: boolean) => {
-    console.log('item:99', item);
     if (item.progress < 100) {
       return;
     }