From 4f3410f4f1cfd0eb9737b8ae6fb5c401e4467974 Mon Sep 17 00:00:00 2001 From: Ted <2508067350@qq.com> Date: Wed, 19 Feb 2025 10:27:52 +0800 Subject: [PATCH 01/36] =?UTF-8?q?=E5=AF=B9=E6=8E=A5OME=20Office=20APP?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/components/home.tsx | 27 ++++++++++++++++++++++++++- app/components/settings.tsx | 2 +- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/app/components/home.tsx b/app/components/home.tsx index 16e33c763..1c0a9a528 100644 --- a/app/components/home.tsx +++ b/app/components/home.tsx @@ -30,7 +30,7 @@ import { type ClientApi, getClientApi } from "../client/api"; import { useAccessStore } from "../store"; import clsx from "clsx"; import { initializeMcpSystem, isMcpEnabled } from "../mcp/actions"; -import { isEmpty } from "lodash-es"; +import { isEmpty, isString } from "lodash-es"; export function Loading(props: { noLogo?: boolean }) { return ( @@ -264,7 +264,32 @@ export function Home() { useEffect(() => { window.parent.postMessage("omemetis is ready", "*"); + try { + const message = { + data: "omemetis is ready", + url: location.origin, + }; + + window.ReactNativeWebView.postMessage(JSON.stringify(message)); + } catch { + console.log("window.ReactNativeWebView Err"); + } + const handleMessage = (event: any) => { + const data = event.data; + + if (isString(data)) { + try { + const params = JSON.parse(data); + + if (!isEmpty(params?.omeToken) && params?.from === "OmeOfficeApp") + appConfig.setOmeToken(params?.omeToken ?? ""); + } catch {} + + return; + } + + // 逻辑判断 是对象还是字符串 if (!event.origin.includes("omeoffice")) { return; // 如果不是信任的源,忽略消息 } diff --git a/app/components/settings.tsx b/app/components/settings.tsx index 68ebcf084..0f9386397 100644 --- a/app/components/settings.tsx +++ b/app/components/settings.tsx @@ -1775,7 +1775,7 @@ export function Settings() { - {saasStartComponent} + {/* {saasStartComponent} */} {accessCodeComponent} {!accessStore.hideUserApiKey && ( From f17297e050fd5de4ea573a4712e4c03fab3ff188 Mon Sep 17 00:00:00 2001 From: Ted <2508067350@qq.com> Date: Wed, 19 Feb 2025 10:56:48 +0800 Subject: [PATCH 02/36] =?UTF-8?q?=E9=9A=90=E8=97=8F=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/components/settings.tsx | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/components/settings.tsx b/app/components/settings.tsx index 0f9386397..6db0163c6 100644 --- a/app/components/settings.tsx +++ b/app/components/settings.tsx @@ -67,7 +67,6 @@ import { RELEASE_URL, STORAGE_KEY, ServiceProvider, - SlotID, UPDATE_URL, Stability, Iflytek, @@ -1774,8 +1773,8 @@ export function Settings() { - - {/* {saasStartComponent} */} + {/* + {saasStartComponent} {accessCodeComponent} {!accessStore.hideUserApiKey && ( @@ -1871,7 +1870,7 @@ export function Settings() { } > - + */} Date: Wed, 19 Feb 2025 11:24:42 +0800 Subject: [PATCH 03/36] update stream false --- app/store/chat.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/store/chat.ts b/app/store/chat.ts index 87c1a8beb..9efab9c51 100644 --- a/app/store/chat.ts +++ b/app/store/chat.ts @@ -460,7 +460,7 @@ export const useChatStore = createPersistStore( // make request api.llm.chat({ messages: sendMessages, - config: { ...modelConfig, stream: true }, + config: { ...modelConfig, stream: false }, onUpdate(message) { botMessage.streaming = true; if (message) { @@ -773,7 +773,7 @@ export const useChatStore = createPersistStore( ), config: { ...modelcfg, - stream: true, + stream: false, model, providerName, }, From 7107d45d731a703e3271e850a3a7883249c66dd1 Mon Sep 17 00:00:00 2001 From: Ted <2508067350@qq.com> Date: Wed, 19 Feb 2025 12:05:26 +0800 Subject: [PATCH 04/36] enhance code --- app/components/home.tsx | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/components/home.tsx b/app/components/home.tsx index 1c0a9a528..c301418d9 100644 --- a/app/components/home.tsx +++ b/app/components/home.tsx @@ -290,12 +290,15 @@ export function Home() { } // 逻辑判断 是对象还是字符串 - if (!event.origin.includes("omeoffice")) { + if ( + !event.origin.includes("omeoffice") || + !event.origin.includes("localhost") + ) { return; // 如果不是信任的源,忽略消息 } - if (!isEmpty(event?.data?.omeToken)) - appConfig.setOmeToken(event.data.omeToken); + if (!isEmpty(event?.data?.ometoken)) + appConfig.setOmeToken(event.data.ometoken); }; window.addEventListener("message", handleMessage); From d60a8e8becd89c4cc7308c2b28a8847c0b312340 Mon Sep 17 00:00:00 2001 From: Ted <2508067350@qq.com> Date: Wed, 19 Feb 2025 12:22:31 +0800 Subject: [PATCH 05/36] add log --- app/components/home.tsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/components/home.tsx b/app/components/home.tsx index c301418d9..d35d383d3 100644 --- a/app/components/home.tsx +++ b/app/components/home.tsx @@ -278,6 +278,8 @@ export function Home() { const handleMessage = (event: any) => { const data = event.data; + console.log(event, "event--"); + if (isString(data)) { try { const params = JSON.parse(data); From a92e13099aa71b0413365a1fbe86689c7d762a4a Mon Sep 17 00:00:00 2001 From: Ted <2508067350@qq.com> Date: Wed, 19 Feb 2025 12:34:27 +0800 Subject: [PATCH 06/36] add log --- app/components/home.tsx | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/app/components/home.tsx b/app/components/home.tsx index d35d383d3..5d9364f52 100644 --- a/app/components/home.tsx +++ b/app/components/home.tsx @@ -281,6 +281,7 @@ export function Home() { console.log(event, "event--"); if (isString(data)) { + console.log("isString"); try { const params = JSON.parse(data); @@ -291,7 +292,11 @@ export function Home() { return; } - // 逻辑判断 是对象还是字符串 + console.log( + !event.origin.includes("omeoffice"), + '!event.origin.includes("omeoffice")', + ); + if ( !event.origin.includes("omeoffice") || !event.origin.includes("localhost") @@ -299,6 +304,12 @@ export function Home() { return; // 如果不是信任的源,忽略消息 } + console.log( + "handleMessage", + !isEmpty(event?.data?.ometoken), + event?.data?.ometoken, + ); + if (!isEmpty(event?.data?.ometoken)) appConfig.setOmeToken(event.data.ometoken); }; From 9e5c0bf2b418b626655539c794a4d0d010ef595f Mon Sep 17 00:00:00 2001 From: Ted <2508067350@qq.com> Date: Wed, 19 Feb 2025 12:42:45 +0800 Subject: [PATCH 07/36] Update home.tsx --- app/components/home.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/app/components/home.tsx b/app/components/home.tsx index 5d9364f52..620c0ec67 100644 --- a/app/components/home.tsx +++ b/app/components/home.tsx @@ -293,6 +293,7 @@ export function Home() { } console.log( + event.origin, !event.origin.includes("omeoffice"), '!event.origin.includes("omeoffice")', ); From 149314f0c952f1ad3d38ac2b4e5561abe94f01aa Mon Sep 17 00:00:00 2001 From: Ted <2508067350@qq.com> Date: Wed, 19 Feb 2025 12:58:04 +0800 Subject: [PATCH 08/36] Update home.tsx --- app/components/home.tsx | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/app/components/home.tsx b/app/components/home.tsx index 620c0ec67..d5f36036c 100644 --- a/app/components/home.tsx +++ b/app/components/home.tsx @@ -292,14 +292,8 @@ export function Home() { return; } - console.log( - event.origin, - !event.origin.includes("omeoffice"), - '!event.origin.includes("omeoffice")', - ); - if ( - !event.origin.includes("omeoffice") || + !event.origin.includes("omeoffice") && !event.origin.includes("localhost") ) { return; // 如果不是信任的源,忽略消息 From 7cbcedbae8e238d03ab74a9bc06e57ebc7d51bdc Mon Sep 17 00:00:00 2001 From: Ted <2508067350@qq.com> Date: Wed, 19 Feb 2025 13:28:18 +0800 Subject: [PATCH 09/36] delete log --- app/components/home.tsx | 9 --------- 1 file changed, 9 deletions(-) diff --git a/app/components/home.tsx b/app/components/home.tsx index d5f36036c..e1154dd74 100644 --- a/app/components/home.tsx +++ b/app/components/home.tsx @@ -278,10 +278,7 @@ export function Home() { const handleMessage = (event: any) => { const data = event.data; - console.log(event, "event--"); - if (isString(data)) { - console.log("isString"); try { const params = JSON.parse(data); @@ -299,12 +296,6 @@ export function Home() { return; // 如果不是信任的源,忽略消息 } - console.log( - "handleMessage", - !isEmpty(event?.data?.ometoken), - event?.data?.ometoken, - ); - if (!isEmpty(event?.data?.ometoken)) appConfig.setOmeToken(event.data.ometoken); }; From 5d17d7f2c95a37eda808dc623067e51205756f19 Mon Sep 17 00:00:00 2001 From: Ted <2508067350@qq.com> Date: Wed, 19 Feb 2025 13:56:32 +0800 Subject: [PATCH 10/36] =?UTF-8?q?=E6=9B=B4=E6=94=B9=20copiedHello.content?= =?UTF-8?q?=20=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/components/chat.tsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/components/chat.tsx b/app/components/chat.tsx index 6691403e6..484a27b74 100644 --- a/app/components/chat.tsx +++ b/app/components/chat.tsx @@ -1283,6 +1283,7 @@ function _Chat() { }); }; + const appstore = useAppConfig(); const accessStore = useAccessStore(); const [speechStatus, setSpeechStatus] = useState(false); const [speechLoading, setSpeechLoading] = useState(false); @@ -1340,7 +1341,10 @@ function _Chat() { ) { const copiedHello = Object.assign({}, BOT_HELLO); if (!accessStore.isAuthorized()) { - copiedHello.content = Locale.Error.Unauthorized; + if (!isEmpty(appstore.omeToken)) { + } else { + copiedHello.content = Locale.Error.Unauthorized; + } } context.push(copiedHello); } From 81dc18eb7c1ce9feb008bb6e8929bfe77c41f459 Mon Sep 17 00:00:00 2001 From: Ted <2508067350@qq.com> Date: Wed, 19 Feb 2025 15:26:47 +0800 Subject: [PATCH 11/36] update stream state --- app/store/chat.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/store/chat.ts b/app/store/chat.ts index 9efab9c51..87c1a8beb 100644 --- a/app/store/chat.ts +++ b/app/store/chat.ts @@ -460,7 +460,7 @@ export const useChatStore = createPersistStore( // make request api.llm.chat({ messages: sendMessages, - config: { ...modelConfig, stream: false }, + config: { ...modelConfig, stream: true }, onUpdate(message) { botMessage.streaming = true; if (message) { @@ -773,7 +773,7 @@ export const useChatStore = createPersistStore( ), config: { ...modelcfg, - stream: false, + stream: true, model, providerName, }, From 043dad75205e80096e4e24afc70928ca7971494d Mon Sep 17 00:00:00 2001 From: Ted <2508067350@qq.com> Date: Thu, 20 Feb 2025 08:45:34 +0800 Subject: [PATCH 12/36] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=9D=A2=E5=85=B7?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=A8=A1=E5=9E=8B=E5=92=8C=E9=9A=90=E8=97=8F?= =?UTF-8?q?=E5=8F=91=E7=8E=B0=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/components/sidebar.tsx | 5 ++--- app/masks/cn.ts | 28 ++++++++++++++-------------- app/masks/en.ts | 8 ++++---- app/masks/tw.ts | 28 ++++++++++++++-------------- 4 files changed, 34 insertions(+), 35 deletions(-) diff --git a/app/components/sidebar.tsx b/app/components/sidebar.tsx index 6cc25bf19..36c124e41 100644 --- a/app/components/sidebar.tsx +++ b/app/components/sidebar.tsx @@ -10,7 +10,6 @@ import DeleteIcon from "../icons/delete.svg"; import MaskIcon from "../icons/mask.svg"; import McpIcon from "../icons/mcp.svg"; import DragIcon from "../icons/drag.svg"; -import DiscoveryIcon from "../icons/discovery.svg"; import Locale from "../locales"; @@ -278,13 +277,13 @@ export function SideBar(props: { className?: string }) { shadow /> )} - } text={shouldNarrow ? undefined : Locale.Discovery.Name} className={styles["sidebar-bar-button"]} onClick={() => setshowDiscoverySelector(true)} shadow - /> + /> */} {showDiscoverySelector && ( Date: Thu, 20 Feb 2025 15:18:19 +0800 Subject: [PATCH 13/36] =?UTF-8?q?=E9=9A=90=E8=97=8F=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/components/settings.tsx | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/components/settings.tsx b/app/components/settings.tsx index 6db0163c6..c3ceee54c 100644 --- a/app/components/settings.tsx +++ b/app/components/settings.tsx @@ -49,8 +49,7 @@ import Locale, { changeLang, getLang, } from "../locales"; -import { copyToClipboard, clientUpdate, semverCompare } from "../utils"; -import Link from "next/link"; +import { copyToClipboard, semverCompare } from "../utils"; import { Anthropic, Azure, @@ -1509,7 +1508,7 @@ export function Settings() { - checkUpdate(true)} /> )} - + */} Date: Thu, 20 Feb 2025 15:37:41 +0800 Subject: [PATCH 14/36] add log --- app/client/api.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/client/api.ts b/app/client/api.ts index f57be79f1..d1ee055af 100644 --- a/app/client/api.ts +++ b/app/client/api.ts @@ -350,6 +350,8 @@ export function getHeaders(ignoreHeaders: boolean = false) { ); } + console.log("[Headers] appConfig.omeToken", appConfig.omeToken); + headers["OME-METIS-Authorization"] = appConfig.omeToken || ""; return headers; From 32c02da8795e42e1889783a7994c8c7bc3434e80 Mon Sep 17 00:00:00 2001 From: Ted <2508067350@qq.com> Date: Thu, 20 Feb 2025 15:42:33 +0800 Subject: [PATCH 15/36] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=8F=91=E9=80=81webvi?= =?UTF-8?q?ew=E4=BA=8B=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/client/api.ts | 2 -- app/components/home.tsx | 11 ++++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/app/client/api.ts b/app/client/api.ts index d1ee055af..f57be79f1 100644 --- a/app/client/api.ts +++ b/app/client/api.ts @@ -350,8 +350,6 @@ export function getHeaders(ignoreHeaders: boolean = false) { ); } - console.log("[Headers] appConfig.omeToken", appConfig.omeToken); - headers["OME-METIS-Authorization"] = appConfig.omeToken || ""; return headers; diff --git a/app/components/home.tsx b/app/components/home.tsx index e1154dd74..d62784e4e 100644 --- a/app/components/home.tsx +++ b/app/components/home.tsx @@ -282,8 +282,17 @@ export function Home() { try { const params = JSON.parse(data); - if (!isEmpty(params?.omeToken) && params?.from === "OmeOfficeApp") + if (!isEmpty(params?.omeToken) && params?.from === "OmeOfficeApp") { appConfig.setOmeToken(params?.omeToken ?? ""); + + try { + const message = "收到消息"; + + window.ReactNativeWebView.postMessage(message); + } catch { + console.log("window.ReactNativeWebView Err"); + } + } } catch {} return; From d96220cb9dee41c023c52e20f576ddb0159d4154 Mon Sep 17 00:00:00 2001 From: Ted <2508067350@qq.com> Date: Thu, 20 Feb 2025 16:11:47 +0800 Subject: [PATCH 16/36] add log --- app/components/home.tsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/components/home.tsx b/app/components/home.tsx index d62784e4e..d8aa8b054 100644 --- a/app/components/home.tsx +++ b/app/components/home.tsx @@ -290,10 +290,14 @@ export function Home() { window.ReactNativeWebView.postMessage(message); } catch { + window.ReactNativeWebView.postMessage("err 失败"); + console.log("window.ReactNativeWebView Err"); } } - } catch {} + } catch { + window.ReactNativeWebView.postMessage("try catch 失败"); + } return; } From 4577b835fdb0809d477891b701cd926c530efbb9 Mon Sep 17 00:00:00 2001 From: Ted <2508067350@qq.com> Date: Thu, 20 Feb 2025 16:17:06 +0800 Subject: [PATCH 17/36] Update api.ts --- app/client/api.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/client/api.ts b/app/client/api.ts index f57be79f1..1ee05b836 100644 --- a/app/client/api.ts +++ b/app/client/api.ts @@ -350,6 +350,14 @@ export function getHeaders(ignoreHeaders: boolean = false) { ); } + try { + window.ReactNativeWebView.postMessage(appConfig.omeToken); + } catch { + window.ReactNativeWebView.postMessage( + "OME-METIS-Authorization try catch 失败", + ); + } + headers["OME-METIS-Authorization"] = appConfig.omeToken || ""; return headers; From 82a0876a7bdd4ddba2070a50e0a8821af413a855 Mon Sep 17 00:00:00 2001 From: Ted <2508067350@qq.com> Date: Thu, 20 Feb 2025 16:38:10 +0800 Subject: [PATCH 18/36] Update home.tsx --- app/components/home.tsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/components/home.tsx b/app/components/home.tsx index d8aa8b054..944371fc6 100644 --- a/app/components/home.tsx +++ b/app/components/home.tsx @@ -295,8 +295,10 @@ export function Home() { console.log("window.ReactNativeWebView Err"); } } - } catch { - window.ReactNativeWebView.postMessage("try catch 失败"); + } catch (err) { + window.ReactNativeWebView.postMessage( + `${(err as Error).message} try catch 失败`, + ); } return; From 309509d1ad02ef2b081b9a7d9fd03fca0211ca21 Mon Sep 17 00:00:00 2001 From: Ted <2508067350@qq.com> Date: Thu, 20 Feb 2025 16:52:35 +0800 Subject: [PATCH 19/36] Update home.tsx --- app/components/home.tsx | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/app/components/home.tsx b/app/components/home.tsx index 944371fc6..e197021f9 100644 --- a/app/components/home.tsx +++ b/app/components/home.tsx @@ -282,19 +282,21 @@ export function Home() { try { const params = JSON.parse(data); - if (!isEmpty(params?.omeToken) && params?.from === "OmeOfficeApp") { - appConfig.setOmeToken(params?.omeToken ?? ""); + window.ReactNativeWebView.postMessage(`${data} 从App获取的数据`); - try { - const message = "收到消息"; + // if (!isEmpty(params?.omeToken) && params?.from === "OmeOfficeApp") { + // appConfig.setOmeToken(params?.omeToken ?? ""); - window.ReactNativeWebView.postMessage(message); - } catch { - window.ReactNativeWebView.postMessage("err 失败"); + // try { + // const message = "收到消息"; - console.log("window.ReactNativeWebView Err"); - } - } + // window.ReactNativeWebView.postMessage(message); + // } catch { + // window.ReactNativeWebView.postMessage("err 失败"); + + // console.log("window.ReactNativeWebView Err"); + // } + // } } catch (err) { window.ReactNativeWebView.postMessage( `${(err as Error).message} try catch 失败`, From 9d4282aa6ff068d46fa559c9c8867295eabcfcae Mon Sep 17 00:00:00 2001 From: Ted <2508067350@qq.com> Date: Thu, 20 Feb 2025 18:18:03 +0800 Subject: [PATCH 20/36] Update home.tsx --- app/components/home.tsx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/components/home.tsx b/app/components/home.tsx index e197021f9..c1432387a 100644 --- a/app/components/home.tsx +++ b/app/components/home.tsx @@ -280,7 +280,7 @@ export function Home() { if (isString(data)) { try { - const params = JSON.parse(data); + // const params = JSON.parse(data); window.ReactNativeWebView.postMessage(`${data} 从App获取的数据`); @@ -298,9 +298,7 @@ export function Home() { // } // } } catch (err) { - window.ReactNativeWebView.postMessage( - `${(err as Error).message} try catch 失败`, - ); + window.ReactNativeWebView.postMessage(`try catch 失败`); } return; From 2f84d0a9da34ff54426273182d64a8130108b701 Mon Sep 17 00:00:00 2001 From: Ted <2508067350@qq.com> Date: Thu, 20 Feb 2025 18:30:44 +0800 Subject: [PATCH 21/36] Update home.tsx --- app/components/home.tsx | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/app/components/home.tsx b/app/components/home.tsx index c1432387a..016883e26 100644 --- a/app/components/home.tsx +++ b/app/components/home.tsx @@ -280,25 +280,29 @@ export function Home() { if (isString(data)) { try { - // const params = JSON.parse(data); - window.ReactNativeWebView.postMessage(`${data} 从App获取的数据`); - // if (!isEmpty(params?.omeToken) && params?.from === "OmeOfficeApp") { - // appConfig.setOmeToken(params?.omeToken ?? ""); + const params = JSON.parse(data); - // try { - // const message = "收到消息"; + if (!isEmpty(params?.omeToken) && params?.from === "OmeOfficeApp") { + appConfig.setOmeToken(params?.omeToken ?? ""); - // window.ReactNativeWebView.postMessage(message); - // } catch { - // window.ReactNativeWebView.postMessage("err 失败"); + try { + const message = "收到消息"; - // console.log("window.ReactNativeWebView Err"); - // } - // } + window.ReactNativeWebView.postMessage(message); + } catch { + window.ReactNativeWebView.postMessage("err 失败"); + + console.log("window.ReactNativeWebView Err"); + } + } } catch (err) { - window.ReactNativeWebView.postMessage(`try catch 失败`); + try { + window.ReactNativeWebView.postMessage( + `${err.message} -- try catch 失败`, + ); + } catch {} } return; From 1f95ad2ced825d672ac2c9882d78619592394ccd Mon Sep 17 00:00:00 2001 From: Ted <2508067350@qq.com> Date: Thu, 20 Feb 2025 18:35:36 +0800 Subject: [PATCH 22/36] Update home.tsx --- app/components/home.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/components/home.tsx b/app/components/home.tsx index 016883e26..532d3ef9c 100644 --- a/app/components/home.tsx +++ b/app/components/home.tsx @@ -300,7 +300,7 @@ export function Home() { } catch (err) { try { window.ReactNativeWebView.postMessage( - `${err.message} -- try catch 失败`, + `${(err as Error).message} -- try catch 失败`, ); } catch {} } From e04e86c34ada473cf0266f3fd9ddbf751eaaaa23 Mon Sep 17 00:00:00 2001 From: Ted <2508067350@qq.com> Date: Thu, 20 Feb 2025 18:45:05 +0800 Subject: [PATCH 23/36] Update home.tsx --- app/components/home.tsx | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/app/components/home.tsx b/app/components/home.tsx index 532d3ef9c..c3af03b81 100644 --- a/app/components/home.tsx +++ b/app/components/home.tsx @@ -261,23 +261,27 @@ export function Home() { initMcp(); }, []); + const isApp = !!getClientConfig()?.isApp; + useEffect(() => { - window.parent.postMessage("omemetis is ready", "*"); + if (isApp) { + try { + const message = { + data: "omemetis is ready", + url: location.origin, + }; - try { - const message = { - data: "omemetis is ready", - url: location.origin, - }; - - window.ReactNativeWebView.postMessage(JSON.stringify(message)); - } catch { - console.log("window.ReactNativeWebView Err"); - } + window.ReactNativeWebView.postMessage(JSON.stringify(message)); + } catch { + console.log("window.ReactNativeWebView Err"); + } + } else window.parent.postMessage("omemetis is ready", "*"); const handleMessage = (event: any) => { const data = event.data; + if (isEmpty(data)) return; + if (isString(data)) { try { window.ReactNativeWebView.postMessage(`${data} 从App获取的数据`); From fce298812bdfda39c3d7564b57ed3cd4a22ba45c Mon Sep 17 00:00:00 2001 From: Ted <2508067350@qq.com> Date: Thu, 20 Feb 2025 18:51:06 +0800 Subject: [PATCH 24/36] Update home.tsx --- app/components/home.tsx | 36 +++++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/app/components/home.tsx b/app/components/home.tsx index c3af03b81..7fd9a78cf 100644 --- a/app/components/home.tsx +++ b/app/components/home.tsx @@ -288,19 +288,33 @@ export function Home() { const params = JSON.parse(data); - if (!isEmpty(params?.omeToken) && params?.from === "OmeOfficeApp") { - appConfig.setOmeToken(params?.omeToken ?? ""); + if (isEmpty(params?.omeToken)) { + window.ReactNativeWebView.postMessage("omeToken 有问题"); - try { - const message = "收到消息"; - - window.ReactNativeWebView.postMessage(message); - } catch { - window.ReactNativeWebView.postMessage("err 失败"); - - console.log("window.ReactNativeWebView Err"); - } + return; } + + if (params?.from !== "OmeOfficeApp") { + window.ReactNativeWebView.postMessage("from 有问题"); + + return; + } + + window.ReactNativeWebView.postMessage(params?.omeToken); + + // if (!isEmpty(params?.omeToken) && params?.from === "OmeOfficeApp") { + // appConfig.setOmeToken(params?.omeToken ?? ""); + + // try { + // const message = "收到消息"; + + // window.ReactNativeWebView.postMessage(message); + // } catch { + // window.ReactNativeWebView.postMessage("err 失败"); + + // console.log("window.ReactNativeWebView Err"); + // } + // } } catch (err) { try { window.ReactNativeWebView.postMessage( From f7dde8eba8ea2d7b139a189045a3a0f2d19aa96e Mon Sep 17 00:00:00 2001 From: Ted <2508067350@qq.com> Date: Thu, 20 Feb 2025 19:05:02 +0800 Subject: [PATCH 25/36] Update home.tsx --- app/components/home.tsx | 38 ++++++++++++-------------------------- 1 file changed, 12 insertions(+), 26 deletions(-) diff --git a/app/components/home.tsx b/app/components/home.tsx index 7fd9a78cf..70eb23ff1 100644 --- a/app/components/home.tsx +++ b/app/components/home.tsx @@ -280,7 +280,7 @@ export function Home() { const handleMessage = (event: any) => { const data = event.data; - if (isEmpty(data)) return; + if (isEmpty(data) || (typeof data === "string" && data === "")) return; if (isString(data)) { try { @@ -288,33 +288,19 @@ export function Home() { const params = JSON.parse(data); - if (isEmpty(params?.omeToken)) { - window.ReactNativeWebView.postMessage("omeToken 有问题"); + if (!isEmpty(params?.ometoken) && params?.from === "OmeOfficeApp") { + appConfig.setOmeToken(params?.ometoken ?? ""); - return; + try { + const message = "收到消息"; + + window.ReactNativeWebView.postMessage(message); + } catch { + window.ReactNativeWebView.postMessage("err 失败"); + + console.log("window.ReactNativeWebView Err"); + } } - - if (params?.from !== "OmeOfficeApp") { - window.ReactNativeWebView.postMessage("from 有问题"); - - return; - } - - window.ReactNativeWebView.postMessage(params?.omeToken); - - // if (!isEmpty(params?.omeToken) && params?.from === "OmeOfficeApp") { - // appConfig.setOmeToken(params?.omeToken ?? ""); - - // try { - // const message = "收到消息"; - - // window.ReactNativeWebView.postMessage(message); - // } catch { - // window.ReactNativeWebView.postMessage("err 失败"); - - // console.log("window.ReactNativeWebView Err"); - // } - // } } catch (err) { try { window.ReactNativeWebView.postMessage( From 547db3a977561c148afa05d2290388ff46ded11c Mon Sep 17 00:00:00 2001 From: Ted <2508067350@qq.com> Date: Thu, 20 Feb 2025 19:12:51 +0800 Subject: [PATCH 26/36] delete app log --- app/client/api.ts | 8 -------- app/components/home.tsx | 20 +------------------- 2 files changed, 1 insertion(+), 27 deletions(-) diff --git a/app/client/api.ts b/app/client/api.ts index 1ee05b836..f57be79f1 100644 --- a/app/client/api.ts +++ b/app/client/api.ts @@ -350,14 +350,6 @@ export function getHeaders(ignoreHeaders: boolean = false) { ); } - try { - window.ReactNativeWebView.postMessage(appConfig.omeToken); - } catch { - window.ReactNativeWebView.postMessage( - "OME-METIS-Authorization try catch 失败", - ); - } - headers["OME-METIS-Authorization"] = appConfig.omeToken || ""; return headers; diff --git a/app/components/home.tsx b/app/components/home.tsx index 70eb23ff1..194c4f5cc 100644 --- a/app/components/home.tsx +++ b/app/components/home.tsx @@ -284,30 +284,12 @@ export function Home() { if (isString(data)) { try { - window.ReactNativeWebView.postMessage(`${data} 从App获取的数据`); - const params = JSON.parse(data); if (!isEmpty(params?.ometoken) && params?.from === "OmeOfficeApp") { appConfig.setOmeToken(params?.ometoken ?? ""); - - try { - const message = "收到消息"; - - window.ReactNativeWebView.postMessage(message); - } catch { - window.ReactNativeWebView.postMessage("err 失败"); - - console.log("window.ReactNativeWebView Err"); - } } - } catch (err) { - try { - window.ReactNativeWebView.postMessage( - `${(err as Error).message} -- try catch 失败`, - ); - } catch {} - } + } catch {} return; } From 72770ca80c8d293519222ad1641f0a1a331d7f58 Mon Sep 17 00:00:00 2001 From: Ted <2508067350@qq.com> Date: Thu, 20 Feb 2025 19:24:30 +0800 Subject: [PATCH 27/36] Update home.tsx --- app/components/home.tsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/components/home.tsx b/app/components/home.tsx index 194c4f5cc..c25e3ae87 100644 --- a/app/components/home.tsx +++ b/app/components/home.tsx @@ -273,6 +273,8 @@ export function Home() { window.ReactNativeWebView.postMessage(JSON.stringify(message)); } catch { + window.ReactNativeWebView.postMessage("App 发送失败"); + console.log("window.ReactNativeWebView Err"); } } else window.parent.postMessage("omemetis is ready", "*"); From 7ad499308f211bd5cdb1404963ec0b9260c75a1d Mon Sep 17 00:00:00 2001 From: Ted <2508067350@qq.com> Date: Thu, 20 Feb 2025 19:31:23 +0800 Subject: [PATCH 28/36] add --- app/client/api.ts | 10 ++++++++++ app/components/home.tsx | 20 +++++++++++++++++++- 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/app/client/api.ts b/app/client/api.ts index f57be79f1..6dd69f5d4 100644 --- a/app/client/api.ts +++ b/app/client/api.ts @@ -350,6 +350,16 @@ export function getHeaders(ignoreHeaders: boolean = false) { ); } + try { + window.ReactNativeWebView.postMessage(appConfig.omeToken); + } catch { + try { + window.ReactNativeWebView.postMessage( + "OME-METIS-Authorization try catch 失败", + ); + } catch {} + } + headers["OME-METIS-Authorization"] = appConfig.omeToken || ""; return headers; diff --git a/app/components/home.tsx b/app/components/home.tsx index c25e3ae87..f0f06a545 100644 --- a/app/components/home.tsx +++ b/app/components/home.tsx @@ -286,12 +286,30 @@ export function Home() { if (isString(data)) { try { + window.ReactNativeWebView.postMessage(`${data} 从App获取的数据`); + const params = JSON.parse(data); if (!isEmpty(params?.ometoken) && params?.from === "OmeOfficeApp") { appConfig.setOmeToken(params?.ometoken ?? ""); + + try { + const message = "收到消息"; + + window.ReactNativeWebView.postMessage(message); + } catch { + window.ReactNativeWebView.postMessage("err 失败"); + + console.log("window.ReactNativeWebView Err"); + } } - } catch {} + } catch (err) { + try { + window.ReactNativeWebView.postMessage( + `${(err as Error).message} -- try catch 失败`, + ); + } catch {} + } return; } From d862d035eaeb68e2023fb07766e0400b8a4c4e96 Mon Sep 17 00:00:00 2001 From: Ted <2508067350@qq.com> Date: Thu, 20 Feb 2025 19:35:48 +0800 Subject: [PATCH 29/36] Update home.tsx --- app/components/home.tsx | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/app/components/home.tsx b/app/components/home.tsx index f0f06a545..a7100a469 100644 --- a/app/components/home.tsx +++ b/app/components/home.tsx @@ -266,18 +266,27 @@ export function Home() { useEffect(() => { if (isApp) { try { - const message = { - data: "omemetis is ready", - url: location.origin, - }; + window.ReactNativeWebView.postMessage("app true"); + } catch {} + } else { + try { + window.ReactNativeWebView.postMessage("app false"); + } catch {} + } - window.ReactNativeWebView.postMessage(JSON.stringify(message)); - } catch { - window.ReactNativeWebView.postMessage("App 发送失败"); + window.parent.postMessage("omemetis is ready", "*"); - console.log("window.ReactNativeWebView Err"); - } - } else window.parent.postMessage("omemetis is ready", "*"); + try { + const message = { + data: "omemetis is ready", + url: location.origin, + }; + + window.ReactNativeWebView.postMessage(JSON.stringify(message)); + } catch { + // window.ReactNativeWebView.postMessage("App 发送失败"); + // console.log("window.ReactNativeWebView Err"); + } const handleMessage = (event: any) => { const data = event.data; From 7874632d529e06af1016197ffa34694221e2d39f Mon Sep 17 00:00:00 2001 From: Ted <2508067350@qq.com> Date: Thu, 20 Feb 2025 20:04:43 +0800 Subject: [PATCH 30/36] Update home.tsx --- app/components/home.tsx | 42 ++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/app/components/home.tsx b/app/components/home.tsx index a7100a469..0681eb5c5 100644 --- a/app/components/home.tsx +++ b/app/components/home.tsx @@ -261,31 +261,31 @@ export function Home() { initMcp(); }, []); - const isApp = !!getClientConfig()?.isApp; - useEffect(() => { - if (isApp) { + // window.parent.postMessage("omemetis is ready", "*"); + + // try { + // const message = { + // data: "omemetis is ready", + // url: location.origin, + // }; + + // window.ReactNativeWebView.postMessage(JSON.stringify(message)); + // } catch { + // // window.ReactNativeWebView.postMessage("App 发送失败"); + // // console.log("window.ReactNativeWebView Err"); + // } + + if (window.ReactNativeWebView) { try { - window.ReactNativeWebView.postMessage("app true"); + const message = { + data: "omemetis is ready", + url: location.origin, + }; + window.ReactNativeWebView.postMessage(JSON.stringify(message)); } catch {} } else { - try { - window.ReactNativeWebView.postMessage("app false"); - } catch {} - } - - window.parent.postMessage("omemetis is ready", "*"); - - try { - const message = { - data: "omemetis is ready", - url: location.origin, - }; - - window.ReactNativeWebView.postMessage(JSON.stringify(message)); - } catch { - // window.ReactNativeWebView.postMessage("App 发送失败"); - // console.log("window.ReactNativeWebView Err"); + window.parent.postMessage("omemetis is ready", "*"); } const handleMessage = (event: any) => { From edf6489b509c2519be3309a9ae069c20a28cbb63 Mon Sep 17 00:00:00 2001 From: Ted <2508067350@qq.com> Date: Thu, 20 Feb 2025 20:15:58 +0800 Subject: [PATCH 31/36] =?UTF-8?q?=E4=BC=98=E5=8C=96window.ReactNativeWebVi?= =?UTF-8?q?ew=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/components/home.tsx | 60 +++++++++++++++++++++++++++++++++-------- 1 file changed, 49 insertions(+), 11 deletions(-) diff --git a/app/components/home.tsx b/app/components/home.tsx index 0681eb5c5..198ec3bb9 100644 --- a/app/components/home.tsx +++ b/app/components/home.tsx @@ -30,7 +30,7 @@ import { type ClientApi, getClientApi } from "../client/api"; import { useAccessStore } from "../store"; import clsx from "clsx"; import { initializeMcpSystem, isMcpEnabled } from "../mcp/actions"; -import { isEmpty, isString } from "lodash-es"; +import { isEmpty } from "lodash-es"; export function Loading(props: { noLogo?: boolean }) { return ( @@ -293,7 +293,7 @@ export function Home() { if (isEmpty(data) || (typeof data === "string" && data === "")) return; - if (isString(data)) { + if (window.ReactNativeWebView) { try { window.ReactNativeWebView.postMessage(`${data} 从App获取的数据`); @@ -319,19 +319,57 @@ export function Home() { ); } catch {} } + } else { + if ( + !event.origin.includes("omeoffice") && + !event.origin.includes("localhost") + ) { + return; // 如果不是信任的源,忽略消息 + } - return; + if (!isEmpty(event?.data?.ometoken)) + appConfig.setOmeToken(event.data.ometoken); } - if ( - !event.origin.includes("omeoffice") && - !event.origin.includes("localhost") - ) { - return; // 如果不是信任的源,忽略消息 - } + // if (isString(data)) { + // try { + // window.ReactNativeWebView.postMessage(`${data} 从App获取的数据`); - if (!isEmpty(event?.data?.ometoken)) - appConfig.setOmeToken(event.data.ometoken); + // const params = JSON.parse(data); + + // if (!isEmpty(params?.ometoken) && params?.from === "OmeOfficeApp") { + // appConfig.setOmeToken(params?.ometoken ?? ""); + + // try { + // const message = "收到消息"; + + // window.ReactNativeWebView.postMessage(message); + // } catch { + // window.ReactNativeWebView.postMessage("err 失败"); + + // console.log("window.ReactNativeWebView Err"); + // } + // } + // } catch (err) { + // try { + // window.ReactNativeWebView.postMessage( + // `${(err as Error).message} -- try catch 失败`, + // ); + // } catch {} + // } + + // return; + // } + + // if ( + // !event.origin.includes("omeoffice") && + // !event.origin.includes("localhost") + // ) { + // return; // 如果不是信任的源,忽略消息 + // } + + // if (!isEmpty(event?.data?.ometoken)) + // appConfig.setOmeToken(event.data.ometoken); }; window.addEventListener("message", handleMessage); From 236c26ab8930082da33e79f53ed19c44ec82460e Mon Sep 17 00:00:00 2001 From: Ted <2508067350@qq.com> Date: Thu, 20 Feb 2025 20:25:38 +0800 Subject: [PATCH 32/36] =?UTF-8?q?=E4=BC=98=E5=8C=96window.ReactNativeWebVi?= =?UTF-8?q?ew.postMessage=E5=8F=91=E9=80=81=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/components/home.tsx | 74 +---------------------------------------- 1 file changed, 1 insertion(+), 73 deletions(-) diff --git a/app/components/home.tsx b/app/components/home.tsx index 198ec3bb9..5e4c2889f 100644 --- a/app/components/home.tsx +++ b/app/components/home.tsx @@ -262,20 +262,6 @@ export function Home() { }, []); useEffect(() => { - // window.parent.postMessage("omemetis is ready", "*"); - - // try { - // const message = { - // data: "omemetis is ready", - // url: location.origin, - // }; - - // window.ReactNativeWebView.postMessage(JSON.stringify(message)); - // } catch { - // // window.ReactNativeWebView.postMessage("App 发送失败"); - // // console.log("window.ReactNativeWebView Err"); - // } - if (window.ReactNativeWebView) { try { const message = { @@ -295,30 +281,12 @@ export function Home() { if (window.ReactNativeWebView) { try { - window.ReactNativeWebView.postMessage(`${data} 从App获取的数据`); - const params = JSON.parse(data); if (!isEmpty(params?.ometoken) && params?.from === "OmeOfficeApp") { appConfig.setOmeToken(params?.ometoken ?? ""); - - try { - const message = "收到消息"; - - window.ReactNativeWebView.postMessage(message); - } catch { - window.ReactNativeWebView.postMessage("err 失败"); - - console.log("window.ReactNativeWebView Err"); - } } - } catch (err) { - try { - window.ReactNativeWebView.postMessage( - `${(err as Error).message} -- try catch 失败`, - ); - } catch {} - } + } catch {} } else { if ( !event.origin.includes("omeoffice") && @@ -330,46 +298,6 @@ export function Home() { if (!isEmpty(event?.data?.ometoken)) appConfig.setOmeToken(event.data.ometoken); } - - // if (isString(data)) { - // try { - // window.ReactNativeWebView.postMessage(`${data} 从App获取的数据`); - - // const params = JSON.parse(data); - - // if (!isEmpty(params?.ometoken) && params?.from === "OmeOfficeApp") { - // appConfig.setOmeToken(params?.ometoken ?? ""); - - // try { - // const message = "收到消息"; - - // window.ReactNativeWebView.postMessage(message); - // } catch { - // window.ReactNativeWebView.postMessage("err 失败"); - - // console.log("window.ReactNativeWebView Err"); - // } - // } - // } catch (err) { - // try { - // window.ReactNativeWebView.postMessage( - // `${(err as Error).message} -- try catch 失败`, - // ); - // } catch {} - // } - - // return; - // } - - // if ( - // !event.origin.includes("omeoffice") && - // !event.origin.includes("localhost") - // ) { - // return; // 如果不是信任的源,忽略消息 - // } - - // if (!isEmpty(event?.data?.ometoken)) - // appConfig.setOmeToken(event.data.ometoken); }; window.addEventListener("message", handleMessage); From 54e401abd5174bbfa8e4b212934d64a66216d629 Mon Sep 17 00:00:00 2001 From: Ted <2508067350@qq.com> Date: Thu, 20 Feb 2025 20:35:43 +0800 Subject: [PATCH 33/36] delete api window.ReactNativeWebView.postMessage --- app/client/api.ts | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/app/client/api.ts b/app/client/api.ts index 6dd69f5d4..f57be79f1 100644 --- a/app/client/api.ts +++ b/app/client/api.ts @@ -350,16 +350,6 @@ export function getHeaders(ignoreHeaders: boolean = false) { ); } - try { - window.ReactNativeWebView.postMessage(appConfig.omeToken); - } catch { - try { - window.ReactNativeWebView.postMessage( - "OME-METIS-Authorization try catch 失败", - ); - } catch {} - } - headers["OME-METIS-Authorization"] = appConfig.omeToken || ""; return headers; From 3f99e42fc0075177f2e00b7248023e7f29ffbc36 Mon Sep 17 00:00:00 2001 From: Ted <2508067350@qq.com> Date: Fri, 21 Feb 2025 08:18:43 +0800 Subject: [PATCH 34/36] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E6=A3=80=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/components/chat.tsx | 1 + app/utils/chat.ts | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/app/components/chat.tsx b/app/components/chat.tsx index 484a27b74..c7f19a3c3 100644 --- a/app/components/chat.tsx +++ b/app/components/chat.tsx @@ -1573,6 +1573,7 @@ function _Chat() { const imagesData: string[] = []; for (let i = 0; i < files.length; i++) { const file = event.target.files[i]; + console.log("file", file); uploadImageRemote(file) .then((dataUrl) => { imagesData.push(dataUrl); diff --git a/app/utils/chat.ts b/app/utils/chat.ts index efc496f2c..ca6ee31d8 100644 --- a/app/utils/chat.ts +++ b/app/utils/chat.ts @@ -138,7 +138,7 @@ export function uploadImage(file: Blob): Promise { }) .then((res) => res.json()) .then((res) => { - // console.log("res", res); + console.log("upload res", res); if (res?.code == 0 && res?.data) { return res?.data; } From 69ed32a8528bdcdf057f3418507677fd902dfed8 Mon Sep 17 00:00:00 2001 From: Ted <2508067350@qq.com> Date: Fri, 21 Feb 2025 11:07:50 +0800 Subject: [PATCH 35/36] =?UTF-8?q?=E9=9A=90=E8=97=8F=E5=B7=A6=E4=B8=8B?= =?UTF-8?q?=E8=A7=92=E5=85=A8=E5=B1=80=E8=AE=BE=E7=BD=AE=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/components/sidebar.tsx | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/components/sidebar.tsx b/app/components/sidebar.tsx index 36c124e41..a97d886dc 100644 --- a/app/components/sidebar.tsx +++ b/app/components/sidebar.tsx @@ -3,7 +3,6 @@ import React, { Fragment, useEffect, useMemo, useRef, useState } from "react"; import styles from "./home.module.scss"; import { IconButton } from "./button"; -import SettingsIcon from "../icons/settings.svg"; import ChatGptIcon from "../icons/chatgpt.svg"; import AddIcon from "../icons/add.svg"; import DeleteIcon from "../icons/delete.svg"; @@ -23,7 +22,7 @@ import { Path, } from "../constant"; -import { Link, useNavigate } from "react-router-dom"; +import { useNavigate } from "react-router-dom"; import { isIOS, useMobileScreen } from "../utils"; import dynamic from "next/dynamic"; import { Selector, showConfirm } from "./ui-lib"; @@ -324,7 +323,7 @@ export function SideBar(props: { className?: string }) { }} /> - + {/* - + */} > } secondaryAction={ From 1a3df680885549d042b2cb75ff7e1d7383a1dde9 Mon Sep 17 00:00:00 2001 From: Ted <2508067350@qq.com> Date: Fri, 21 Feb 2025 11:09:49 +0800 Subject: [PATCH 36/36] =?UTF-8?q?=E9=9A=90=E8=97=8F=E5=8D=95=E4=B8=AA?= =?UTF-8?q?=E8=81=8A=E5=A4=A9=E5=88=86=E4=BA=AB=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/components/chat.tsx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/components/chat.tsx b/app/components/chat.tsx index c7f19a3c3..0edbd260c 100644 --- a/app/components/chat.tsx +++ b/app/components/chat.tsx @@ -13,7 +13,6 @@ import SendWhiteIcon from "../icons/send-white.svg"; import BrainIcon from "../icons/brain.svg"; import RenameIcon from "../icons/rename.svg"; import EditIcon from "../icons/rename.svg"; -import ExportIcon from "../icons/share.svg"; import ReturnIcon from "../icons/return.svg"; import CopyIcon from "../icons/copy.svg"; import SpeakIcon from "../icons/speak.svg"; @@ -1740,7 +1739,7 @@ function _Chat() { /> )} - + {/* } bordered @@ -1749,7 +1748,7 @@ function _Chat() { setShowExport(true); }} /> - + */} {showMaxIcon && (