Merge branch 'master' of https://gitlab.gsstcloud.com/poc/poc-fe into shirlyn

src/composables/useDialogueFile.ts

@@ -20,8 +20,17 @@ export function useDialogueFile() {
   const uploadFileList = ref<FileInfoItem[]>([])
 
   function handleLimitUpload(data: { file: UploadFileInfo }) {
+    const allowTypeList = ['md', 'doc', 'docx', 'pdf', 'txt']
+
     const fileType = (data.file.file && data.file.file?.name.split('.')?.pop()?.toLowerCase()) || ''
 
+    if (fileType && !allowTypeList.includes(fileType)) {
+      window.$message.error(
+        t('personal_space_module.knowledge_module.upload_document_module.upload_format_error_message'),
+      )
+      return false
+    }
+
     if (data.file.file && data.file.file?.size === 0) {
       window.$message.error(
         t('personal_space_module.knowledge_module.upload_document_module.empty_document_content_message'),

src/views/personal-settings/personal-settings.vue

@@ -22,7 +22,7 @@ const imageCropperRef = useTemplateRef<InstanceType<typeof ImageCropper> | null>
 
 const userInfoForm = ref({
   nickName: '',
-  remark: userStore.userInfo.remark,
+  remark: '',
 })
 
 const userInfoFormItemEdit = reactive({
@@ -62,7 +62,7 @@ function userInfoUpdate(userInfo: {
   remark?: string
 }) {
   return fetchUserInfoUpdate(userInfo).then(() => {
-    userStore.fetchUpdateUserInfo()
+    return userStore.fetchUpdateUserInfo()
   })
 }
 
@@ -108,8 +108,6 @@ function handleAvatarUpload(e: Event) {
 function handleUserInfoFormItemEditUpdate(key: keyof typeof userInfoFormItemEdit, isSave = false) {
   !isSave && (userInfoForm.value[key] = userInfo.value[key])
 
-  userInfoFormItemEdit[key] = !userInfoFormItemEdit[key]
-
   if (userInfoFormItemEdit[key]) {
     nextTick(() => {
       if (inputRefs.value && !Array.isArray(inputRefs.value)) {
@@ -119,12 +117,25 @@ function handleUserInfoFormItemEditUpdate(key: keyof typeof userInfoFormItemEdit
   }
 
   if (isSave) {
+    if (!userInfoForm.value[key]) {
+      window.$message.warning(t('personal_space_module.knowledge_module.knowledge_chunk_content_input_rule'))
+      return
+    }
+
+    saveBtnLoading.value = true
+
     userInfoUpdate({
       [key]: userInfoForm.value[key],
-    }).then(() => {
-      window.$message.success(t('common_module.successful_update'))
     })
+      .then(() => {
+        window.$message.success(t('common_module.successful_update'))
+      })
+      .finally(() => {
+        saveBtnLoading.value = false
+      })
   }
+
+  userInfoFormItemEdit[key] = !userInfoFormItemEdit[key]
 }
 </script>