From c3ccc3829fb51f5ccfe6e7999e5e472ee0f94185 Mon Sep 17 00:00:00 2001 From: cyfung1031 <44498510+cyfung1031@users.noreply.github.com> Date: Mon, 16 Feb 2026 09:51:52 +0900 Subject: [PATCH 1/6] fix #1256 --- src/pages/options/routes/Setting.tsx | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/pages/options/routes/Setting.tsx b/src/pages/options/routes/Setting.tsx index afb779499..4167234cc 100644 --- a/src/pages/options/routes/Setting.tsx +++ b/src/pages/options/routes/Setting.tsx @@ -16,7 +16,7 @@ import { useSystemConfig } from "./utils"; import { subscribeMessage } from "@App/pages/store/global"; import { SystemConfigChange, type SystemConfigKey } from "@App/pkg/config/config"; import { type TKeyValue } from "@Packages/message/message_queue"; -import { useEffect, useMemo } from "react"; +import { useEffect, useMemo, useRef } from "react"; import { systemConfig } from "@App/pages/store/global"; import { initRegularUpdateCheck } from "@App/app/service/service_worker/regular_updatecheck"; import { HookManager } from "@App/pkg/utils/hookManager"; @@ -108,8 +108,14 @@ function Setting() { // eslint-disable-next-line react-hooks/exhaustive-deps }, []); + const scrollContainerRef = useRef(null); + return ( - + {/* 基本设置 */}
@@ -126,6 +132,7 @@ function Setting() { submitLanguage(value); Message.success(t("language_change_tip")!); }} + getPopupContainer={() => scrollContainerRef.current} > {languageList.map((item) => ( From 7471143c0e2d2108a592b1b4636716d1d72f0555 Mon Sep 17 00:00:00 2001 From: cyfung1031 <44498510+cyfung1031@users.noreply.github.com> Date: Mon, 16 Feb 2026 09:56:55 +0900 Subject: [PATCH 2/6] Update Setting.tsx --- src/pages/options/routes/Setting.tsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/pages/options/routes/Setting.tsx b/src/pages/options/routes/Setting.tsx index 4167234cc..d2203f784 100644 --- a/src/pages/options/routes/Setting.tsx +++ b/src/pages/options/routes/Setting.tsx @@ -108,7 +108,7 @@ function Setting() { // eslint-disable-next-line react-hooks/exhaustive-deps }, []); - const scrollContainerRef = useRef(null); + const scrollContainerRef = useRef(null); return ( scrollContainerRef.current} + getPopupContainer={() => scrollContainerRef.current!} > {languageList.map((item) => ( @@ -235,6 +235,7 @@ function Setting() { onChange={(value) => { submitBadgeNumberType(value); }} + getPopupContainer={() => scrollContainerRef.current!} > {t("badge_type_none")} {t("badge_type_run_count")} @@ -332,6 +333,7 @@ function Setting() { initRegularUpdateCheck(systemConfig); }); }} + getPopupContainer={() => scrollContainerRef.current!} > {t("never")} {t("6_hours")} From 08a8c68ab2b929a83e80a47c0215086ef0ac0e40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E4=B8=80=E4=B9=8B?= Date: Mon, 16 Feb 2026 14:13:15 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BD=BF=E7=94=A8ConfigProvider=E5=A4=84?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/components/layout/MainLayout.tsx | 7 +++++++ src/pages/options/routes/Setting.tsx | 13 ++----------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/pages/components/layout/MainLayout.tsx b/src/pages/components/layout/MainLayout.tsx index 6dbbdef41..c06b73ee1 100644 --- a/src/pages/components/layout/MainLayout.tsx +++ b/src/pages/components/layout/MainLayout.tsx @@ -294,6 +294,13 @@ const MainLayout: React.FC<{ return ; }} locale={arcoLocale(i18n.language)} + componentConfig={{ + Select: { + getPopupContainer: (node) => { + return node; + }, + }, + }} > {contextHolder} diff --git a/src/pages/options/routes/Setting.tsx b/src/pages/options/routes/Setting.tsx index d2203f784..afb779499 100644 --- a/src/pages/options/routes/Setting.tsx +++ b/src/pages/options/routes/Setting.tsx @@ -16,7 +16,7 @@ import { useSystemConfig } from "./utils"; import { subscribeMessage } from "@App/pages/store/global"; import { SystemConfigChange, type SystemConfigKey } from "@App/pkg/config/config"; import { type TKeyValue } from "@Packages/message/message_queue"; -import { useEffect, useMemo, useRef } from "react"; +import { useEffect, useMemo } from "react"; import { systemConfig } from "@App/pages/store/global"; import { initRegularUpdateCheck } from "@App/app/service/service_worker/regular_updatecheck"; import { HookManager } from "@App/pkg/utils/hookManager"; @@ -108,14 +108,8 @@ function Setting() { // eslint-disable-next-line react-hooks/exhaustive-deps }, []); - const scrollContainerRef = useRef(null); - return ( - + {/* 基本设置 */}
@@ -132,7 +126,6 @@ function Setting() { submitLanguage(value); Message.success(t("language_change_tip")!); }} - getPopupContainer={() => scrollContainerRef.current!} > {languageList.map((item) => ( @@ -235,7 +228,6 @@ function Setting() { onChange={(value) => { submitBadgeNumberType(value); }} - getPopupContainer={() => scrollContainerRef.current!} > {t("badge_type_none")} {t("badge_type_run_count")} @@ -333,7 +325,6 @@ function Setting() { initRegularUpdateCheck(systemConfig); }); }} - getPopupContainer={() => scrollContainerRef.current!} > {t("never")} {t("6_hours")} From 860a41d38bbe1cbed4b411bcac0d2c2a019de1ba Mon Sep 17 00:00:00 2001 From: cyfung1031 <44498510+cyfung1031@users.noreply.github.com> Date: Mon, 16 Feb 2026 16:12:09 +0900 Subject: [PATCH 4/6] Popconfirm --- src/pages/components/layout/MainLayout.tsx | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/pages/components/layout/MainLayout.tsx b/src/pages/components/layout/MainLayout.tsx index c06b73ee1..6cf3259f8 100644 --- a/src/pages/components/layout/MainLayout.tsx +++ b/src/pages/components/layout/MainLayout.tsx @@ -300,6 +300,11 @@ const MainLayout: React.FC<{ return node; }, }, + Popconfirm: { + getPopupContainer: (node) => { + return node.parentNode as Element; + }, + }, }} > {contextHolder} From d6b936bee68a4cd40d5c4e5be06981f32c107391 Mon Sep 17 00:00:00 2001 From: cyfung1031 <44498510+cyfung1031@users.noreply.github.com> Date: Mon, 16 Feb 2026 16:16:15 +0900 Subject: [PATCH 5/6] Tooltip --- src/pages/components/layout/MainLayout.tsx | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/pages/components/layout/MainLayout.tsx b/src/pages/components/layout/MainLayout.tsx index 6cf3259f8..1a63947bc 100644 --- a/src/pages/components/layout/MainLayout.tsx +++ b/src/pages/components/layout/MainLayout.tsx @@ -305,6 +305,11 @@ const MainLayout: React.FC<{ return node.parentNode as Element; }, }, + Tooltip: { + getPopupContainer: (node) => { + return node.parentNode as Element; + }, + }, }} > {contextHolder} From 2cac24554757113f86a04e91d3493e873466ace8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E4=B8=80=E4=B9=8B?= Date: Mon, 16 Feb 2026 15:55:11 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E5=A4=84=E7=90=86getPopupContainer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/components/layout/MainLayout.tsx | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/src/pages/components/layout/MainLayout.tsx b/src/pages/components/layout/MainLayout.tsx index 1a63947bc..d936c7e01 100644 --- a/src/pages/components/layout/MainLayout.tsx +++ b/src/pages/components/layout/MainLayout.tsx @@ -295,21 +295,14 @@ const MainLayout: React.FC<{ }} locale={arcoLocale(i18n.language)} componentConfig={{ - Select: { - getPopupContainer: (node) => { - return node; - }, - }, Popconfirm: { getPopupContainer: (node) => { return node.parentNode as Element; }, }, - Tooltip: { - getPopupContainer: (node) => { - return node.parentNode as Element; - }, - }, + }} + getPopupContainer={(node) => { + return node; }} > {contextHolder}