From 0a8339a405209adb2c2dc85d8bd968adfd22e9f2 Mon Sep 17 00:00:00 2001
From: zhongming4762 <zhongming4762@hotmail.com>
Date: Wed, 22 Oct 2025 19:52:01 +0800
Subject: [PATCH 01/23] feat: increase support for multiple time zones

---
 apps/backend-mock/api/profile/timezone.ts     |  7 ++
 apps/backend-mock/api/user/setTimezone.ts     | 14 +++
 apps/backend-mock/api/user/timezone.ts        | 12 +++
 apps/backend-mock/utils/mock-data.ts          | 31 +++++++
 apps/backend-mock/utils/timezone-utils.ts     | 10 +++
 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           | 40 ++++++++-
 apps/web-antd/src/store/index.ts              |  1 +
 apps/web-antd/src/store/user-profile.ts       | 56 ++++++++++++
 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            | 40 ++++++++-
 apps/web-ele/src/store/index.ts               |  1 +
 apps/web-ele/src/store/user-profile.ts        | 56 ++++++++++++
 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          | 41 ++++++++-
 apps/web-naive/src/store/index.ts             |  1 +
 apps/web-naive/src/store/user-profile.ts      | 56 ++++++++++++
 packages/@core/base/shared/src/utils/date.ts  | 23 ++++-
 packages/@core/base/typings/src/index.ts      |  1 +
 .../@core/base/typings/src/user-profile.d.ts  |  9 ++
 packages/@core/preferences/src/config.ts      |  1 +
 packages/@core/preferences/src/types.ts       |  2 +
 .../layouts/src/basic/header/header.vue       | 10 ++-
 packages/effects/layouts/src/basic/layout.vue |  3 +
 packages/effects/layouts/src/widgets/index.ts |  1 +
 .../layouts/src/widgets/timezone/index.ts     |  1 +
 .../src/widgets/timezone/timezone-button.vue  | 89 +++++++++++++++++++
 packages/locales/src/langs/en-US/ui.json      |  4 +
 packages/locales/src/langs/zh-CN/ui.json      |  4 +
 32 files changed, 577 insertions(+), 9 deletions(-)
 create mode 100644 apps/backend-mock/api/profile/timezone.ts
 create mode 100644 apps/backend-mock/api/user/setTimezone.ts
 create mode 100644 apps/backend-mock/api/user/timezone.ts
 create mode 100644 apps/backend-mock/utils/timezone-utils.ts
 create mode 100644 apps/web-antd/src/api/core/user-profile.ts
 create mode 100644 apps/web-antd/src/store/user-profile.ts
 create mode 100644 apps/web-ele/src/api/core/user-profile.ts
 create mode 100644 apps/web-ele/src/store/user-profile.ts
 create mode 100644 apps/web-naive/src/api/core/user-profile.ts
 create mode 100644 apps/web-naive/src/store/user-profile.ts
 create mode 100644 packages/@core/base/typings/src/user-profile.d.ts
 create mode 100644 packages/effects/layouts/src/widgets/timezone/index.ts
 create mode 100644 packages/effects/layouts/src/widgets/timezone/timezone-button.vue

diff --git a/apps/backend-mock/api/profile/timezone.ts b/apps/backend-mock/api/profile/timezone.ts
new file mode 100644
index 00000000..20b54ca8
--- /dev/null
+++ b/apps/backend-mock/api/profile/timezone.ts
@@ -0,0 +1,7 @@
+import { eventHandler } from 'h3';
+import { TIME_ZONE_OPTIONS } from '~/utils/mock-data';
+import { useResponseSuccess } from '~/utils/response';
+
+export default eventHandler(() => {
+  return useResponseSuccess(TIME_ZONE_OPTIONS);
+});
diff --git a/apps/backend-mock/api/user/setTimezone.ts b/apps/backend-mock/api/user/setTimezone.ts
new file mode 100644
index 00000000..2265e3cb
--- /dev/null
+++ b/apps/backend-mock/api/user/setTimezone.ts
@@ -0,0 +1,14 @@
+import { eventHandler, readBody } from 'h3';
+import { verifyAccessToken } from '~/utils/jwt-utils';
+import { unAuthorizedResponse, useResponseSuccess } from '~/utils/response';
+import { setTimezone } from '~/utils/timezone-utils';
+
+export default eventHandler(async (event) => {
+  const userinfo = verifyAccessToken(event);
+  if (!userinfo) {
+    return unAuthorizedResponse(event);
+  }
+  const { timezone } = await readBody(event);
+  setTimezone(timezone);
+  return useResponseSuccess();
+});
diff --git a/apps/backend-mock/api/user/timezone.ts b/apps/backend-mock/api/user/timezone.ts
new file mode 100644
index 00000000..0cbcb6ec
--- /dev/null
+++ b/apps/backend-mock/api/user/timezone.ts
@@ -0,0 +1,12 @@
+import { eventHandler } from 'h3';
+import { verifyAccessToken } from '~/utils/jwt-utils';
+import { unAuthorizedResponse, useResponseSuccess } from '~/utils/response';
+import { getTimezone } from '~/utils/timezone-utils';
+
+export default eventHandler((event) => {
+  const userinfo = verifyAccessToken(event);
+  if (!userinfo) {
+    return unAuthorizedResponse(event);
+  }
+  return useResponseSuccess(getTimezone());
+});
diff --git a/apps/backend-mock/utils/mock-data.ts b/apps/backend-mock/utils/mock-data.ts
index 192f30a0..5c534437 100644
--- a/apps/backend-mock/utils/mock-data.ts
+++ b/apps/backend-mock/utils/mock-data.ts
@@ -7,6 +7,11 @@ export interface UserInfo {
   homePath?: string;
 }
 
+export interface TimeZoneOption {
+  offset: number;
+  timeZone: string;
+}
+
 export const MOCK_USERS: UserInfo[] = [
   {
     id: 0,
@@ -388,3 +393,29 @@ export function getMenuIds(menus: any[]) {
   });
   return ids;
 }
+
+/**
+ * 时区选项
+ */
+export const TIME_ZONE_OPTIONS: TimeZoneOption[] = [
+  {
+    offset: -5,
+    timezone: 'America/New_York',
+  },
+  {
+    offset: 0,
+    timezone: 'Europe/London',
+  },
+  {
+    offset: 8,
+    timezone: 'Asia/Shanghai',
+  },
+  {
+    offset: 9,
+    timezone: 'Asia/Tokyo',
+  },
+  {
+    offset: 9,
+    timezone: 'Asia/Seoul',
+  },
+];
diff --git a/apps/backend-mock/utils/timezone-utils.ts b/apps/backend-mock/utils/timezone-utils.ts
new file mode 100644
index 00000000..87d244ad
--- /dev/null
+++ b/apps/backend-mock/utils/timezone-utils.ts
@@ -0,0 +1,10 @@
+let mockTimeZone: null | string = null;
+
+export const setTimezone = (timeZone: string) => {
+  mockTimeZone = timeZone;
+};
+
+export const getTimezone = () => {
+  console.log('mockTimeZone', mockTimeZone);
+  return mockTimeZone;
+};
diff --git a/apps/web-antd/src/api/core/index.ts b/apps/web-antd/src/api/core/index.ts
index 28a5aef4..e5d52a40 100644
--- a/apps/web-antd/src/api/core/index.ts
+++ b/apps/web-antd/src/api/core/index.ts
@@ -1,3 +1,4 @@
 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
new file mode 100644
index 00000000..eefa9ab7
--- /dev/null
+++ b/apps/web-antd/src/api/core/user-profile.ts
@@ -0,0 +1,23 @@
+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 805b8a73..37c5ec26 100644
--- a/apps/web-antd/src/layouts/basic.vue
+++ b/apps/web-antd/src/layouts/basic.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup>
+import type { ExtendedModalApi } from '@vben/common-ui';
 import type { NotificationItem } from '@vben/layouts';
 
-import { computed, ref, watch } from 'vue';
+import { computed, onMounted, ref, watch } from 'vue';
 
 import { AuthenticationLoginExpiredModal } from '@vben/common-ui';
 import { VBEN_DOC_URL, VBEN_GITHUB_URL } from '@vben/constants';
