From 9866a2a8e162ddf5a9f5e3304783f7ff89313b09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B4=94=E5=BA=86=E6=89=8D=E4=B8=A8=E9=9D=99=E8=A7=85?=
 <cqc@cuiqingcai.com>
Date: Fri, 5 Apr 2024 14:39:40 +0800
Subject: [PATCH] Add round style for button and fix model name (#17)

Co-authored-by: Germey <germey@acedata.cloud>
---
 ...-828cf724-b2d2-4b08-9653-8b2b1cb7c267.json |  7 +++++
 src/components/chat/ModelSelector.vue         | 10 ++++++-
 src/pages/chat/Conversation.vue               |  9 +------
 src/pages/console/application/List.vue        |  2 +-
 src/pages/console/order/Detail.vue            |  4 +--
 src/pages/console/order/List.vue              | 26 ++++++++++---------
 src/pages/distribution/Index.vue              | 10 +++----
 src/pages/midjourney/History.vue              |  2 +-
 src/pages/midjourney/Index.vue                |  2 +-
 9 files changed, 41 insertions(+), 31 deletions(-)
 create mode 100644 change/@acedatacloud-hub-828cf724-b2d2-4b08-9653-8b2b1cb7c267.json

diff --git a/change/@acedatacloud-hub-828cf724-b2d2-4b08-9653-8b2b1cb7c267.json b/change/@acedatacloud-hub-828cf724-b2d2-4b08-9653-8b2b1cb7c267.json
new file mode 100644
index 00000000..57c69177
--- /dev/null
+++ b/change/@acedatacloud-hub-828cf724-b2d2-4b08-9653-8b2b1cb7c267.json
@@ -0,0 +1,7 @@
+{
+  "type": "patch",
+  "comment": "fix wrong model name",
+  "packageName": "@acedatacloud/hub",
+  "email": "germey@acedata.cloud",
+  "dependentChangeType": "patch"
+}
diff --git a/src/components/chat/ModelSelector.vue b/src/components/chat/ModelSelector.vue
index f6add6f5..241b8fa3 100644
--- a/src/components/chat/ModelSelector.vue
+++ b/src/components/chat/ModelSelector.vue
@@ -97,7 +97,15 @@ export default defineComponent({
   },
   computed: {
     model() {
-      return this.$store.state.chat.model;
+      const modelName = this.$store.state.chat.model.name;
+      const model = [
+        CHAT_MODEL_GPT_3_5,
+        CHAT_MODEL_GPT_3_5_BROWSING,
+        CHAT_MODEL_GPT_4,
+        CHAT_MODEL_GPT_4_BROWSING,
+        CHAT_MODEL_GPT_4_VISION
+      ].find((model) => model.name === modelName);
+      return model;
     }
   },
   methods: {
diff --git a/src/pages/chat/Conversation.vue b/src/pages/chat/Conversation.vue
index 0905b89a..78f3afed 100644
--- a/src/pages/chat/Conversation.vue
+++ b/src/pages/chat/Conversation.vue
@@ -40,14 +40,7 @@ import axios from 'axios';
 import { defineComponent } from 'vue';
 import Message from '@/components/chat/Message.vue';
 import { ROLE_ASSISTANT, ROLE_USER } from '@/constants';
-import {
-  IChatModel,
-  IApplication,
-  IChatMessageState,
-  IChatConversationResponse,
-  IChatConversation,
-  IChatMessage
-} from '@/models';
+import { IChatModel, IChatMessageState, IChatConversationResponse, IChatConversation, IChatMessage } from '@/models';
 import InputBox from '@/components/chat/InputBox.vue';
 import ModelSelector from '@/components/chat/ModelSelector.vue';
 import { ERROR_CODE_CANCELED, ERROR_CODE_NOT_APPLIED, ERROR_CODE_UNKNOWN } from '@/constants/errorCode';
diff --git a/src/pages/console/application/List.vue b/src/pages/console/application/List.vue
index f269b63f..3da44bc8 100644
--- a/src/pages/console/application/List.vue
+++ b/src/pages/console/application/List.vue
@@ -52,7 +52,7 @@
               <el-table-column fixed="right" width="120px">
                 <template #default="scope">
                   <div class="float-right">
-                    <el-button type="primary" size="small" @click="onBuyMore(scope?.row)">
+                    <el-button type="primary" round size="small" @click="onBuyMore(scope?.row)">
                       {{ $t('application.button.buyMore') }}
                     </el-button>
                   </div>
diff --git a/src/pages/console/order/Detail.vue b/src/pages/console/order/Detail.vue
index dd29ee1d..96786cdd 100644
--- a/src/pages/console/order/Detail.vue
+++ b/src/pages/console/order/Detail.vue
@@ -90,12 +90,12 @@
                   </div>
                 </div>
                 <div v-if="!order?.pay_way">
-                  <el-button :loading="prepaying" type="primary" size="large" class="btn-pay" @click="onPay">{{
+                  <el-button :loading="prepaying" round type="primary" size="large" class="btn-pay" @click="onPay">{{
                     $t('common.button.pay')
                   }}</el-button>
                 </div>
                 <div v-else>
-                  <el-button type="primary" size="large" class="btn-repay" @click="onRepay">{{
+                  <el-button type="primary" round size="large" class="btn-repay" @click="onRepay">{{
                     $t('common.button.repay')
                   }}</el-button>
                 </div>
diff --git a/src/pages/console/order/List.vue b/src/pages/console/order/List.vue
index 01b1fc84..be074b9d 100644
--- a/src/pages/console/order/List.vue
+++ b/src/pages/console/order/List.vue
@@ -23,17 +23,7 @@
                   <span class="price">¥{{ scope.row?.price?.toFixed(2) }}</span>
                 </template>
               </el-table-column>
-              <el-table-column :label="$t('order.field.createdAt')" width="180px">
-                <template #default="scope">
-                  <span class="created-at">{{ $dayjs.format(scope.row.created_at) }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column :label="$t('order.field.description')" width="300px">
-                <template #default="scope">
-                  <span class="description">{{ scope.row.description }}</span>
-                </template>
-              </el-table-column>
-              <el-table-column prop="state" :label="$t('order.field.state')" class-name="text-center">
+              <el-table-column prop="state" :label="$t('order.field.state')" class-name="text-center" width="120px">
                 <template #default="scope">
                   <span v-if="scope.row.state === OrderState?.PENDING">
                     <el-tag type="info" class="mx-1" effect="dark">{{ $t('order.state.pending') }}</el-tag>
@@ -49,13 +39,24 @@
                   </span>
                 </template>
               </el-table-column>
-              <el-table-column min-width="120px">
+              <el-table-column :label="$t('order.field.description')" width="300px">
+                <template #default="scope">
+                  <span class="description">{{ scope.row.description }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column :label="$t('order.field.createdAt')" width="180px">
+                <template #default="scope">
+                  <span class="created-at">{{ $dayjs.format(scope.row.created_at) }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column fixed="right" min-width="120px">
                 <template #default="scope">
                   <div class="float-right">
                     <el-button
                       v-if="scope.row.state !== OrderState.PAID"
                       type="primary"
                       size="small"
+                      round
                       @click="
                         $router.push({
                           name: 'console-order-detail',
@@ -70,6 +71,7 @@
                     <el-button
                       v-else
                       size="small"
+                      round
                       @click="
                         $router.push({
                           name: 'console-order-detail',
diff --git a/src/pages/distribution/Index.vue b/src/pages/distribution/Index.vue
index cea26c9f..2d676466 100644
--- a/src/pages/distribution/Index.vue
+++ b/src/pages/distribution/Index.vue
@@ -18,7 +18,7 @@
                 <p class="description">{{ $t('distribution.title.price') }}</p>
                 <p class="value">${{ distributionStatus?.price?.toFixed(2) }}</p>
               </div>
-              <el-button type="primary" size="small" class="btn" @click="goHistory"
+              <el-button type="primary" round size="small" class="btn" @click="goHistory"
                 >{{ $t('distribution.button.detail') }}
               </el-button>
             </div>
@@ -36,7 +36,7 @@
                 <p class="value">${{ distributionStatus?.reward?.toFixed(2) }}</p>
               </div>
               <el-tooltip effect="dark" :content="$t('distribution.message.developingWithDrawal')" placement="top">
-                <el-button type="primary" size="small" class="btn"
+                <el-button type="primary" round size="small" class="btn"
                   >{{ $t('distribution.button.withdrawal') }}
                 </el-button>
               </el-tooltip>
@@ -68,7 +68,7 @@
                 <p class="description">{{ $t('distribution.title.inviteesCount') }}</p>
                 <p class="value">{{ inviteesCount }}</p>
               </div>
-              <el-button type="primary" size="small" class="btn" @click="goInvitees"
+              <el-button type="primary" round size="small" class="btn" @click="goInvitees"
                 >{{ $t('distribution.button.detail') }}
               </el-button>
             </div>
@@ -364,7 +364,7 @@ export default defineComponent({
     margin: 0;
   }
   .description {
-    color: var(--el-text-color-secondary);
+    color: var(--el-text-color-regular);
     font-size: 14px;
     margin-bottom: 5px;
   }
@@ -406,7 +406,7 @@ export default defineComponent({
     font-size: 14px;
     margin-bottom: 10px;
     .more {
-      color: var(--el-color-primary);
+      color: var(--el-color-regular);
       cursor: pointer;
     }
   }
diff --git a/src/pages/midjourney/History.vue b/src/pages/midjourney/History.vue
index 6811a717..e6874999 100644
--- a/src/pages/midjourney/History.vue
+++ b/src/pages/midjourney/History.vue
@@ -10,7 +10,7 @@
       @refresh="onGetApplications"
     />
     <task-full-list @custom="onCustom" />
-    <el-button type="primary" class="btn btn-generate" @click="onGenerateNew">
+    <el-button type="primary" round class="btn btn-generate" @click="onGenerateNew">
       <font-awesome-icon icon="fa-solid fa-chevron-left" class="icon icon-rotate mr-1" />
       {{ $t('midjourney.button.generateNew') }}
     </el-button>
diff --git a/src/pages/midjourney/Index.vue b/src/pages/midjourney/Index.vue
index f3ea93db..6ef8f54c 100644
--- a/src/pages/midjourney/Index.vue
+++ b/src/pages/midjourney/Index.vue
@@ -19,7 +19,7 @@
         <elements-selector v-model="elements" :advanced="preset?.advanced" class="mb-4" />
         <ignore-selector v-if="preset?.advanced" v-model="ignore" class="mb-4" />
         <final-prompt v-if="finalPrompt" :model-value="finalPrompt" />
-        <el-button type="primary" class="btn btn-generate" :disabled="!finalPrompt" @click="onGenerate">
+        <el-button type="primary" round class="btn btn-generate" :disabled="!finalPrompt" @click="onGenerate">
           {{ $t('midjourney.button.generate') }}
         </el-button>
       </div>