diff --git a/apps/web-antd/src/adapter/index.ts b/apps/web-antd/src/adapter/index.ts
deleted file mode 100644
index 6a9391be..00000000
--- a/apps/web-antd/src/adapter/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './form';
-export * from './vxe-table';
diff --git a/apps/web-antd/src/locales/index.ts b/apps/web-antd/src/locales/index.ts
index 7497ad1e..f052fe69 100644
--- a/apps/web-antd/src/locales/index.ts
+++ b/apps/web-antd/src/locales/index.ts
@@ -45,14 +45,14 @@ async function loadThirdPartyMessage(lang: SupportedLanguagesType) {
async function loadDayjsLocale(lang: SupportedLanguagesType) {
let locale;
switch (lang) {
- case 'zh-CN': {
- locale = await import('dayjs/locale/zh-cn');
- break;
- }
case 'en-US': {
locale = await import('dayjs/locale/en');
break;
}
+ case 'zh-CN': {
+ locale = await import('dayjs/locale/zh-cn');
+ break;
+ }
// 默认使用英语
default: {
locale = await import('dayjs/locale/en');
@@ -71,14 +71,14 @@ async function loadDayjsLocale(lang: SupportedLanguagesType) {
*/
async function loadAntdLocale(lang: SupportedLanguagesType) {
switch (lang) {
- case 'zh-CN': {
- antdLocale.value = antdDefaultLocale;
- break;
- }
case 'en-US': {
antdLocale.value = antdEnLocale;
break;
}
+ case 'zh-CN': {
+ antdLocale.value = antdDefaultLocale;
+ break;
+ }
}
}
diff --git a/apps/web-ele/src/adapter/index.ts b/apps/web-ele/src/adapter/index.ts
deleted file mode 100644
index 6a9391be..00000000
--- a/apps/web-ele/src/adapter/index.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export * from './form';
-export * from './vxe-table';
diff --git a/apps/web-ele/src/locales/index.ts b/apps/web-ele/src/locales/index.ts
index 0557333e..be39b2b3 100644
--- a/apps/web-ele/src/locales/index.ts
+++ b/apps/web-ele/src/locales/index.ts
@@ -45,14 +45,14 @@ async function loadThirdPartyMessage(lang: SupportedLanguagesType) {
async function loadDayjsLocale(lang: SupportedLanguagesType) {
let locale;
switch (lang) {
- case 'zh-CN': {
- locale = await import('dayjs/locale/zh-cn');
- break;
- }
case 'en-US': {
locale = await import('dayjs/locale/en');
break;
}
+ case 'zh-CN': {
+ locale = await import('dayjs/locale/zh-cn');
+ break;
+ }
// 默认使用英语
default: {
locale = await import('dayjs/locale/en');
@@ -71,14 +71,14 @@ async function loadDayjsLocale(lang: SupportedLanguagesType) {
*/
async function loadElementLocale(lang: SupportedLanguagesType) {
switch (lang) {
- case 'zh-CN': {
- elementLocale.value = defaultLocale;
- break;
- }
case 'en-US': {
elementLocale.value = enLocale;
break;
}
+ case 'zh-CN': {
+ elementLocale.value = defaultLocale;
+ break;
+ }
}
}
diff --git a/apps/web-naive/src/adapter/index.ts b/apps/web-naive/src/adapter/index.ts
deleted file mode 100644
index 9617430f..00000000
--- a/apps/web-naive/src/adapter/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from './form';
-export * from './naive';
-export * from './vxe-table';
diff --git a/apps/web-naive/src/api/request.ts b/apps/web-naive/src/api/request.ts
index 6d159293..5f431dde 100644
--- a/apps/web-naive/src/api/request.ts
+++ b/apps/web-naive/src/api/request.ts
@@ -12,7 +12,7 @@ import {
} from '@vben/request';
import { useAccessStore } from '@vben/stores';
-import { message } from '#/adapter';
+import { message } from '#/adapter/naive';
import { useAuthStore } from '#/store';
import { refreshTokenApi } from './core';
diff --git a/apps/web-naive/src/router/access.ts b/apps/web-naive/src/router/access.ts
index 37a12be9..7a80bac0 100644
--- a/apps/web-naive/src/router/access.ts
+++ b/apps/web-naive/src/router/access.ts
@@ -6,7 +6,7 @@ import type {
import { generateAccessible } from '@vben/access';
import { preferences } from '@vben/preferences';
-import { message } from '#/adapter';
+import { message } from '#/adapter/naive';
import { getAllMenusApi } from '#/api';
import { BasicLayout, IFrameView } from '#/layouts';
import { $t } from '#/locales';
diff --git a/apps/web-naive/src/store/auth.ts b/apps/web-naive/src/store/auth.ts
index 2485a324..d5088838 100644
--- a/apps/web-naive/src/store/auth.ts
+++ b/apps/web-naive/src/store/auth.ts
@@ -9,7 +9,7 @@ import { resetAllStores, useAccessStore, useUserStore } from '@vben/stores';
import { defineStore } from 'pinia';
-import { notification } from '#/adapter';
+import { notification } from '#/adapter/naive';
import { getAccessCodesApi, getUserInfoApi, loginApi, logoutApi } from '#/api';
import { $t } from '#/locales';
diff --git a/docs/.vitepress/theme/styles/index.ts b/docs/.vitepress/theme/styles/index.ts
index 1ee8ccc4..566e63f8 100644
--- a/docs/.vitepress/theme/styles/index.ts
+++ b/docs/.vitepress/theme/styles/index.ts
@@ -1,3 +1,4 @@
+import '@vben/styles';
+
import './variables.css';
import './base.css';
-import '@vben/styles';
diff --git a/docs/src/components/common-ui/vben-form.md b/docs/src/components/common-ui/vben-form.md
index e9ca7666..f9a89857 100644
--- a/docs/src/components/common-ui/vben-form.md
+++ b/docs/src/components/common-ui/vben-form.md
@@ -258,7 +258,7 @@ _注意_ 需要指定 `dependencies` 的 `triggerFields` 属性,设置由谁
```vue
diff --git a/docs/src/demos/vben-form/basic/index.vue b/docs/src/demos/vben-form/basic/index.vue
index 0272a9de..88d01425 100644
--- a/docs/src/demos/vben-form/basic/index.vue
+++ b/docs/src/demos/vben-form/basic/index.vue
@@ -1,7 +1,7 @@
diff --git a/playground/src/views/examples/form/basic.vue b/playground/src/views/examples/form/basic.vue
index cbc5ded5..9e75469b 100644
--- a/playground/src/views/examples/form/basic.vue
+++ b/playground/src/views/examples/form/basic.vue
@@ -4,7 +4,7 @@ import { Page } from '@vben/common-ui';
import { Button, Card, message } from 'ant-design-vue';
import dayjs from 'dayjs';
-import { useVbenForm } from '#/adapter';
+import { useVbenForm } from '#/adapter/form';
import DocButton from '../doc-button.vue';
diff --git a/playground/src/views/examples/form/custom.vue b/playground/src/views/examples/form/custom.vue
index d94d78e0..a035e597 100644
--- a/playground/src/views/examples/form/custom.vue
+++ b/playground/src/views/examples/form/custom.vue
@@ -5,7 +5,7 @@ import { Page } from '@vben/common-ui';
import { Card, Input, message } from 'ant-design-vue';
-import { useVbenForm } from '#/adapter';
+import { useVbenForm } from '#/adapter/form';
const [Form] = useVbenForm({
// 所有表单项共用,可单独在表单内覆盖
diff --git a/playground/src/views/examples/form/dynamic.vue b/playground/src/views/examples/form/dynamic.vue
index cf306b5b..c11a3c1a 100644
--- a/playground/src/views/examples/form/dynamic.vue
+++ b/playground/src/views/examples/form/dynamic.vue
@@ -3,7 +3,7 @@ import { Page } from '@vben/common-ui';
import { Button, Card, message } from 'ant-design-vue';
-import { useVbenForm } from '#/adapter';
+import { useVbenForm } from '#/adapter/form';
const [Form, formApi] = useVbenForm({
// 提交函数
diff --git a/playground/src/views/examples/form/merge.vue b/playground/src/views/examples/form/merge.vue
index c0da8a17..22f20fa1 100644
--- a/playground/src/views/examples/form/merge.vue
+++ b/playground/src/views/examples/form/merge.vue
@@ -5,7 +5,7 @@ import { Page } from '@vben/common-ui';
import { Button, Card, message, Step, Steps, Switch } from 'ant-design-vue';
-import { useVbenForm } from '#/adapter';
+import { useVbenForm } from '#/adapter/form';
const currentTab = ref(0);
function onFirstSubmit(values: Record) {
diff --git a/playground/src/views/examples/form/query.vue b/playground/src/views/examples/form/query.vue
index 542da42c..23292362 100644
--- a/playground/src/views/examples/form/query.vue
+++ b/playground/src/views/examples/form/query.vue
@@ -3,7 +3,7 @@ import { Page } from '@vben/common-ui';
import { Card, message } from 'ant-design-vue';
-import { useVbenForm } from '#/adapter';
+import { useVbenForm } from '#/adapter/form';
const [QueryForm] = useVbenForm({
// 默认展开
diff --git a/playground/src/views/examples/form/rules.vue b/playground/src/views/examples/form/rules.vue
index f4558613..dd95894c 100644
--- a/playground/src/views/examples/form/rules.vue
+++ b/playground/src/views/examples/form/rules.vue
@@ -3,7 +3,7 @@ import { Page } from '@vben/common-ui';
import { Button, Card, message } from 'ant-design-vue';
-import { useVbenForm, z } from '#/adapter';
+import { useVbenForm, z } from '#/adapter/form';
const [Form, formApi] = useVbenForm({
// 所有表单项共用,可单独在表单内覆盖
diff --git a/playground/src/views/examples/modal/form-model-demo.vue b/playground/src/views/examples/modal/form-model-demo.vue
index 959a3ce8..d04a40f1 100644
--- a/playground/src/views/examples/modal/form-model-demo.vue
+++ b/playground/src/views/examples/modal/form-model-demo.vue
@@ -3,7 +3,7 @@ import { useVbenModal } from '@vben/common-ui';
import { message } from 'ant-design-vue';
-import { useVbenForm } from '#/adapter';
+import { useVbenForm } from '#/adapter/form';
defineOptions({
name: 'FormModelDemo',
diff --git a/playground/src/views/examples/vxe-table/basic.vue b/playground/src/views/examples/vxe-table/basic.vue
index ef8509be..ad70f68f 100644
--- a/playground/src/views/examples/vxe-table/basic.vue
+++ b/playground/src/views/examples/vxe-table/basic.vue
@@ -1,11 +1,11 @@