@@ -11,14 +12,18 @@ 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 } from '#/store';
+import { useAuthStore, useUserProfileStore } from '#/store';
 import LoginForm from '#/views/_core/authentication/login.vue';
 
 const notifications = ref<NotificationItem[]>([
@@ -60,6 +65,29 @@ const showDot = computed(() =>
   notifications.value.some((item) => !item.isRead),
 );
 
+const userProfileStore = useUserProfileStore();
+const computedTimezone = computed(() => userProfileStore.timezone);
+
+const timezoneOptions = ref<string[]>([]);
+onMounted(async () => {
+  timezoneOptions.value = ((await getTimezoneOptionsApi()) || []).map(
+    (item) => item.timezone,
+  );
+});
+const handleSetTimezone = async (
+  timezone: string,
+  modalApi: ExtendedModalApi,
+) => {
+  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: () => {
@@ -147,6 +175,14 @@ 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 269586ee..9b27eab9 100644
--- a/apps/web-antd/src/store/index.ts
+++ b/apps/web-antd/src/store/index.ts
@@ -1 +1,2 @@
 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
new file mode 100644
index 00000000..02cb5b4a
--- /dev/null
+++ b/apps/web-antd/src/store/user-profile.ts
@@ -0,0 +1,56 @@
+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) {
+    timezoneRef.value = timezone;
+    // 设置dayjs默认时区
+    setDefaultTimezone(timezone);
+    // 保存用户的时区设置
+    await setUserTimezoneApi(timezone);
+  }
+
+  /**
+   * 初始化用户时区
+   * Initialize the user's timezone
+   */
+  async function initTimezone() {
+    // 从服务器获取用户时区
+    const timezone = await getUserTimezoneApi();
+    if (timezone) {
+      timezoneRef.value = timezone;
+      // 设置dayjs默认时区
+      setDefaultTimezone(timezone);
+    }
+  }
+
+  initTimezone();
+
+  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 28a5aef4..e5d52a40 100644
--- a/apps/web-ele/src/api/core/index.ts
+++ b/apps/web-ele/src/api/core/index.ts
@@ -1,3 +1,4 @@
 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
new file mode 100644
index 00000000..eefa9ab7
--- /dev/null
+++ b/apps/web-ele/src/api/core/user-profile.ts
@@ -0,0 +1,23 @@
+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 805b8a73..6f775b91 100644
--- a/apps/web-ele/src/layouts/basic.vue
+++ b/apps/web-ele/src/layouts/basic.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup>
+import type { ExtendedModalApi } from '@vben/common-ui';
 import type { NotificationItem } from '@vben/layouts';
 
-import { computed, ref, watch } from 'vue';
+import { computed, onMounted, ref, watch } from 'vue';
 
 import { AuthenticationLoginExpiredModal } from '@vben/common-ui';
 import { VBEN_DOC_URL, VBEN_GITHUB_URL } from '@vben/constants';
@@ -11,14 +12,18 @@ 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 } from '#/store';
+import { useAuthStore, useUserProfileStore } from '#/store';
 import LoginForm from '#/views/_core/authentication/login.vue';
 
 const notifications = ref<NotificationItem[]>([
@@ -60,6 +65,29 @@ const showDot = computed(() =>
   notifications.value.some((item) => !item.isRead),
 );
 
+const userProfileStore = useUserProfileStore();
+const computedTimezone = computed(() => userProfileStore.timezone);
+
+const timezoneOptions = ref<string[]>([]);
+onMounted(async () => {
+  timezoneOptions.value = ((await getTimezoneOptionsApi()) || []).map(
+    (item) => item.timezone,
+  );
+});
+const handleSetTimezone = async (
+  timezone: string,
+  modalApi: ExtendedModalApi,
+) => {
+  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: () => {
@@ -147,6 +175,14 @@ 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 269586ee..9b27eab9 100644
--- a/apps/web-ele/src/store/index.ts
+++ b/apps/web-ele/src/store/index.ts
@@ -1 +1,2 @@
 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
new file mode 100644
index 00000000..02cb5b4a
--- /dev/null
+++ b/apps/web-ele/src/store/user-profile.ts
@@ -0,0 +1,56 @@
+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) {
+    timezoneRef.value = timezone;
+    // 设置dayjs默认时区
+    setDefaultTimezone(timezone);
+    // 保存用户的时区设置
+    await setUserTimezoneApi(timezone);
+  }
+
+  /**
+   * 初始化用户时区
+   * Initialize the user's timezone
+   */
+  async function initTimezone() {
+    // 从服务器获取用户时区
+    const timezone = await getUserTimezoneApi();
+    if (timezone) {
+      timezoneRef.value = timezone;
+      // 设置dayjs默认时区
+      setDefaultTimezone(timezone);
+    }
+  }
+
+  initTimezone();
+
+  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 28a5aef4..e5d52a40 100644
--- a/apps/web-naive/src/api/core/index.ts
+++ b/apps/web-naive/src/api/core/index.ts
@@ -1,3 +1,4 @@
 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
new file mode 100644
index 00000000..eefa9ab7
--- /dev/null
+++ b/apps/web-naive/src/api/core/user-profile.ts
@@ -0,0 +1,23 @@
+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 0e9747be..cac3e7de 100644
--- a/apps/web-naive/src/layouts/basic.vue
+++ b/apps/web-naive/src/layouts/basic.vue
@@ -1,7 +1,8 @@
 <script lang="ts" setup>
+import type { ExtendedModalApi } from '@vben/common-ui';
 import type { NotificationItem } from '@vben/layouts';
 
-import { computed, ref, watch } from 'vue';
+import { computed, onMounted, ref, watch } from 'vue';
 
 import { AuthenticationLoginExpiredModal } from '@vben/common-ui';
 import { VBEN_DOC_URL, VBEN_GITHUB_URL } from '@vben/constants';
@@ -11,16 +12,21 @@ 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 } from '#/store';
+import { useAuthStore, useUserProfileStore } 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',
@@ -60,6 +66,29 @@ const showDot = computed(() =>
   notifications.value.some((item) => !item.isRead),
 );
 
+const userProfileStore = useUserProfileStore();
+const computedTimezone = computed(() => userProfileStore.timezone);
+
+const timezoneOptions = ref<string[]>([]);
+onMounted(async () => {
+  timezoneOptions.value = ((await getTimezoneOptionsApi()) || []).map(
+    (item) => item.timezone,
+  );
+});
+const handleSetTimezone = async (
+  timezone: string,
+  modalApi: ExtendedModalApi,
+) => {
+  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: () => {
@@ -148,6 +177,14 @@ 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 269586ee..9b27eab9 100644
--- a/apps/web-naive/src/store/index.ts
+++ b/apps/web-naive/src/store/index.ts
@@ -1 +1,2 @@
 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
new file mode 100644
index 00000000..02cb5b4a
--- /dev/null
+++ b/apps/web-naive/src/store/user-profile.ts
@@ -0,0 +1,56 @@
+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) {
+    timezoneRef.value = timezone;
+    // 设置dayjs默认时区
+    setDefaultTimezone(timezone);
+    // 保存用户的时区设置
+    await setUserTimezoneApi(timezone);
+  }
+
+  /**
+   * 初始化用户时区
+   * Initialize the user's timezone
+   */
+  async function initTimezone() {
+    // 从服务器获取用户时区
+    const timezone = await getUserTimezoneApi();
+    if (timezone) {
+      timezoneRef.value = timezone;
+      // 设置dayjs默认时区
+      setDefaultTimezone(timezone);
+    }
+  }
+
+  initTimezone();
+
+  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/shared/src/utils/date.ts b/packages/@core/base/shared/src/utils/date.ts
index 3736b9ad..4b80308b 100644
--- a/packages/@core/base/shared/src/utils/date.ts
+++ b/packages/@core/base/shared/src/utils/date.ts
@@ -1,4 +1,9 @@
 import dayjs from 'dayjs';
+import timezone from 'dayjs/plugin/timezone';
+import utc from 'dayjs/plugin/utc';
+
+dayjs.extend(utc);
+dayjs.extend(timezone);
 
 export function formatDate(time: number | string, format = 'YYYY-MM-DD') {
   try {
@@ -6,7 +11,7 @@ export function formatDate(time: number | string, format = 'YYYY-MM-DD') {
     if (!date.isValid()) {
       throw new Error('Invalid date');
     }
-    return date.format(format);
+    return date.tz().format(format);
   } catch (error) {
     console.error(`Error formatting date: ${error}`);
     return time;
@@ -24,3 +29,19 @@ export function isDate(value: any): value is Date {
 export function isDayjsObject(value: any): value is dayjs.Dayjs {
   return dayjs.isDayjs(value);
 }
+
+/**
+ * 设置默认时区
+ * @param timezone
+ */
+export const setDefaultTimezone = (timezone?: string) => {
+  timezone ? dayjs.tz.setDefault(timezone) : dayjs.tz.setDefault();
+};
+
+/**
+ * 获取当前时区
+ * @returns 当前时区
+ */
+export const getTimezone = () => {
+  return dayjs.tz.guess();
+};
diff --git a/packages/@core/base/typings/src/index.ts b/packages/@core/base/typings/src/index.ts
index 33c35661..496fc32b 100644
--- a/packages/@core/base/typings/src/index.ts
+++ b/packages/@core/base/typings/src/index.ts
@@ -3,4 +3,5 @@ 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
new file mode 100644
index 00000000..252c9aec
--- /dev/null
+++ b/packages/@core/base/typings/src/user-profile.d.ts
@@ -0,0 +1,9 @@
+/**
+ * 时区选项
+ */
+interface TimezoneOption {
+  offset: number;
+  timezone: string;
+}
+
+export type { TimezoneOption };
diff --git a/packages/@core/preferences/src/config.ts b/packages/@core/preferences/src/config.ts
index b8b7212a..5b8d7236 100644
--- a/packages/@core/preferences/src/config.ts
+++ b/packages/@core/preferences/src/config.ts
@@ -134,6 +134,7 @@ const defaultPreferences: Preferences = {
     refresh: true,
     sidebarToggle: true,
     themeToggle: true,
+    timezone: true,
   },
 };
 
diff --git a/packages/@core/preferences/src/types.ts b/packages/@core/preferences/src/types.ts
index 0c90da80..584e919f 100644
--- a/packages/@core/preferences/src/types.ts
+++ b/packages/@core/preferences/src/types.ts
@@ -275,6 +275,8 @@ interface WidgetPreferences {
   sidebarToggle: boolean;
   /** 是否显示主题切换部件 */
   themeToggle: boolean;
+  /** 是否显示时区部件 */
+  timezone: boolean;
 }
 
 interface Preferences {
diff --git a/packages/effects/layouts/src/basic/header/header.vue b/packages/effects/layouts/src/basic/header/header.vue
index 7a8cc857..eddceb98 100644
--- a/packages/effects/layouts/src/basic/header/header.vue
+++ b/packages/effects/layouts/src/basic/header/header.vue
@@ -66,15 +66,21 @@ const rightSlots = computed(() => {
       name: 'language-toggle',
     });
   }
-  if (preferences.widget.fullscreen) {
+  if (preferences.widget.timezone) {
     list.push({
       index: REFERENCE_VALUE + 40,
+      name: 'timezone',
+    });
+  }
+  if (preferences.widget.fullscreen) {
+    list.push({
+      index: REFERENCE_VALUE + 50,
       name: 'fullscreen',
     });
   }
   if (preferences.widget.notification) {
     list.push({
-      index: REFERENCE_VALUE + 50,
+      index: REFERENCE_VALUE + 60,
       name: 'notification',
     });
   }
diff --git a/packages/effects/layouts/src/basic/layout.vue b/packages/effects/layouts/src/basic/layout.vue
index 35f28c1d..6644e8a9 100644
--- a/packages/effects/layouts/src/basic/layout.vue
+++ b/packages/effects/layouts/src/basic/layout.vue
@@ -302,6 +302,9 @@ const headerSlots = computed(() => {
         <template #notification>
           <slot name="notification"></slot>
         </template>
+        <template #timezone>
+          <slot name="timezone"></slot>
+        </template>
         <template v-for="item in headerSlots" #[item]>
           <slot :name="item"></slot>
         </template>
diff --git a/packages/effects/layouts/src/widgets/index.ts b/packages/effects/layouts/src/widgets/index.ts
index f6a4a7ba..0f9e11a9 100644
--- a/packages/effects/layouts/src/widgets/index.ts
+++ b/packages/effects/layouts/src/widgets/index.ts
@@ -8,4 +8,5 @@ export * from './lock-screen';
 export * from './notification';
 export * from './preferences';
 export * from './theme-toggle';
+export * from './timezone';
 export * from './user-dropdown';
diff --git a/packages/effects/layouts/src/widgets/timezone/index.ts b/packages/effects/layouts/src/widgets/timezone/index.ts
new file mode 100644
index 00000000..eef486dd
--- /dev/null
+++ b/packages/effects/layouts/src/widgets/timezone/index.ts
@@ -0,0 +1 @@
+export { default as TimezoneButton } from './timezone-button.vue';
diff --git a/packages/effects/layouts/src/widgets/timezone/timezone-button.vue b/packages/effects/layouts/src/widgets/timezone/timezone-button.vue
new file mode 100644
index 00000000..cc2fd3fe
--- /dev/null
+++ b/packages/effects/layouts/src/widgets/timezone/timezone-button.vue
@@ -0,0 +1,89 @@
+<script setup lang="ts">
+import type { ExtendedModalApi } from '@vben-core/popup-ui';
+
+import { ref, unref, watch } from 'vue';
+
+import { createIconifyIcon } from '@vben/icons';
+import { $t } from '@vben/locales';
+
+import { useVbenModal } from '@vben-core/popup-ui';
+import {
+  RadioGroup,
+  RadioGroupItem,
+  VbenIconButton,
+} from '@vben-core/shadcn-ui';
+
+interface Props {
+  timezoneOptions: string[];
+  okHandler?: (
+    timezone: string,
+    modalApi: ExtendedModalApi,
+  ) => Promise<void> | void;
+  timezone?: string;
+}
+
+interface Listener {
+  change: (timezone: string) => void;
+}
+
+const props = defineProps<Props>();
+const emit = defineEmits<Listener>();
+
+const TimezoneIcon = createIconifyIcon('fluent-mdl2:world-clock');
+
+const [Modal, modalApi] = useVbenModal({
+  fullscreenButton: false,
+  onConfirm: () => {
+    props.okHandler?.(unref(timezoneValue), modalApi);
+  },
+});
+
+const handleClick = () => {
+  modalApi.open();
+};
+
+const timezoneValue = ref(props.timezone);
+watch(
+  () => props.timezone,
+  (newTimezone) => {
+    timezoneValue.value = newTimezone;
+  },
+);
+const handleClickItem = (timezone: string) => {
+  timezoneValue.value = timezone;
+  emit('change', timezone);
+};
+</script>
+
+<template>
+  <div>
+    <VbenIconButton
+      :tooltip="$t('ui.widgets.timezone.setTimezone')"
+      class="hover:animate-[shrink_0.3s_ease-in-out]"
+      @click="handleClick"
+    >
+      <TimezoneIcon class="text-foreground size-4" />
+    </VbenIconButton>
+    <Modal :title="$t('ui.widgets.timezone.setTimezone')">
+      <div class="timezone-container">
+        <RadioGroup v-model="timezoneValue" 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)"
+          >
+            <RadioGroupItem :id="item" :value="item" />
+            <label class="cursor-pointer">{{ item }}</label>
+          </div>
+        </RadioGroup>
+      </div>
+    </Modal>
+  </div>
+</template>
+
+<style scoped>
+.container {
+  padding-left: 20px;
+}
+</style>
diff --git a/packages/locales/src/langs/en-US/ui.json b/packages/locales/src/langs/en-US/ui.json
index 0179c225..f920ee33 100644
--- a/packages/locales/src/langs/en-US/ui.json
+++ b/packages/locales/src/langs/en-US/ui.json
@@ -102,6 +102,10 @@
       "errorPasswordTip": "Password error, please re-enter",
       "backToLogin": "Back to login",
       "entry": "Enter the system"
+    },
+    "timezone": {
+      "setTimezone": "Set Timezone",
+      "setSuccess": "Timezone set successfully"
     }
   }
 }
diff --git a/packages/locales/src/langs/zh-CN/ui.json b/packages/locales/src/langs/zh-CN/ui.json
index da2dbeb0..3433bcb5 100644
--- a/packages/locales/src/langs/zh-CN/ui.json
+++ b/packages/locales/src/langs/zh-CN/ui.json
@@ -102,6 +102,10 @@
       "errorPasswordTip": "密码错误，请重新输入",
       "backToLogin": "返回登录",
       "entry": "进入系统"
+    },
+    "timezone": {
+      "setTimezone": "设置时区",
+      "setSuccess": "时区设置成功"
     }
   }
 }

From b029f77b6ad3295b91056dc91dc3b43b339ba4fd Mon Sep 17 00:00:00 2001
From: zhongming4762 <zhongming4762@hotmail.com>
Date: Wed, 22 Oct 2025 20:18:25 +0800
Subject: [PATCH 02/23] feat: increase support for multiple time zones

---
 apps/backend-mock/utils/timezone-utils.ts              |  1 -
 apps/web-antd/src/layouts/basic.vue                    |  9 ++++++---
 apps/web-antd/src/store/user-profile.ts                |  4 ++--
 apps/web-ele/src/layouts/basic.vue                     |  9 ++++++---
 apps/web-ele/src/store/user-profile.ts                 |  4 ++--
 apps/web-naive/src/layouts/basic.vue                   |  9 ++++++---
 apps/web-naive/src/store/user-profile.ts               |  4 ++--
 .../__tests__/__snapshots__/config.test.ts.snap        |  3 +++
 .../layouts/src/widgets/timezone/timezone-button.vue   | 10 +++++-----
 packages/effects/plugins/src/echarts/use-echarts.ts    |  2 +-
 10 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/apps/backend-mock/utils/timezone-utils.ts b/apps/backend-mock/utils/timezone-utils.ts
index 87d244ad..da35f920 100644
--- a/apps/backend-mock/utils/timezone-utils.ts
+++ b/apps/backend-mock/utils/timezone-utils.ts
@@ -5,6 +5,5 @@ export const setTimezone = (timeZone: string) => {
 };
 
 export const getTimezone = () => {
-  console.log('mockTimeZone', mockTimeZone);
   return mockTimeZone;
 };
diff --git a/apps/web-antd/src/layouts/basic.vue b/apps/web-antd/src/layouts/basic.vue
index 37c5ec26..742378f9 100644
--- a/apps/web-antd/src/layouts/basic.vue
+++ b/apps/web-antd/src/layouts/basic.vue
@@ -2,7 +2,7 @@
 import type { ExtendedModalApi } from '@vben/common-ui';
 import type { NotificationItem } from '@vben/layouts';
 
-import { computed, onMounted, ref, watch } from 'vue';
+import { computed, onMounted, ref, unref, watch } from 'vue';
 
 import { AuthenticationLoginExpiredModal } from '@vben/common-ui';
 import { VBEN_DOC_URL, VBEN_GITHUB_URL } from '@vben/constants';
@@ -66,7 +66,7 @@ const showDot = computed(() =>
 );
 
 const userProfileStore = useUserProfileStore();
-const computedTimezone = computed(() => userProfileStore.timezone);
+const computedTimezone = computed(() => unref(userProfileStore.timezone));
 
 const timezoneOptions = ref<string[]>([]);
 onMounted(async () => {
@@ -75,9 +75,12 @@ onMounted(async () => {
   );
 });
 const handleSetTimezone = async (
-  timezone: string,
   modalApi: ExtendedModalApi,
+  timezone?: string,
 ) => {
+  if (!timezone) {
+    return;
+  }
   try {
     modalApi.setState({ confirmLoading: true });
     await userProfileStore.setTimezone(timezone);
diff --git a/apps/web-antd/src/store/user-profile.ts b/apps/web-antd/src/store/user-profile.ts
index 02cb5b4a..0fd21569 100644
--- a/apps/web-antd/src/store/user-profile.ts
+++ b/apps/web-antd/src/store/user-profile.ts
@@ -17,11 +17,11 @@ const useUserProfileStore = defineStore('user-profile', () => {
    * @param timezone 时区字符串
    */
   async function setTimezone(timezone: string) {
+    // 保存用户的时区设置
+    await setUserTimezoneApi(timezone);
     timezoneRef.value = timezone;
     // 设置dayjs默认时区
     setDefaultTimezone(timezone);
-    // 保存用户的时区设置
-    await setUserTimezoneApi(timezone);
   }
 
   /**
diff --git a/apps/web-ele/src/layouts/basic.vue b/apps/web-ele/src/layouts/basic.vue
index 6f775b91..5a9984f4 100644
--- a/apps/web-ele/src/layouts/basic.vue
+++ b/apps/web-ele/src/layouts/basic.vue
@@ -2,7 +2,7 @@
 import type { ExtendedModalApi } from '@vben/common-ui';
 import type { NotificationItem } from '@vben/layouts';
 
-import { computed, onMounted, ref, watch } from 'vue';
+import { computed, onMounted, ref, unref, watch } from 'vue';
 
 import { AuthenticationLoginExpiredModal } from '@vben/common-ui';
 import { VBEN_DOC_URL, VBEN_GITHUB_URL } from '@vben/constants';
@@ -66,7 +66,7 @@ const showDot = computed(() =>
 );
 
 const userProfileStore = useUserProfileStore();
-const computedTimezone = computed(() => userProfileStore.timezone);
+const computedTimezone = computed(() => unref(userProfileStore.timezone));
 
 const timezoneOptions = ref<string[]>([]);
 onMounted(async () => {
@@ -75,9 +75,12 @@ onMounted(async () => {
   );
 });
 const handleSetTimezone = async (
-  timezone: string,
   modalApi: ExtendedModalApi,
+  timezone?: string,
 ) => {
+  if (!timezone) {
+    return;
+  }
   try {
     modalApi.setState({ confirmLoading: true });
     await userProfileStore.setTimezone(timezone);
diff --git a/apps/web-ele/src/store/user-profile.ts b/apps/web-ele/src/store/user-profile.ts
index 02cb5b4a..0fd21569 100644
--- a/apps/web-ele/src/store/user-profile.ts
+++ b/apps/web-ele/src/store/user-profile.ts
@@ -17,11 +17,11 @@ const useUserProfileStore = defineStore('user-profile', () => {
    * @param timezone 时区字符串
    */
   async function setTimezone(timezone: string) {
+    // 保存用户的时区设置
+    await setUserTimezoneApi(timezone);
     timezoneRef.value = timezone;
     // 设置dayjs默认时区
     setDefaultTimezone(timezone);
-    // 保存用户的时区设置
-    await setUserTimezoneApi(timezone);
   }
 
   /**
diff --git a/apps/web-naive/src/layouts/basic.vue b/apps/web-naive/src/layouts/basic.vue
index cac3e7de..f2afcdbb 100644
--- a/apps/web-naive/src/layouts/basic.vue
+++ b/apps/web-naive/src/layouts/basic.vue
@@ -2,7 +2,7 @@
 import type { ExtendedModalApi } from '@vben/common-ui';
 import type { NotificationItem } from '@vben/layouts';
 
-import { computed, onMounted, ref, watch } from 'vue';
+import { computed, onMounted, ref, unref, watch } from 'vue';
 
 import { AuthenticationLoginExpiredModal } from '@vben/common-ui';
 import { VBEN_DOC_URL, VBEN_GITHUB_URL } from '@vben/constants';
@@ -67,7 +67,7 @@ const showDot = computed(() =>
 );
 
 const userProfileStore = useUserProfileStore();
-const computedTimezone = computed(() => userProfileStore.timezone);
+const computedTimezone = computed(() => unref(userProfileStore.timezone));
 
 const timezoneOptions = ref<string[]>([]);
 onMounted(async () => {
@@ -76,9 +76,12 @@ onMounted(async () => {
   );
 });
 const handleSetTimezone = async (
-  timezone: string,
   modalApi: ExtendedModalApi,
+  timezone?: string,
 ) => {
+  if (!timezone) {
+    return;
+  }
   try {
     modalApi.setState({ confirmLoading: true });
     await userProfileStore.setTimezone(timezone);
diff --git a/apps/web-naive/src/store/user-profile.ts b/apps/web-naive/src/store/user-profile.ts
index 02cb5b4a..0fd21569 100644
--- a/apps/web-naive/src/store/user-profile.ts
+++ b/apps/web-naive/src/store/user-profile.ts
@@ -17,11 +17,11 @@ const useUserProfileStore = defineStore('user-profile', () => {
    * @param timezone 时区字符串
    */
   async function setTimezone(timezone: string) {
+    // 保存用户的时区设置
+    await setUserTimezoneApi(timezone);
     timezoneRef.value = timezone;
     // 设置dayjs默认时区
     setDefaultTimezone(timezone);
-    // 保存用户的时区设置
-    await setUserTimezoneApi(timezone);
   }
 
   /**
diff --git a/packages/@core/preferences/__tests__/__snapshots__/config.test.ts.snap b/packages/@core/preferences/__tests__/__snapshots__/config.test.ts.snap
index 1cccbbb2..a6452b39 100644
--- a/packages/@core/preferences/__tests__/__snapshots__/config.test.ts.snap
+++ b/packages/@core/preferences/__tests__/__snapshots__/config.test.ts.snap
@@ -22,6 +22,7 @@ exports[`defaultPreferences immutability test > should not modify the config obj
     "enableCheckUpdates": true,
     "enablePreferences": true,
     "enableRefreshToken": false,
+    "enableStickyPreferencesNavigationBar": true,
     "isMobile": false,
     "layout": "sidebar-nav",
     "locale": "zh-CN",
@@ -29,6 +30,7 @@ exports[`defaultPreferences immutability test > should not modify the config obj
     "name": "Vben Admin",
     "preferencesButtonPosition": "auto",
     "watermark": false,
+    "watermarkContent": "",
     "zIndex": 200,
   },
   "breadcrumb": {
@@ -131,6 +133,7 @@ exports[`defaultPreferences immutability test > should not modify the config obj
     "refresh": true,
     "sidebarToggle": true,
     "themeToggle": true,
+    "timezone": true,
   },
 }
 `;
diff --git a/packages/effects/layouts/src/widgets/timezone/timezone-button.vue b/packages/effects/layouts/src/widgets/timezone/timezone-button.vue
index cc2fd3fe..dae20dd7 100644
--- a/packages/effects/layouts/src/widgets/timezone/timezone-button.vue
+++ b/packages/effects/layouts/src/widgets/timezone/timezone-button.vue
@@ -16,8 +16,8 @@ import {
 interface Props {
   timezoneOptions: string[];
   okHandler?: (
-    timezone: string,
-    modalApi: ExtendedModalApi,
+    modalApi?: ExtendedModalApi,
+    timezone?: string,
   ) => Promise<void> | void;
   timezone?: string;
 }
@@ -34,7 +34,7 @@ const TimezoneIcon = createIconifyIcon('fluent-mdl2:world-clock');
 const [Modal, modalApi] = useVbenModal({
   fullscreenButton: false,
   onConfirm: () => {
-    props.okHandler?.(unref(timezoneValue), modalApi);
+    props.okHandler?.(modalApi, unref(timezoneValue));
   },
 });
 
@@ -42,11 +42,11 @@ const handleClick = () => {
   modalApi.open();
 };
 
-const timezoneValue = ref(props.timezone);
+const timezoneValue = ref<string | undefined>(unref(props.timezone));
 watch(
   () => props.timezone,
   (newTimezone) => {
-    timezoneValue.value = newTimezone;
+    timezoneValue.value = unref(newTimezone);
   },
 );
 const handleClickItem = (timezone: string) => {
diff --git a/packages/effects/plugins/src/echarts/use-echarts.ts b/packages/effects/plugins/src/echarts/use-echarts.ts
index b5ff6d42..1a28fb12 100644
--- a/packages/effects/plugins/src/echarts/use-echarts.ts
+++ b/packages/effects/plugins/src/echarts/use-echarts.ts
@@ -69,7 +69,7 @@ function useEcharts(chartRef: Ref<EchartsUIType>) {
 
   const renderEcharts = (
     options: EChartsOption,
-    clear = true
+    clear = true,
   ): Promise<Nullable<echarts.ECharts>> => {
     cacheOptions = options;
     const currentOptions = {

From 61ce53b6868dc232eb489f4480c23a8707ba92cc Mon Sep 17 00:00:00 2001
From: zhongming4762 <zhongming4762@hotmail.com>
Date: Wed, 22 Oct 2025 20:23:55 +0800
Subject: [PATCH 03/23] feat: increase support for multiple time zones

---
 .../effects/layouts/src/widgets/timezone/timezone-button.vue    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/effects/layouts/src/widgets/timezone/timezone-button.vue b/packages/effects/layouts/src/widgets/timezone/timezone-button.vue
index dae20dd7..4b2a56e0 100644
--- a/packages/effects/layouts/src/widgets/timezone/timezone-button.vue
+++ b/packages/effects/layouts/src/widgets/timezone/timezone-button.vue
@@ -16,7 +16,7 @@ import {
 interface Props {
   timezoneOptions: string[];
   okHandler?: (
-    modalApi?: ExtendedModalApi,
+    modalApi: ExtendedModalApi,
     timezone?: string,
   ) => Promise<void> | void;
   timezone?: string;

From e3e5755903637255db62cfd5015d38aebb7cc40c Mon Sep 17 00:00:00 2001
From: zhongming4762 <zhongming4762@hotmail.com>
Date: Wed, 22 Oct 2025 20:29:53 +0800
Subject: [PATCH 04/23] feat: increase support for multiple time zones

---
 .../layouts/src/widgets/timezone/timezone-button.vue        | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/effects/layouts/src/widgets/timezone/timezone-button.vue b/packages/effects/layouts/src/widgets/timezone/timezone-button.vue
index 4b2a56e0..11798ed5 100644
--- a/packages/effects/layouts/src/widgets/timezone/timezone-button.vue
+++ b/packages/effects/layouts/src/widgets/timezone/timezone-button.vue
@@ -22,12 +22,8 @@ interface Props {
   timezone?: string;
 }
 
-interface Listener {
-  change: (timezone: string) => void;
-}
-
 const props = defineProps<Props>();
-const emit = defineEmits<Listener>();
+const emit = defineEmits<{ change: [string] }>();
 
 const TimezoneIcon = createIconifyIcon('fluent-mdl2:world-clock');
 

From e01803ce9d54e30ca6606757e827fa436de4d09a Mon Sep 17 00:00:00 2001
From: zhongming4762 <zhongming4762@hotmail.com>
Date: Wed, 22 Oct 2025 20:39:00 +0800
Subject: [PATCH 05/23] feat: increase support for multiple time zones

---
 apps/web-antd/src/store/user-profile.ts                       | 4 +++-
 apps/web-ele/src/store/user-profile.ts                        | 4 +++-
 apps/web-naive/src/store/user-profile.ts                      | 4 +++-
 .../effects/layouts/src/widgets/timezone/timezone-button.vue  | 4 ++--
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/apps/web-antd/src/store/user-profile.ts b/apps/web-antd/src/store/user-profile.ts
index 0fd21569..6c552e4f 100644
--- a/apps/web-antd/src/store/user-profile.ts
+++ b/apps/web-antd/src/store/user-profile.ts
@@ -38,7 +38,9 @@ const useUserProfileStore = defineStore('user-profile', () => {
     }
   }
 
-  initTimezone();
+  initTimezone().catch((error) => {
+    console.error('Failed to initialize timezone during store setup:', error);
+  });
 
   return {
     timezone: timezoneRef,
diff --git a/apps/web-ele/src/store/user-profile.ts b/apps/web-ele/src/store/user-profile.ts
index 0fd21569..6c552e4f 100644
--- a/apps/web-ele/src/store/user-profile.ts
+++ b/apps/web-ele/src/store/user-profile.ts
@@ -38,7 +38,9 @@ const useUserProfileStore = defineStore('user-profile', () => {
     }
   }
 
-  initTimezone();
+  initTimezone().catch((error) => {
+    console.error('Failed to initialize timezone during store setup:', error);
+  });
 
   return {
     timezone: timezoneRef,
diff --git a/apps/web-naive/src/store/user-profile.ts b/apps/web-naive/src/store/user-profile.ts
index 0fd21569..6c552e4f 100644
--- a/apps/web-naive/src/store/user-profile.ts
+++ b/apps/web-naive/src/store/user-profile.ts
@@ -38,7 +38,9 @@ const useUserProfileStore = defineStore('user-profile', () => {
     }
   }
 
-  initTimezone();
+  initTimezone().catch((error) => {
+    console.error('Failed to initialize timezone during store setup:', error);
+  });
 
   return {
     timezone: timezoneRef,
diff --git a/packages/effects/layouts/src/widgets/timezone/timezone-button.vue b/packages/effects/layouts/src/widgets/timezone/timezone-button.vue
index 11798ed5..5a1c8318 100644
--- a/packages/effects/layouts/src/widgets/timezone/timezone-button.vue
+++ b/packages/effects/layouts/src/widgets/timezone/timezone-button.vue
@@ -70,7 +70,7 @@ const handleClickItem = (timezone: string) => {
             @click="handleClickItem(item)"
           >
             <RadioGroupItem :id="item" :value="item" />
-            <label class="cursor-pointer">{{ item }}</label>
+            <label :for="item" class="cursor-pointer">{{ item }}</label>
           </div>
         </RadioGroup>
       </div>
@@ -79,7 +79,7 @@ const handleClickItem = (timezone: string) => {
 </template>
 
 <style scoped>
-.container {
+.timezone-container {
   padding-left: 20px;
 }
 </style>

From 6b6cdef42d41a4fbaafeb8095f10dce56f864c89 Mon Sep 17 00:00:00 2001
From: Jin Mao <jinmao88@qq.com>
Date: Sun, 26 Oct 2025 15:00:47 +0800
Subject: [PATCH 06/23] =?UTF-8?q?chore:=20=E4=B8=80=E4=BA=9B=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../preferences/__tests__/__snapshots__/config.test.ts.snap    | 2 ++
 packages/@core/preferences/src/config.ts                       | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/@core/preferences/__tests__/__snapshots__/config.test.ts.snap b/packages/@core/preferences/__tests__/__snapshots__/config.test.ts.snap
index 1cccbbb2..b3f15980 100644
--- a/packages/@core/preferences/__tests__/__snapshots__/config.test.ts.snap
+++ b/packages/@core/preferences/__tests__/__snapshots__/config.test.ts.snap
@@ -22,6 +22,7 @@ exports[`defaultPreferences immutability test > should not modify the config obj
     "enableCheckUpdates": true,
     "enablePreferences": true,
     "enableRefreshToken": false,
+    "enableStickyPreferencesNavigationBar": true,
     "isMobile": false,
     "layout": "sidebar-nav",
     "locale": "zh-CN",
@@ -29,6 +30,7 @@ exports[`defaultPreferences immutability test > should not modify the config obj
     "name": "Vben Admin",
     "preferencesButtonPosition": "auto",
     "watermark": false,
+    "watermarkContent": "",
     "zIndex": 200,
   },
   "breadcrumb": {
diff --git a/packages/@core/preferences/src/config.ts b/packages/@core/preferences/src/config.ts
index b8b7212a..f6c1c2b7 100644
--- a/packages/@core/preferences/src/config.ts
+++ b/packages/@core/preferences/src/config.ts
@@ -1,4 +1,4 @@
-import type { Preferences } from './types';
+import type { Preferences } from "./types";
 
 const defaultPreferences: Preferences = {
   app: {
@@ -32,6 +32,7 @@ const defaultPreferences: Preferences = {
     watermark: false,
     watermarkContent: '',
     zIndex: 200,
+
   },
   breadcrumb: {
     enable: true,

From 0e62862119e6956677c1b2070cb9f25e67e4344c Mon Sep 17 00:00:00 2001
From: Jin Mao <jinmao88@qq.com>
Date: Sun, 26 Oct 2025 15:01:58 +0800
Subject: [PATCH 07/23] chore: fix lint

---
 .../plugins/src/echarts/use-echarts.ts        | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/packages/effects/plugins/src/echarts/use-echarts.ts b/packages/effects/plugins/src/echarts/use-echarts.ts
index b5ff6d42..22a791a2 100644
--- a/packages/effects/plugins/src/echarts/use-echarts.ts
+++ b/packages/effects/plugins/src/echarts/use-echarts.ts
@@ -1,24 +1,23 @@
-import type { EChartsOption } from 'echarts';
+import type { EChartsOption } from "echarts";
 
-import type { Ref } from 'vue';
+import type { Ref } from "vue";
+import { computed, nextTick, watch } from "vue";
 
-import type { Nullable } from '@vben/types';
+import type { Nullable } from "@vben/types";
 
-import type EchartsUI from './echarts-ui.vue';
+import type EchartsUI from "./echarts-ui.vue";
 
-import { computed, nextTick, watch } from 'vue';
-
-import { usePreferences } from '@vben/preferences';
+import { usePreferences } from "@vben/preferences";
 
 import {
   tryOnUnmounted,
   useDebounceFn,
   useResizeObserver,
   useTimeoutFn,
-  useWindowSize,
-} from '@vueuse/core';
+  useWindowSize
+} from "@vueuse/core";
 
-import echarts from './echarts';
+import echarts from "./echarts";
 
 type EchartsUIType = typeof EchartsUI | undefined;
 

From cfbce0d7379566f19d899604671041d3941868ad Mon Sep 17 00:00:00 2001
From: Jin Mao <jinmao88@qq.com>
Date: Sun, 26 Oct 2025 15:27:28 +0800
Subject: [PATCH 08/23] chore: fix lint

---
 packages/@core/preferences/src/config.ts      |  3 +--
 .../plugins/src/echarts/use-echarts.ts        | 21 ++++++++++---------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/packages/@core/preferences/src/config.ts b/packages/@core/preferences/src/config.ts
index f6c1c2b7..b8b7212a 100644
--- a/packages/@core/preferences/src/config.ts
+++ b/packages/@core/preferences/src/config.ts
@@ -1,4 +1,4 @@
-import type { Preferences } from "./types";
+import type { Preferences } from './types';
 
 const defaultPreferences: Preferences = {
   app: {
@@ -32,7 +32,6 @@ const defaultPreferences: Preferences = {
     watermark: false,
     watermarkContent: '',
     zIndex: 200,
-
   },
   breadcrumb: {
     enable: true,
diff --git a/packages/effects/plugins/src/echarts/use-echarts.ts b/packages/effects/plugins/src/echarts/use-echarts.ts
index 22a791a2..1a28fb12 100644
--- a/packages/effects/plugins/src/echarts/use-echarts.ts
+++ b/packages/effects/plugins/src/echarts/use-echarts.ts
@@ -1,23 +1,24 @@
-import type { EChartsOption } from "echarts";
+import type { EChartsOption } from 'echarts';
 
-import type { Ref } from "vue";
-import { computed, nextTick, watch } from "vue";
+import type { Ref } from 'vue';
 
-import type { Nullable } from "@vben/types";
+import type { Nullable } from '@vben/types';
 
-import type EchartsUI from "./echarts-ui.vue";
+import type EchartsUI from './echarts-ui.vue';
 
-import { usePreferences } from "@vben/preferences";
+import { computed, nextTick, watch } from 'vue';
+
+import { usePreferences } from '@vben/preferences';
 
 import {
   tryOnUnmounted,
   useDebounceFn,
   useResizeObserver,
   useTimeoutFn,
-  useWindowSize
-} from "@vueuse/core";
+  useWindowSize,
+} from '@vueuse/core';
 
-import echarts from "./echarts";
+import echarts from './echarts';
 
 type EchartsUIType = typeof EchartsUI | undefined;
 
@@ -68,7 +69,7 @@ function useEcharts(chartRef: Ref<EchartsUIType>) {
 
   const renderEcharts = (
     options: EChartsOption,
-    clear = true
+    clear = true,
   ): Promise<Nullable<echarts.ECharts>> => {
     cacheOptions = options;
     const currentOptions = {

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 09/23] 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();
+    },
+  });
+}

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

 * 优化实现方法
---
 .../backend-mock/api/timezone/getTimezoneOptions.ts |  6 +++++-
 apps/backend-mock/api/timezone/setTimezone.ts       | 10 +++++++++-
 apps/backend-mock/utils/mock-data.ts                |  2 +-
 .../src/widgets/timezone/timezone-button.vue        |  5 +++--
 packages/stores/src/modules/timezone.ts             | 11 ++++++-----
 playground/src/api/core/timezone.ts                 | 13 ++++---------
 6 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/apps/backend-mock/api/timezone/getTimezoneOptions.ts b/apps/backend-mock/api/timezone/getTimezoneOptions.ts
index 20b54ca8..6c241864 100644
--- a/apps/backend-mock/api/timezone/getTimezoneOptions.ts
+++ b/apps/backend-mock/api/timezone/getTimezoneOptions.ts
@@ -3,5 +3,9 @@ import { TIME_ZONE_OPTIONS } from '~/utils/mock-data';
 import { useResponseSuccess } from '~/utils/response';
 
 export default eventHandler(() => {
-  return useResponseSuccess(TIME_ZONE_OPTIONS);
+  const data = TIME_ZONE_OPTIONS.map((o) => ({
+    label: `${o.timezone} (GMT${o.offset >= 0 ? `+${o.offset}` : o.offset})`,
+    value: o.timezone,
+  }));
+  return useResponseSuccess(data);
 });
diff --git a/apps/backend-mock/api/timezone/setTimezone.ts b/apps/backend-mock/api/timezone/setTimezone.ts
index 9ec00a50..34d8f19e 100644
--- a/apps/backend-mock/api/timezone/setTimezone.ts
+++ b/apps/backend-mock/api/timezone/setTimezone.ts
@@ -1,5 +1,6 @@
 import { eventHandler, readBody } from 'h3';
 import { verifyAccessToken } from '~/utils/jwt-utils';
+import { TIME_ZONE_OPTIONS } from '~/utils/mock-data';
 import { unAuthorizedResponse, useResponseSuccess } from '~/utils/response';
 import { setTimezone } from '~/utils/timezone-utils';
 
@@ -8,7 +9,14 @@ export default eventHandler(async (event) => {
   if (!userinfo) {
     return unAuthorizedResponse(event);
   }
-  const { timezone } = await readBody(event);
+  const body = await readBody<{ timezone?: unknown }>(event);
+  const timezone =
+    typeof body?.timezone === 'string' ? body.timezone : undefined;
+  const allowed = TIME_ZONE_OPTIONS.some((o) => o.timezone === timezone);
+  if (!timezone || !allowed) {
+    setResponseStatus(event, 400);
+    return useResponseError('Bad Request', 'Invalid timezone');
+  }
   setTimezone(timezone);
   return useResponseSuccess({});
 });
diff --git a/apps/backend-mock/utils/mock-data.ts b/apps/backend-mock/utils/mock-data.ts
index 54cfa506..165c9ed0 100644
--- a/apps/backend-mock/utils/mock-data.ts
+++ b/apps/backend-mock/utils/mock-data.ts
@@ -9,7 +9,7 @@ export interface UserInfo {
 
 export interface TimezoneOption {
   offset: number;
-  timeZone: string;
+  timezone: string;
 }
 
 export const MOCK_USERS: UserInfo[] = [
diff --git a/packages/effects/layouts/src/widgets/timezone/timezone-button.vue b/packages/effects/layouts/src/widgets/timezone/timezone-button.vue
index 78f71933..5d691f35 100644
--- a/packages/effects/layouts/src/widgets/timezone/timezone-button.vue
+++ b/packages/effects/layouts/src/widgets/timezone/timezone-button.vue
@@ -30,8 +30,9 @@ const [Modal, modalApi] = useVbenModal({
   onConfirm: async () => {
     try {
       modalApi.setState({ confirmLoading: true });
-      if (timezoneRef.value) {
-        await timezoneStore.setTimezone(unref(timezoneRef));
+      const timezone = unref(timezoneRef);
+      if (timezone) {
+        await timezoneStore.setTimezone(timezone);
       }
       modalApi.close();
     } finally {
diff --git a/packages/stores/src/modules/timezone.ts b/packages/stores/src/modules/timezone.ts
index 31904aef..c0b8873e 100644
--- a/packages/stores/src/modules/timezone.ts
+++ b/packages/stores/src/modules/timezone.ts
@@ -13,7 +13,7 @@ interface TimezoneHandler {
       value: string;
     }[]
   >;
-  onTimezoneChange?: (timezone: string) => Promise<void>;
+  setTimezone?: (timezone: string) => Promise<void>;
 }
 
 /**
@@ -63,13 +63,12 @@ const useTimezoneStore = defineStore(
       getTimezone() || new Intl.DateTimeFormat().resolvedOptions().timeZone,
     );
 
-    const timezoneHandler = getTimezoneHandler();
-
     /**
      * 初始化时区
      * Initialize the timezone
      */
     async function initTimezone() {
+      const timezoneHandler = getTimezoneHandler();
       const timezone = await timezoneHandler.getTimezone?.();
       if (timezone) {
         timezoneRef.value = timezone;
@@ -84,7 +83,8 @@ const useTimezoneStore = defineStore(
      * @param timezone 时区字符串
      */
     async function setTimezone(timezone: string) {
-      await timezoneHandler.onTimezoneChange?.(timezone);
+      const timezoneHandler = getTimezoneHandler();
+      await timezoneHandler.setTimezone?.(timezone);
       timezoneRef.value = timezone;
       // 设置dayjs默认时区
       setDefaultTimezone(timezone);
@@ -95,7 +95,8 @@ const useTimezoneStore = defineStore(
      * Get the timezone options
      */
     async function getTimezoneOptions() {
-      return await timezoneHandler.getTimezoneOptions();
+      const timezoneHandler = getTimezoneHandler();
+      return (await timezoneHandler.getTimezoneOptions?.()) || [];
     }
 
     initTimezone().catch((error) => {
diff --git a/playground/src/api/core/timezone.ts b/playground/src/api/core/timezone.ts
index c21f808d..559ed4b2 100644
--- a/playground/src/api/core/timezone.ts
+++ b/playground/src/api/core/timezone.ts
@@ -6,14 +6,9 @@ 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,
-  }));
+  return await requestClient.get<TimezoneOption[]>(
+    '/timezone/getTimezoneOptions',
+  );
 }
 /**
  * 获取用户时区
@@ -25,6 +20,6 @@ export async function getTimezoneApi(): Promise<null | string | undefined> {
  * 设置用户时区
  * @param timezone 时区
  */
-export async function setTimezoneApi(timezone: string) {
+export async function setTimezoneApi(timezone: string): Promise<void> {
   return requestClient.post('/timezone/setTimezone', { timezone });
 }

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

 * 优化实现方法
---
 .../effects/layouts/src/widgets/timezone/timezone-button.vue    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/effects/layouts/src/widgets/timezone/timezone-button.vue b/packages/effects/layouts/src/widgets/timezone/timezone-button.vue
index 5d691f35..f426b94c 100644
--- a/packages/effects/layouts/src/widgets/timezone/timezone-button.vue
+++ b/packages/effects/layouts/src/widgets/timezone/timezone-button.vue
@@ -16,7 +16,7 @@ const TimezoneIcon = createIconifyIcon('fluent-mdl2:world-clock');
 
 const timezoneStore = useTimezoneStore();
 
-const timezoneRef = ref<null | string>(null);
+const timezoneRef = ref<string | undefined>();
 
 const timezoneOptionsRef = ref<
   {

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

 * 优化实现方法
---
 playground/src/api/core/timezone.ts | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/playground/src/api/core/timezone.ts b/playground/src/api/core/timezone.ts
index 559ed4b2..13d44d19 100644
--- a/playground/src/api/core/timezone.ts
+++ b/playground/src/api/core/timezone.ts
@@ -1,14 +1,15 @@
-import type { TimezoneOption } from '@vben/types';
-
 import { requestClient } from '#/api/request';
 
 /**
  * 获取系统支持的时区列表
  */
 export async function getTimezoneOptionsApi() {
-  return await requestClient.get<TimezoneOption[]>(
-    '/timezone/getTimezoneOptions',
-  );
+  return await requestClient.get<
+    {
+      label: string;
+      value: string;
+    }[]
+  >('/timezone/getTimezoneOptions');
 }
 /**
  * 获取用户时区

From 565be77e96fefe046fa68fcddb0afdd17e1c4940 Mon Sep 17 00:00:00 2001
From: zhongming4762 <zhongming4762@hotmail.com>
Date: Thu, 30 Oct 2025 17:01:49 +0800
Subject: [PATCH 13/23] fix: resolve the issue of logout failure caused by the
 timezone store

---
 .../shared/src/utils/__tests__/date.test.ts   | 143 ++++++++++++++++++
 packages/@core/base/shared/src/utils/date.ts  |  40 +++--
 packages/stores/src/modules/timezone.ts       |  18 ++-
 3 files changed, 183 insertions(+), 18 deletions(-)
 create mode 100644 packages/@core/base/shared/src/utils/__tests__/date.test.ts

diff --git a/packages/@core/base/shared/src/utils/__tests__/date.test.ts b/packages/@core/base/shared/src/utils/__tests__/date.test.ts
new file mode 100644
index 00000000..46a27c58
--- /dev/null
+++ b/packages/@core/base/shared/src/utils/__tests__/date.test.ts
@@ -0,0 +1,143 @@
+import dayjs from 'dayjs';
+import timezone from 'dayjs/plugin/timezone';
+import utc from 'dayjs/plugin/utc';
+import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
+
+import {
+  formatDate,
+  formatDateTime,
+  getCurrentTimezone,
+  getSystemTimezone,
+  isDate,
+  isDayjsObject,
+  setCurrentTimezone,
+} from '../date';
+
+dayjs.extend(utc);
+dayjs.extend(timezone);
+
+describe('dateUtils', () => {
+  const sampleISO = '2024-10-30T12:34:56Z';
+  const sampleTimestamp = Date.parse(sampleISO);
+
+  beforeEach(() => {
+    // 重置时区
+    dayjs.tz.setDefault();
+    setCurrentTimezone(); // 重置为系统默认
+  });
+
+  afterEach(() => {
+    vi.restoreAllMocks();
+  });
+
+  // ===============================
+  // formatDate
+  // ===============================
+  describe('formatDate', () => {
+    it('should format a valid ISO date string', () => {
+      const formatted = formatDate(sampleISO, 'YYYY/MM/DD');
+      expect(formatted).toMatch(/2024\/10\/30/);
+    });
+
+    it('should format a timestamp correctly', () => {
+      const formatted = formatDate(sampleTimestamp);
+      expect(formatted).toMatch(/2024-10-30/);
+    });
+
+    it('should format a Date object', () => {
+      const formatted = formatDate(new Date(sampleISO));
+      expect(formatted).toMatch(/2024-10-30/);
+    });
+
+    it('should format a dayjs object', () => {
+      const formatted = formatDate(dayjs(sampleISO));
+      expect(formatted).toMatch(/2024-10-30/);
+    });
+
+    it('should return original input if date is invalid', () => {
+      const invalid = 'not-a-date';
+      const spy = vi.spyOn(console, 'error').mockImplementation(() => {});
+      const formatted = formatDate(invalid);
+      expect(formatted).toBe(invalid);
+      expect(spy).toHaveBeenCalledOnce();
+    });
+
+    it('should apply given format', () => {
+      const formatted = formatDate(sampleISO, 'YYYY-MM-DD HH:mm');
+      expect(formatted).toMatch(/\d{4}-\d{2}-\d{2} \d{2}:\d{2}/);
+    });
+  });
+
+  // ===============================
+  // formatDateTime
+  // ===============================
+  describe('formatDateTime', () => {
+    it('should format date into full datetime', () => {
+      const result = formatDateTime(sampleISO);
+      expect(result).toMatch(/2024-10-30 \d{2}:\d{2}:\d{2}/);
+    });
+  });
+
+  // ===============================
+  // isDate
+  // ===============================
+  describe('isDate', () => {
+    it('should return true for Date instances', () => {
+      expect(isDate(new Date())).toBe(true);
+    });
+
+    it('should return false for non-Date values', () => {
+      expect(isDate('2024-10-30')).toBe(false);
+      expect(isDate(null)).toBe(false);
+      expect(isDate(undefined)).toBe(false);
+    });
+  });
+
+  // ===============================
+  // isDayjsObject
+  // ===============================
+  describe('isDayjsObject', () => {
+    it('should return true for dayjs objects', () => {
+      expect(isDayjsObject(dayjs())).toBe(true);
+    });
+
+    it('should return false for other values', () => {
+      expect(isDayjsObject(new Date())).toBe(false);
+      expect(isDayjsObject('string')).toBe(false);
+    });
+  });
+
+  // ===============================
+  // getSystemTimezone
+  // ===============================
+  describe('getSystemTimezone', () => {
+    it('should return a valid IANA timezone string', () => {
+      const tz = getSystemTimezone();
+      expect(typeof tz).toBe('string');
+      expect(tz).toMatch(/^[A-Z]+\/[A-Z_]+/i);
+    });
+  });
+
+  // ===============================
+  // setCurrentTimezone / getCurrentTimezone
+  // ===============================
+  describe('setCurrentTimezone & getCurrentTimezone', () => {
+    it('should set and retrieve the current timezone', () => {
+      setCurrentTimezone('Asia/Shanghai');
+      expect(getCurrentTimezone()).toBe('Asia/Shanghai');
+    });
+
+    it('should reset to system timezone when called with no args', () => {
+      const guessed = getSystemTimezone();
+      setCurrentTimezone();
+      expect(getCurrentTimezone()).toBe(guessed);
+    });
+
+    it('should update dayjs default timezone', () => {
+      setCurrentTimezone('America/New_York');
+      const d = dayjs('2024-01-01T00:00:00Z');
+      // 校验时区转换生效（小时变化）
+      expect(d.tz().format('HH')).not.toBe('00');
+    });
+  });
+});
diff --git a/packages/@core/base/shared/src/utils/date.ts b/packages/@core/base/shared/src/utils/date.ts
index 4b80308b..84d03d26 100644
--- a/packages/@core/base/shared/src/utils/date.ts
+++ b/packages/@core/base/shared/src/utils/date.ts
@@ -5,9 +5,11 @@ import utc from 'dayjs/plugin/utc';
 dayjs.extend(utc);
 dayjs.extend(timezone);
 
-export function formatDate(time: number | string, format = 'YYYY-MM-DD') {
+type FormatDate = Date | dayjs.Dayjs | number | string;
+
+export function formatDate(time: FormatDate, format = 'YYYY-MM-DD') {
   try {
-    const date = dayjs(time);
+    const date = dayjs.isDayjs(time) ? time : dayjs(time);
     if (!date.isValid()) {
       throw new Error('Invalid date');
     }
@@ -18,7 +20,7 @@ export function formatDate(time: number | string, format = 'YYYY-MM-DD') {
   }
 }
 
-export function formatDateTime(time: number | string) {
+export function formatDateTime(time: FormatDate) {
   return formatDate(time, 'YYYY-MM-DD HH:mm:ss');
 }
 
@@ -30,18 +32,32 @@ export function isDayjsObject(value: any): value is dayjs.Dayjs {
   return dayjs.isDayjs(value);
 }
 
-/**
- * 设置默认时区
- * @param timezone
- */
-export const setDefaultTimezone = (timezone?: string) => {
-  timezone ? dayjs.tz.setDefault(timezone) : dayjs.tz.setDefault();
-};
-
 /**
  * 获取当前时区
  * @returns 当前时区
  */
-export const getTimezone = () => {
+export const getSystemTimezone = () => {
   return dayjs.tz.guess();
 };
+
+/**
+ * 自定义设置的时区
+ */
+let currentTimezone = getSystemTimezone();
+
+/**
+ * 设置默认时区
+ * @param timezone
+ */
+export const setCurrentTimezone = (timezone?: string) => {
+  currentTimezone = timezone || getSystemTimezone();
+  dayjs.tz.setDefault(currentTimezone);
+};
+
+/**
+ * 获取设置的时区
+ * @returns 设置的时区
+ */
+export const getCurrentTimezone = () => {
+  return currentTimezone;
+};
diff --git a/packages/stores/src/modules/timezone.ts b/packages/stores/src/modules/timezone.ts
index c0b8873e..24180c60 100644
--- a/packages/stores/src/modules/timezone.ts
+++ b/packages/stores/src/modules/timezone.ts
@@ -1,7 +1,10 @@
 import { ref, unref } from 'vue';
 
 import { DEFAULT_TIME_ZONE_OPTIONS } from '@vben-core/preferences';
-import { getTimezone, setDefaultTimezone } from '@vben-core/shared/utils';
+import {
+  getCurrentTimezone,
+  setCurrentTimezone,
+} from '@vben-core/shared/utils';
 
 import { acceptHMRUpdate, defineStore } from 'pinia';
 
@@ -59,9 +62,7 @@ const getTimezoneHandler = () => {
 const useTimezoneStore = defineStore(
   'core-timezone',
   () => {
-    const timezoneRef = ref(
-      getTimezone() || new Intl.DateTimeFormat().resolvedOptions().timeZone,
-    );
+    const timezoneRef = ref(getCurrentTimezone());
 
     /**
      * 初始化时区
@@ -74,7 +75,7 @@ const useTimezoneStore = defineStore(
         timezoneRef.value = timezone;
       }
       // 设置dayjs默认时区
-      setDefaultTimezone(unref(timezoneRef));
+      setCurrentTimezone(unref(timezoneRef));
     }
 
     /**
@@ -87,7 +88,7 @@ const useTimezoneStore = defineStore(
       await timezoneHandler.setTimezone?.(timezone);
       timezoneRef.value = timezone;
       // 设置dayjs默认时区
-      setDefaultTimezone(timezone);
+      setCurrentTimezone(timezone);
     }
 
     /**
@@ -103,10 +104,15 @@ const useTimezoneStore = defineStore(
       console.error('Failed to initialize timezone during store setup:', error);
     });
 
+    function $reset() {
+      timezoneRef.value = getCurrentTimezone();
+    }
+
     return {
       timezone: timezoneRef,
       setTimezone,
       getTimezoneOptions,
+      $reset,
     };
   },
   {

From 639ea96bb9b382e662cb7fddb9df4c4ecce676da Mon Sep 17 00:00:00 2001
From: zhongming4762 <zhongming4762@hotmail.com>
Date: Thu, 30 Oct 2025 17:12:45 +0800
Subject: [PATCH 14/23] fix: resolve the issue of logout failure caused by the
 timezone store

---
 packages/@core/base/shared/src/utils/date.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@core/base/shared/src/utils/date.ts b/packages/@core/base/shared/src/utils/date.ts
index 84d03d26..b56023c8 100644
--- a/packages/@core/base/shared/src/utils/date.ts
+++ b/packages/@core/base/shared/src/utils/date.ts
@@ -16,7 +16,7 @@ export function formatDate(time: FormatDate, format = 'YYYY-MM-DD') {
     return date.tz().format(format);
   } catch (error) {
     console.error(`Error formatting date: ${error}`);
-    return time;
+    return String(time);
   }
 }
 

From b36d32b66d27722bc50a92cea4177c7dbcc6f638 Mon Sep 17 00:00:00 2001
From: Jin Mao <jinmao88@qq.com>
Date: Thu, 30 Oct 2025 23:27:53 +0800
Subject: [PATCH 15/23] =?UTF-8?q?chore(timezone):=20=E6=B7=BB=E5=8A=A0=20$?=
 =?UTF-8?q?reset=20=E6=96=B9=E6=B3=95=E5=B9=B6=E5=88=9D=E5=A7=8B=E5=8C=96?=
 =?UTF-8?q?=E6=97=B6=E5=8C=BA=E5=AD=98=E5=82=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在时区存储中添加 `$reset` 方法
-修复导入语句引号为双引号
- 优化时区初始化错误处理逻辑- 导出 `$reset` 方法以便外部调用- 确保时区设置与默认选项同步
- 提升代码一致性和可维护性
---
 packages/stores/src/modules/timezone.ts | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/packages/stores/src/modules/timezone.ts b/packages/stores/src/modules/timezone.ts
index c0b8873e..5e4e2d8c 100644
--- a/packages/stores/src/modules/timezone.ts
+++ b/packages/stores/src/modules/timezone.ts
@@ -1,9 +1,9 @@
-import { ref, unref } from 'vue';
+import { ref, unref } from "vue";
 
-import { DEFAULT_TIME_ZONE_OPTIONS } from '@vben-core/preferences';
-import { getTimezone, setDefaultTimezone } from '@vben-core/shared/utils';
+import { DEFAULT_TIME_ZONE_OPTIONS } from "@vben-core/preferences";
+import { getTimezone, setDefaultTimezone } from "@vben-core/shared/utils";
 
-import { acceptHMRUpdate, defineStore } from 'pinia';
+import { acceptHMRUpdate, defineStore } from "pinia";
 
 interface TimezoneHandler {
   getTimezone?: () => Promise<null | string | undefined>;
@@ -102,11 +102,14 @@ const useTimezoneStore = defineStore(
     initTimezone().catch((error) => {
       console.error('Failed to initialize timezone during store setup:', error);
     });
+    function $reset() {
+    }
 
     return {
       timezone: timezoneRef,
       setTimezone,
       getTimezoneOptions,
+      $reset
     };
   },
   {

From f8a7a0a9a2824f5ebc3b1be90f410311a326f9ad Mon Sep 17 00:00:00 2001
From: Jin Mao <jinmao88@qq.com>
Date: Fri, 31 Oct 2025 09:11:40 +0800
Subject: [PATCH 16/23] chore: lint

---
 packages/@core/base/shared/src/utils/date.ts |  6 +++---
 packages/stores/src/modules/timezone.ts      | 11 ++++-------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/packages/@core/base/shared/src/utils/date.ts b/packages/@core/base/shared/src/utils/date.ts
index b56023c8..fa17aa8e 100644
--- a/packages/@core/base/shared/src/utils/date.ts
+++ b/packages/@core/base/shared/src/utils/date.ts
@@ -1,6 +1,6 @@
-import dayjs from 'dayjs';
-import timezone from 'dayjs/plugin/timezone';
-import utc from 'dayjs/plugin/utc';
+import dayjs from "dayjs";
+import timezone from "dayjs/plugin/timezone";
+import utc from "dayjs/plugin/utc";
 
 dayjs.extend(utc);
 dayjs.extend(timezone);
diff --git a/packages/stores/src/modules/timezone.ts b/packages/stores/src/modules/timezone.ts
index 24180c60..32090427 100644
--- a/packages/stores/src/modules/timezone.ts
+++ b/packages/stores/src/modules/timezone.ts
@@ -1,12 +1,9 @@
-import { ref, unref } from 'vue';
+import { ref, unref } from "vue";
 
-import { DEFAULT_TIME_ZONE_OPTIONS } from '@vben-core/preferences';
-import {
-  getCurrentTimezone,
-  setCurrentTimezone,
-} from '@vben-core/shared/utils';
+import { DEFAULT_TIME_ZONE_OPTIONS } from "@vben-core/preferences";
+import { getCurrentTimezone, setCurrentTimezone } from "@vben-core/shared/utils";
 
-import { acceptHMRUpdate, defineStore } from 'pinia';
+import { acceptHMRUpdate, defineStore } from "pinia";
 
 interface TimezoneHandler {
   getTimezone?: () => Promise<null | string | undefined>;

From c7c39047de3e205fcb548b70ddbdc58dce2f6ceb Mon Sep 17 00:00:00 2001
From: Copilot <198982749+Copilot@users.noreply.github.com>
Date: Mon, 3 Nov 2025 13:07:36 +0800
Subject: [PATCH 17/23] feat: add theme-aware logo support via optional
 sourceDark configuration (#6866)

* Initial plan

* Initial exploration and setup

Co-authored-by: aonoa <32682251+aonoa@users.noreply.github.com>

* Add support for separate light and dark theme logos

Co-authored-by: aonoa <32682251+aonoa@users.noreply.github.com>

* Update documentation with dark theme logo configuration

Co-authored-by: aonoa <32682251+aonoa@users.noreply.github.com>

* feat: Add theme-aware logo support for authentication/login page

Co-authored-by: aonoa <32682251+aonoa@users.noreply.github.com>

* revert: .npmrc

Signed-off-by: aonoa <1991849113@qq.com>

---------

Signed-off-by: aonoa <1991849113@qq.com>
Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: aonoa <32682251+aonoa@users.noreply.github.com>
Co-authored-by: Li Kui <90845831+likui628@users.noreply.github.com>
Co-authored-by: aonoa <1991849113@qq.com>
---
 .npmrc                                        |  2 +-
 apps/web-antd/src/layouts/auth.vue            |  2 ++
 apps/web-ele/src/layouts/auth.vue             |  2 ++
 apps/web-naive/src/layouts/auth.vue           |  2 ++
 docs/src/en/guide/essentials/settings.md      |  3 ++
 docs/src/guide/essentials/settings.md         |  3 ++
 packages/@core/base/shared/src/utils/date.ts  |  6 ++--
 packages/@core/preferences/src/types.ts       |  2 ++
 .../shadcn-ui/src/components/logo/logo.vue    | 25 ++++++++++++++--
 .../src/authentication/authentication.vue     | 29 +++++++++++++++++--
 packages/effects/layouts/src/basic/layout.vue |  3 ++
 packages/stores/src/modules/timezone.ts       | 11 ++++---
 12 files changed, 76 insertions(+), 14 deletions(-)

diff --git a/.npmrc b/.npmrc
index 21147aff..aeac1ae9 100644
--- a/.npmrc
+++ b/.npmrc
@@ -1,4 +1,4 @@
-registry = "https://registry.npmmirror.com"
+registry=https://registry.npmmirror.com
 public-hoist-pattern[]=lefthook
 public-hoist-pattern[]=eslint
 public-hoist-pattern[]=prettier
diff --git a/apps/web-antd/src/layouts/auth.vue b/apps/web-antd/src/layouts/auth.vue
index 18d415bc..8ba66e85 100644
--- a/apps/web-antd/src/layouts/auth.vue
+++ b/apps/web-antd/src/layouts/auth.vue
@@ -8,12 +8,14 @@ import { $t } from '#/locales';
 
 const appName = computed(() => preferences.app.name);
 const logo = computed(() => preferences.logo.source);
+const logoDark = computed(() => preferences.logo.sourceDark);
 </script>
 
 <template>
   <AuthPageLayout
     :app-name="appName"
     :logo="logo"
+    :logo-dark="logoDark"
     :page-description="$t('authentication.pageDesc')"
     :page-title="$t('authentication.pageTitle')"
   >
diff --git a/apps/web-ele/src/layouts/auth.vue b/apps/web-ele/src/layouts/auth.vue
index 18d415bc..8ba66e85 100644
--- a/apps/web-ele/src/layouts/auth.vue
+++ b/apps/web-ele/src/layouts/auth.vue
@@ -8,12 +8,14 @@ import { $t } from '#/locales';
 
 const appName = computed(() => preferences.app.name);
 const logo = computed(() => preferences.logo.source);
+const logoDark = computed(() => preferences.logo.sourceDark);
 </script>
 
 <template>
   <AuthPageLayout
     :app-name="appName"
     :logo="logo"
+    :logo-dark="logoDark"
     :page-description="$t('authentication.pageDesc')"
     :page-title="$t('authentication.pageTitle')"
   >
diff --git a/apps/web-naive/src/layouts/auth.vue b/apps/web-naive/src/layouts/auth.vue
index 18d415bc..8ba66e85 100644
--- a/apps/web-naive/src/layouts/auth.vue
+++ b/apps/web-naive/src/layouts/auth.vue
@@ -8,12 +8,14 @@ import { $t } from '#/locales';
 
 const appName = computed(() => preferences.app.name);
 const logo = computed(() => preferences.logo.source);
+const logoDark = computed(() => preferences.logo.sourceDark);
 </script>
 
 <template>
   <AuthPageLayout
     :app-name="appName"
     :logo="logo"
+    :logo-dark="logoDark"
     :page-description="$t('authentication.pageDesc')"
     :page-title="$t('authentication.pageTitle')"
   >
diff --git a/docs/src/en/guide/essentials/settings.md b/docs/src/en/guide/essentials/settings.md
index 59a6c5c0..ba3f860d 100644
--- a/docs/src/en/guide/essentials/settings.md
+++ b/docs/src/en/guide/essentials/settings.md
@@ -261,6 +261,7 @@ const defaultPreferences: Preferences = {
     enable: true,
     fit: 'contain',
     source: 'https://unpkg.com/@vbenjs/static-source@0.1.7/source/logo-v1.webp',
+    // sourceDark: 'https://unpkg.com/@vbenjs/static-source@0.1.7/source/logo-dark.webp', // Optional: Dark theme logo
   },
   navigation: {
     accordion: true,
@@ -457,6 +458,8 @@ interface LogoPreferences {
   fit: 'contain' | 'cover' | 'fill' | 'none' | 'scale-down';
   /** Logo URL */
   source: string;
+  /** Dark theme logo URL (optional, if not set, use source) */
+  sourceDark?: string;
 }
 
 interface NavigationPreferences {
diff --git a/docs/src/guide/essentials/settings.md b/docs/src/guide/essentials/settings.md
index 9b47c04d..f2290492 100644
--- a/docs/src/guide/essentials/settings.md
+++ b/docs/src/guide/essentials/settings.md
@@ -260,6 +260,7 @@ const defaultPreferences: Preferences = {
     enable: true,
     fit: 'contain',
     source: 'https://unpkg.com/@vbenjs/static-source@0.1.7/source/logo-v1.webp',
+    // sourceDark: 'https://unpkg.com/@vbenjs/static-source@0.1.7/source/logo-dark.webp', // 可选：暗色主题logo
   },
   navigation: {
     accordion: true,
@@ -457,6 +458,8 @@ interface LogoPreferences {
   fit: 'contain' | 'cover' | 'fill' | 'none' | 'scale-down';
   /** logo地址 */
   source: string;
+  /** 暗色主题logo地址 (可选，若不设置则使用 source) */
+  sourceDark?: string;
 }
 
 interface NavigationPreferences {
diff --git a/packages/@core/base/shared/src/utils/date.ts b/packages/@core/base/shared/src/utils/date.ts
index fa17aa8e..b56023c8 100644
--- a/packages/@core/base/shared/src/utils/date.ts
+++ b/packages/@core/base/shared/src/utils/date.ts
@@ -1,6 +1,6 @@
-import dayjs from "dayjs";
-import timezone from "dayjs/plugin/timezone";
-import utc from "dayjs/plugin/utc";
+import dayjs from 'dayjs';
+import timezone from 'dayjs/plugin/timezone';
+import utc from 'dayjs/plugin/utc';
 
 dayjs.extend(utc);
 dayjs.extend(timezone);
diff --git a/packages/@core/preferences/src/types.ts b/packages/@core/preferences/src/types.ts
index 584e919f..9a4d94bd 100644
--- a/packages/@core/preferences/src/types.ts
+++ b/packages/@core/preferences/src/types.ts
@@ -146,6 +146,8 @@ interface LogoPreferences {
   fit: 'contain' | 'cover' | 'fill' | 'none' | 'scale-down';
   /** logo地址 */
   source: string;
+  /** 暗色主题logo地址 (可选，若不设置则使用 source) */
+  sourceDark?: string;
 }
 
 interface NavigationPreferences {
diff --git a/packages/@core/ui-kit/shadcn-ui/src/components/logo/logo.vue b/packages/@core/ui-kit/shadcn-ui/src/components/logo/logo.vue
index d8be09a1..8ad1e81c 100644
--- a/packages/@core/ui-kit/shadcn-ui/src/components/logo/logo.vue
+++ b/packages/@core/ui-kit/shadcn-ui/src/components/logo/logo.vue
@@ -1,4 +1,6 @@
 <script setup lang="ts">
+import { computed } from 'vue';
+
 import { VbenAvatar } from '../avatar';
 
 interface Props {
@@ -22,6 +24,10 @@ interface Props {
    * @zh_CN Logo 图标
    */
   src?: string;
+  /**
+   * @zh_CN 暗色主题 Logo 图标 (可选，若不设置则使用 src)
+   */
+  srcDark?: string;
   /**
    * @zh_CN Logo 文本
    */
@@ -36,14 +42,27 @@ defineOptions({
   name: 'VbenLogo',
 });
 
-withDefaults(defineProps<Props>(), {
+const props = withDefaults(defineProps<Props>(), {
   collapsed: false,
   href: 'javascript:void 0',
   logoSize: 32,
   src: '',
+  srcDark: '',
   theme: 'light',
   fit: 'cover',
 });
+
+/**
+ * @zh_CN 根据主题选择合适的 logo 图标
+ */
+const logoSrc = computed(() => {
+  // 如果是暗色主题且提供了 srcDark，则使用暗色主题的 logo
+  if (props.theme === 'dark' && props.srcDark) {
+    return props.srcDark;
+  }
+  // 否则使用默认的 src
+  return props.src;
+});
 </script>
 
 <template>
@@ -54,9 +73,9 @@ withDefaults(defineProps<Props>(), {
       class="flex h-full items-center gap-2 overflow-hidden px-3 text-lg leading-normal transition-all duration-500"
     >
       <VbenAvatar
-        v-if="src"
+        v-if="logoSrc"
         :alt="text"
-        :src="src"
+        :src="logoSrc"
         :size="logoSize"
         :fit="fit"
         class="relative rounded-none bg-transparent"
diff --git a/packages/effects/layouts/src/authentication/authentication.vue b/packages/effects/layouts/src/authentication/authentication.vue
index 72e31bd3..6d3bf8c3 100644
--- a/packages/effects/layouts/src/authentication/authentication.vue
+++ b/packages/effects/layouts/src/authentication/authentication.vue
@@ -1,6 +1,8 @@
 <script setup lang="ts">
 import type { ToolbarType } from './types';
 
+import { computed } from 'vue';
+
 import { preferences, usePreferences } from '@vben/preferences';
 
 import { Copyright } from '../basic/copyright';
@@ -11,6 +13,7 @@ import Toolbar from './toolbar.vue';
 interface Props {
   appName?: string;
   logo?: string;
+  logoDark?: string;
   pageTitle?: string;
   pageDescription?: string;
   sloganImage?: string;
@@ -20,10 +23,11 @@ interface Props {
   clickLogo?: () => void;
 }
 
-withDefaults(defineProps<Props>(), {
+const props = withDefaults(defineProps<Props>(), {
   appName: '',
   copyright: true,
   logo: '',
+  logoDark: '',
   pageDescription: '',
   pageTitle: '',
   sloganImage: '',
@@ -34,6 +38,18 @@ withDefaults(defineProps<Props>(), {
 
 const { authPanelCenter, authPanelLeft, authPanelRight, isDark } =
   usePreferences();
+
+/**
+ * @zh_CN 根据主题选择合适的 logo 图标
+ */
+const logoSrc = computed(() => {
+  // 如果是暗色主题且提供了 logoDark，则使用暗色主题的 logo
+  if (isDark.value && props.logoDark) {
+    return props.logoDark;
+  }
+  // 否则使用默认的 logo
+  return props.logo;
+});
 </script>
 
 <template>
@@ -65,14 +81,21 @@ const { authPanelCenter, authPanelLeft, authPanelRight, isDark } =
     <slot name="logo">
       <!-- 头部 Logo 和应用名称 -->
       <div
-        v-if="logo || appName"
+        v-if="logoSrc || appName"
         class="absolute left-0 top-0 z-10 flex flex-1"
         @click="clickLogo"
       >
         <div
           class="text-foreground lg:text-foreground ml-4 mt-4 flex flex-1 items-center sm:left-6 sm:top-6"
         >
-          <img v-if="logo" :alt="appName" :src="logo" class="mr-2" width="42" />
+          <img
+            v-if="logoSrc"
+            :key="logoSrc"
+            :alt="appName"
+            :src="logoSrc"
+            class="mr-2"
+            width="42"
+          />
           <p v-if="appName" class="m-0 text-xl font-medium">
             {{ appName }}
           </p>
diff --git a/packages/effects/layouts/src/basic/layout.vue b/packages/effects/layouts/src/basic/layout.vue
index 6644e8a9..605f3cf5 100644
--- a/packages/effects/layouts/src/basic/layout.vue
+++ b/packages/effects/layouts/src/basic/layout.vue
@@ -259,6 +259,7 @@ const headerSlots = computed(() => {
         :class="logoClass"
         :collapsed="logoCollapsed"
         :src="preferences.logo.source"
+        :src-dark="preferences.logo.sourceDark"
         :text="preferences.app.name"
         :theme="showHeaderNav ? headerTheme : theme"
         @click="clickLogo"
@@ -350,6 +351,8 @@ const headerSlots = computed(() => {
       <VbenLogo
         v-if="preferences.logo.enable"
         :fit="preferences.logo.fit"
+        :src="preferences.logo.source"
+        :src-dark="preferences.logo.sourceDark"
         :text="preferences.app.name"
         :theme="theme"
       >
diff --git a/packages/stores/src/modules/timezone.ts b/packages/stores/src/modules/timezone.ts
index 32090427..24180c60 100644
--- a/packages/stores/src/modules/timezone.ts
+++ b/packages/stores/src/modules/timezone.ts
@@ -1,9 +1,12 @@
-import { ref, unref } from "vue";
+import { ref, unref } from 'vue';
 
-import { DEFAULT_TIME_ZONE_OPTIONS } from "@vben-core/preferences";
-import { getCurrentTimezone, setCurrentTimezone } from "@vben-core/shared/utils";
+import { DEFAULT_TIME_ZONE_OPTIONS } from '@vben-core/preferences';
+import {
+  getCurrentTimezone,
+  setCurrentTimezone,
+} from '@vben-core/shared/utils';
 
-import { acceptHMRUpdate, defineStore } from "pinia";
+import { acceptHMRUpdate, defineStore } from 'pinia';
 
 interface TimezoneHandler {
   getTimezone?: () => Promise<null | string | undefined>;

From a854760d26ed06dbca1a00fd4593391aae7d2ef8 Mon Sep 17 00:00:00 2001
From: zengmingyong <42780443+zengmingyong@users.noreply.github.com>
Date: Mon, 3 Nov 2025 13:08:06 +0800
Subject: [PATCH 18/23] =?UTF-8?q?refactor(jwt):=20=E6=9B=B4=E6=96=B0=20JWT?=
 =?UTF-8?q?=20=E5=B7=A5=E5=85=B7=E5=87=BD=E6=95=B0=E5=AE=9E=E7=8E=B0?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=20(#6869)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

refactor(jwt): 更新 JWT 工具函数实现方式

- 将默认导入 jsonwebtoken 改为解构导入 sign 和 verify 方法
---
 apps/backend-mock/utils/jwt-utils.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/backend-mock/utils/jwt-utils.ts b/apps/backend-mock/utils/jwt-utils.ts
index 71858307..f0f74323 100644
--- a/apps/backend-mock/utils/jwt-utils.ts
+++ b/apps/backend-mock/utils/jwt-utils.ts
@@ -3,7 +3,7 @@ import type { EventHandlerRequest, H3Event } from 'h3';
 import type { UserInfo } from './mock-data';
 
 import { getHeader } from 'h3';
-import jwt from 'jsonwebtoken';
+import { sign, verify } from 'jsonwebtoken';
 
 import { MOCK_USERS } from './mock-data';
 
@@ -17,11 +17,11 @@ export interface UserPayload extends UserInfo {
 }
 
 export function generateAccessToken(user: UserInfo) {
-  return jwt.sign(user, ACCESS_TOKEN_SECRET, { expiresIn: '7d' });
+  return sign(user, ACCESS_TOKEN_SECRET, { expiresIn: '7d' });
 }
 
 export function generateRefreshToken(user: UserInfo) {
-  return jwt.sign(user, REFRESH_TOKEN_SECRET, {
+  return sign(user, REFRESH_TOKEN_SECRET, {
     expiresIn: '30d',
   });
 }
@@ -40,7 +40,7 @@ export function verifyAccessToken(
   }
   const token = tokenParts[1] as string;
   try {
-    const decoded = jwt.verify(
+    const decoded = verify(
       token,
       ACCESS_TOKEN_SECRET,
     ) as unknown as UserPayload;
@@ -61,7 +61,7 @@ export function verifyRefreshToken(
   token: string,
 ): null | Omit<UserInfo, 'password'> {
   try {
-    const decoded = jwt.verify(token, REFRESH_TOKEN_SECRET) as UserPayload;
+    const decoded = verify(token, REFRESH_TOKEN_SECRET) as UserPayload;
     const username = decoded.username;
     const user = MOCK_USERS.find(
       (item) => item.username === username,

From 348c97710fea49bd65b47820e98b82b08e9e320d Mon Sep 17 00:00:00 2001
From: Jin Mao <jinmao88@qq.com>
Date: Mon, 3 Nov 2025 19:34:45 +0800
Subject: [PATCH 19/23] =?UTF-8?q?Revert=20"refactor(jwt):=20=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=20JWT=20=E5=B7=A5=E5=85=B7=E5=87=BD=E6=95=B0=E5=AE=9E?=
 =?UTF-8?q?=E7=8E=B0=E6=96=B9=E5=BC=8F=20(#6869)"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit a854760d26ed06dbca1a00fd4593391aae7d2ef8.
---
 apps/backend-mock/utils/jwt-utils.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/apps/backend-mock/utils/jwt-utils.ts b/apps/backend-mock/utils/jwt-utils.ts
index f0f74323..71858307 100644
--- a/apps/backend-mock/utils/jwt-utils.ts
+++ b/apps/backend-mock/utils/jwt-utils.ts
@@ -3,7 +3,7 @@ import type { EventHandlerRequest, H3Event } from 'h3';
 import type { UserInfo } from './mock-data';
 
 import { getHeader } from 'h3';
-import { sign, verify } from 'jsonwebtoken';
+import jwt from 'jsonwebtoken';
 
 import { MOCK_USERS } from './mock-data';
 
@@ -17,11 +17,11 @@ export interface UserPayload extends UserInfo {
 }
 
 export function generateAccessToken(user: UserInfo) {
-  return sign(user, ACCESS_TOKEN_SECRET, { expiresIn: '7d' });
+  return jwt.sign(user, ACCESS_TOKEN_SECRET, { expiresIn: '7d' });
 }
 
 export function generateRefreshToken(user: UserInfo) {
-  return sign(user, REFRESH_TOKEN_SECRET, {
+  return jwt.sign(user, REFRESH_TOKEN_SECRET, {
     expiresIn: '30d',
   });
 }
@@ -40,7 +40,7 @@ export function verifyAccessToken(
   }
   const token = tokenParts[1] as string;
   try {
-    const decoded = verify(
+    const decoded = jwt.verify(
       token,
       ACCESS_TOKEN_SECRET,
     ) as unknown as UserPayload;
@@ -61,7 +61,7 @@ export function verifyRefreshToken(
   token: string,
 ): null | Omit<UserInfo, 'password'> {
   try {
-    const decoded = verify(token, REFRESH_TOKEN_SECRET) as UserPayload;
+    const decoded = jwt.verify(token, REFRESH_TOKEN_SECRET) as UserPayload;
     const username = decoded.username;
     const user = MOCK_USERS.find(
       (item) => item.username === username,

From c8af58086698772167363a51fdedf7556d1bc8c7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Nov 2025 04:14:47 +0800
Subject: [PATCH 20/23] chore(deps): bump SamKirkland/FTP-Deploy-Action (#6873)

Bumps the non-breaking-changes group with 1 update: [SamKirkland/FTP-Deploy-Action](https://github.com/samkirkland/ftp-deploy-action).


Updates `SamKirkland/FTP-Deploy-Action` from 4.3.5 to 4.3.6
- [Release notes](https://github.com/samkirkland/ftp-deploy-action/releases)
- [Commits](https://github.com/samkirkland/ftp-deploy-action/compare/v4.3.5...v4.3.6)

---
updated-dependencies:
- dependency-name: SamKirkland/FTP-Deploy-Action
  dependency-version: 4.3.6
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: non-breaking-changes
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/deploy.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index b4afdd93..bb59abb0 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -30,7 +30,7 @@ jobs:
         run: pnpm build:play
 
       - name: Sync Playground files
-        uses: SamKirkland/FTP-Deploy-Action@v4.3.5
+        uses: SamKirkland/FTP-Deploy-Action@v4.3.6
         with:
           server: ${{ secrets.PRO_FTP_HOST }}
           username: ${{ secrets.WEB_PLAYGROUND_FTP_ACCOUNT }}
@@ -54,7 +54,7 @@ jobs:
         run: pnpm build:docs
 
       - name: Sync Docs files
-        uses: SamKirkland/FTP-Deploy-Action@v4.3.5
+        uses: SamKirkland/FTP-Deploy-Action@v4.3.6
         with:
           server: ${{ secrets.PRO_FTP_HOST }}
           username: ${{ secrets.WEBSITE_FTP_ACCOUNT }}
@@ -85,7 +85,7 @@ jobs:
         run: pnpm run build:antd
 
       - name: Sync files
-        uses: SamKirkland/FTP-Deploy-Action@v4.3.5
+        uses: SamKirkland/FTP-Deploy-Action@v4.3.6
         with:
           server: ${{ secrets.PRO_FTP_HOST }}
           username: ${{ secrets.WEB_ANTD_FTP_ACCOUNT }}
@@ -116,7 +116,7 @@ jobs:
         run: pnpm run build:ele
 
       - name: Sync files
-        uses: SamKirkland/FTP-Deploy-Action@v4.3.5
+        uses: SamKirkland/FTP-Deploy-Action@v4.3.6
         with:
           server: ${{ secrets.PRO_FTP_HOST }}
           username: ${{ secrets.WEB_ELE_FTP_ACCOUNT }}
@@ -147,7 +147,7 @@ jobs:
         run: pnpm run build:naive
 
       - name: Sync files
-        uses: SamKirkland/FTP-Deploy-Action@v4.3.5
+        uses: SamKirkland/FTP-Deploy-Action@v4.3.6
         with:
           server: ${{ secrets.PRO_FTP_HOST }}
           username: ${{ secrets.WEB_NAIVE_FTP_ACCOUNT }}

From fdc78faa13c13a0d4a897c81f7937c29876e16d3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Nov 2025 04:16:37 +0800
Subject: [PATCH 21/23] chore(deps): bump @vueuse/integrations from 12.8.2 to
 14.0.0 (#6861)

Bumps [@vueuse/integrations](https://github.com/vueuse/vueuse/tree/HEAD/packages/integrations) from 12.8.2 to 14.0.0.
- [Release notes](https://github.com/vueuse/vueuse/releases)
- [Commits](https://github.com/vueuse/vueuse/commits/v14.0.0/packages/integrations)

---
updated-dependencies:
- dependency-name: "@vueuse/integrations"
  dependency-version: 14.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pnpm-lock.yaml      | 44 +++++++++++++++++++++++++++++++++++---------
 pnpm-workspace.yaml |  2 +-
 2 files changed, 36 insertions(+), 10 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 82bf03bf..5a0d2618 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -148,8 +148,8 @@ catalogs:
       specifier: ^13.4.0
       version: 13.4.0
     '@vueuse/integrations':
-      specifier: ^13.4.0
-      version: 13.4.0
+      specifier: ^14.0.0
+      version: 14.0.0
     '@vueuse/motion':
       specifier: ^3.0.3
       version: 3.0.3
@@ -1553,7 +1553,7 @@ importers:
         version: 13.4.0(vue@3.5.17(typescript@5.8.3))
       '@vueuse/integrations':
         specifier: 'catalog:'
-        version: 13.4.0(async-validator@4.2.5)(axios@1.10.0)(focus-trap@7.6.4)(jwt-decode@4.0.0)(nprogress@0.2.0)(qrcode@1.5.4)(sortablejs@1.15.6)(vue@3.5.17(typescript@5.8.3))
+        version: 14.0.0(async-validator@4.2.5)(axios@1.10.0)(focus-trap@7.6.4)(jwt-decode@4.0.0)(nprogress@0.2.0)(qrcode@1.5.4)(sortablejs@1.15.6)(vue@3.5.17(typescript@5.8.3))
       json-bigint:
         specifier: 'catalog:'
         version: 1.0.0
@@ -5322,6 +5322,11 @@ packages:
     peerDependencies:
       vue: ^3.5.17
 
+  '@vueuse/core@14.0.0':
+    resolution: {integrity: sha512-d6tKRWkZE8IQElX2aHBxXOMD478fHIYV+Dzm2y9Ag122ICBpNKtGICiXKOhWU3L1kKdttDD9dCMS4bGP3jhCTQ==}
+    peerDependencies:
+      vue: ^3.5.17
+
   '@vueuse/core@9.13.0':
     resolution: {integrity: sha512-pujnclbeHWxxPRqXWmdkKV5OX4Wk4YeK7wusHqRwU0Q7EFusHoqNA/aPhB6KCh9hEqJkLAJo7bb0Lh9b+OIVzw==}
 
@@ -5366,8 +5371,8 @@ packages:
       universal-cookie:
         optional: true
 
-  '@vueuse/integrations@13.4.0':
-    resolution: {integrity: sha512-rwNoE0MNJBUuSzTZcUVrkovtHvpWIySOcC6XpcS33ZarHDNhd9CPvCD4eNl3N0Phz1he1JV0iYULRyPQ5HCbFA==}
+  '@vueuse/integrations@14.0.0':
+    resolution: {integrity: sha512-5A0X7q9qyLtM3xyghq5nK/NEESf7cpcZlkQgXTMuW4JWiAMYxc1ImdhhGrk4negFBsq3ejvAlRmLdNrkcTzk1Q==}
     peerDependencies:
       async-validator: ^4
       axios: ^1
@@ -5380,7 +5385,7 @@ packages:
       nprogress: ^0.2
       qrcode: ^1.5
       sortablejs: ^1
-      universal-cookie: ^7
+      universal-cookie: ^7 || ^8
       vue: ^3.5.17
     peerDependenciesMeta:
       async-validator:
@@ -5417,6 +5422,9 @@ packages:
   '@vueuse/metadata@13.4.0':
     resolution: {integrity: sha512-CPDQ/IgOeWbqItg1c/pS+Ulum63MNbpJ4eecjFJqgD/JUCJ822zLfpw6M9HzSvL6wbzMieOtIAW/H8deQASKHg==}
 
+  '@vueuse/metadata@14.0.0':
+    resolution: {integrity: sha512-6yoGqbJcMldVCevkFiHDBTB1V5Hq+G/haPlGIuaFZHpXC0HADB0EN1ryQAAceiW+ryS3niUwvdFbGiqHqBrfVA==}
+
   '@vueuse/metadata@9.13.0':
     resolution: {integrity: sha512-gdU7TKNAUVlXXLbaF+ZCfte8BjRJQWPCa2J55+7/h+yDtzw3vOoGQDRXzI6pyKyo6bXFT5/QoPE4hAknExjRLQ==}
 
@@ -5441,6 +5449,11 @@ packages:
     peerDependencies:
       vue: ^3.5.17
 
+  '@vueuse/shared@14.0.0':
+    resolution: {integrity: sha512-mTCA0uczBgurRlwVaQHfG0Ja7UdGe4g9mwffiJmvLiTtp1G4AQyIjej6si/k8c8pUwTfVpNufck+23gXptPAkw==}
+    peerDependencies:
+      vue: ^3.5.17
+
   '@vueuse/shared@9.13.0':
     resolution: {integrity: sha512-UrnhU+Cnufu4S6JLCPZnkWh0WwZGUp72ktOF2DFptMlOs3TOdVv8xJN53zhHGARmVOsz5KqOls09+J1NR6sBKw==}
 
@@ -15687,6 +15700,13 @@ snapshots:
       '@vueuse/shared': 13.4.0(vue@3.5.17(typescript@5.8.3))
       vue: 3.5.17(typescript@5.8.3)
 
+  '@vueuse/core@14.0.0(vue@3.5.17(typescript@5.8.3))':
+    dependencies:
+      '@types/web-bluetooth': 0.0.21
+      '@vueuse/metadata': 14.0.0
+      '@vueuse/shared': 14.0.0(vue@3.5.17(typescript@5.8.3))
+      vue: 3.5.17(typescript@5.8.3)
+
   '@vueuse/core@9.13.0(vue@3.5.17(typescript@5.8.3))':
     dependencies:
       '@types/web-bluetooth': 0.0.16
@@ -15713,10 +15733,10 @@ snapshots:
     transitivePeerDependencies:
       - typescript
 
-  '@vueuse/integrations@13.4.0(async-validator@4.2.5)(axios@1.10.0)(focus-trap@7.6.4)(jwt-decode@4.0.0)(nprogress@0.2.0)(qrcode@1.5.4)(sortablejs@1.15.6)(vue@3.5.17(typescript@5.8.3))':
+  '@vueuse/integrations@14.0.0(async-validator@4.2.5)(axios@1.10.0)(focus-trap@7.6.4)(jwt-decode@4.0.0)(nprogress@0.2.0)(qrcode@1.5.4)(sortablejs@1.15.6)(vue@3.5.17(typescript@5.8.3))':
     dependencies:
-      '@vueuse/core': 13.4.0(vue@3.5.17(typescript@5.8.3))
-      '@vueuse/shared': 13.4.0(vue@3.5.17(typescript@5.8.3))
+      '@vueuse/core': 14.0.0(vue@3.5.17(typescript@5.8.3))
+      '@vueuse/shared': 14.0.0(vue@3.5.17(typescript@5.8.3))
       vue: 3.5.17(typescript@5.8.3)
     optionalDependencies:
       async-validator: 4.2.5
@@ -15733,6 +15753,8 @@ snapshots:
 
   '@vueuse/metadata@13.4.0': {}
 
+  '@vueuse/metadata@14.0.0': {}
+
   '@vueuse/metadata@9.13.0': {}
 
   '@vueuse/motion@3.0.3(magicast@0.3.5)(vue@3.5.17(typescript@5.8.3))':
@@ -15770,6 +15792,10 @@ snapshots:
     dependencies:
       vue: 3.5.17(typescript@5.8.3)
 
+  '@vueuse/shared@14.0.0(vue@3.5.17(typescript@5.8.3))':
+    dependencies:
+      vue: 3.5.17(typescript@5.8.3)
+
   '@vueuse/shared@9.13.0(vue@3.5.17(typescript@5.8.3))':
     dependencies:
       vue-demi: 0.14.10(vue@3.5.17(typescript@5.8.3))
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 9751fb61..cd75c77b 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -64,7 +64,7 @@ catalog:
   '@vue/shared': ^3.5.17
   '@vue/test-utils': ^2.4.6
   '@vueuse/core': ^13.4.0
-  '@vueuse/integrations': ^13.4.0
+  '@vueuse/integrations': ^14.0.0
   '@vueuse/motion': ^3.0.3
   ant-design-vue: ^4.2.6
   archiver: ^7.0.1

From 23c41a80592cc9b53b80f1582843d8118bcc8a34 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 4 Nov 2025 04:16:59 +0800
Subject: [PATCH 22/23] chore(deps): bump @types/node from 12.20.55 to 24.9.2
 (#6860)

Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 12.20.55 to 24.9.2.
- [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases)
- [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node)

---
updated-dependencies:
- dependency-name: "@types/node"
  dependency-version: 24.9.2
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 pnpm-lock.yaml      | 216 +++++++++++++++++++++++---------------------
 pnpm-workspace.yaml |   2 +-
 2 files changed, 115 insertions(+), 103 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 5a0d2618..13d9cb3e 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -103,8 +103,8 @@ catalogs:
       specifier: ^4.3.9
       version: 4.3.9
     '@types/node':
-      specifier: ^22.16.0
-      version: 22.16.0
+      specifier: ^24.9.2
+      version: 24.9.2
     '@types/nprogress':
       specifier: ^0.2.3
       version: 0.2.3
@@ -546,7 +546,7 @@ importers:
         version: 1.53.2
       '@types/node':
         specifier: 'catalog:'
-        version: 22.16.0
+        version: 24.9.2
       '@vben/commitlint-config':
         specifier: workspace:*
         version: link:internal/lint-configs/commitlint-config
@@ -576,10 +576,10 @@ importers:
         version: link:scripts/vsh
       '@vitejs/plugin-vue':
         specifier: 'catalog:'
-        version: 6.0.1(vite@7.1.2(@types/node@22.16.0)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0))(vue@3.5.17(typescript@5.8.3))
+        version: 6.0.1(vite@7.1.2(@types/node@24.9.2)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0))(vue@3.5.17(typescript@5.8.3))
       '@vitejs/plugin-vue-jsx':
         specifier: 'catalog:'
-        version: 5.0.1(vite@7.1.2(@types/node@22.16.0)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0))(vue@3.5.17(typescript@5.8.3))
+        version: 5.0.1(vite@7.1.2(@types/node@24.9.2)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0))(vue@3.5.17(typescript@5.8.3))
       '@vue/test-utils':
         specifier: 'catalog:'
         version: 2.4.6
@@ -621,10 +621,10 @@ importers:
         version: 3.6.1(sass@1.89.2)(typescript@5.8.3)(vue-tsc@2.2.10(typescript@5.8.3))(vue@3.5.17(typescript@5.8.3))
       vite:
         specifier: 'catalog:'
-        version: 7.1.2(@types/node@22.16.0)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0)
+        version: 7.1.2(@types/node@24.9.2)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0)
       vitest:
         specifier: 'catalog:'
-        version: 3.2.4(@types/node@22.16.0)(happy-dom@17.6.3)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0)
+        version: 3.2.4(@types/node@24.9.2)(happy-dom@17.6.3)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0)
       vue:
         specifier: ^3.5.17
         version: 3.5.17(typescript@5.8.3)
@@ -872,20 +872,20 @@ importers:
         version: 1.9.17(vue@3.5.17(typescript@5.8.3))
       vitepress-plugin-group-icons:
         specifier: 'catalog:'
-        version: 1.6.1(markdown-it@14.1.0)(vite@5.4.18(@types/node@22.16.0)(less@4.3.0)(sass@1.89.2)(terser@5.39.0))
+        version: 1.6.1(markdown-it@14.1.0)(vite@5.4.18(@types/node@24.9.2)(less@4.3.0)(sass@1.89.2)(terser@5.39.0))
     devDependencies:
       '@nolebase/vitepress-plugin-git-changelog':
         specifier: 'catalog:'
-        version: 2.18.0(typescript@5.8.3)(vitepress@1.6.3(@algolia/client-search@5.23.4)(@types/node@22.16.0)(async-validator@4.2.5)(axios@1.10.0)(jwt-decode@4.0.0)(less@4.3.0)(nprogress@0.2.0)(postcss@8.5.6)(qrcode@1.5.4)(sass@1.89.2)(search-insights@2.17.3)(sortablejs@1.15.6)(terser@5.39.0)(typescript@5.8.3))
+        version: 2.18.0(typescript@5.8.3)(vitepress@1.6.3(@algolia/client-search@5.23.4)(@types/node@24.9.2)(async-validator@4.2.5)(axios@1.10.0)(jwt-decode@4.0.0)(less@4.3.0)(nprogress@0.2.0)(postcss@8.5.6)(qrcode@1.5.4)(sass@1.89.2)(search-insights@2.17.3)(sortablejs@1.15.6)(terser@5.39.0)(typescript@5.8.3))
       '@vben/vite-config':
         specifier: workspace:*
         version: link:../internal/vite-config
       '@vite-pwa/vitepress':
         specifier: 'catalog:'
-        version: 1.0.0(vite-plugin-pwa@1.0.1(vite@5.4.18(@types/node@22.16.0)(less@4.3.0)(sass@1.89.2)(terser@5.39.0))(workbox-build@7.3.0)(workbox-window@7.3.0))
+        version: 1.0.0(vite-plugin-pwa@1.0.1(vite@5.4.18(@types/node@24.9.2)(less@4.3.0)(sass@1.89.2)(terser@5.39.0))(workbox-build@7.3.0)(workbox-window@7.3.0))
       vitepress:
         specifier: 'catalog:'
-        version: 1.6.3(@algolia/client-search@5.23.4)(@types/node@22.16.0)(async-validator@4.2.5)(axios@1.10.0)(jwt-decode@4.0.0)(less@4.3.0)(nprogress@0.2.0)(postcss@8.5.6)(qrcode@1.5.4)(sass@1.89.2)(search-insights@2.17.3)(sortablejs@1.15.6)(terser@5.39.0)(typescript@5.8.3)
+        version: 1.6.3(@algolia/client-search@5.23.4)(@types/node@24.9.2)(async-validator@4.2.5)(axios@1.10.0)(jwt-decode@4.0.0)(less@4.3.0)(nprogress@0.2.0)(postcss@8.5.6)(qrcode@1.5.4)(sass@1.89.2)(search-insights@2.17.3)(sortablejs@1.15.6)(terser@5.39.0)(typescript@5.8.3)
       vue:
         specifier: ^3.5.17
         version: 3.5.17(typescript@5.8.3)
@@ -894,7 +894,7 @@ importers:
     dependencies:
       '@commitlint/cli':
         specifier: 'catalog:'
-        version: 19.8.1(@types/node@22.16.0)(typescript@5.8.3)
+        version: 19.8.1(@types/node@24.9.2)(typescript@5.8.3)
       '@commitlint/config-conventional':
         specifier: 'catalog:'
         version: 19.8.1
@@ -970,7 +970,7 @@ importers:
         version: 4.1.4(@typescript-eslint/eslint-plugin@8.35.1(@typescript-eslint/parser@8.35.1(eslint@9.30.1(jiti@2.5.1))(typescript@5.8.3))(eslint@9.30.1(jiti@2.5.1))(typescript@5.8.3))(eslint@9.30.1(jiti@2.5.1))
       eslint-plugin-vitest:
         specifier: 'catalog:'
-        version: 0.5.4(@typescript-eslint/eslint-plugin@8.35.1(@typescript-eslint/parser@8.35.1(eslint@9.30.1(jiti@2.5.1))(typescript@5.8.3))(eslint@9.30.1(jiti@2.5.1))(typescript@5.8.3))(eslint@9.30.1(jiti@2.5.1))(typescript@5.8.3)(vitest@3.2.4(@types/node@22.16.0)(happy-dom@17.6.3)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0))
+        version: 0.5.4(@typescript-eslint/eslint-plugin@8.35.1(@typescript-eslint/parser@8.35.1(eslint@9.30.1(jiti@2.5.1))(typescript@5.8.3))(eslint@9.30.1(jiti@2.5.1))(typescript@5.8.3))(eslint@9.30.1(jiti@2.5.1))(typescript@5.8.3)(vitest@3.2.4(@types/node@24.9.2)(happy-dom@17.6.3)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0))
       eslint-plugin-vue:
         specifier: 'catalog:'
         version: 10.2.0(eslint@9.30.1(jiti@2.5.1))(vue-eslint-parser@10.2.0(eslint@9.30.1(jiti@2.5.1)))
@@ -1128,7 +1128,7 @@ importers:
         version: link:../../packages/types
       vite:
         specifier: 'catalog:'
-        version: 7.1.2(@types/node@22.16.0)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0)
+        version: 7.1.2(@types/node@24.9.2)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0)
 
   internal/vite-config:
     dependencies:
@@ -1158,10 +1158,10 @@ importers:
         version: 2.0.3
       vite-plugin-pwa:
         specifier: 'catalog:'
-        version: 1.0.1(vite@7.1.2(@types/node@22.16.0)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0))(workbox-build@7.3.0)(workbox-window@7.3.0)
+        version: 1.0.1(vite@7.1.2(@types/node@24.9.2)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0))(workbox-build@7.3.0)(workbox-window@7.3.0)
       vite-plugin-vue-devtools:
         specifier: 'catalog:'
-        version: 7.7.7(rollup@4.44.1)(vite@7.1.2(@types/node@22.16.0)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0))(vue@3.5.17(typescript@5.8.3))
+        version: 7.7.7(rollup@4.44.1)(vite@7.1.2(@types/node@24.9.2)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0))(vue@3.5.17(typescript@5.8.3))
     devDependencies:
       '@pnpm/workspace.read-manifest':
         specifier: 'catalog:'
@@ -1177,10 +1177,10 @@ importers:
         version: link:../node-utils
       '@vitejs/plugin-vue':
         specifier: 'catalog:'
-        version: 6.0.1(vite@7.1.2(@types/node@22.16.0)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0))(vue@3.5.17(typescript@5.8.3))
+        version: 6.0.1(vite@7.1.2(@types/node@24.9.2)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0))(vue@3.5.17(typescript@5.8.3))
       '@vitejs/plugin-vue-jsx':
         specifier: 'catalog:'
-        version: 5.0.1(vite@7.1.2(@types/node@22.16.0)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0))(vue@3.5.17(typescript@5.8.3))
+        version: 5.0.1(vite@7.1.2(@types/node@24.9.2)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0))(vue@3.5.17(typescript@5.8.3))
       dayjs:
         specifier: 'catalog:'
         version: 1.11.13
@@ -1198,16 +1198,16 @@ importers:
         version: 1.89.2
       vite:
         specifier: 'catalog:'
-        version: 7.1.2(@types/node@22.16.0)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0)
+        version: 7.1.2(@types/node@24.9.2)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0)
       vite-plugin-compression:
         specifier: 'catalog:'
-        version: 0.5.1(vite@7.1.2(@types/node@22.16.0)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0))
+        version: 0.5.1(vite@7.1.2(@types/node@24.9.2)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0))
       vite-plugin-dts:
         specifier: 'catalog:'
-        version: 4.5.4(@types/node@22.16.0)(rollup@4.44.1)(typescript@5.8.3)(vite@7.1.2(@types/node@22.16.0)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0))
+        version: 4.5.4(@types/node@24.9.2)(rollup@4.44.1)(typescript@5.8.3)(vite@7.1.2(@types/node@24.9.2)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0))
       vite-plugin-html:
         specifier: 'catalog:'
-        version: 3.2.2(vite@7.1.2(@types/node@22.16.0)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0))
+        version: 3.2.2(vite@7.1.2(@types/node@24.9.2)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0))
       vite-plugin-lazy-import:
         specifier: 'catalog:'
         version: 1.0.7
@@ -4836,6 +4836,9 @@ packages:
   '@types/node@22.16.0':
     resolution: {integrity: sha512-B2egV9wALML1JCpv3VQoQ+yesQKAmNMBIAY7OteVrikcOcAkWm+dGL6qpeCktPjAv6N1JLnhbNiqS35UpFyBsQ==}
 
+  '@types/node@24.9.2':
+    resolution: {integrity: sha512-uWN8YqxXxqFMX2RqGOrumsKeti4LlmIMIyV0lgut4jx7KQBcBiW6vkDtIBvHnHIquwNfJhk8v2OtmO8zXWHfPA==}
+
   '@types/normalize-package-data@2.4.4':
     resolution: {integrity: sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==}
 
@@ -10985,6 +10988,9 @@ packages:
   undici-types@6.21.0:
     resolution: {integrity: sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==}
 
+  undici-types@7.16.0:
+    resolution: {integrity: sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==}
+
   undici@7.11.0:
     resolution: {integrity: sha512-heTSIac3iLhsmZhUCjyS3JQEkZELateufzZuBaVM5RHXdSBMb1LPMQf5x+FH7qjsZYDP0ttAc3nnVpUB+wYbOg==}
     engines: {node: '>=20.18.1'}
@@ -12996,11 +13002,11 @@ snapshots:
 
   '@colors/colors@1.6.0': {}
 
-  '@commitlint/cli@19.8.1(@types/node@22.16.0)(typescript@5.8.3)':
+  '@commitlint/cli@19.8.1(@types/node@24.9.2)(typescript@5.8.3)':
     dependencies:
       '@commitlint/format': 19.8.1
       '@commitlint/lint': 19.8.1
-      '@commitlint/load': 19.8.1(@types/node@22.16.0)(typescript@5.8.3)
+      '@commitlint/load': 19.8.1(@types/node@24.9.2)(typescript@5.8.3)
       '@commitlint/read': 19.8.1
       '@commitlint/types': 19.8.1
       tinyexec: 1.0.1
@@ -13047,7 +13053,7 @@ snapshots:
       '@commitlint/rules': 19.8.1
       '@commitlint/types': 19.8.1
 
-  '@commitlint/load@19.8.1(@types/node@22.16.0)(typescript@5.8.3)':
+  '@commitlint/load@19.8.1(@types/node@24.9.2)(typescript@5.8.3)':
     dependencies:
       '@commitlint/config-validator': 19.8.1
       '@commitlint/execute-rule': 19.8.1
@@ -13055,7 +13061,7 @@ snapshots:
       '@commitlint/types': 19.8.1
       chalk: 5.4.1
       cosmiconfig: 9.0.0(typescript@5.8.3)
-      cosmiconfig-typescript-loader: 6.1.0(@types/node@22.16.0)(cosmiconfig@9.0.0(typescript@5.8.3))(typescript@5.8.3)
+      cosmiconfig-typescript-loader: 6.1.0(@types/node@24.9.2)(cosmiconfig@9.0.0(typescript@5.8.3))(typescript@5.8.3)
       lodash.isplainobject: 4.0.6
       lodash.merge: 4.6.2
       lodash.uniq: 4.5.0
@@ -14091,23 +14097,23 @@ snapshots:
       - encoding
       - supports-color
 
-  '@microsoft/api-extractor-model@7.30.5(@types/node@22.16.0)':
+  '@microsoft/api-extractor-model@7.30.5(@types/node@24.9.2)':
     dependencies:
       '@microsoft/tsdoc': 0.15.1
       '@microsoft/tsdoc-config': 0.17.1
-      '@rushstack/node-core-library': 5.13.0(@types/node@22.16.0)
+      '@rushstack/node-core-library': 5.13.0(@types/node@24.9.2)
     transitivePeerDependencies:
       - '@types/node'
 
-  '@microsoft/api-extractor@7.52.5(@types/node@22.16.0)':
+  '@microsoft/api-extractor@7.52.5(@types/node@24.9.2)':
     dependencies:
-      '@microsoft/api-extractor-model': 7.30.5(@types/node@22.16.0)
+      '@microsoft/api-extractor-model': 7.30.5(@types/node@24.9.2)
       '@microsoft/tsdoc': 0.15.1
       '@microsoft/tsdoc-config': 0.17.1
-      '@rushstack/node-core-library': 5.13.0(@types/node@22.16.0)
+      '@rushstack/node-core-library': 5.13.0(@types/node@24.9.2)
       '@rushstack/rig-package': 0.5.3
-      '@rushstack/terminal': 0.15.2(@types/node@22.16.0)
-      '@rushstack/ts-command-line': 5.0.0(@types/node@22.16.0)
+      '@rushstack/terminal': 0.15.2(@types/node@24.9.2)
+      '@rushstack/ts-command-line': 5.0.0(@types/node@24.9.2)
       lodash: 4.17.21
       minimatch: 3.0.8
       resolve: 1.22.10
@@ -14236,19 +14242,19 @@ snapshots:
       '@nodelib/fs.scandir': 2.1.5
       fastq: 1.19.1
 
-  '@nolebase/ui@2.18.0(typescript@5.8.3)(vitepress@1.6.3(@algolia/client-search@5.23.4)(@types/node@22.16.0)(async-validator@4.2.5)(axios@1.10.0)(jwt-decode@4.0.0)(less@4.3.0)(nprogress@0.2.0)(postcss@8.5.6)(qrcode@1.5.4)(sass@1.89.2)(search-insights@2.17.3)(sortablejs@1.15.6)(terser@5.39.0)(typescript@5.8.3))':
+  '@nolebase/ui@2.18.0(typescript@5.8.3)(vitepress@1.6.3(@algolia/client-search@5.23.4)(@types/node@24.9.2)(async-validator@4.2.5)(axios@1.10.0)(jwt-decode@4.0.0)(less@4.3.0)(nprogress@0.2.0)(postcss@8.5.6)(qrcode@1.5.4)(sass@1.89.2)(search-insights@2.17.3)(sortablejs@1.15.6)(terser@5.39.0)(typescript@5.8.3))':
     dependencies:
       '@iconify-json/octicon': 1.2.7
       less: 4.3.0
-      vitepress: 1.6.3(@algolia/client-search@5.23.4)(@types/node@22.16.0)(async-validator@4.2.5)(axios@1.10.0)(jwt-decode@4.0.0)(less@4.3.0)(nprogress@0.2.0)(postcss@8.5.6)(qrcode@1.5.4)(sass@1.89.2)(search-insights@2.17.3)(sortablejs@1.15.6)(terser@5.39.0)(typescript@5.8.3)
+      vitepress: 1.6.3(@algolia/client-search@5.23.4)(@types/node@24.9.2)(async-validator@4.2.5)(axios@1.10.0)(jwt-decode@4.0.0)(less@4.3.0)(nprogress@0.2.0)(postcss@8.5.6)(qrcode@1.5.4)(sass@1.89.2)(search-insights@2.17.3)(sortablejs@1.15.6)(terser@5.39.0)(typescript@5.8.3)
       vue: 3.5.17(typescript@5.8.3)
     transitivePeerDependencies:
       - typescript
 
-  '@nolebase/vitepress-plugin-git-changelog@2.18.0(typescript@5.8.3)(vitepress@1.6.3(@algolia/client-search@5.23.4)(@types/node@22.16.0)(async-validator@4.2.5)(axios@1.10.0)(jwt-decode@4.0.0)(less@4.3.0)(nprogress@0.2.0)(postcss@8.5.6)(qrcode@1.5.4)(sass@1.89.2)(search-insights@2.17.3)(sortablejs@1.15.6)(terser@5.39.0)(typescript@5.8.3))':
+  '@nolebase/vitepress-plugin-git-changelog@2.18.0(typescript@5.8.3)(vitepress@1.6.3(@algolia/client-search@5.23.4)(@types/node@24.9.2)(async-validator@4.2.5)(axios@1.10.0)(jwt-decode@4.0.0)(less@4.3.0)(nprogress@0.2.0)(postcss@8.5.6)(qrcode@1.5.4)(sass@1.89.2)(search-insights@2.17.3)(sortablejs@1.15.6)(terser@5.39.0)(typescript@5.8.3))':
     dependencies:
       '@iconify-json/octicon': 1.2.7
-      '@nolebase/ui': 2.18.0(typescript@5.8.3)(vitepress@1.6.3(@algolia/client-search@5.23.4)(@types/node@22.16.0)(async-validator@4.2.5)(axios@1.10.0)(jwt-decode@4.0.0)(less@4.3.0)(nprogress@0.2.0)(postcss@8.5.6)(qrcode@1.5.4)(sass@1.89.2)(search-insights@2.17.3)(sortablejs@1.15.6)(terser@5.39.0)(typescript@5.8.3))
+      '@nolebase/ui': 2.18.0(typescript@5.8.3)(vitepress@1.6.3(@algolia/client-search@5.23.4)(@types/node@24.9.2)(async-validator@4.2.5)(axios@1.10.0)(jwt-decode@4.0.0)(less@4.3.0)(nprogress@0.2.0)(postcss@8.5.6)(qrcode@1.5.4)(sass@1.89.2)(search-insights@2.17.3)(sortablejs@1.15.6)(terser@5.39.0)(typescript@5.8.3))
       colorette: 2.0.20
       date-fns: 4.1.0
       defu: 6.1.4
@@ -14258,7 +14264,7 @@ snapshots:
       gray-matter: 4.0.3
       less: 4.3.0
       uncrypto: 0.1.3
-      vitepress: 1.6.3(@algolia/client-search@5.23.4)(@types/node@22.16.0)(async-validator@4.2.5)(axios@1.10.0)(jwt-decode@4.0.0)(less@4.3.0)(nprogress@0.2.0)(postcss@8.5.6)(qrcode@1.5.4)(sass@1.89.2)(search-insights@2.17.3)(sortablejs@1.15.6)(terser@5.39.0)(typescript@5.8.3)
+      vitepress: 1.6.3(@algolia/client-search@5.23.4)(@types/node@24.9.2)(async-validator@4.2.5)(axios@1.10.0)(jwt-decode@4.0.0)(less@4.3.0)(nprogress@0.2.0)(postcss@8.5.6)(qrcode@1.5.4)(sass@1.89.2)(search-insights@2.17.3)(sortablejs@1.15.6)(terser@5.39.0)(typescript@5.8.3)
     transitivePeerDependencies:
       - typescript
 
@@ -14776,7 +14782,7 @@ snapshots:
   '@rollup/rollup-win32-x64-msvc@4.46.2':
     optional: true
 
-  '@rushstack/node-core-library@5.13.0(@types/node@22.16.0)':
+  '@rushstack/node-core-library@5.13.0(@types/node@24.9.2)':
     dependencies:
       ajv: 8.13.0
       ajv-draft-04: 1.0.0(ajv@8.13.0)
@@ -14787,23 +14793,23 @@ snapshots:
       resolve: 1.22.10
       semver: 7.5.4
     optionalDependencies:
-      '@types/node': 22.16.0
+      '@types/node': 24.9.2
 
   '@rushstack/rig-package@0.5.3':
     dependencies:
       resolve: 1.22.10
       strip-json-comments: 3.1.1
 
-  '@rushstack/terminal@0.15.2(@types/node@22.16.0)':
+  '@rushstack/terminal@0.15.2(@types/node@24.9.2)':
     dependencies:
-      '@rushstack/node-core-library': 5.13.0(@types/node@22.16.0)
+      '@rushstack/node-core-library': 5.13.0(@types/node@24.9.2)
       supports-color: 8.1.1
     optionalDependencies:
-      '@types/node': 22.16.0
+      '@types/node': 24.9.2
 
-  '@rushstack/ts-command-line@5.0.0(@types/node@22.16.0)':
+  '@rushstack/ts-command-line@5.0.0(@types/node@24.9.2)':
     dependencies:
-      '@rushstack/terminal': 0.15.2(@types/node@22.16.0)
+      '@rushstack/terminal': 0.15.2(@types/node@24.9.2)
       '@types/argparse': 1.0.38
       argparse: 1.0.10
       string-argv: 0.3.2
@@ -14955,7 +14961,7 @@ snapshots:
 
   '@types/conventional-commits-parser@5.0.1':
     dependencies:
-      '@types/node': 22.15.3
+      '@types/node': 22.16.0
 
   '@types/deep-eql@4.0.2': {}
 
@@ -15036,6 +15042,10 @@ snapshots:
     dependencies:
       undici-types: 6.21.0
 
+  '@types/node@24.9.2':
+    dependencies:
+      undici-types: 7.16.0
+
   '@types/normalize-package-data@2.4.4': {}
 
   '@types/nprogress@0.2.3': {}
@@ -15054,7 +15064,7 @@ snapshots:
 
   '@types/readdir-glob@1.1.5':
     dependencies:
-      '@types/node': 22.15.3
+      '@types/node': 22.16.0
 
   '@types/resolve@1.20.2': {}
 
@@ -15074,7 +15084,7 @@ snapshots:
 
   '@types/yauzl@2.10.3':
     dependencies:
-      '@types/node': 22.15.3
+      '@types/node': 22.16.0
     optional: true
 
   '@typescript-eslint/eslint-plugin@8.35.1(@typescript-eslint/parser@8.35.1(eslint@9.30.1(jiti@2.5.1))(typescript@5.8.3))(eslint@9.30.1(jiti@2.5.1))(typescript@5.8.3)':
@@ -15358,30 +15368,30 @@ snapshots:
       - rollup
       - supports-color
 
-  '@vite-pwa/vitepress@1.0.0(vite-plugin-pwa@1.0.1(vite@5.4.18(@types/node@22.16.0)(less@4.3.0)(sass@1.89.2)(terser@5.39.0))(workbox-build@7.3.0)(workbox-window@7.3.0))':
+  '@vite-pwa/vitepress@1.0.0(vite-plugin-pwa@1.0.1(vite@5.4.18(@types/node@24.9.2)(less@4.3.0)(sass@1.89.2)(terser@5.39.0))(workbox-build@7.3.0)(workbox-window@7.3.0))':
     dependencies:
-      vite-plugin-pwa: 1.0.1(vite@5.4.18(@types/node@22.16.0)(less@4.3.0)(sass@1.89.2)(terser@5.39.0))(workbox-build@7.3.0)(workbox-window@7.3.0)
+      vite-plugin-pwa: 1.0.1(vite@5.4.18(@types/node@24.9.2)(less@4.3.0)(sass@1.89.2)(terser@5.39.0))(workbox-build@7.3.0)(workbox-window@7.3.0)
 
-  '@vitejs/plugin-vue-jsx@5.0.1(vite@7.1.2(@types/node@22.16.0)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0))(vue@3.5.17(typescript@5.8.3))':
+  '@vitejs/plugin-vue-jsx@5.0.1(vite@7.1.2(@types/node@24.9.2)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0))(vue@3.5.17(typescript@5.8.3))':
     dependencies:
       '@babel/core': 7.27.7
       '@babel/plugin-transform-typescript': 7.27.1(@babel/core@7.27.7)
       '@rolldown/pluginutils': 1.0.0-beta.23
       '@vue/babel-plugin-jsx': 1.4.0(@babel/core@7.27.7)
-      vite: 7.1.2(@types/node@22.16.0)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0)
+      vite: 7.1.2(@types/node@24.9.2)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0)
       vue: 3.5.17(typescript@5.8.3)
     transitivePeerDependencies:
       - supports-color
 
-  '@vitejs/plugin-vue@5.2.3(vite@5.4.18(@types/node@22.16.0)(less@4.3.0)(sass@1.89.2)(terser@5.39.0))(vue@3.5.17(typescript@5.8.3))':
+  '@vitejs/plugin-vue@5.2.3(vite@5.4.18(@types/node@24.9.2)(less@4.3.0)(sass@1.89.2)(terser@5.39.0))(vue@3.5.17(typescript@5.8.3))':
     dependencies:
-      vite: 5.4.18(@types/node@22.16.0)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)
+      vite: 5.4.18(@types/node@24.9.2)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)
       vue: 3.5.17(typescript@5.8.3)
 
-  '@vitejs/plugin-vue@6.0.1(vite@7.1.2(@types/node@22.16.0)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0))(vue@3.5.17(typescript@5.8.3))':
+  '@vitejs/plugin-vue@6.0.1(vite@7.1.2(@types/node@24.9.2)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0))(vue@3.5.17(typescript@5.8.3))':
     dependencies:
       '@rolldown/pluginutils': 1.0.0-beta.29
-      vite: 7.1.2(@types/node@22.16.0)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0)
+      vite: 7.1.2(@types/node@24.9.2)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0)
       vue: 3.5.17(typescript@5.8.3)
 
   '@vitest/expect@3.2.4':
@@ -15392,13 +15402,13 @@ snapshots:
       chai: 5.2.0
       tinyrainbow: 2.0.0
 
-  '@vitest/mocker@3.2.4(vite@7.1.2(@types/node@22.16.0)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0))':
+  '@vitest/mocker@3.2.4(vite@7.1.2(@types/node@24.9.2)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0))':
     dependencies:
       '@vitest/spy': 3.2.4
       estree-walker: 3.0.3
       magic-string: 0.30.17
     optionalDependencies:
-      vite: 7.1.2(@types/node@22.16.0)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0)
+      vite: 7.1.2(@types/node@24.9.2)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0)
 
   '@vitest/pretty-format@3.2.4':
     dependencies:
@@ -15577,14 +15587,14 @@ snapshots:
     dependencies:
       '@vue/devtools-kit': 7.7.5
 
-  '@vue/devtools-core@7.7.7(vite@7.1.2(@types/node@22.16.0)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0))(vue@3.5.17(typescript@5.8.3))':
+  '@vue/devtools-core@7.7.7(vite@7.1.2(@types/node@24.9.2)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0))(vue@3.5.17(typescript@5.8.3))':
     dependencies:
       '@vue/devtools-kit': 7.7.7
       '@vue/devtools-shared': 7.7.7
       mitt: 3.0.1
       nanoid: 5.1.5
       pathe: 2.0.3
-      vite-hot-client: 2.0.4(vite@7.1.2(@types/node@22.16.0)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0))
+      vite-hot-client: 2.0.4(vite@7.1.2(@types/node@24.9.2)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0))
       vue: 3.5.17(typescript@5.8.3)
     transitivePeerDependencies:
       - vite
@@ -16643,9 +16653,9 @@ snapshots:
 
   core-util-is@1.0.3: {}
 
-  cosmiconfig-typescript-loader@6.1.0(@types/node@22.16.0)(cosmiconfig@9.0.0(typescript@5.8.3))(typescript@5.8.3):
+  cosmiconfig-typescript-loader@6.1.0(@types/node@24.9.2)(cosmiconfig@9.0.0(typescript@5.8.3))(typescript@5.8.3):
     dependencies:
-      '@types/node': 22.16.0
+      '@types/node': 24.9.2
       cosmiconfig: 9.0.0(typescript@5.8.3)
       jiti: 2.4.2
       typescript: 5.8.3
@@ -17621,13 +17631,13 @@ snapshots:
     optionalDependencies:
       '@typescript-eslint/eslint-plugin': 8.35.1(@typescript-eslint/parser@8.35.1(eslint@9.30.1(jiti@2.5.1))(typescript@5.8.3))(eslint@9.30.1(jiti@2.5.1))(typescript@5.8.3)
 
-  eslint-plugin-vitest@0.5.4(@typescript-eslint/eslint-plugin@8.35.1(@typescript-eslint/parser@8.35.1(eslint@9.30.1(jiti@2.5.1))(typescript@5.8.3))(eslint@9.30.1(jiti@2.5.1))(typescript@5.8.3))(eslint@9.30.1(jiti@2.5.1))(typescript@5.8.3)(vitest@3.2.4(@types/node@22.16.0)(happy-dom@17.6.3)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0)):
+  eslint-plugin-vitest@0.5.4(@typescript-eslint/eslint-plugin@8.35.1(@typescript-eslint/parser@8.35.1(eslint@9.30.1(jiti@2.5.1))(typescript@5.8.3))(eslint@9.30.1(jiti@2.5.1))(typescript@5.8.3))(eslint@9.30.1(jiti@2.5.1))(typescript@5.8.3)(vitest@3.2.4(@types/node@24.9.2)(happy-dom@17.6.3)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0)):
     dependencies:
       '@typescript-eslint/utils': 7.18.0(eslint@9.30.1(jiti@2.5.1))(typescript@5.8.3)
       eslint: 9.30.1(jiti@2.5.1)
     optionalDependencies:
       '@typescript-eslint/eslint-plugin': 8.35.1(@typescript-eslint/parser@8.35.1(eslint@9.30.1(jiti@2.5.1))(typescript@5.8.3))(eslint@9.30.1(jiti@2.5.1))(typescript@5.8.3)
-      vitest: 3.2.4(@types/node@22.16.0)(happy-dom@17.6.3)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0)
+      vitest: 3.2.4(@types/node@24.9.2)(happy-dom@17.6.3)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0)
     transitivePeerDependencies:
       - supports-color
       - typescript
@@ -21855,6 +21865,8 @@ snapshots:
 
   undici-types@6.21.0: {}
 
+  undici-types@7.16.0: {}
+
   undici@7.11.0: {}
 
   unenv@2.0.0-rc.18:
@@ -22110,17 +22122,17 @@ snapshots:
       '@types/unist': 3.0.3
       vfile-message: 4.0.2
 
-  vite-hot-client@2.0.4(vite@7.1.2(@types/node@22.16.0)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0)):
+  vite-hot-client@2.0.4(vite@7.1.2(@types/node@24.9.2)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0)):
     dependencies:
-      vite: 7.1.2(@types/node@22.16.0)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0)
+      vite: 7.1.2(@types/node@24.9.2)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0)
 
-  vite-node@3.2.4(@types/node@22.16.0)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0):
+  vite-node@3.2.4(@types/node@24.9.2)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0):
     dependencies:
       cac: 6.7.14
       debug: 4.4.1
       es-module-lexer: 1.7.0
       pathe: 2.0.3
-      vite: 7.1.2(@types/node@22.16.0)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0)
+      vite: 7.1.2(@types/node@24.9.2)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0)
     transitivePeerDependencies:
       - '@types/node'
       - jiti
@@ -22135,18 +22147,18 @@ snapshots:
       - tsx
       - yaml
 
-  vite-plugin-compression@0.5.1(vite@7.1.2(@types/node@22.16.0)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0)):
+  vite-plugin-compression@0.5.1(vite@7.1.2(@types/node@24.9.2)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0)):
     dependencies:
       chalk: 4.1.2
       debug: 4.4.0
       fs-extra: 10.1.0
-      vite: 7.1.2(@types/node@22.16.0)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0)
+      vite: 7.1.2(@types/node@24.9.2)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0)
     transitivePeerDependencies:
       - supports-color
 
-  vite-plugin-dts@4.5.4(@types/node@22.16.0)(rollup@4.44.1)(typescript@5.8.3)(vite@7.1.2(@types/node@22.16.0)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0)):
+  vite-plugin-dts@4.5.4(@types/node@24.9.2)(rollup@4.44.1)(typescript@5.8.3)(vite@7.1.2(@types/node@24.9.2)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0)):
     dependencies:
-      '@microsoft/api-extractor': 7.52.5(@types/node@22.16.0)
+      '@microsoft/api-extractor': 7.52.5(@types/node@24.9.2)
       '@rollup/pluginutils': 5.1.4(rollup@4.44.1)
       '@volar/typescript': 2.4.13
       '@vue/language-core': 2.2.0(typescript@5.8.3)
@@ -22157,13 +22169,13 @@ snapshots:
       magic-string: 0.30.17
       typescript: 5.8.3
     optionalDependencies:
-      vite: 7.1.2(@types/node@22.16.0)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0)
+      vite: 7.1.2(@types/node@24.9.2)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0)
     transitivePeerDependencies:
       - '@types/node'
       - rollup
       - supports-color
 
-  vite-plugin-html@3.2.2(vite@7.1.2(@types/node@22.16.0)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0)):
+  vite-plugin-html@3.2.2(vite@7.1.2(@types/node@24.9.2)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0)):
     dependencies:
       '@rollup/pluginutils': 4.2.1
       colorette: 2.0.20
@@ -22177,9 +22189,9 @@ snapshots:
       html-minifier-terser: 6.1.0
       node-html-parser: 5.4.2
       pathe: 0.2.0
-      vite: 7.1.2(@types/node@22.16.0)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0)
+      vite: 7.1.2(@types/node@24.9.2)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0)
 
-  vite-plugin-inspect@0.8.9(rollup@4.44.1)(vite@7.1.2(@types/node@22.16.0)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0)):
+  vite-plugin-inspect@0.8.9(rollup@4.44.1)(vite@7.1.2(@types/node@24.9.2)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0)):
     dependencies:
       '@antfu/utils': 0.7.10
       '@rollup/pluginutils': 5.1.4(rollup@4.44.1)
