Merge pull request #885 from SuanmoSuanyangTechnology/feature/app_zy

Feature/app zy
2026-04-14 10:32:45 +08:00
parent 59b5a1bcf2 9032f50a19
commit 72b39c6fa3
6 changed files with 45 additions and 18 deletions
--- a/web/src/components/Chat/ChatContent.tsx
+++ b/web/src/components/Chat/ChatContent.tsx
@@ -2,7 +2,7 @@
 * @Author: ZhaoYing 
 * @Date: 2025-12-10 16:46:17 
 * @Last Modified by: ZhaoYing
- * @Last Modified time: 2026-04-10 18:46:57
+ * @Last Modified time: 2026-04-14 10:13:56
 */
 import { type FC, useRef, useEffect, useState } from 'react'
 import clsx from 'clsx'
@@ -174,6 +174,7 @@ const ChatContent: FC<ChatContentProps> = ({
                      )
                    }

+                    const documentType = (file.file_type || file.type)?.split('/')
                    return (
                      <Flex
                        key={file.url || file.uid}
@@ -208,7 +209,7 @@ const ChatContent: FC<ChatContentProps> = ({
                        ></div>
                        <div className="rb:flex-1 rb:w-32.5">
                          <div className="rb:leading-4 rb:text-ellipsis rb:overflow-hidden rb:whitespace-nowrap">{file.name}</div>
-                          <div className="rb:leading-3.5 rb:mt-0.5 rb:text-[#5B6167] rb:text-ellipsis rb:overflow-hidden rb:whitespace-nowrap">{file.type?.split('/')[file.type?.split('/').length - 1]} · {file.size}</div>
+                          <div className="rb:leading-3.5 rb:mt-0.5 rb:text-[#5B6167] rb:text-ellipsis rb:overflow-hidden rb:whitespace-nowrap">{documentType?.[documentType.length - 1]} · {file.size}</div>
                        </div>
                      </Flex>
                    )
--- a/web/src/i18n/en.ts
+++ b/web/src/i18n/en.ts
@@ -1522,6 +1522,8 @@ export const en = {
  "version":"app_release_id"
  // string, optional, application version ID; specify a historical release version ID, or omit to use the currently active version;
 }`,
+      uploadCover: 'Import and Overwrite',
+      refresh: 'Refresh Current Page',
    },
    userMemory: {
      userMemory: 'User Memory',
--- a/web/src/i18n/zh.ts
+++ b/web/src/i18n/zh.ts
@@ -857,6 +857,8 @@ export const zh = {
  "version":"app_release_id"
  //string，可选，应用版本ID；指定历史发布版本ID，不传则使用当前生效版本；
 }`,
+      uploadCover: '导入并覆盖',
+      refresh: '刷新当前页',
    },
    table: {
      totalRecords: '共 {{total}} 条记录'
--- a/web/src/views/ApplicationConfig/components/ConfigHeader.tsx
+++ b/web/src/views/ApplicationConfig/components/ConfigHeader.tsx
@@ -2,7 +2,7 @@
 * @Author: ZhaoYing 
 * @Date: 2026-02-03 16:27:52 
 * @Last Modified by: ZhaoYing
- * @Last Modified time: 2026-04-07 16:28:33
+ * @Last Modified time: 2026-04-13 18:19:27
 */
 import { type FC, useRef, useMemo } from 'react';
 import { useNavigate, useParams } from 'react-router-dom';
@@ -12,13 +12,14 @@ import { useTranslation } from 'react-i18next';
 import clsx from 'clsx';

 import styles from '../index.module.css'
-import type { Application, ApplicationModalRef } from '@/views/ApplicationManagement/types';
+import type { Application, ApplicationModalRef, UploadWorkflowModalRef } from '@/views/ApplicationManagement/types';
 import ApplicationModal from '@/views/ApplicationManagement/components/ApplicationModal'
 import type { CopyModalRef, AgentRef, ClusterRef, WorkflowRef, FeaturesConfigForm } from '../types'
 import { deleteApplication, appExport } from '@/api/application'
 import CopyModal from './CopyModal'
 import PageHeader from '@/components/Layout/PageHeader'
 import CheckList from '@/views/Workflow/components/CheckList'
+import UploadModal from '@/views/ApplicationManagement/components/UploadModal'

 /**
 * Tab keys for application configuration
@@ -77,6 +78,7 @@ const ConfigHeader: FC<ConfigHeaderProps> = ({
  const { id, source } = useParams();
  const applicationModalRef = useRef<ApplicationModalRef>(null);
  const copyModalRef = useRef<CopyModalRef>(null);
+  const uploadModalRef = useRef<UploadWorkflowModalRef>(null);

  /**
   * Format tab items for display
@@ -111,6 +113,9 @@ const ConfigHeader: FC<ConfigHeaderProps> = ({
      case 'delete':
        handleDelete()
        break;
+      case 'uploadCover':
+        uploadModalRef.current?.handleOpen()
+        break
    }
  }
  /**
@@ -165,11 +170,11 @@ const ConfigHeader: FC<ConfigHeaderProps> = ({
   * Format dropdown menu items
   */
  const formatMenuItems = useMemo(() => {
-    const items = (application?.type !== 'multi_agent' ? ['edit', 'copy', 'export', 'delete'] : ['edit', 'copy', 'delete']).map(key => ({
+    const items = (application?.type !== 'multi_agent' ? ['edit', 'copy', 'export', 'uploadCover', 'delete'] : ['edit', 'copy', 'delete']).map(key => ({
      key,
      icon: <div className={`rb:size-4 rb:mr-2 ${menuIcons[key]}`} />,
      danger: key === 'delete',
-      label: t(`common.${key}`),
+      label: key === 'uploadCover' ? t('application.uploadCover') : t(`common.${key}`),
    }))
    return items
  }, [t, handleClick, application])
@@ -261,6 +266,11 @@ const ConfigHeader: FC<ConfigHeaderProps> = ({
        refresh={refresh}
      />
      <CopyModal ref={copyModalRef} data={application as Application} />
+      <UploadModal
+        ref={uploadModalRef}
+        refresh={refresh}
+        id={id as string}
+      />
    </>
  );
 };
--- a/web/src/views/ApplicationManagement/components/UploadModal.tsx
+++ b/web/src/views/ApplicationManagement/components/UploadModal.tsx
@@ -2,7 +2,7 @@
 * @Author: ZhaoYing 
 * @Date: 2026-02-28 14:08:14 
 * @Last Modified by: ZhaoYing
- * @Last Modified time: 2026-03-12 17:19:46
+ * @Last Modified time: 2026-04-13 18:17:32
 */
 /**
 * UploadModal Component
@@ -28,6 +28,7 @@ import { appImport } from '@/api/application'
 interface UploadModalProps {
  /** Function to refresh the parent component after workflow import */
  refresh: () => void;
+  id?: string;
 }


@@ -46,10 +47,11 @@ const steps = [
 * @param {React.Ref<UploadModalRef>} ref - Ref for imperative methods
 */
 const UploadModal = forwardRef<UploadModalRef, UploadModalProps>(({
-  refresh
+  refresh,
+  id
 }, ref) => {
  const { t } = useTranslation();
-  
+
  // State management
  const [visible, setVisible] = useState(false);           // Modal visibility
  const [form] = Form.useForm<{ file: File[] }>();  // Form instance
@@ -87,8 +89,8 @@ const UploadModal = forwardRef<UploadModalRef, UploadModalProps>(({
   */
  const handleSave = () => {
    const values = form.getFieldsValue();
-    
-    switch(current) {
+
+    switch (current) {
      case 0: // Step 1: Upload file
        if (!values.file || values.file.length === 0) {
          message.warning(t('application.pleaseUploadFile'));
@@ -96,6 +98,9 @@ const UploadModal = forwardRef<UploadModalRef, UploadModalProps>(({
        }
        const formData = new FormData();
        formData.append('file', values.file[0]);
+        if (id) {
+          formData.append('app_id', id)
+        }

        setLoading(true)
        // Call import API
@@ -134,8 +139,12 @@ const UploadModal = forwardRef<UploadModalRef, UploadModalProps>(({
    setTimeout(() => {
      switch (type) {
        case 'detail':
-          // Open application detail page in new tab
-          window.open(`/#/application/config/${appId}`, '_blank');
+          if (id) {
+            window.location.reload();
+          } else {
+            // Open application detail page in new tab
+            window.open(`/#/application/config/${appId}`, '_blank');
+          }
          break;
      }
    }, 100)
@@ -171,7 +180,7 @@ const UploadModal = forwardRef<UploadModalRef, UploadModalProps>(({
            loading={loading}
            onClick={() => handleJump('detail')}
          >
-            {t('application.gotoDetail')}
+            {id ? t('application.refresh') : t('application.gotoDetail')}
          </Button>
        ]
      default:
@@ -244,7 +253,7 @@ const UploadModal = forwardRef<UploadModalRef, UploadModalProps>(({
              loading={loading}
              onClick={() => handleJump('detail')}
            >
-              {t('application.gotoDetail')}
+              {id ? t('application.refresh') : t('application.gotoDetail')}
            </Button>
          ]}
        />
--- a/web/src/views/Conversation/index.tsx
+++ b/web/src/views/Conversation/index.tsx
@@ -2,7 +2,7 @@
 * @Author: ZhaoYing 
 * @Date: 2026-02-03 16:58:03 
 * @Last Modified by: ZhaoYing
- * @Last Modified time: 2026-04-07 21:21:52
+ * @Last Modified time: 2026-04-13 18:32:58
 */
 /**
 * Conversation Page
@@ -397,7 +397,10 @@ const Conversation: FC = () => {
          return {
            type: file.type,
            transfer_method: 'local_file',
-            upload_file_id: file.response.data.file_id
+            upload_file_id: file.response.data.file_id,
+            file_type: file.response.data.file_type,
+            size: file.response.data.file_size,
+            name: file.response.data.file_name
          }
        }
      }),
@@ -444,7 +447,7 @@ const Conversation: FC = () => {
    })
  }

-  console.log('chatList', chatList, streamLoadingRef.current)
+  console.log('chatList', fileList, streamLoadingRef.current)

  return (
    <Flex className="rb:w-full rb:p-[-16px]!">