From 4d713db546c832da452dfe8455614de5f43ff49e Mon Sep 17 00:00:00 2001
From: zhongming4762 <zhongming4762@hotmail.com>
Date: Wed, 29 Oct 2025 19:47:10 +0800
Subject: [PATCH] feat: increase support for multiple time zones
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 * 优化实现方法
---
 .../timezone.ts => timezone/getTimezone.ts}   |   0
 .../getTimezoneOptions.ts}                    |   0
 .../api/{user => timezone}/setTimezone.ts     |   2 +-
 apps/backend-mock/utils/mock-data.ts          |   4 +-
 apps/web-antd/src/api/core/index.ts           |   1 -
 apps/web-antd/src/api/core/user-profile.ts    |  23 ----
 apps/web-antd/src/layouts/basic.vue           |  43 +-----
 apps/web-antd/src/store/index.ts              |   1 -
 apps/web-antd/src/store/user-profile.ts       |  58 --------
 apps/web-ele/src/api/core/index.ts            |   1 -
 apps/web-ele/src/api/core/user-profile.ts     |  23 ----
 apps/web-ele/src/layouts/basic.vue            |  43 +-----
 apps/web-ele/src/store/index.ts               |   1 -
 apps/web-ele/src/store/user-profile.ts        |  58 --------
 apps/web-naive/src/api/core/index.ts          |   1 -
 apps/web-naive/src/api/core/user-profile.ts   |  23 ----
 apps/web-naive/src/layouts/basic.vue          |  44 +-----
 apps/web-naive/src/store/index.ts             |   1 -
 apps/web-naive/src/store/user-profile.ts      |  58 --------
 packages/@core/base/typings/src/app.d.ts      |  10 ++
 packages/@core/base/typings/src/index.ts      |   1 -
 .../@core/base/typings/src/user-profile.d.ts  |   9 --
 packages/@core/preferences/src/constants.ts   |  35 ++++-
 .../layouts/src/basic/header/header.vue       |   4 +
 .../src/widgets/timezone/timezone-button.vue  |  71 +++++-----
 packages/stores/src/modules/index.ts          |   1 +
 packages/stores/src/modules/timezone.ts       | 125 ++++++++++++++++++
 playground/src/api/core/index.ts              |   1 +
 playground/src/api/core/timezone.ts           |  30 +++++
 playground/src/bootstrap.ts                   |   4 +
 playground/src/timezone-init.ts               |  20 +++
 31 files changed, 273 insertions(+), 423 deletions(-)
 rename apps/backend-mock/api/{user/timezone.ts => timezone/getTimezone.ts} (100%)
 rename apps/backend-mock/api/{profile/timezone.ts => timezone/getTimezoneOptions.ts} (100%)
 rename apps/backend-mock/api/{user => timezone}/setTimezone.ts (93%)
 delete mode 100644 apps/web-antd/src/api/core/user-profile.ts
 delete mode 100644 apps/web-antd/src/store/user-profile.ts
 delete mode 100644 apps/web-ele/src/api/core/user-profile.ts
 delete mode 100644 apps/web-ele/src/store/user-profile.ts
 delete mode 100644 apps/web-naive/src/api/core/user-profile.ts
 delete mode 100644 apps/web-naive/src/store/user-profile.ts
 delete mode 100644 packages/@core/base/typings/src/user-profile.d.ts
 create mode 100644 packages/stores/src/modules/timezone.ts
 create mode 100644 playground/src/api/core/timezone.ts
 create mode 100644 playground/src/timezone-init.ts

diff --git a/apps/backend-mock/api/user/timezone.ts b/apps/backend-mock/api/timezone/getTimezone.ts
similarity index 100%
rename from apps/backend-mock/api/user/timezone.ts
rename to apps/backend-mock/api/timezone/getTimezone.ts
diff --git a/apps/backend-mock/api/profile/timezone.ts b/apps/backend-mock/api/timezone/getTimezoneOptions.ts
similarity index 100%
rename from apps/backend-mock/api/profile/timezone.ts
rename to apps/backend-mock/api/timezone/getTimezoneOptions.ts
diff --git a/apps/backend-mock/api/user/setTimezone.ts b/apps/backend-mock/api/timezone/setTimezone.ts
similarity index 93%
rename from apps/backend-mock/api/user/setTimezone.ts
rename to apps/backend-mock/api/timezone/setTimezone.ts
index 2265e3cb..9ec00a50 100644
--- a/apps/backend-mock/api/user/setTimezone.ts
+++ b/apps/backend-mock/api/timezone/setTimezone.ts
@@ -10,5 +10,5 @@ export default eventHandler(async (event) => {
   }
   const { timezone } = await readBody(event);
   setTimezone(timezone);
-  return useResponseSuccess();
+  return useResponseSuccess({});
 });
diff --git a/apps/backend-mock/utils/mock-data.ts b/apps/backend-mock/utils/mock-data.ts
index 5c534437..54cfa506 100644
--- a/apps/backend-mock/utils/mock-data.ts
+++ b/apps/backend-mock/utils/mock-data.ts
@@ -7,7 +7,7 @@ export interface UserInfo {
   homePath?: string;
 }
 
