From b5db36b8f8a28b9467bd9533e024801a5b966f9b Mon Sep 17 00:00:00 2001
From: Dooy <dooy520@qq.com>
Date: Tue, 26 Nov 2024 20:26:34 +0800
Subject: [PATCH] 2.22.4

---
 changlog.md               | 4 ++++
 package.json              | 2 +-
 src-tauri/tauri.conf.json | 2 +-
 src/views/mj/mjText.vue   | 8 ++++++--
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/changlog.md b/changlog.md
index d06e019689..f6e117c8d3 100644
--- a/changlog.md
+++ b/changlog.md
@@ -1,6 +1,10 @@
 # 功能升级日志
 
 #  计划 
+# 2.22.4
+- 🐞 修复：mj shorten
+- 🐞 修复：mj 图转文
+
 # 2.22.3
 - 😄 新增音乐：suno-v4
 - 😄 新增gpt模型：gpt-4o-2024-11-20
diff --git a/package.json b/package.json
index 6b71cdf07f..aba4887a59 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chatgpt-web-midjourney-proxy",
-  "version": "2.22.3",
+  "version": "2.22.4",
   "private": false,
   "description": "ChatGPT Web Midjourney Proxy",
   "author": "Dooy <ydlhero@gmail.com>",
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index 3a750f49c1..d7d7858209 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "ChatGPT-MJ",
-    "version": "2.22.3"
+    "version": "2.22.4"
   },
   "tauri": {
     "allowlist": {
diff --git a/src/views/mj/mjText.vue b/src/views/mj/mjText.vue
index ec9210e1a4..9d01be896e 100644
--- a/src/views/mj/mjText.vue
+++ b/src/views/mj/mjText.vue
@@ -212,7 +212,10 @@ watch(()=>homeStore.myData.act,(n)=>{
     }
 })
 const text = computed(() => {
-  const value =  props.chat.opt?.properties?.finalZhPrompt 
+  let  value =   props.chat.opt?.properties?.finalZhPrompt 
+  if(value==''){
+     value= props.chat.opt?.properties?.finalPrompt 
+  }
  return props.mdi.render(value)
    
 })
@@ -238,7 +241,8 @@ load();
         <div>{{ $t('mjchat.failReason') }}<p>{{ chat.opt?.failReason }}</p></div>
     </div>
     <template  v-else-if="chat.opt?.progress">
-        <div v-if="chat.opt?.action=='SHORTEN'" class="markdown-body" v-html="text" > 
+       
+        <div v-if="chat.opt?.action=='SHORTEN'" class="markdown-body" v-html="text " > 
              
         </div> 
         <div v-else-if="chat.opt?.action!='IMAGINE'" class="py-2 text-[#666]  whitespace-pre-wrap">{{ chat.opt?.promptEn }} (<span v-html="chat.opt?.action"></span>)</div>