@@ -22190,7 +22202,7 @@ snapshots:
       perfect-debounce: 1.0.0
       picocolors: 1.1.1
       sirv: 3.0.1
-      vite: 7.1.2(@types/node@22.16.0)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0)
+      vite: 7.1.2(@types/node@24.9.2)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0)
     transitivePeerDependencies:
       - rollup
       - supports-color
@@ -22202,45 +22214,45 @@ snapshots:
       rollup: 4.44.1
       xe-utils: 3.7.4
 
-  vite-plugin-pwa@1.0.1(vite@5.4.18(@types/node@22.16.0)(less@4.3.0)(sass@1.89.2)(terser@5.39.0))(workbox-build@7.3.0)(workbox-window@7.3.0):
+  vite-plugin-pwa@1.0.1(vite@5.4.18(@types/node@24.9.2)(less@4.3.0)(sass@1.89.2)(terser@5.39.0))(workbox-build@7.3.0)(workbox-window@7.3.0):
     dependencies:
       debug: 4.4.0
       pretty-bytes: 6.1.1
       tinyglobby: 0.2.13
-      vite: 5.4.18(@types/node@22.16.0)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)
+      vite: 5.4.18(@types/node@24.9.2)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)
       workbox-build: 7.3.0
       workbox-window: 7.3.0
     transitivePeerDependencies:
       - supports-color
 
