Merge branch 'main' of github.com:1Panel-dev/MaxKB

Author: shaohuzhang1

.dockerignore

@@ -1 +1,2 @@
-.git*
+.git*
+.idea*

.gitignore

@@ -180,4 +180,3 @@ apps/static
 models/
 data
 .dev
-poetry.lock

apps/common/constants/permission_constants.py

@@ -11,7 +11,7 @@
 
 class Group(Enum):
     """
-    权限组 一个组一般对应前段一个菜单
+    权限组 一个组一般对应前端一个菜单
     """
     USER = "USER"
 

main.py

@@ -18,7 +18,7 @@
 def collect_static():
     """
      收集静态文件到指定目录
-     本项目主要是将前段vue/dist的前段项目放到静态目录下面
+     本项目主要是将前端vue/dist的前段项目放到静态目录下面
     :return:
     """
     logging.info("Collect static files")

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,15 +83,15 @@ const getChatRecordLog: (
         }
  */
 const putChatRecordLog: (
-  applicaiton_id: String,
+  application_id: String,
   chart_id: String,
   chart_record_id: String,
   dataset_id: String,
   document_id: String,
   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,15 +131,15 @@ 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,
   document_id: String,
   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
   )

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)
 }

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

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'])
 

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'