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)} /> )} - + */}