-  vite-plugin-pwa@1.0.1(vite@7.1.2(@types/node@22.16.0)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0))(workbox-build@7.3.0)(workbox-window@7.3.0):
+  vite-plugin-pwa@1.0.1(vite@7.1.2(@types/node@24.9.2)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0))(workbox-build@7.3.0)(workbox-window@7.3.0):
     dependencies:
       debug: 4.4.0
       pretty-bytes: 6.1.1
       tinyglobby: 0.2.13
-      vite: 7.1.2(@types/node@22.16.0)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0)
+      vite: 7.1.2(@types/node@24.9.2)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0)
       workbox-build: 7.3.0
       workbox-window: 7.3.0
     transitivePeerDependencies:
       - supports-color
 
-  vite-plugin-vue-devtools@7.7.7(rollup@4.44.1)(vite@7.1.2(@types/node@22.16.0)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0))(vue@3.5.17(typescript@5.8.3)):
+  vite-plugin-vue-devtools@7.7.7(rollup@4.44.1)(vite@7.1.2(@types/node@24.9.2)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0))(vue@3.5.17(typescript@5.8.3)):
     dependencies:
-      '@vue/devtools-core': 7.7.7(vite@7.1.2(@types/node@22.16.0)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0))(vue@3.5.17(typescript@5.8.3))
+      '@vue/devtools-core': 7.7.7(vite@7.1.2(@types/node@24.9.2)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0))(vue@3.5.17(typescript@5.8.3))
       '@vue/devtools-kit': 7.7.7
       '@vue/devtools-shared': 7.7.7
       execa: 9.5.2
       sirv: 3.0.1
