From 6c4a742627bb0a09f5aabe18f7c6170791281d1f Mon Sep 17 00:00:00 2001 From: Vben Date: Mon, 14 Oct 2024 22:53:23 +0800 Subject: [PATCH] refactor: remove the adapter bucket introduction pattern and improve potential introduction timing (#4635) * refactor: remove the adapter bucket introduction pattern and improve potential introduction timing * chore: update deps --- apps/web-antd/src/adapter/index.ts | 2 - apps/web-ele/src/adapter/index.ts | 2 - apps/web-naive/src/adapter/index.ts | 3 - apps/web-naive/src/api/request.ts | 2 +- apps/web-naive/src/router/access.ts | 2 +- apps/web-naive/src/store/auth.ts | 2 +- docs/src/components/common-ui/vben-form.md | 4 +- docs/src/demos/vben-form/api/index.vue | 2 +- docs/src/demos/vben-form/basic/index.vue | 2 +- docs/src/demos/vben-form/custom/index.vue | 2 +- docs/src/demos/vben-form/dynamic/index.vue | 2 +- docs/src/demos/vben-form/query/index.vue | 2 +- docs/src/demos/vben-form/rules/index.vue | 2 +- .../eslint-config/src/custom-config.ts | 1 + .../layouts/src/authentication/toolbar.vue | 6 +- playground/src/adapter/index.ts | 2 - .../examples/drawer/form-drawer-demo.vue | 2 +- playground/src/views/examples/form/api.vue | 2 +- playground/src/views/examples/form/basic.vue | 2 +- playground/src/views/examples/form/custom.vue | 2 +- .../src/views/examples/form/dynamic.vue | 2 +- playground/src/views/examples/form/merge.vue | 2 +- playground/src/views/examples/form/query.vue | 2 +- playground/src/views/examples/form/rules.vue | 2 +- .../views/examples/modal/form-model-demo.vue | 2 +- .../src/views/examples/vxe-table/basic.vue | 4 +- .../views/examples/vxe-table/custom-cell.vue | 4 +- .../views/examples/vxe-table/edit-cell.vue | 4 +- .../src/views/examples/vxe-table/edit-row.vue | 4 +- .../src/views/examples/vxe-table/fixed.vue | 4 +- .../src/views/examples/vxe-table/form.vue | 5 +- .../src/views/examples/vxe-table/remote.vue | 4 +- .../src/views/examples/vxe-table/tree.vue | 4 +- .../src/views/examples/vxe-table/virtual.vue | 4 +- pnpm-lock.yaml | 510 ++++++++++-------- pnpm-workspace.yaml | 14 +- 36 files changed, 344 insertions(+), 273 deletions(-) delete mode 100644 apps/web-antd/src/adapter/index.ts delete mode 100644 apps/web-ele/src/adapter/index.ts delete mode 100644 apps/web-naive/src/adapter/index.ts delete mode 100644 playground/src/adapter/index.ts 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-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-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/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