diff --git a/apps/web-antd/src/layouts/basic.vue b/apps/web-antd/src/layouts/basic.vue
index 59dc915b..4891c44c 100644
--- a/apps/web-antd/src/layouts/basic.vue
+++ b/apps/web-antd/src/layouts/basic.vue
@@ -1,9 +1,10 @@
diff --git a/apps/web-antd/src/router/guard.ts b/apps/web-antd/src/router/guard.ts
index 673a86e4..205ee569 100644
--- a/apps/web-antd/src/router/guard.ts
+++ b/apps/web-antd/src/router/guard.ts
@@ -34,9 +34,7 @@ function setupCommonGuard(router: Router) {
router.afterEach((to) => {
// 记录页面是否加载,如果已经加载,后续的页面切换动画等效果不在重复执行
- if (preferences.tabbar.enable) {
- loadedPaths.add(to.path);
- }
+ loadedPaths.add(to.path);
// 关闭页面加载进度条
if (preferences.transition.progress) {
diff --git a/apps/web-ele/src/layouts/basic.vue b/apps/web-ele/src/layouts/basic.vue
index 3c302634..d7435b8a 100644
--- a/apps/web-ele/src/layouts/basic.vue
+++ b/apps/web-ele/src/layouts/basic.vue
@@ -1,10 +1,11 @@
diff --git a/apps/web-ele/src/router/guard.ts b/apps/web-ele/src/router/guard.ts
index 673a86e4..205ee569 100644
--- a/apps/web-ele/src/router/guard.ts
+++ b/apps/web-ele/src/router/guard.ts
@@ -34,9 +34,7 @@ function setupCommonGuard(router: Router) {
router.afterEach((to) => {
// 记录页面是否加载,如果已经加载,后续的页面切换动画等效果不在重复执行
- if (preferences.tabbar.enable) {
- loadedPaths.add(to.path);
- }
+ loadedPaths.add(to.path);
// 关闭页面加载进度条
if (preferences.transition.progress) {
diff --git a/apps/web-naive/src/layouts/basic.vue b/apps/web-naive/src/layouts/basic.vue
index 3c302634..bd0cbca0 100644
--- a/apps/web-naive/src/layouts/basic.vue
+++ b/apps/web-naive/src/layouts/basic.vue
@@ -1,10 +1,11 @@
diff --git a/apps/web-naive/src/router/guard.ts b/apps/web-naive/src/router/guard.ts
index cf84be11..6c9f8232 100644
--- a/apps/web-naive/src/router/guard.ts
+++ b/apps/web-naive/src/router/guard.ts
@@ -34,9 +34,7 @@ function setupCommonGuard(router: Router) {
router.afterEach((to) => {
// 记录页面是否加载,如果已经加载,后续的页面切换动画等效果不在重复执行
- if (preferences.tabbar.enable) {
- loadedPaths.add(to.path);
- }
+ loadedPaths.add(to.path);
// 关闭页面加载进度条
if (preferences.transition.progress) {
diff --git a/docs/src/en/guide/essentials/settings.md b/docs/src/en/guide/essentials/settings.md
index 03f0bbff..d09338a4 100644
--- a/docs/src/en/guide/essentials/settings.md
+++ b/docs/src/en/guide/essentials/settings.md
@@ -234,7 +234,6 @@ const defaultPreferences: Preferences = {
showIcon: true,
showMaximize: true,
showMore: true,
- showRefresh: true,
styleType: 'chrome',
},
theme: {
@@ -262,6 +261,7 @@ const defaultPreferences: Preferences = {
notification: true,
sidebarToggle: true,
themeToggle: true,
+ refresh: true,
},
};
```
@@ -421,8 +421,6 @@ interface TabbarPreferences {
showMaximize: boolean;
/** Whether to show the more button */
showMore: boolean;
- /** Whether to show the refresh button */
- showRefresh: boolean;
/** Tab style */
styleType: TabsStyleType;
}
@@ -469,6 +467,8 @@ interface WidgetPreferences {
lockScreen: boolean;
/** Whether notification widget is displayed */
notification: boolean;
+ /** Whether to show the refresh button */
+ refresh: boolean;
/** Whether sidebar show/hide widget is displayed */
sidebarToggle: boolean;
/** Whether theme switch widget is displayed */
diff --git a/docs/src/guide/essentials/settings.md b/docs/src/guide/essentials/settings.md
index 01598581..15ac5c3d 100644
--- a/docs/src/guide/essentials/settings.md
+++ b/docs/src/guide/essentials/settings.md
@@ -256,7 +256,6 @@ const defaultPreferences: Preferences = {
showIcon: true,
showMaximize: true,
showMore: true,
- showRefresh: true,
styleType: 'chrome',
},
theme: {
@@ -282,6 +281,7 @@ const defaultPreferences: Preferences = {
languageToggle: true,
lockScreen: true,
notification: true,
+ refresh: true,
sidebarToggle: true,
themeToggle: true,
},
@@ -445,8 +445,6 @@ interface TabbarPreferences {
showMaximize: boolean;
/** 显示更多按钮 */
showMore: boolean;
- /** 显示刷新按钮 */
- showRefresh: boolean;
/** 标签页风格 */
styleType: TabsStyleType;
}
@@ -494,6 +492,8 @@ interface WidgetPreferences {
lockScreen: boolean;
/** 是否显示通知部件 */
notification: boolean;
+ /** 显示刷新按钮 */
+ refresh: boolean;
/** 是否显示侧边栏显示/隐藏部件 */
sidebarToggle: boolean;
/** 是否显示主题切换部件 */
diff --git a/packages/@core/preferences/__tests__/__snapshots__/config.test.ts.snap b/packages/@core/preferences/__tests__/__snapshots__/config.test.ts.snap
index 139f23e4..1f860f35 100644
--- a/packages/@core/preferences/__tests__/__snapshots__/config.test.ts.snap
+++ b/packages/@core/preferences/__tests__/__snapshots__/config.test.ts.snap
@@ -81,7 +81,6 @@ exports[`defaultPreferences immutability test > should not modify the config obj
"showIcon": true,
"showMaximize": true,
"showMore": true,
- "showRefresh": true,
"styleType": "chrome",
},
"theme": {
@@ -107,6 +106,7 @@ exports[`defaultPreferences immutability test > should not modify the config obj
"languageToggle": true,
"lockScreen": true,
"notification": true,
+ "refresh": true,
"sidebarToggle": true,
"themeToggle": true,
},
diff --git a/packages/@core/preferences/src/config.ts b/packages/@core/preferences/src/config.ts
index 4e2dd28a..1e15403c 100644
--- a/packages/@core/preferences/src/config.ts
+++ b/packages/@core/preferences/src/config.ts
@@ -81,7 +81,7 @@ const defaultPreferences: Preferences = {
showIcon: true,
showMaximize: true,
showMore: true,
- showRefresh: true,
+
styleType: 'chrome',
},
theme: {
@@ -107,6 +107,7 @@ const defaultPreferences: Preferences = {
languageToggle: true,
lockScreen: true,
notification: true,
+ refresh: true,
sidebarToggle: true,
themeToggle: true,
},
diff --git a/packages/@core/preferences/src/types.ts b/packages/@core/preferences/src/types.ts
index e3ad2bf5..59341af2 100644
--- a/packages/@core/preferences/src/types.ts
+++ b/packages/@core/preferences/src/types.ts
@@ -169,8 +169,6 @@ interface TabbarPreferences {
showMaximize: boolean;
/** 显示更多按钮 */
showMore: boolean;
- /** 显示刷新按钮 */
- showRefresh: boolean;
/** 标签页风格 */
styleType: TabsStyleType;
}
@@ -218,6 +216,8 @@ interface WidgetPreferences {
lockScreen: boolean;
/** 是否显示通知部件 */
notification: boolean;
+ /** 显示刷新按钮 */
+ refresh: boolean;
/** 是否显示侧边栏显示/隐藏部件 */
sidebarToggle: boolean;
/** 是否显示主题切换部件 */
diff --git a/packages/@core/ui-kit/tabs-ui/src/components/widgets/index.ts b/packages/@core/ui-kit/tabs-ui/src/components/widgets/index.ts
index f7634ce8..a26899ef 100644
--- a/packages/@core/ui-kit/tabs-ui/src/components/widgets/index.ts
+++ b/packages/@core/ui-kit/tabs-ui/src/components/widgets/index.ts
@@ -1,3 +1,2 @@
export { default as TabsToolMore } from './tool-more.vue';
-export { default as TabsToolRefresh } from './tool-refresh.vue';
export { default as TabsToolScreen } from './tool-screen.vue';
diff --git a/packages/@core/ui-kit/tabs-ui/src/components/widgets/tool-refresh.vue b/packages/@core/ui-kit/tabs-ui/src/components/widgets/tool-refresh.vue
deleted file mode 100644
index 4eba2415..00000000
--- a/packages/@core/ui-kit/tabs-ui/src/components/widgets/tool-refresh.vue
+++ /dev/null
@@ -1,31 +0,0 @@
-
-
-
-
-
-
-
diff --git a/packages/effects/hooks/src/use-watermark.ts b/packages/effects/hooks/src/use-watermark.ts
index 0efd4391..765cdfb5 100644
--- a/packages/effects/hooks/src/use-watermark.ts
+++ b/packages/effects/hooks/src/use-watermark.ts
@@ -1,8 +1,6 @@
import type { Watermark, WatermarkOptions } from 'watermark-js-plus';
-import { nextTick, onUnmounted, ref, watch } from 'vue';
-
-import { preferences } from '@vben/preferences';
+import { nextTick, onUnmounted, ref } from 'vue';
const watermark = ref();
const cachedOptions = ref>({
@@ -67,15 +65,6 @@ export function useWatermark() {
watermark.value?.destroy();
}
- watch(
- () => preferences.app.watermark,
- (enable) => {
- if (!enable) {
- destroyWatermark();
- }
- },
- );
-
onUnmounted(() => {
destroyWatermark();
});
diff --git a/packages/effects/layouts/src/basic/README.md b/packages/effects/layouts/src/basic/README.md
index 05d7afc8..b1266ea2 100644
--- a/packages/effects/layouts/src/basic/README.md
+++ b/packages/effects/layouts/src/basic/README.md
@@ -3,5 +3,5 @@
### header
- 支持N个自定义插槽,命名方式:header-right-n,header-left-n
-- header-left-n ,排序方式:1-4 ,breadcrumb,6-x
-- header-right-n ,排序方式:1-4,global-search,6-9,theme-toggle,11-14,language-toggle,16-19,fullscreen,21-24,notification,26-29,user-dropdown,30-x
+- header-left-n ,排序方式:0-19 ,breadcrumb 21-x
+- header-right-n ,排序方式:0-49,global-search,51-59,theme-toggle,61-69,language-toggle,71-79,fullscreen,81-89,notification,91-149,user-dropdown,151-x
diff --git a/packages/effects/layouts/src/basic/header/header.vue b/packages/effects/layouts/src/basic/header/header.vue
index a083d13f..787fe28f 100644
--- a/packages/effects/layouts/src/basic/header/header.vue
+++ b/packages/effects/layouts/src/basic/header/header.vue
@@ -1,9 +1,11 @@
diff --git a/playground/src/router/guard.ts b/playground/src/router/guard.ts
index 08685687..441dcf9f 100644
--- a/playground/src/router/guard.ts
+++ b/playground/src/router/guard.ts
@@ -33,10 +33,7 @@ function setupCommonGuard(router: Router) {
router.afterEach((to) => {
// 记录页面是否加载,如果已经加载,后续的页面切换动画等效果不在重复执行
-
- if (preferences.tabbar.enable) {
- loadedPaths.add(to.path);
- }
+ loadedPaths.add(to.path);
// 关闭页面加载进度条
if (preferences.transition.progress) {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index ea3723f4..9431dfdb 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -475,8 +475,8 @@ catalogs:
specifier: ^2.1.6
version: 2.1.6
vxe-pc-ui:
- specifier: ^4.2.13
- version: 4.2.13
+ specifier: ^4.2.14
+ version: 4.2.14
vxe-table:
specifier: ^4.7.84
version: 4.7.85
@@ -1698,7 +1698,7 @@ importers:
version: 3.5.11(typescript@5.6.2)
vxe-pc-ui:
specifier: 'catalog:'
- version: 4.2.13
+ version: 4.2.14
vxe-table:
specifier: 'catalog:'
version: 4.7.85
@@ -10766,8 +10766,8 @@ packages:
peerDependencies:
vue: ^3.5.11
- vxe-pc-ui@4.2.13:
- resolution: {integrity: sha512-zTI0pDAO0sJ5Snvv8zDnvxMcZt2dKg5RPrtOXsHpSuAW+B2dS/grdn7bvj7RVpgb/cSx4fdNoVmmU5U6HLufAA==}
+ vxe-pc-ui@4.2.14:
+ resolution: {integrity: sha512-yXZo7axUmn62bksPKFwOHafGJTDH7QXsvhWVwr/xb+vM4wLA14WUijyEnAJJvY78lM5FB8cIFZqwahOhj1Pu8w==}
vxe-table@4.7.85:
resolution: {integrity: sha512-sNQ4jKnU6vZkStTK2JDDKgIz5kKCCWtTtOVl7dpNsLJ16NYWMCDlNby5m/DJC+xa0dPvSdr7+AH4TXfD1vpRFg==}
@@ -21256,13 +21256,13 @@ snapshots:
vooks: 0.2.12(vue@3.5.11(typescript@5.6.2))
vue: 3.5.11(typescript@5.6.2)
- vxe-pc-ui@4.2.13:
+ vxe-pc-ui@4.2.14:
dependencies:
'@vxe-ui/core': 4.0.12
vxe-table@4.7.85:
dependencies:
- vxe-pc-ui: 4.2.13
+ vxe-pc-ui: 4.2.14
w3c-keyname@2.2.8: {}
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 39f4c540..96c5adfc 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -173,7 +173,7 @@ catalog:
vue-i18n: ^10.0.3
vue-router: ^4.4.5
vue-tsc: ^2.1.6
- vxe-pc-ui: ^4.2.13
+ vxe-pc-ui: ^4.2.14
vxe-table: ^4.7.84
watermark-js-plus: ^1.5.7
zod: ^3.23.8