-      vite: 7.1.2(@types/node@22.16.0)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0)
-      vite-plugin-inspect: 0.8.9(rollup@4.44.1)(vite@7.1.2(@types/node@22.16.0)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0))
-      vite-plugin-vue-inspector: 5.3.1(vite@7.1.2(@types/node@22.16.0)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0))
+      vite: 7.1.2(@types/node@24.9.2)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0)
+      vite-plugin-inspect: 0.8.9(rollup@4.44.1)(vite@7.1.2(@types/node@24.9.2)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0))
+      vite-plugin-vue-inspector: 5.3.1(vite@7.1.2(@types/node@24.9.2)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0))
     transitivePeerDependencies:
       - '@nuxt/kit'
       - rollup
       - supports-color
       - vue
 
-  vite-plugin-vue-inspector@5.3.1(vite@7.1.2(@types/node@22.16.0)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0)):
+  vite-plugin-vue-inspector@5.3.1(vite@7.1.2(@types/node@24.9.2)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0)):
     dependencies:
       '@babel/core': 7.26.10
       '@babel/plugin-proposal-decorators': 7.25.9(@babel/core@7.26.10)
@@ -22251,23 +22263,23 @@ snapshots:
       '@vue/compiler-dom': 3.5.13
       kolorist: 1.8.0
       magic-string: 0.30.17
