fix: Optimize file upload

Author: wangdan-fit2cloud

ui/src/components/dynamics-form/items/upload/LocalFileUpload.vue

@@ -11,7 +11,6 @@
       :auto-upload="false"
       :show-file-list="false"
       :accept="accept"
-      :limit="file_count_limit"
       :on-exceed="onExceed"
       :on-change="fileHandleChange"
       @click.prevent="handlePreview(false)"
@@ -60,6 +59,10 @@
           {{ $t('dynamicsForm.UploadInput.reUpload') }}
         </el-button>
       </span>
+      <span v-else-if="successCount === fileArray.length" class="flex align-center">
+        <el-icon class="color-success"><WarningFilled /></el-icon>
+        <span class="ml-4">{{ $t('dynamicsForm.UploadInput.allSuccess') }}</span>
+      </span>
     </div>
     <el-row :gutter="8" v-if="fileArray?.length" class="mt-8">
       <template v-for="(item, index) in sortedFileArray" :key="index">
@@ -170,6 +173,7 @@ const sortedFileArray = computed(() =>
 const retryAll = () => {
   retryList.value.forEach((i: any) => uploadFile(i))
 }
+
 // 上传on-change事件
 const fileHandleChange = (file: any, fileList: UploadFiles) => {
   // 按文件唯一标识精确定位并移除当前文件

ui/src/locales/lang/en-US/dynamics-form.ts

@@ -139,6 +139,7 @@ export default {
     uploadStatus: 'Completed {success} / {total} files',
     failedStatus: '{count} files failed',
     uploading: 'Uploading',
+    allSuccess: 'All successful',
   },
   AssignmentMethod: {
     label: 'Assignment Method',

ui/src/locales/lang/zh-CN/dynamics-form.ts

@@ -139,6 +139,7 @@ export default {
     uploadStatus: '已完成 {success} / {total} 个文件',
     failedStatus: '失败 {count} 个文件',
     uploading: '上传中',
+    allSuccess: '全部成功',
   },
   AssignmentMethod: {
     label: '赋值方式',

ui/src/locales/lang/zh-Hant/dynamics-form.ts

@@ -139,6 +139,7 @@ export default {
     uploadStatus: '已完成 {success} / {total} 個文件',
     failedStatus: '失敗 {count} 個文件',
     uploading: '上傳中',
+    allSuccess: '全部成功',
   },
   AssignmentMethod: {
     label: '賦值方式',

ui/src/views/document/ImportWorkflowDocument.vue

@@ -37,7 +37,7 @@
       >
       <el-button
         v-if="base_form_list.length > 0 && active == 'data_source'"
-        :disabled="loading"
+        :disabled="loading || actionUploading"
         @click="next"
       >
         {{ $t('common.steps.next') }}
@@ -46,7 +46,7 @@
         v-if="base_form_list.length > 0 ? active == 'knowledge_base' : active == 'data_source'"
         @click="upload"
         type="primary"
-        :disabled="loading"
+        :disabled="loading || actionUploading"
       >
         {{ $t('views.document.buttons.import') }}
       </el-button>
@@ -113,6 +113,9 @@ const action_id = ref<string>()
 const form_data = ref<any>({})
 const active = ref<'data_source' | 'knowledge_base' | 'result'>('data_source')
 const _workflow = ref<any>(null)
+const actionUploading = computed(
+  () => active.value === 'data_source' && ActionRef.value?.uploadingCount > 0,
+)
 
 const base_form_list = computed(() => {
   const kBase = _workflow.value?.nodes?.find((n: any) => n.type === WorkflowType.KnowledgeBase)
@@ -122,6 +125,7 @@ const base_form_list = computed(() => {
   return []
 })
 const next = () => {
+  if (actionUploading.value) return
   ActionRef.value.validate().then(() => {
     form_data.value[active.value] = ActionRef.value.get_data()
     active.value = 'knowledge_base'
@@ -133,6 +137,7 @@ const up = () => {
   })
 }
 const upload = () => {
+  if (actionUploading.value) return
   ActionRef.value.validate().then(() => {
     form_data.value[active.value] = ActionRef.value.get_data()
     loadSharedApi({ type: 'knowledge', systemType: apiType.value })

ui/src/views/document/UploadDocument.vue

@@ -35,12 +35,10 @@
         @click="next"
         type="primary"
         v-if="active === 0"
-        :disabled="SetRulesRef?.loading || loading"
+        :disabled="SetRulesRef?.loading || loading || uploadComponentUploading"
       >
         {{
-          documentsType === 'txt'
-            ? $t('common.steps.next')
-            : $t('views.document.buttons.import')
+          documentsType === 'txt' ? $t('common.steps.next') : $t('views.document.buttons.import')
         }}
       </el-button>
       <el-button
@@ -96,7 +94,9 @@ const loading = ref(false)
 const disabled = ref(false)
 const active = ref(0)
 const successInfo = ref<any>(null)
+const uploadComponentUploading = computed(() =>UploadComponentRef.value?.uploadingCount> 0)
 async function next() {
+  if (uploadComponentUploading.value) return
   disabled.value = true
   if (await UploadComponentRef.value.validate()) {
     if (documentsType.value === 'QA') {

ui/src/views/document/upload/UploadComponent.vue

@@ -53,7 +53,6 @@
         :auto-upload="false"
         :show-file-list="false"
         accept=".xlsx, .xls, .csv,.zip"
-        :limit="file_count_limit"
         :on-exceed="onExceed"
         :on-change="fileHandleChange"
         @click.prevent="handlePreview(false)"
@@ -111,7 +110,6 @@
         :auto-upload="false"
         :show-file-list="false"
         accept=".xlsx, .xls, .csv"
-        :limit="file_count_limit"
         :on-exceed="onExceed"
         :on-change="fileHandleChange"
         @click.prevent="handlePreview(false)"
@@ -157,7 +155,6 @@
         :auto-upload="false"
         :show-file-list="false"
         accept=".txt, .md, .log, .docx, .pdf, .html,.zip,.xlsx,.xls,.csv"
-        :limit="file_count_limit"
         :on-exceed="onExceed"
         :on-change="fileHandleChange"
         @click.prevent="handlePreview(false)"
@@ -207,6 +204,10 @@
         {{ $t('dynamicsForm.UploadInput.reUpload') }}
       </el-button>
     </span>
+    <span v-else-if="successCount === form.fileList.length" class="flex align-center">
+      <el-icon class="color-success"><WarningFilled /></el-icon>
+      <span class="ml-4">{{ $t('dynamicsForm.UploadInput.allSuccess') }}</span>
+    </span>
   </div>
   <el-row :gutter="8" v-if="form.fileList?.length" class="mt-8">
     <template v-for="(item, index) in sortedFileList" :key="index">
@@ -335,6 +336,7 @@ const sortedFileList = computed(() =>
 const retryAll = () => {
   retryList.value.forEach((i: any) => uploadFile(i))
 }
+
 const filterSuccessFiles = (data: any): any => {
   return data?.filter((f: any) => f.status === 'success') || []
 }
@@ -527,6 +529,7 @@ onUnmounted(() => {
 defineExpose({
   validate,
   form,
+  uploadingCount,
 })
 </script>
 <style scoped lang="scss"></style>

ui/src/views/knowledge-workflow/component/action/DataSource.vue

@@ -143,6 +143,10 @@ const base_form_data_rule = ref<FormRules>({
 const validate = () => {
   return dynamicsFormRef.value?.validate()
 }
+const uploadingCount = computed(
+  () =>
+    (form_data.value as any)?.file_list?.filter((f: any) => f.status === 'uploading').length || 0,
+)
 const filterSuccessFiles = (data: any): any => {
   return {
     ...data,
@@ -164,6 +168,6 @@ watch(
   { immediate: true },
 )
 
-defineExpose({ validate, get_data })
+defineExpose({ validate, get_data, uploadingCount })
 </script>
 <style lang="scss" scoped></style>