-export interface TimeZoneOption {
+export interface TimezoneOption {
   offset: number;
   timeZone: string;
 }
@@ -397,7 +397,7 @@ export function getMenuIds(menus: any[]) {
 /**
  * 时区选项
  */
-export const TIME_ZONE_OPTIONS: TimeZoneOption[] = [
+export const TIME_ZONE_OPTIONS: TimezoneOption[] = [
   {
     offset: -5,
     timezone: 'America/New_York',
diff --git a/apps/web-antd/src/api/core/index.ts b/apps/web-antd/src/api/core/index.ts
index e5d52a40..28a5aef4 100644
--- a/apps/web-antd/src/api/core/index.ts
+++ b/apps/web-antd/src/api/core/index.ts
@@ -1,4 +1,3 @@
 export * from './auth';
 export * from './menu';
 export * from './user';
-export * from './user-profile';
diff --git a/apps/web-antd/src/api/core/user-profile.ts b/apps/web-antd/src/api/core/user-profile.ts
deleted file mode 100644
index eefa9ab7..00000000
--- a/apps/web-antd/src/api/core/user-profile.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import type { TimezoneOption } from '@vben/types';
-
-import { requestClient } from '#/api/request';
-
-/**
- * 获取系统支持的时区列表
- */
-export async function getTimezoneOptionsApi() {
-  return requestClient.get<TimezoneOption[]>('/profile/timezone');
-}
-/**
- * 获取用户时区
- */
-export async function getUserTimezoneApi(): Promise<null | string | undefined> {
-  return requestClient.get<null | string | undefined>('/user/timezone');
-}
-/**
- * 设置用户时区
- * @param timezone 时区
- */
-export async function setUserTimezoneApi(timezone: string) {
-  return requestClient.post('/user/setTimezone', { timezone });
-}
diff --git a/apps/web-antd/src/layouts/basic.vue b/apps/web-antd/src/layouts/basic.vue
index 742378f9..805b8a73 100644
--- a/apps/web-antd/src/layouts/basic.vue
+++ b/apps/web-antd/src/layouts/basic.vue
@@ -1,8 +1,7 @@
 <script lang="ts" setup>
-import type { ExtendedModalApi } from '@vben/common-ui';
 import type { NotificationItem } from '@vben/layouts';
 
-import { computed, onMounted, ref, unref, watch } from 'vue';
+import { computed, ref, watch } from 'vue';
 
 import { AuthenticationLoginExpiredModal } from '@vben/common-ui';
 import { VBEN_DOC_URL, VBEN_GITHUB_URL } from '@vben/constants';
@@ -12,18 +11,14 @@ import {
   BasicLayout,
   LockScreen,
   Notification,
-  TimezoneButton,
   UserDropdown,
 } from '@vben/layouts';
 import { preferences } from '@vben/preferences';
 import { useAccessStore, useUserStore } from '@vben/stores';
 import { openWindow } from '@vben/utils';
 
-import { message } from 'ant-design-vue';
-
-import { getTimezoneOptionsApi } from '#/api';
 import { $t } from '#/locales';
-import { useAuthStore, useUserProfileStore } from '#/store';
+import { useAuthStore } from '#/store';
 import LoginForm from '#/views/_core/authentication/login.vue';
 
 const notifications = ref<NotificationItem[]>([
@@ -65,32 +60,6 @@ const showDot = computed(() =>
   notifications.value.some((item) => !item.isRead),
 );
 
-const userProfileStore = useUserProfileStore();
-const computedTimezone = computed(() => unref(userProfileStore.timezone));
-
-const timezoneOptions = ref<string[]>([]);
-onMounted(async () => {
-  timezoneOptions.value = ((await getTimezoneOptionsApi()) || []).map(
-    (item) => item.timezone,
-  );
-});
-const handleSetTimezone = async (
-  modalApi: ExtendedModalApi,
-  timezone?: string,
-) => {
-  if (!timezone) {
-    return;
-  }
-  try {
-    modalApi.setState({ confirmLoading: true });
-    await userProfileStore.setTimezone(timezone);
-    message.success($t('ui.widgets.timezone.setSuccess'));
-    modalApi.close();
-  } finally {
-    modalApi.setState({ confirmLoading: false });
-  }
-};
-
 const menus = computed(() => [
   {
     handler: () => {
@@ -178,14 +147,6 @@ watch(
         @make-all="handleMakeAll"
       />
     </template>
-    <template #timezone>
-      <TimezoneButton
-        :ok-handler="handleSetTimezone"
-        :timezone="computedTimezone"
-        :timezone-options="timezoneOptions"
-        name="out"
-      />
-    </template>
     <template #extra>
       <AuthenticationLoginExpiredModal
         v-model:open="accessStore.loginExpired"
diff --git a/apps/web-antd/src/store/index.ts b/apps/web-antd/src/store/index.ts
index 9b27eab9..269586ee 100644
--- a/apps/web-antd/src/store/index.ts
+++ b/apps/web-antd/src/store/index.ts
@@ -1,2 +1 @@
 export * from './auth';
-export * from './user-profile';
diff --git a/apps/web-antd/src/store/user-profile.ts b/apps/web-antd/src/store/user-profile.ts
deleted file mode 100644
index 6c552e4f..00000000
--- a/apps/web-antd/src/store/user-profile.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import { ref } from 'vue';
-
-import { getTimezone, setDefaultTimezone } from '@vben/utils';
-
-import { acceptHMRUpdate, defineStore } from 'pinia';
-
-import { getUserTimezoneApi, setUserTimezoneApi } from '#/api';
-
-const useUserProfileStore = defineStore('user-profile', () => {
-  const timezoneRef = ref(
-    getTimezone() || new Intl.DateTimeFormat().resolvedOptions().timeZone,
-  );
-
-  /**
-   * 设置用户时区
-   * Set the user's timezone
-   * @param timezone 时区字符串
-   */
-  async function setTimezone(timezone: string) {
-    // 保存用户的时区设置
-    await setUserTimezoneApi(timezone);
-    timezoneRef.value = timezone;
-    // 设置dayjs默认时区
-    setDefaultTimezone(timezone);
-  }
-
-  /**
-   * 初始化用户时区
-   * Initialize the user's timezone
-   */
-  async function initTimezone() {
-    // 从服务器获取用户时区
-    const timezone = await getUserTimezoneApi();
-    if (timezone) {
-      timezoneRef.value = timezone;
-      // 设置dayjs默认时区
-      setDefaultTimezone(timezone);
-    }
-  }
-
-  initTimezone().catch((error) => {
-    console.error('Failed to initialize timezone during store setup:', error);
-  });
-
-  return {
-    timezone: timezoneRef,
-    setTimezone,
-    initTimezone,
-  };
-});
-
-export { useUserProfileStore };
-
-// 解决热更新问题
-const hot = import.meta.hot;
-if (hot) {
-  hot.accept(acceptHMRUpdate(useUserProfileStore, hot));
-}
diff --git a/apps/web-ele/src/api/core/index.ts b/apps/web-ele/src/api/core/index.ts
index e5d52a40..28a5aef4 100644
--- a/apps/web-ele/src/api/core/index.ts
+++ b/apps/web-ele/src/api/core/index.ts
@@ -1,4 +1,3 @@
 export * from './auth';
 export * from './menu';
 export * from './user';
-export * from './user-profile';
diff --git a/apps/web-ele/src/api/core/user-profile.ts b/apps/web-ele/src/api/core/user-profile.ts
deleted file mode 100644
index eefa9ab7..00000000
--- a/apps/web-ele/src/api/core/user-profile.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import type { TimezoneOption } from '@vben/types';
-
-import { requestClient } from '#/api/request';
-
-/**
- * 获取系统支持的时区列表
- */
-export async function getTimezoneOptionsApi() {
-  return requestClient.get<TimezoneOption[]>('/profile/timezone');
-}
-/**
- * 获取用户时区
- */
-export async function getUserTimezoneApi(): Promise<null | string | undefined> {
-  return requestClient.get<null | string | undefined>('/user/timezone');
-}
-/**
- * 设置用户时区
- * @param timezone 时区
- */
-export async function setUserTimezoneApi(timezone: string) {
-  return requestClient.post('/user/setTimezone', { timezone });
-}
diff --git a/apps/web-ele/src/layouts/basic.vue b/apps/web-ele/src/layouts/basic.vue
index 5a9984f4..805b8a73 100644
--- a/apps/web-ele/src/layouts/basic.vue
+++ b/apps/web-ele/src/layouts/basic.vue
@@ -1,8 +1,7 @@
 <script lang="ts" setup>
-import type { ExtendedModalApi } from '@vben/common-ui';
 import type { NotificationItem } from '@vben/layouts';
 
-import { computed, onMounted, ref, unref, watch } from 'vue';
+import { computed, ref, watch } from 'vue';
 
 import { AuthenticationLoginExpiredModal } from '@vben/common-ui';
 import { VBEN_DOC_URL, VBEN_GITHUB_URL } from '@vben/constants';
@@ -12,18 +11,14 @@ import {
   BasicLayout,
   LockScreen,
   Notification,
-  TimezoneButton,
   UserDropdown,
 } from '@vben/layouts';
 import { preferences } from '@vben/preferences';
 import { useAccessStore, useUserStore } from '@vben/stores';
 import { openWindow } from '@vben/utils';
 
-import { ElMessage } from 'element-plus';
-
-import { getTimezoneOptionsApi } from '#/api';
 import { $t } from '#/locales';
-import { useAuthStore, useUserProfileStore } from '#/store';
+import { useAuthStore } from '#/store';
 import LoginForm from '#/views/_core/authentication/login.vue';
 
 const notifications = ref<NotificationItem[]>([
@@ -65,32 +60,6 @@ const showDot = computed(() =>
   notifications.value.some((item) => !item.isRead),
 );
 
-const userProfileStore = useUserProfileStore();
-const computedTimezone = computed(() => unref(userProfileStore.timezone));
-
-const timezoneOptions = ref<string[]>([]);
-onMounted(async () => {
-  timezoneOptions.value = ((await getTimezoneOptionsApi()) || []).map(
-    (item) => item.timezone,
-  );
-});
-const handleSetTimezone = async (
-  modalApi: ExtendedModalApi,
-  timezone?: string,
-) => {
-  if (!timezone) {
-    return;
-  }
-  try {
-    modalApi.setState({ confirmLoading: true });
-    await userProfileStore.setTimezone(timezone);
-    ElMessage.success($t('ui.widgets.timezone.setSuccess'));
-    modalApi.close();
-  } finally {
-    modalApi.setState({ confirmLoading: false });
-  }
-};
-
 const menus = computed(() => [
   {
     handler: () => {
@@ -178,14 +147,6 @@ watch(
         @make-all="handleMakeAll"
       />
     </template>
-    <template #timezone>
-      <TimezoneButton
-        :ok-handler="handleSetTimezone"
-        :timezone="computedTimezone"
-        :timezone-options="timezoneOptions"
-        name="out"
-      />
-    </template>
     <template #extra>
       <AuthenticationLoginExpiredModal
         v-model:open="accessStore.loginExpired"
diff --git a/apps/web-ele/src/store/index.ts b/apps/web-ele/src/store/index.ts
index 9b27eab9..269586ee 100644
--- a/apps/web-ele/src/store/index.ts
+++ b/apps/web-ele/src/store/index.ts
@@ -1,2 +1 @@
 export * from './auth';
-export * from './user-profile';
diff --git a/apps/web-ele/src/store/user-profile.ts b/apps/web-ele/src/store/user-profile.ts
deleted file mode 100644
index 6c552e4f..00000000
--- a/apps/web-ele/src/store/user-profile.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import { ref } from 'vue';
-
-import { getTimezone, setDefaultTimezone } from '@vben/utils';
-
-import { acceptHMRUpdate, defineStore } from 'pinia';
-
-import { getUserTimezoneApi, setUserTimezoneApi } from '#/api';
-
-const useUserProfileStore = defineStore('user-profile', () => {
-  const timezoneRef = ref(
-    getTimezone() || new Intl.DateTimeFormat().resolvedOptions().timeZone,
-  );
-
-  /**
-   * 设置用户时区
-   * Set the user's timezone
-   * @param timezone 时区字符串
-   */
-  async function setTimezone(timezone: string) {
-    // 保存用户的时区设置
-    await setUserTimezoneApi(timezone);
-    timezoneRef.value = timezone;
-    // 设置dayjs默认时区
-    setDefaultTimezone(timezone);
-  }
-
-  /**
-   * 初始化用户时区
-   * Initialize the user's timezone
-   */
-  async function initTimezone() {
-    // 从服务器获取用户时区
-    const timezone = await getUserTimezoneApi();
-    if (timezone) {
-      timezoneRef.value = timezone;
-      // 设置dayjs默认时区
-      setDefaultTimezone(timezone);
-    }
-  }
-
-  initTimezone().catch((error) => {
-    console.error('Failed to initialize timezone during store setup:', error);
-  });
-
-  return {
-    timezone: timezoneRef,
-    setTimezone,
-    initTimezone,
-  };
-});
-
-export { useUserProfileStore };
-
-// 解决热更新问题
-const hot = import.meta.hot;
-if (hot) {
-  hot.accept(acceptHMRUpdate(useUserProfileStore, hot));
-}
diff --git a/apps/web-naive/src/api/core/index.ts b/apps/web-naive/src/api/core/index.ts
index e5d52a40..28a5aef4 100644
--- a/apps/web-naive/src/api/core/index.ts
+++ b/apps/web-naive/src/api/core/index.ts
@@ -1,4 +1,3 @@
 export * from './auth';
 export * from './menu';
 export * from './user';
-export * from './user-profile';
diff --git a/apps/web-naive/src/api/core/user-profile.ts b/apps/web-naive/src/api/core/user-profile.ts
deleted file mode 100644
index eefa9ab7..00000000
--- a/apps/web-naive/src/api/core/user-profile.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import type { TimezoneOption } from '@vben/types';
-
-import { requestClient } from '#/api/request';
-
-/**
- * 获取系统支持的时区列表
- */
-export async function getTimezoneOptionsApi() {
-  return requestClient.get<TimezoneOption[]>('/profile/timezone');
-}
-/**
- * 获取用户时区
- */
-export async function getUserTimezoneApi(): Promise<null | string | undefined> {
-  return requestClient.get<null | string | undefined>('/user/timezone');
-}
-/**
- * 设置用户时区
- * @param timezone 时区
- */
-export async function setUserTimezoneApi(timezone: string) {
-  return requestClient.post('/user/setTimezone', { timezone });
-}
diff --git a/apps/web-naive/src/layouts/basic.vue b/apps/web-naive/src/layouts/basic.vue
index f2afcdbb..0e9747be 100644
--- a/apps/web-naive/src/layouts/basic.vue
+++ b/apps/web-naive/src/layouts/basic.vue
@@ -1,8 +1,7 @@
 <script lang="ts" setup>
-import type { ExtendedModalApi } from '@vben/common-ui';
 import type { NotificationItem } from '@vben/layouts';
 
-import { computed, onMounted, ref, unref, watch } from 'vue';
+import { computed, ref, watch } from 'vue';
 
 import { AuthenticationLoginExpiredModal } from '@vben/common-ui';
 import { VBEN_DOC_URL, VBEN_GITHUB_URL } from '@vben/constants';
@@ -12,21 +11,16 @@ import {
   BasicLayout,
   LockScreen,
   Notification,
-  TimezoneButton,
   UserDropdown,
 } from '@vben/layouts';
 import { preferences } from '@vben/preferences';
 import { useAccessStore, useUserStore } from '@vben/stores';
 import { openWindow } from '@vben/utils';
 
-import { useMessage } from 'naive-ui';
-
-import { getTimezoneOptionsApi } from '#/api';
 import { $t } from '#/locales';
-import { useAuthStore, useUserProfileStore } from '#/store';
+import { useAuthStore } from '#/store';
 import LoginForm from '#/views/_core/authentication/login.vue';
 
-const message = useMessage();
 const notifications = ref<NotificationItem[]>([
   {
     avatar: 'https://avatar.vercel.sh/vercel.svg?text=VB',
@@ -66,32 +60,6 @@ const showDot = computed(() =>
   notifications.value.some((item) => !item.isRead),
 );
 
-const userProfileStore = useUserProfileStore();
-const computedTimezone = computed(() => unref(userProfileStore.timezone));
-
-const timezoneOptions = ref<string[]>([]);
-onMounted(async () => {
-  timezoneOptions.value = ((await getTimezoneOptionsApi()) || []).map(
-    (item) => item.timezone,
-  );
-});
-const handleSetTimezone = async (
-  modalApi: ExtendedModalApi,
-  timezone?: string,
-) => {
-  if (!timezone) {
-    return;
-  }
-  try {
-    modalApi.setState({ confirmLoading: true });
-    await userProfileStore.setTimezone(timezone);
-    message.success($t('ui.widgets.timezone.setSuccess'));
-    modalApi.close();
-  } finally {
-    modalApi.setState({ confirmLoading: false });
-  }
-};
-
 const menus = computed(() => [
   {
     handler: () => {
@@ -180,14 +148,6 @@ watch(
         @make-all="handleMakeAll"
       />
     </template>
-    <template #timezone>
-      <TimezoneButton
-        :ok-handler="handleSetTimezone"
-        :timezone="computedTimezone"
-        :timezone-options="timezoneOptions"
-        name="out"
-      />
-    </template>
     <template #extra>
       <AuthenticationLoginExpiredModal
         v-model:open="accessStore.loginExpired"
diff --git a/apps/web-naive/src/store/index.ts b/apps/web-naive/src/store/index.ts
index 9b27eab9..269586ee 100644
--- a/apps/web-naive/src/store/index.ts
+++ b/apps/web-naive/src/store/index.ts
@@ -1,2 +1 @@
 export * from './auth';
-export * from './user-profile';
diff --git a/apps/web-naive/src/store/user-profile.ts b/apps/web-naive/src/store/user-profile.ts
deleted file mode 100644
index 6c552e4f..00000000
--- a/apps/web-naive/src/store/user-profile.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import { ref } from 'vue';
-
-import { getTimezone, setDefaultTimezone } from '@vben/utils';
-
-import { acceptHMRUpdate, defineStore } from 'pinia';
-
-import { getUserTimezoneApi, setUserTimezoneApi } from '#/api';
-
-const useUserProfileStore = defineStore('user-profile', () => {
-  const timezoneRef = ref(
-    getTimezone() || new Intl.DateTimeFormat().resolvedOptions().timeZone,
-  );
-
-  /**
-   * 设置用户时区
-   * Set the user's timezone
-   * @param timezone 时区字符串
-   */
-  async function setTimezone(timezone: string) {
-    // 保存用户的时区设置
-    await setUserTimezoneApi(timezone);
-    timezoneRef.value = timezone;
-    // 设置dayjs默认时区
-    setDefaultTimezone(timezone);
-  }
-
-  /**
-   * 初始化用户时区
-   * Initialize the user's timezone
-   */
-  async function initTimezone() {
-    // 从服务器获取用户时区
-    const timezone = await getUserTimezoneApi();
-    if (timezone) {
-      timezoneRef.value = timezone;
-      // 设置dayjs默认时区
-      setDefaultTimezone(timezone);
-    }
-  }
-
-  initTimezone().catch((error) => {
-    console.error('Failed to initialize timezone during store setup:', error);
-  });
-
-  return {
-    timezone: timezoneRef,
-    setTimezone,
-    initTimezone,
-  };
-});
-
-export { useUserProfileStore };
-
-// 解决热更新问题
-const hot = import.meta.hot;
-if (hot) {
-  hot.accept(acceptHMRUpdate(useUserProfileStore, hot));
-}
diff --git a/packages/@core/base/typings/src/app.d.ts b/packages/@core/base/typings/src/app.d.ts
index d2e86aec..f2b44335 100644
--- a/packages/@core/base/typings/src/app.d.ts
+++ b/packages/@core/base/typings/src/app.d.ts
@@ -93,6 +93,15 @@ type PageTransitionType = 'fade' | 'fade-down' | 'fade-slide' | 'fade-up';
  */
 type AuthPageLayoutType = 'panel-center' | 'panel-left' | 'panel-right';
 
+/**
+ * 时区选项
+ */
+interface TimezoneOption {
+  label: string;
+  offset: number;
+  timezone: string;
+}
+
 export type {
   AccessModeType,
   AuthPageLayoutType,
@@ -108,4 +117,5 @@ export type {
   PreferencesButtonPositionType,
   TabsStyleType,
   ThemeModeType,
+  TimezoneOption,
 };
diff --git a/packages/@core/base/typings/src/index.ts b/packages/@core/base/typings/src/index.ts
index 496fc32b..33c35661 100644
--- a/packages/@core/base/typings/src/index.ts
+++ b/packages/@core/base/typings/src/index.ts
@@ -3,5 +3,4 @@ export type * from './basic';
 export type * from './helper';
 export type * from './menu-record';
 export type * from './tabs';
-export type * from './user-profile';
 export type * from './vue-router';
diff --git a/packages/@core/base/typings/src/user-profile.d.ts b/packages/@core/base/typings/src/user-profile.d.ts
deleted file mode 100644
index 252c9aec..00000000
--- a/packages/@core/base/typings/src/user-profile.d.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * 时区选项
- */
-interface TimezoneOption {
-  offset: number;
-  timezone: string;
-}
-
-export type { TimezoneOption };
diff --git a/packages/@core/preferences/src/constants.ts b/packages/@core/preferences/src/constants.ts
index 430ee3b0..7ec2007d 100644
--- a/packages/@core/preferences/src/constants.ts
+++ b/packages/@core/preferences/src/constants.ts
@@ -1,4 +1,4 @@
-import type { BuiltinThemeType } from '@vben-core/typings';
+import type { BuiltinThemeType, TimezoneOption } from '@vben-core/typings';
 
 interface BuiltinThemePreset {
   color: string;
@@ -81,8 +81,39 @@ const BUILT_IN_THEME_PRESETS: BuiltinThemePreset[] = [
   },
 ];
 
+/**
+ * 时区选项
+ */
+const DEFAULT_TIME_ZONE_OPTIONS: TimezoneOption[] = [
+  {
+    offset: -5,
+    timezone: 'America/New_York',
+    label: 'America/New_York(GMT-5)',
+  },
+  {
+    offset: 0,
+    timezone: 'Europe/London',
+    label: 'Europe/London(GMT0)',
+  },
+  {
+    offset: 8,
+    timezone: 'Asia/Shanghai',
+    label: 'Asia/Shanghai(GMT+8)',
+  },
+  {
+    offset: 9,
+    timezone: 'Asia/Tokyo',
+    label: 'Asia/Tokyo(GMT+9)',
+  },
+  {
+    offset: 9,
+    timezone: 'Asia/Seoul',
+    label: 'Asia/Seoul(GMT+9)',
+  },
+];
+
 export const COLOR_PRESETS = [...BUILT_IN_THEME_PRESETS].slice(0, 7);
 
-export { BUILT_IN_THEME_PRESETS };
+export { BUILT_IN_THEME_PRESETS, DEFAULT_TIME_ZONE_OPTIONS };
 
 export type { BuiltinThemePreset };
diff --git a/packages/effects/layouts/src/basic/header/header.vue b/packages/effects/layouts/src/basic/header/header.vue
index eddceb98..26c92a64 100644
--- a/packages/effects/layouts/src/basic/header/header.vue
+++ b/packages/effects/layouts/src/basic/header/header.vue
@@ -13,6 +13,7 @@ import {
   LanguageToggle,
   PreferencesButton,
   ThemeToggle,
+  TimezoneButton,
 } from '../../widgets';
 
 interface Props {
@@ -172,6 +173,9 @@ function clearPreferencesAndLogout() {
         <template v-else-if="slot.name === 'fullscreen'">
           <VbenFullScreen class="mr-1" />
         </template>
+        <template v-else-if="slot.name === 'timezone'">
+          <TimezoneButton class="mr-1 mt-[2px]" />
+        </template>
       </slot>
     </template>
   </div>
diff --git a/packages/effects/layouts/src/widgets/timezone/timezone-button.vue b/packages/effects/layouts/src/widgets/timezone/timezone-button.vue
index 5a1c8318..78f71933 100644
--- a/packages/effects/layouts/src/widgets/timezone/timezone-button.vue
+++ b/packages/effects/layouts/src/widgets/timezone/timezone-button.vue
@@ -1,10 +1,9 @@
 <script setup lang="ts">
-import type { ExtendedModalApi } from '@vben-core/popup-ui';
-
-import { ref, unref, watch } from 'vue';
+import { ref, unref } from 'vue';
 
 import { createIconifyIcon } from '@vben/icons';
 import { $t } from '@vben/locales';
+import { useTimezoneStore } from '@vben/stores';
 
 import { useVbenModal } from '@vben-core/popup-ui';
 import {
@@ -13,42 +12,43 @@ import {
   VbenIconButton,
 } from '@vben-core/shadcn-ui';
 
-interface Props {
-  timezoneOptions: string[];
-  okHandler?: (
-    modalApi: ExtendedModalApi,
-    timezone?: string,
-  ) => Promise<void> | void;
-  timezone?: string;
-}
-
-const props = defineProps<Props>();
-const emit = defineEmits<{ change: [string] }>();
-
 const TimezoneIcon = createIconifyIcon('fluent-mdl2:world-clock');
 
+const timezoneStore = useTimezoneStore();
+
+const timezoneRef = ref<null | string>(null);
+
+const timezoneOptionsRef = ref<
+  {
+    label: string;
+    value: string;
+  }[]
+>([]);
+
 const [Modal, modalApi] = useVbenModal({
   fullscreenButton: false,
-  onConfirm: () => {
-    props.okHandler?.(modalApi, unref(timezoneValue));
+  onConfirm: async () => {
+    try {
+      modalApi.setState({ confirmLoading: true });
+      if (timezoneRef.value) {
+        await timezoneStore.setTimezone(unref(timezoneRef));
+      }
+      modalApi.close();
+    } finally {
+      modalApi.setState({ confirmLoading: false });
+    }
+  },
+  async onOpenChange(isOpen) {
+    if (isOpen) {
+      timezoneRef.value = unref(timezoneStore.timezone);
+      timezoneOptionsRef.value = await timezoneStore.getTimezoneOptions();
+    }
   },
 });
 
 const handleClick = () => {
   modalApi.open();
 };
-
-const timezoneValue = ref<string | undefined>(unref(props.timezone));
-watch(
-  () => props.timezone,
-  (newTimezone) => {
-    timezoneValue.value = unref(newTimezone);
-  },
-);
-const handleClickItem = (timezone: string) => {
-  timezoneValue.value = timezone;
-  emit('change', timezone);
-};
 </script>
 
 <template>
@@ -62,15 +62,16 @@ const handleClickItem = (timezone: string) => {
     </VbenIconButton>
     <Modal :title="$t('ui.widgets.timezone.setTimezone')">
       <div class="timezone-container">
-        <RadioGroup v-model="timezoneValue" class="flex flex-col gap-2">
+        <RadioGroup v-model="timezoneRef" class="flex flex-col gap-2">
           <div
             class="flex cursor-pointer items-center gap-2"
-            v-for="item in props.timezoneOptions"
-            :key="`container${item}`"
-            @click="handleClickItem(item)"
+            v-for="item in timezoneOptionsRef"
+            :key="`container${item.value}`"
           >
-            <RadioGroupItem :id="item" :value="item" />
-            <label :for="item" class="cursor-pointer">{{ item }}</label>
+            <RadioGroupItem :id="item.value" :value="item.value" />
+            <label :for="item.value" class="cursor-pointer">{{
+              item.label
+            }}</label>
           </div>
         </RadioGroup>
       </div>
diff --git a/packages/stores/src/modules/index.ts b/packages/stores/src/modules/index.ts
index ec764ae8..bb9a66f4 100644
--- a/packages/stores/src/modules/index.ts
+++ b/packages/stores/src/modules/index.ts
@@ -1,3 +1,4 @@
 export * from './access';
 export * from './tabbar';
+export * from './timezone';
 export * from './user';
diff --git a/packages/stores/src/modules/timezone.ts b/packages/stores/src/modules/timezone.ts
new file mode 100644
index 00000000..31904aef
--- /dev/null
+++ b/packages/stores/src/modules/timezone.ts
@@ -0,0 +1,125 @@
+import { ref, unref } from 'vue';
+
+import { DEFAULT_TIME_ZONE_OPTIONS } from '@vben-core/preferences';
+import { getTimezone, setDefaultTimezone } from '@vben-core/shared/utils';
+
+import { acceptHMRUpdate, defineStore } from 'pinia';
+
+interface TimezoneHandler {
+  getTimezone?: () => Promise<null | string | undefined>;
+  getTimezoneOptions?: () => Promise<
+    {
+      label: string;
+      value: string;
+    }[]
+  >;
+  onTimezoneChange?: (timezone: string) => Promise<void>;
+}
+
+/**
+ * 默认时区处理模块
+ * 时区存储基于pinia存储插件
+ */
+const getDefaultTimezoneHandler = (): TimezoneHandler => {
+  return {
+    getTimezoneOptions: () => {
+      return Promise.resolve(
+        DEFAULT_TIME_ZONE_OPTIONS.map((item) => {
+          return {
+            label: item.label,
+            value: item.timezone,
+          };
+        }),
+      );
+    },
+  };
+};
+
+/**
+ * 自定义时区处理模块
+ */
+let customTimezoneHandler: null | Partial<TimezoneHandler> = null;
+const setTimezoneHandler = (handler: Partial<TimezoneHandler>) => {
+  customTimezoneHandler = handler;
+};
+
+/**
+ * 获取时区处理模块
+ */
+const getTimezoneHandler = () => {
+  return {
+    ...getDefaultTimezoneHandler(),
+    ...customTimezoneHandler,
+  };
+};
+
+/**
+ * timezone支持模块
+ */
+const useTimezoneStore = defineStore(
+  'core-timezone',
+  () => {
+    const timezoneRef = ref(
+      getTimezone() || new Intl.DateTimeFormat().resolvedOptions().timeZone,
+    );
+
+    const timezoneHandler = getTimezoneHandler();
+
+    /**
+     * 初始化时区
+     * Initialize the timezone
+     */
+    async function initTimezone() {
+      const timezone = await timezoneHandler.getTimezone?.();
+      if (timezone) {
+        timezoneRef.value = timezone;
+      }
+      // 设置dayjs默认时区
+      setDefaultTimezone(unref(timezoneRef));
+    }
+
+    /**
+     * 设置时区
+     * Set the timezone
+     * @param timezone 时区字符串
+     */
+    async function setTimezone(timezone: string) {
+      await timezoneHandler.onTimezoneChange?.(timezone);
+      timezoneRef.value = timezone;
+      // 设置dayjs默认时区
+      setDefaultTimezone(timezone);
+    }
+
+    /**
+     * 获取时区选项
+     * Get the timezone options
+     */
+    async function getTimezoneOptions() {
+      return await timezoneHandler.getTimezoneOptions();
+    }
+
+    initTimezone().catch((error) => {
+      console.error('Failed to initialize timezone during store setup:', error);
+    });
+
+    return {
+      timezone: timezoneRef,
+      setTimezone,
+      getTimezoneOptions,
+    };
+  },
+  {
+    persist: {
+      // 持久化
+      pick: ['timezone'],
+    },
+  },
+);
+
+export { setTimezoneHandler, useTimezoneStore };
+
+// 解决热更新问题
+const hot = import.meta.hot;
+if (hot) {
+  hot.accept(acceptHMRUpdate(useTimezoneStore, hot));
+}
diff --git a/playground/src/api/core/index.ts b/playground/src/api/core/index.ts
index 28a5aef4..7134366b 100644
--- a/playground/src/api/core/index.ts
+++ b/playground/src/api/core/index.ts
@@ -1,3 +1,4 @@
 export * from './auth';
 export * from './menu';
+export * from './timezone';
 export * from './user';
diff --git a/playground/src/api/core/timezone.ts b/playground/src/api/core/timezone.ts
new file mode 100644
index 00000000..c21f808d
--- /dev/null
+++ b/playground/src/api/core/timezone.ts
@@ -0,0 +1,30 @@
+import type { TimezoneOption } from '@vben/types';
+
+import { requestClient } from '#/api/request';
+
+/**
+ * 获取系统支持的时区列表
+ */
+export async function getTimezoneOptionsApi() {
+  const dataList =
+    (await requestClient.get<TimezoneOption[]>(
+      '/timezone/getTimezoneOptions',
+    )) || [];
+  return dataList.map((item) => ({
+    label: item.timezone,
+    value: item.timezone,
+  }));
+}
+/**
+ * 获取用户时区
+ */
+export async function getTimezoneApi(): Promise<null | string | undefined> {
+  return requestClient.get<null | string | undefined>('/timezone/getTimezone');
+}
+/**
+ * 设置用户时区
+ * @param timezone 时区
+ */
+export async function setTimezoneApi(timezone: string) {
+  return requestClient.post('/timezone/setTimezone', { timezone });
+}
diff --git a/playground/src/bootstrap.ts b/playground/src/bootstrap.ts
index f0a668b4..fed07340 100644
--- a/playground/src/bootstrap.ts
+++ b/playground/src/bootstrap.ts
@@ -15,6 +15,7 @@ import { router } from '#/router';
 import { initComponentAdapter } from './adapter/component';
 import { initSetupVbenForm } from './adapter/form';
 import App from './app.vue';
+import { initTimezone } from './timezone-init';
 
 async function bootstrap(namespace: string) {
   // 初始化组件适配器
@@ -46,6 +47,9 @@ async function bootstrap(namespace: string) {
   // 配置 pinia-tore
   await initStores(app, { namespace });
 
+  // 初始化时区HANDLER
+  initTimezone();
+
   // 安装权限指令
   registerAccessDirective(app);
 
diff --git a/playground/src/timezone-init.ts b/playground/src/timezone-init.ts
new file mode 100644
index 00000000..1d82bd47
--- /dev/null
+++ b/playground/src/timezone-init.ts
@@ -0,0 +1,20 @@
+import { setTimezoneHandler } from '@vben/stores';
+
+import { getTimezoneApi, getTimezoneOptionsApi, setTimezoneApi } from '#/api';
+
+/**
+ * 初始化时区处理，通过API保存时区设置
+ */
+export function initTimezone() {
+  setTimezoneHandler({
+    getTimezone() {
+      return getTimezoneApi();
+    },
+    setTimezone(timezone: string) {
+      return setTimezoneApi(timezone);
+    },
+    getTimezoneOptions() {
+      return getTimezoneOptionsApi();
+    },
+  });
+}