-      vite: 7.1.2(@types/node@22.16.0)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0)
+      vite: 7.1.2(@types/node@24.9.2)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0)
     transitivePeerDependencies:
       - supports-color
 
-  vite@5.4.18(@types/node@22.16.0)(less@4.3.0)(sass@1.89.2)(terser@5.39.0):
+  vite@5.4.18(@types/node@24.9.2)(less@4.3.0)(sass@1.89.2)(terser@5.39.0):
     dependencies:
       esbuild: 0.25.3
       postcss: 8.5.3
       rollup: 4.40.1
     optionalDependencies:
-      '@types/node': 22.16.0
+      '@types/node': 24.9.2
       fsevents: 2.3.3
       less: 4.3.0
       sass: 1.89.2
       terser: 5.39.0
 
-  vite@7.1.2(@types/node@22.16.0)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0):
+  vite@7.1.2(@types/node@24.9.2)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0):
     dependencies:
       esbuild: 0.25.3
       fdir: 6.4.6(picomatch@4.0.3)
@@ -22276,7 +22288,7 @@ snapshots:
       rollup: 4.44.1
       tinyglobby: 0.2.14
     optionalDependencies:
-      '@types/node': 22.16.0
+      '@types/node': 24.9.2
       fsevents: 2.3.3
       jiti: 2.5.1
       less: 4.3.0
