From 9257677e4bad968e9bafad5e9c5b503573617e33 Mon Sep 17 00:00:00 2001
From: shaohuzhang1 <shaohu.zhang@fit2cloud.com>
Date: Mon, 26 Aug 2024 11:21:40 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=BA=94=E7=94=A8?=
 =?UTF-8?q?=E5=A4=8D=E5=88=B6=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chat_pipeline/step/chat_step/i_chat_step.py     |  3 ++-
 apps/application/serializers/chat_serializers.py    |  8 ++++----
 ui/src/views/application/index.vue                  | 13 +++++++++----
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/apps/application/chat_pipeline/step/chat_step/i_chat_step.py b/apps/application/chat_pipeline/step/chat_step/i_chat_step.py
index 958eb59b1..e1a860d43 100644
--- a/apps/application/chat_pipeline/step/chat_step/i_chat_step.py
+++ b/apps/application/chat_pipeline/step/chat_step/i_chat_step.py
@@ -74,7 +74,8 @@ class IChatStep(IBaseChatPipelineStep):
 
         user_id = serializers.UUIDField(required=True, error_messages=ErrMessage.uuid("用户id"))
 
-        model_params_setting = serializers.DictField(required=True, error_messages=ErrMessage.dict("模型参数设置"))
+        model_params_setting = serializers.DictField(required=False, allow_null=True,
+                                                     error_messages=ErrMessage.dict("模型参数设置"))
 
         def is_valid(self, *, raise_exception=False):
             super().is_valid(raise_exception=True)
diff --git a/apps/application/serializers/chat_serializers.py b/apps/application/serializers/chat_serializers.py
index fd3eb52af..a4c2806fe 100644
--- a/apps/application/serializers/chat_serializers.py
+++ b/apps/application/serializers/chat_serializers.py
@@ -271,7 +271,7 @@ class ChatSerializers(serializers.Serializer):
                                    application_id=application_id)]
             chat_id = str(uuid.uuid1())
             chat_cache.set(chat_id,
-                           ChatInfo(chat_id,  dataset_id_list,
+                           ChatInfo(chat_id, dataset_id_list,
                                     [str(document.id) for document in
                                      QuerySet(Document).filter(
                                          dataset_id__in=dataset_id_list,
@@ -297,7 +297,7 @@ class ChatSerializers(serializers.Serializer):
                                       )
             work_flow_version = WorkFlowVersion(work_flow=work_flow)
             chat_cache.set(chat_id,
-                           ChatInfo(chat_id,  [],
+                           ChatInfo(chat_id, [],
                                     [],
                                     application, work_flow_version), timeout=60 * 30)
             return chat_id
@@ -322,7 +322,7 @@ class ChatSerializers(serializers.Serializer):
         # 问题补全
         problem_optimization = serializers.BooleanField(required=True, error_messages=ErrMessage.boolean("问题补全"))
         # 模型相关设置
-        model_params_setting = serializers.JSONField(required=True)
+        model_params_setting = serializers.JSONField(required=False, error_messages=ErrMessage.dict("模型参数相关设置"))
 
         def is_valid(self, *, raise_exception=False):
             super().is_valid(raise_exception=True)
@@ -354,7 +354,7 @@ class ChatSerializers(serializers.Serializer):
                                       model_params_setting=self.data.get('model_params_setting'),
                                       user_id=user_id)
             chat_cache.set(chat_id,
-                           ChatInfo(chat_id,  dataset_id_list,
+                           ChatInfo(chat_id, dataset_id_list,
                                     [str(document.id) for document in
                                      QuerySet(Document).filter(
                                          dataset_id__in=dataset_id_list,
diff --git a/ui/src/views/application/index.vue b/ui/src/views/application/index.vue
index 59e5cd593..976547be0 100644
--- a/ui/src/views/application/index.vue
+++ b/ui/src/views/application/index.vue
@@ -96,7 +96,10 @@
                       </el-button>
                       <template #dropdown>
                         <el-dropdown-menu>
-                          <el-dropdown-item @click="copyApplication(item)">
+                          <el-dropdown-item
+                            v-if="is_show_copy_button(item)"
+                            @click="copyApplication(item)"
+                          >
                             <AppIcon iconName="app-copy"></AppIcon>
                             复制</el-dropdown-item
                           >
@@ -130,7 +133,7 @@ import { useRouter } from 'vue-router'
 import { isWorkFlow } from '@/utils/application'
 import useStore from '@/stores'
 import { t } from '@/locales'
-const { application } = useStore()
+const { application, user } = useStore()
 const router = useRouter()
 
 const CopyApplicationDialogRef = ref()
@@ -149,11 +152,13 @@ const searchValue = ref('')
 
 function copyApplication(row: any) {
   application.asyncGetApplicationDetail(row.id, loading).then((res: any) => {
-    row['dataset_id_list'] = res.data.dataset_id_list
+    CopyApplicationDialogRef.value.open(res.data)
   })
-  CopyApplicationDialogRef.value.open(row)
 }
 
+const is_show_copy_button = (row: any) => {
+  return user.userInfo ? user.userInfo.id == row.user_id : false
+}
 function settingApplication(row: any) {
   if (isWorkFlow(row.type)) {
     router.push({ path: `/application/${row.id}/workflow` })