From dc988a0f991e4b54eb0f562fc3809d157dffe72e Mon Sep 17 00:00:00 2001
From: zhangliqiang <zhangliqiang5258@gmail.com>
Date: Mon, 15 Apr 2024 14:17:59 +0800
Subject: [PATCH 1/8] build: Update .dockerignore

remove useless directory.
---
 .dockerignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.dockerignore b/.dockerignore
index 92c02acca..305b3d81b 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -1 +1,2 @@
-.git*
\ No newline at end of file
+.git*
+.idea*

From c226a49af792d20085e2f2b215ad37d597f08d0c Mon Sep 17 00:00:00 2001
From: shaohuzhang1 <80892890+shaohuzhang1@users.noreply.github.com>
Date: Mon, 15 Apr 2024 14:18:33 +0800
Subject: [PATCH 2/8] Pr@main@fix hit test (#70)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* fix: 应用命中测试报没有权限访问 #65
---
 ui/src/views/paragraph/component/ProblemComponent.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/src/views/paragraph/component/ProblemComponent.vue b/ui/src/views/paragraph/component/ProblemComponent.vue
index cef42b4e1..6284f3285 100644
--- a/ui/src/views/paragraph/component/ProblemComponent.vue
+++ b/ui/src/views/paragraph/component/ProblemComponent.vue
@@ -168,7 +168,7 @@ const remoteMethod = (query: string) => {
 function getProblemOption(filterText?: string) {
   return problem
     .asyncGetProblem(
-      id as string,
+      props.datasetId || (id as string),
       { current_page: 1, page_size: 100 },
       filterText && { content: filterText },
       optionLoading

From 9c830366b317cc274903fc028b06e0bb3950816a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BB=BA=E5=9B=BD?=
 <75963100+Jianguo-Genius@users.noreply.github.com>
Date: Mon, 15 Apr 2024 14:42:26 +0800
Subject: [PATCH 3/8] =?UTF-8?q?docs:=20=E4=BF=AE=E5=A4=8D=E6=B3=A8?=
 =?UTF-8?q?=E9=87=8A=E4=B8=AD=E7=9A=84=E9=94=99=E5=88=AB=E5=AD=97=20(#73)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 main.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main.py b/main.py
index f925b09f8..0f5e744fe 100644
--- a/main.py
+++ b/main.py
@@ -18,7 +18,7 @@ django.setup()
 def collect_static():
     """
      收集静态文件到指定目录
-     本项目主要是将前段vue/dist的前段项目放到静态目录下面
+     本项目主要是将前端vue/dist的前段项目放到静态目录下面
     :return:
     """
     logging.info("Collect static files")

From fc63b15e7fb72bdd467a5729d826f39208dda76f Mon Sep 17 00:00:00 2001
From: Craftsman <70558837+fit2-zhao@users.noreply.github.com>
Date: Mon, 15 Apr 2024 14:42:39 +0800
Subject: [PATCH 4/8] refactor: remove unused element (#74)

---
 ui/src/views/user-manage/component/UserDialog.vue    | 5 ++---
 ui/src/views/user-manage/component/UserPwdDialog.vue | 3 +--
 ui/src/views/user-manage/index.vue                   | 4 ++--
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/ui/src/views/user-manage/component/UserDialog.vue b/ui/src/views/user-manage/component/UserDialog.vue
index 997d9bd4c..998531983 100644
--- a/ui/src/views/user-manage/component/UserDialog.vue
+++ b/ui/src/views/user-manage/component/UserDialog.vue
@@ -53,10 +53,9 @@
 </template>
 <script setup lang="ts">
 import { ref, reactive, watch } from 'vue'
-import type { FormInstance, FormRules } from 'element-plus'
-import { cloneDeep } from 'lodash'
+import type { FormInstance } from 'element-plus'
 import userApi from '@/api/user-manage'
-import { MsgSuccess, MsgConfirm } from '@/utils/message'
+import { MsgSuccess } from '@/utils/message'
 
 const props = defineProps({
   title: String
diff --git a/ui/src/views/user-manage/component/UserPwdDialog.vue b/ui/src/views/user-manage/component/UserPwdDialog.vue
index 298a71531..2ad7628f9 100644
--- a/ui/src/views/user-manage/component/UserPwdDialog.vue
+++ b/ui/src/views/user-manage/component/UserPwdDialog.vue
@@ -39,9 +39,8 @@
 import { ref, reactive, watch } from 'vue'
 import type { FormInstance, FormRules } from 'element-plus'
 import type { ResetPasswordRequest } from '@/api/type/user'
-import { cloneDeep } from 'lodash'
 import userApi from '@/api/user-manage'
-import { MsgSuccess, MsgConfirm } from '@/utils/message'
+import { MsgSuccess } from '@/utils/message'
 
 const emit = defineEmits(['refresh'])
 
diff --git a/ui/src/views/user-manage/index.vue b/ui/src/views/user-manage/index.vue
index cc93d0bea..033c446ae 100644
--- a/ui/src/views/user-manage/index.vue
+++ b/ui/src/views/user-manage/index.vue
@@ -79,10 +79,10 @@
   </LayoutContainer>
 </template>
 <script setup lang="ts">
-import { ref, onMounted, reactive, watch, computed } from 'vue'
+import { ref, onMounted, reactive } from 'vue'
 import UserDialog from './component/UserDialog.vue'
 import UserPwdDialog from './component/UserPwdDialog.vue'
-import { MsgSuccess, MsgConfirm, MsgError } from '@/utils/message'
+import { MsgSuccess, MsgConfirm } from '@/utils/message'
 import userApi from '@/api/user-manage'
 import { datetimeFormat } from '@/utils/time'
 

From 49647ea4f92685e4a071c881695d74d1b4cd4ebb Mon Sep 17 00:00:00 2001
From: w940853815 <w940853815@gmail.com>
Date: Mon, 15 Apr 2024 14:42:49 +0800
Subject: [PATCH 5/8] =?UTF-8?q?typo:application=5Fid=EF=BC=8Capplication?=
 =?UTF-8?q?=5Fname=20(#75)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/src/api/log.ts | 54 +++++++++++++++++++++++------------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/ui/src/api/log.ts b/ui/src/api/log.ts
index 77131fff6..1904e96b0 100644
--- a/ui/src/api/log.ts
+++ b/ui/src/api/log.ts
@@ -6,7 +6,7 @@ import { type Ref } from 'vue'
 const prefix = '/application'
 /**
  * 对话日志
- * @param 参数 
+ * @param 参数
  * application_id, history_day
  * page  {
               "current_page": "string",
@@ -18,37 +18,37 @@ const prefix = '/application'
             }
  */
 const getChatLog: (
-  applicaiton_id: String,
+  application_id: String,
   page: pageRequest,
   param: any,
   loading?: Ref<boolean>
-) => Promise<Result<any>> = (applicaiton_id, page, param, loading) => {
+) => Promise<Result<any>> = (application_id, page, param, loading) => {
   return get(
-    `${prefix}/${applicaiton_id}/chat/${page.current_page}/${page.page_size}`,
+    `${prefix}/${application_id}/chat/${page.current_page}/${page.page_size}`,
     param,
     loading
   )
 }
 
 const exportChatLog: (
-  applicaiton_id: string,
-  applicantion_name: string,
+  application_id: string,
+  application_name: string,
   param: any,
   loading?: Ref<boolean>
-) => void = (applicaiton_id, applicantion_name, param, loading) => {
-  exportExcel(applicantion_name, `${prefix}/${applicaiton_id}/chat/export`, param, loading)
+) => void = (application_id, application_name, param, loading) => {
+  exportExcel(application_name, `${prefix}/${application_id}/chat/export`, param, loading)
 }
 
 /**
  * 删除日志
- * @param 参数 applicaiton_id, chat_id,
+ * @param 参数 application_id, chat_id,
  */
 const delChatLog: (
-  applicaiton_id: string,
+  application_id: string,
   chat_id: string,
   loading?: Ref<boolean>
-) => Promise<Result<boolean>> = (applicaiton_id, chat_id, loading) => {
-  return del(`${prefix}/${applicaiton_id}/chat/${chat_id}`, undefined, {}, loading)
+) => Promise<Result<boolean>> = (application_id, chat_id, loading) => {
+  return del(`${prefix}/${application_id}/chat/${chat_id}`, undefined, {}, loading)
 }
 
 /**
@@ -61,13 +61,13 @@ const delChatLog: (
         }
  */
 const getChatRecordLog: (
-  applicaiton_id: String,
+  application_id: String,
   chart_id: String,
   page: pageRequest,
   loading?: Ref<boolean>
-) => Promise<Result<any>> = (applicaiton_id, chart_id, page, loading) => {
+) => Promise<Result<any>> = (application_id, chart_id, page, loading) => {
   return get(
-    `${prefix}/${applicaiton_id}/chat/${chart_id}/chat_record/${page.current_page}/${page.page_size}`,
+    `${prefix}/${application_id}/chat/${chart_id}/chat_record/${page.current_page}/${page.page_size}`,
     undefined,
     loading
   )
@@ -83,7 +83,7 @@ const getChatRecordLog: (
         }
  */
 const putChatRecordLog: (
-  applicaiton_id: String,
+  application_id: String,
   chart_id: String,
   chart_record_id: String,
   dataset_id: String,
@@ -91,7 +91,7 @@ const putChatRecordLog: (
   data: any,
   loading?: Ref<boolean>
 ) => Promise<Result<any>> = (
-  applicaiton_id,
+  application_id,
   chart_id,
   chart_record_id,
   dataset_id,
@@ -100,7 +100,7 @@ const putChatRecordLog: (
   loading
 ) => {
   return put(
-    `${prefix}/${applicaiton_id}/chat/${chart_id}/chat_record/${chart_record_id}/dataset/${dataset_id}/document_id/${document_id}/improve`,
+    `${prefix}/${application_id}/chat/${chart_id}/chat_record/${chart_record_id}/dataset/${dataset_id}/document_id/${document_id}/improve`,
     data,
     undefined,
     loading
@@ -113,13 +113,13 @@ const putChatRecordLog: (
  * application_id, chart_id,  chart_record_id
  */
 const getMarkRecord: (
-  applicaiton_id: String,
+  application_id: String,
   chart_id: String,
   chart_record_id: String,
   loading?: Ref<boolean>
-) => Promise<Result<any>> = (applicaiton_id, chart_id, chart_record_id, loading) => {
+) => Promise<Result<any>> = (application_id, chart_id, chart_record_id, loading) => {
   return get(
-    `${prefix}/${applicaiton_id}/chat/${chart_id}/chat_record/${chart_record_id}/improve`,
+    `${prefix}/${application_id}/chat/${chart_id}/chat_record/${chart_record_id}/improve`,
     undefined,
     loading
   )
@@ -131,7 +131,7 @@ const getMarkRecord: (
  * application_id, chart_id,  chart_record_id, dataset_id, document_id,paragraph_id
  */
 const delMarkRecord: (
-  applicaiton_id: String,
+  application_id: String,
   chart_id: String,
   chart_record_id: String,
   dataset_id: String,
@@ -139,7 +139,7 @@ const delMarkRecord: (
   paragraph_id: String,
   loading?: Ref<boolean>
 ) => Promise<Result<any>> = (
-  applicaiton_id,
+  application_id,
   chart_id,
   chart_record_id,
   dataset_id,
@@ -148,7 +148,7 @@ const delMarkRecord: (
   loading
 ) => {
   return del(
-    `${prefix}/${applicaiton_id}/chat/${chart_id}/chat_record/${chart_record_id}/dataset/${dataset_id}/document_id/${document_id}/improve/${paragraph_id}`,
+    `${prefix}/${application_id}/chat/${chart_id}/chat_record/${chart_record_id}/dataset/${dataset_id}/document_id/${document_id}/improve/${paragraph_id}`,
     undefined,
     {},
     loading
@@ -161,13 +161,13 @@ const delMarkRecord: (
  * application_id, chart_id,  chart_record_id
  */
 const getRecordDetail: (
-  applicaiton_id: String,
+  application_id: String,
   chart_id: String,
   chart_record_id: String,
   loading?: Ref<boolean>
-) => Promise<Result<any>> = (applicaiton_id, chart_id, chart_record_id, loading) => {
+) => Promise<Result<any>> = (application_id, chart_id, chart_record_id, loading) => {
   return get(
-    `${prefix}/${applicaiton_id}/chat/${chart_id}/chat_record/${chart_record_id}`,
+    `${prefix}/${application_id}/chat/${chart_id}/chat_record/${chart_record_id}`,
     undefined,
     loading
   )

From 930817a3c5abff6fb79141feb17254e7d727be26 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <67260074+fit2cloud-chenyw@users.noreply.github.com>
Date: Mon, 15 Apr 2024 14:42:57 +0800
Subject: [PATCH 6/8] =?UTF-8?q?fix:=20typo-total=E6=8B=BC=E5=86=99?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=20(#76)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ui/src/utils/utils.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/src/utils/utils.ts b/ui/src/utils/utils.ts
index 370b7efbc..c431d1ad7 100644
--- a/ui/src/utils/utils.ts
+++ b/ui/src/utils/utils.ts
@@ -79,5 +79,5 @@ export function getAttrsArray(array: Array<any>, attr: string) {
 
 // 求和
 export function getSum(array: Array<any>) {
-  return array.reduce((totol, item) => totol + item, 0)
+  return array.reduce((total, item) => total + item, 0)
 }

From 4be261be43ea2130d38cca96361b5b0546232a19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=81=E5=B9=BF?= <ibuler@qq.com>
Date: Mon, 15 Apr 2024 14:50:53 +0800
Subject: [PATCH 7/8] Update .gitignore (#79)

deps: poetry.lock should be commit
---
 .gitignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 7e6be9bfb..69ccc46e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -180,4 +180,3 @@ apps/static
 models/
 data
 .dev
-poetry.lock

From 765ae8c79f49e23742e37dfd6100504b86b5da93 Mon Sep 17 00:00:00 2001
From: wxg0103 <46886316+wxg0103@users.noreply.github.com>
Date: Mon, 15 Apr 2024 14:51:09 +0800
Subject: [PATCH 8/8] =?UTF-8?q?docs:=20=E4=BF=AE=E6=94=B9=E6=B3=A8?=
 =?UTF-8?q?=E9=87=8A=E7=9A=84=E9=94=99=E5=88=AB=E5=AD=97=20(#78)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/common/constants/permission_constants.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/common/constants/permission_constants.py b/apps/common/constants/permission_constants.py
index 2d08e0c40..6484897c7 100644
--- a/apps/common/constants/permission_constants.py
+++ b/apps/common/constants/permission_constants.py
@@ -11,7 +11,7 @@ from typing import List
 
 class Group(Enum):
     """
-    权限组 一个组一般对应前段一个菜单
+    权限组 一个组一般对应前端一个菜单
     """
     USER = "USER"