@@ -22284,17 +22296,17 @@ snapshots:
       terser: 5.39.0
       yaml: 2.8.0
 
-  vitepress-plugin-group-icons@1.6.1(markdown-it@14.1.0)(vite@5.4.18(@types/node@22.16.0)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)):
+  vitepress-plugin-group-icons@1.6.1(markdown-it@14.1.0)(vite@5.4.18(@types/node@24.9.2)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)):
     dependencies:
       '@iconify-json/logos': 1.2.4
       '@iconify-json/vscode-icons': 1.2.23
       '@iconify/utils': 2.3.0
       markdown-it: 14.1.0
-      vite: 5.4.18(@types/node@22.16.0)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)
+      vite: 5.4.18(@types/node@24.9.2)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)
     transitivePeerDependencies:
       - supports-color
 
-  vitepress@1.6.3(@algolia/client-search@5.23.4)(@types/node@22.16.0)(async-validator@4.2.5)(axios@1.10.0)(jwt-decode@4.0.0)(less@4.3.0)(nprogress@0.2.0)(postcss@8.5.6)(qrcode@1.5.4)(sass@1.89.2)(search-insights@2.17.3)(sortablejs@1.15.6)(terser@5.39.0)(typescript@5.8.3):
+  vitepress@1.6.3(@algolia/client-search@5.23.4)(@types/node@24.9.2)(async-validator@4.2.5)(axios@1.10.0)(jwt-decode@4.0.0)(less@4.3.0)(nprogress@0.2.0)(postcss@8.5.6)(qrcode@1.5.4)(sass@1.89.2)(search-insights@2.17.3)(sortablejs@1.15.6)(terser@5.39.0)(typescript@5.8.3):
     dependencies:
       '@docsearch/css': 3.8.2
       '@docsearch/js': 3.8.2(@algolia/client-search@5.23.4)(search-insights@2.17.3)
@@ -22303,7 +22315,7 @@ snapshots:
       '@shikijs/transformers': 2.5.0
       '@shikijs/types': 2.5.0
       '@types/markdown-it': 14.1.2
-      '@vitejs/plugin-vue': 5.2.3(vite@5.4.18(@types/node@22.16.0)(less@4.3.0)(sass@1.89.2)(terser@5.39.0))(vue@3.5.17(typescript@5.8.3))
+      '@vitejs/plugin-vue': 5.2.3(vite@5.4.18(@types/node@24.9.2)(less@4.3.0)(sass@1.89.2)(terser@5.39.0))(vue@3.5.17(typescript@5.8.3))
       '@vue/devtools-api': 7.7.5
       '@vue/shared': 3.5.13
       '@vueuse/core': 12.8.2(typescript@5.8.3)
@@ -22312,7 +22324,7 @@ snapshots:
       mark.js: 8.11.1
       minisearch: 7.1.2
       shiki: 2.5.0
-      vite: 5.4.18(@types/node@22.16.0)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)
+      vite: 5.4.18(@types/node@24.9.2)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)
       vue: 3.5.17(typescript@5.8.3)
     optionalDependencies:
       postcss: 8.5.6
@@ -22343,11 +22355,11 @@ snapshots:
       - typescript
       - universal-cookie
 
-  vitest@3.2.4(@types/node@22.16.0)(happy-dom@17.6.3)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0):
+  vitest@3.2.4(@types/node@24.9.2)(happy-dom@17.6.3)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0):
     dependencies:
       '@types/chai': 5.2.2
       '@vitest/expect': 3.2.4
-      '@vitest/mocker': 3.2.4(vite@7.1.2(@types/node@22.16.0)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0))
+      '@vitest/mocker': 3.2.4(vite@7.1.2(@types/node@24.9.2)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0))
       '@vitest/pretty-format': 3.2.4
       '@vitest/runner': 3.2.4
       '@vitest/snapshot': 3.2.4
@@ -22365,11 +22377,11 @@ snapshots:
       tinyglobby: 0.2.14
       tinypool: 1.1.1
       tinyrainbow: 2.0.0
-      vite: 7.1.2(@types/node@22.16.0)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0)
-      vite-node: 3.2.4(@types/node@22.16.0)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0)
+      vite: 7.1.2(@types/node@24.9.2)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0)
+      vite-node: 3.2.4(@types/node@24.9.2)(jiti@2.5.1)(less@4.3.0)(sass@1.89.2)(terser@5.39.0)(yaml@2.8.0)
       why-is-node-running: 2.3.0
     optionalDependencies:
-      '@types/node': 22.16.0
+      '@types/node': 24.9.2
       happy-dom: 17.6.3
     transitivePeerDependencies:
       - jiti
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index cd75c77b..f9b6349a 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -48,7 +48,7 @@ catalog:
   '@types/lodash.get': ^4.4.9
   '@types/lodash.isequal': ^4.5.8
   '@types/lodash.set': ^4.3.9
-  '@types/node': ^22.16.0
+  '@types/node': ^24.9.2
   '@types/nprogress': ^0.2.3
   '@types/postcss-import': ^14.0.3
   '@types/qrcode': ^1.5.5

From 72688246122840a089e7a2b86b300b83f7eaa110 Mon Sep 17 00:00:00 2001
From: Olexandr88 <radole1203@gmail.com>
Date: Mon, 3 Nov 2025 22:34:55 +0200
Subject: [PATCH 23/23] Update README.md (#6828)

Co-authored-by: Jin Mao <50581550+jinmao88@users.noreply.github.com>
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index b9dd73eb..ce8e8975 100644
--- a/README.md
+++ b/README.md
@@ -10,7 +10,7 @@
   <h1>Vue Vben Admin</h1>
 </div>
 
-[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=vbenjs_vue-vben-admin&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=vbenjs_vue-vben-admin) ![codeql](https://github.com/vbenjs/vue-vben-admin/actions/workflows/codeql.yml/badge.svg) ![build](https://github.com/vbenjs/vue-vben-admin/actions/workflows/build.yml/badge.svg) ![ci](https://github.com/vbenjs/vue-vben-admin/actions/workflows/ci.yml/badge.svg) ![deploy](https://github.com/vbenjs/vue-vben-admin/actions/workflows/deploy.yml/badge.svg)
+[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=vbenjs_vue-vben-admin&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=vbenjs_vue-vben-admin) [![codeql](https://github.com/vbenjs/vue-vben-admin/actions/workflows/codeql.yml/badge.svg)](https://github.com/vbenjs/vue-vben-admin/actions/workflows/codeql.yml) [![build](https://github.com/vbenjs/vue-vben-admin/actions/workflows/build.yml/badge.svg)](https://github.com/vbenjs/vue-vben-admin/actions/workflows/build.yml) [![ci](https://github.com/vbenjs/vue-vben-admin/actions/workflows/ci.yml/badge.svg)](https://github.com/vbenjs/vue-vben-admin/actions/workflows/ci.yml) [![deploy](https://github.com/vbenjs/vue-vben-admin/actions/workflows/deploy.yml/badge.svg)](https://github.com/vbenjs/vue-vben-admin/actions/workflows/deploy.yml)
 
 **English** | [中文](./README.zh-CN.md) | [日本語](./README.ja-JP.md)