From 728dbed28d5738d1d3b4a4925f719cb05026af1f Mon Sep 17 00:00:00 2001
From: CaIon <1808837298@qq.com>
Date: Wed, 13 Mar 2024 16:29:27 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=85=BC=E5=AE=B9=E5=8F=98=E7=84=A6?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 constant/midjourney.go            | 1 +
 relay/relay-mj.go                 | 5 ++++-
 web/src/components/MjLogsTable.js | 2 ++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/constant/midjourney.go b/constant/midjourney.go
index dbcc5c8..c184435 100644
--- a/constant/midjourney.go
+++ b/constant/midjourney.go
@@ -13,4 +13,5 @@ const (
 	MjActionVariation  = "VARIATION"
 	MjActionInPaint    = "INPAINT"
 	MjActionInPaintPre = "INPAINT_PRE"
+	MjActionZoom       = "ZOOM"
 )
diff --git a/relay/relay-mj.go b/relay/relay-mj.go
index 5fafc89..d582055 100644
--- a/relay/relay-mj.go
+++ b/relay/relay-mj.go
@@ -27,6 +27,7 @@ var DefaultModelPrice = map[string]float64{
 	"mj_reroll":      0.1,
 	"mj_blend":       0.1,
 	"mj_inpaint":     0.1,
+	"mj_zoom":        0.1,
 	"mj_inpaint_pre": 0,
 	"mj_describe":    0.05,
 	"mj_upscale":     0.05,
@@ -646,11 +647,13 @@ func coverPlusActionToNormalAction(midjRequest *dto.MidjourneyRequest) *dto.Midj
 		midjRequest.Action = constant.MjActionUpscale
 	} else if strings.Contains(action, "variation") {
 		midjRequest.Action = constant.MjActionVariation
+		midjRequest.Index = 1
 	} else if strings.Contains(action, "pan") {
 		midjRequest.Action = constant.MjActionVariation
 		midjRequest.Index = 1
 	} else if action == "Outpaint" || strings.Contains(action, "CustomZoom") {
-		midjRequest.Action = constant.MjActionInPaintPre
+		midjRequest.Action = constant.MjActionZoom
+		midjRequest.Index = 1
 	} else if action == "Inpaint" {
 		midjRequest.Action = constant.MjActionInPaintPre
 		midjRequest.Index = 1
diff --git a/web/src/components/MjLogsTable.js b/web/src/components/MjLogsTable.js
index 4accf54..a1ffeb6 100644
--- a/web/src/components/MjLogsTable.js
+++ b/web/src/components/MjLogsTable.js
@@ -39,6 +39,8 @@ function renderType(type) {
             return <Tag color="indigo" size='large'>重绘</Tag>;
         case 'INPAINT':
             return <Tag color="violet" size='large'>局部重绘</Tag>;
+        case 'ZOOM':
+            return <Tag color="teal" size='large'>变焦</Tag>;
         case 'INPAINT_PRE':
             return <Tag color="violet" size='large'>局部重绘-预处理</Tag>;
         default: