From 25d70b7b4911c546474d5526dadb9ed6a02fe196 Mon Sep 17 00:00:00 2001
From: jialin <jialinkuang@126.com>
Date: Thu, 6 Mar 2025 11:54:18 +0800
Subject: [PATCH] fix: preview field  missing in image

---
 src/components/image-editor/index.tsx         | 31 ++++++++++++++++---
 src/config/hotkeys.ts                         |  1 +
 .../playground/components/ground-images.tsx   |  4 +--
 .../playground/components/image-edit.tsx      |  4 +--
 4 files changed, 32 insertions(+), 8 deletions(-)

diff --git a/src/components/image-editor/index.tsx b/src/components/image-editor/index.tsx
index f025cc18..c960642c 100644
--- a/src/components/image-editor/index.tsx
+++ b/src/components/image-editor/index.tsx
@@ -1,3 +1,4 @@
+import { KeyMap } from '@/config/hotkeys';
 import {
   ClearOutlined,
   CloseOutlined,
@@ -787,6 +788,19 @@ const CanvasImageEditor: React.FC<CanvasImageEditorProps> = ({
     };
   }, []);
 
+  const handleDeleteMask = () => {
+    clearUploadMask?.();
+    setInvertMask(false);
+    redrawStrokes(strokesRef.current);
+  };
+
+  useEffect(() => {
+    if (maskUpload?.length) {
+      // clear the overlay canvas
+      clearOverlayCanvas();
+    }
+  }, [maskUpload]);
+
   return (
     <div className="editor-wrapper">
       <div className="flex-between">
@@ -812,7 +826,7 @@ const CanvasImageEditor: React.FC<CanvasImageEditorProps> = ({
                   vertical={false}
                   defaultValue={lineWidth}
                   min={10}
-                  max={60}
+                  max={100}
                   onChange={handleBrushSizeChange}
                 />
               </div>
@@ -822,7 +836,16 @@ const CanvasImageEditor: React.FC<CanvasImageEditorProps> = ({
               <FormatPainterOutlined className="font-size-14" />
             </Button>
           </Tooltip>
-          <Tooltip title={intl.formatMessage({ id: 'common.button.undo' })}>
+          <Tooltip
+            title={
+              <span>
+                [{KeyMap.UNDO.textKeybinding}]
+                <span className="m-l-5">
+                  {intl.formatMessage({ id: 'common.button.undo' })}
+                </span>
+              </span>
+            }
+          >
             <Button
               onClick={undo}
               size="middle"
@@ -864,7 +887,7 @@ const CanvasImageEditor: React.FC<CanvasImageEditorProps> = ({
                 ...
               </span>
               <Button
-                onClick={clearUploadMask}
+                onClick={handleDeleteMask}
                 size="small"
                 type="text"
                 icon={<CloseOutlined className="close-btn"></CloseOutlined>}
@@ -947,7 +970,7 @@ const CanvasImageEditor: React.FC<CanvasImageEditorProps> = ({
         <div
           ref={cursorRef}
           style={{
-            display: 'none',
+            display: disabled ? 'none' : 'block',
             position: 'fixed',
             width: lineWidth * activeScale,
             height: lineWidth * activeScale,
diff --git a/src/config/hotkeys.ts b/src/config/hotkeys.ts
index 5104ebc5..33d2040f 100644
--- a/src/config/hotkeys.ts
+++ b/src/config/hotkeys.ts
@@ -9,6 +9,7 @@ const KeybindingsMap = {
   SUBMIT: ['Ctrl+Enter', 'Meta+Enter'],
   SAVEAS: ['Alt+Ctrl+S', 'Alt+Meta+S'],
   OPEN: ['Alt+Ctrl+O', 'Alt+Meta+O'],
+  UNDO: ['Ctrl+Z', 'Meta+Z'],
   CANCEL: ['Ctrl+W', 'Meta+W'],
   DELETE: ['delete'],
   COPY: ['Ctrl+C', 'Meta+C'],
diff --git a/src/pages/playground/components/ground-images.tsx b/src/pages/playground/components/ground-images.tsx
index 5b7dda03..50f17759 100644
--- a/src/pages/playground/components/ground-images.tsx
+++ b/src/pages/playground/components/ground-images.tsx
@@ -102,7 +102,7 @@ const GroundImages: React.FC<MessageProps> = forwardRef((props, ref) => {
   const finalParameters = useMemo(() => {
     if (parameters.size === 'custom') {
       return {
-        ..._.omit(parameters, ['width', 'height', 'preview']),
+        ..._.omit(parameters, ['width', 'height', 'preview', 'random_seed']),
         size:
           parameters.width && parameters.height
             ? `${parameters.width}x${parameters.height}`
@@ -177,7 +177,7 @@ const GroundImages: React.FC<MessageProps> = forwardRef((props, ref) => {
       if (!parameters.model) return;
       const params = generateParams();
       setParams({
-        ...params,
+        ...parameters,
         seed: params.seed
       });
 
diff --git a/src/pages/playground/components/image-edit.tsx b/src/pages/playground/components/image-edit.tsx
index cb1d8ac6..a18b6604 100644
--- a/src/pages/playground/components/image-edit.tsx
+++ b/src/pages/playground/components/image-edit.tsx
@@ -122,7 +122,7 @@ const GroundImages: React.FC<MessageProps> = forwardRef((props, ref) => {
   const finalParameters = useMemo(() => {
     if (parameters.size === 'custom') {
       return {
-        ..._.omit(parameters, ['width', 'height', 'preview']),
+        ..._.omit(parameters, ['width', 'height', 'preview', 'random_seed']),
         image: imageFile,
         mask: maskFile,
         size:
@@ -203,7 +203,7 @@ const GroundImages: React.FC<MessageProps> = forwardRef((props, ref) => {
       if (!parameters.model) return;
       const params = generateParams();
       setParams({
-        ...params,
+        ...parameters,
         seed: params.seed
       });