From 9cef3a26250667fa6761dbe9893a194de0c28aef Mon Sep 17 00:00:00 2001
From: chanx <1243304602@qq.com>
Date: Mon, 17 Nov 2025 11:16:55 +0800
Subject: [PATCH] Fix: Fixed the issue of not being able to select the time
 zone in the user center. (#11298)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

… user center.

### What problem does this PR solve?

Fix: Fixed the issue of not being able to select the time zone in the
user center.

### Type of change

- [x] Bug Fix (non-breaking change which fixes an issue)
---
 web/src/components/ui/modal/modal.tsx        |  4 +++
 web/src/pages/user-setting/profile/index.tsx | 30 ++++++--------------
 2 files changed, 12 insertions(+), 22 deletions(-)

diff --git a/web/src/components/ui/modal/modal.tsx b/web/src/components/ui/modal/modal.tsx
index acae6c147..af516b1e6 100644
--- a/web/src/components/ui/modal/modal.tsx
+++ b/web/src/components/ui/modal/modal.tsx
@@ -86,6 +86,9 @@ const Modal: ModalType = ({
     onOk?.();
   }, [onOk, onOpenChange]);
   const handleChange = (open: boolean) => {
+    if (!open && !maskClosable) {
+      return;
+    }
     onOpenChange?.(open);
     console.log('open', open, onOpenChange);
     if (open && !disabled) {
@@ -185,6 +188,7 @@ const Modal: ModalType = ({
                     <button
                       type="button"
                       className="flex h-7 w-7 items-center justify-center rounded-full hover:bg-muted focus-visible:outline-none"
+                      onClick={handleCancel}
                     >
                       {closeIcon}
                     </button>
diff --git a/web/src/pages/user-setting/profile/index.tsx b/web/src/pages/user-setting/profile/index.tsx
index dceb2cdf3..5c2741cf6 100644
--- a/web/src/pages/user-setting/profile/index.tsx
+++ b/web/src/pages/user-setting/profile/index.tsx
@@ -13,13 +13,7 @@ import {
 } from '@/components/ui/form';
 import { Input } from '@/components/ui/input';
 import { Modal } from '@/components/ui/modal/modal';
-import {
-  Select,
-  SelectContent,
-  SelectItem,
-  SelectTrigger,
-  SelectValue,
-} from '@/components/ui/select';
+import { RAGFlowSelect } from '@/components/ui/select';
 import { useTranslate } from '@/hooks/common-hooks';
 import { TimezoneList } from '@/pages/user-setting/constants';
 import { zodResolver } from '@hookform/resolvers/zod';
@@ -230,6 +224,7 @@ const ProfilePage: FC = () => {
           title={modalTitle[editType]}
           open={isEditing}
           showfooter={false}
+          maskClosable={false}
           titleClassName="text-base"
           onOpenChange={(open) => {
             if (!open) {
@@ -281,23 +276,14 @@ const ProfilePage: FC = () => {
                         <FormLabel className="text-sm text-text-secondary whitespace-nowrap">
                           {t('timezone')}
                         </FormLabel>
-                        <Select
+                        <RAGFlowSelect
+                          options={TimezoneList.map((timeStr) => {
+                            return { value: timeStr, label: timeStr };
+                          })}
+                          placeholder="Select a timeZone"
                           onValueChange={field.onChange}
                           value={field.value}
-                        >
-                          <FormControl className="w-full bg-bg-input border-border-default">
-                            <SelectTrigger>
-                              <SelectValue placeholder="Select a timeZone" />
-                            </SelectTrigger>
-                          </FormControl>
-                          <SelectContent>
-                            {TimezoneList.map((timeStr) => (
-                              <SelectItem key={timeStr} value={timeStr}>
-                                {timeStr}
-                              </SelectItem>
-                            ))}
-                          </SelectContent>
-                        </Select>
+                        />
                       </div>
                       <div className="flex w-full pt-1">
                         <div className="w-1/4"></div>