From 20d7a9d2db003a2d8f7aef67e95c17f89f3c238f Mon Sep 17 00:00:00 2001
From: "xiaoqi.cxq" <xiaoqi.cxq@gmail.com>
Date: Tue, 11 Apr 2023 09:30:15 +0800
Subject: [PATCH] =?UTF-8?q?ChatGPT=E8=BE=85=E5=8A=A9=E5=86=99=E4=BD=9C?=
 =?UTF-8?q?=E7=AA=97=E5=8F=A3=E6=8E=A7=E5=88=B6=E5=8F=B0=E6=8A=A5=E9=94=99?=
 =?UTF-8?q?bugfix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/modals/ChatGptConfigModal.vue | 12 ++++++------
 src/components/modals/ChatGptModal.vue       |  8 ++++----
 src/components/modals/common/FormEntry.vue   |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/components/modals/ChatGptConfigModal.vue b/src/components/modals/ChatGptConfigModal.vue
index 644d694b..5a074e5e 100644
--- a/src/components/modals/ChatGptConfigModal.vue
+++ b/src/components/modals/ChatGptConfigModal.vue
@@ -30,13 +30,9 @@ import modalTemplate from './common/modalTemplate';
 
 export default modalTemplate({
   data: () => ({
-    apiKey: this.config.apiKey,
-    proxyHost: this.config.proxyHost,
+    apiKey: null,
+    proxyHost: null,
   }),
-  computedLocalSettings: {
-    apiKey: 'chatgptApiKey',
-    proxyHost: 'chatgptProxyHost',
-  },
   methods: {
     resolve() {
       if (!this.apiKey) {
@@ -48,5 +44,9 @@ export default modalTemplate({
       this.config.resolve({ apiKey: this.apiKey, proxyHost: this.proxyHost });
     },
   },
+  mounted() {
+    this.apiKey = this.config.apiKey;
+    this.proxyHost = this.config.proxyHost;
+  },
 });
 </script>
diff --git a/src/components/modals/ChatGptModal.vue b/src/components/modals/ChatGptModal.vue
index 2fba924d..c3afae9d 100644
--- a/src/components/modals/ChatGptModal.vue
+++ b/src/components/modals/ChatGptModal.vue
@@ -6,7 +6,7 @@
       </div>
       <p><b>ChatGPT内容生成</b><br>生成时长受ChatGPT服务响应与网络响应时长影响，时间可能较长</p>
       <form-entry label="生成内容要求详细描述" error="content">
-        <textarea slot="field" class="text-input" type="text" placeholder="输入内容" v-model.trim="content" :disabled="generating || !chatGptConfig.apiKey"></textarea>
+        <textarea slot="field" class="text-input" type="text" placeholder="输入内容(支持换行)" v-model.trim="content" :disabled="generating || !chatGptConfig.apiKey"></textarea>
         <div class="form-entry__info">
           <span v-if="!chatGptConfig.apiKey" class="config-warning">
             未配置apiKey，请点击 <a href="javascript:void(0)" @click="openConfig">配置</a> apiKey。
@@ -20,8 +20,8 @@
         </div>
       </form-entry>
       <div class="modal__result">
-        <span v-if="generating && !result">(等待生成中...)</span>
-        <pre class="result_pre" v-text="result"></pre>
+        <pre class="result_pre" v-if="generating && !result">(等待生成中...)</pre>
+        <pre class="result_pre" v-else v-text="result"></pre>
       </div>
     </div>
     <div class="modal__button-bar">
@@ -139,7 +139,7 @@ export default modalTemplate({
   }
 
   .text-input {
-    min-height: 50px;
+    min-height: 60px;
   }
 }
 </style>
diff --git a/src/components/modals/common/FormEntry.vue b/src/components/modals/common/FormEntry.vue
index bab2843b..09f7512e 100644
--- a/src/components/modals/common/FormEntry.vue
+++ b/src/components/modals/common/FormEntry.vue
@@ -17,7 +17,7 @@ export default {
     uid: utils.uid(),
   }),
   mounted() {
-    this.$el.querySelector('input,select').id = this.uid;
+    this.$el.querySelector('input,select,textarea').id = this.uid;
   },
 };
 </script>