diff --git a/web/apps/web-ele/src/adapter/component/index.ts b/web/apps/web-ele/src/adapter/component/index.ts index 7b1b449..3d3f9a3 100644 --- a/web/apps/web-ele/src/adapter/component/index.ts +++ b/web/apps/web-ele/src/adapter/component/index.ts @@ -5,14 +5,16 @@ import type { Component } from 'vue'; -import type { BaseFormComponentType } from '@vben/common-ui'; +import type { BaseFormComponentType } from '@vben-core/form-ui'; import type { Recordable } from '@vben/types'; import { defineAsyncComponent, defineComponent, h, ref } from 'vue'; -import { ApiComponent, globalShareState } from '@vben/common-ui'; +import { globalShareState } from '@vben-core/shared/global-state'; import { $t } from '@vben/locales'; +import { ApiComponent } from '@vben/common-ui/es/api-component'; + const ElButton = defineAsyncComponent(() => import('element-plus/es/components/button/index').then((res) => res.ElButton), ); diff --git a/web/apps/web-ele/src/adapter/form.ts b/web/apps/web-ele/src/adapter/form.ts index 936c3fe..e32d0a5 100644 --- a/web/apps/web-ele/src/adapter/form.ts +++ b/web/apps/web-ele/src/adapter/form.ts @@ -1,11 +1,11 @@ import type { VbenFormSchema as FormSchema, VbenFormProps, -} from '@vben/common-ui'; +} from '@vben-core/form-ui'; import type { ComponentType } from './component'; -import { setupVbenForm, useVbenForm as useForm, z } from '@vben/common-ui'; +import { setupVbenForm, useVbenForm as useForm, z } from '@vben-core/form-ui'; import { $t } from '@vben/locales'; async function initSetupVbenForm() { diff --git a/web/apps/web-ele/src/bootstrap.ts b/web/apps/web-ele/src/bootstrap.ts index 8e586da..d81c473 100644 --- a/web/apps/web-ele/src/bootstrap.ts +++ b/web/apps/web-ele/src/bootstrap.ts @@ -1,7 +1,6 @@ import { createApp, watchEffect } from 'vue'; import { registerAccessDirective } from '@vben/access'; -import { registerLoadingDirective } from '@vben/common-ui'; import { preferences } from '@vben/preferences'; import { initStores } from '@vben/stores'; import '@vben/styles'; @@ -43,12 +42,6 @@ async function bootstrap(namespace: string) { setupElementPlus(app); - // 注册Vben提供的v-loading和v-spinning指令 - registerLoadingDirective(app, { - loading: false, // Vben提供的v-loading指令和Element Plus提供的v-loading指令二选一即可,此处false表示不注册Vben提供的v-loading指令 - spinning: 'spinning', - }); - // 国际化 i18n 配置 await setupI18n(app); diff --git a/web/apps/web-ele/vite.config.mts b/web/apps/web-ele/vite.config.mts index d99a514..c56a50a 100644 --- a/web/apps/web-ele/vite.config.mts +++ b/web/apps/web-ele/vite.config.mts @@ -109,6 +109,10 @@ export default defineConfig(async () => { '@vben/common-ui/es/tippy', '../../packages/effects/common-ui/src/components/tippy/index.ts', ), + exactAlias( + '@vben/common-ui/es/api-component', + '../../packages/effects/common-ui/src/components/api-component/index.ts', + ), exactAlias( '@vben/constants', '../../packages/constants/src/index.ts', diff --git a/web/packages/effects/common-ui/package.json b/web/packages/effects/common-ui/package.json index d222154..2ef6d6c 100644 --- a/web/packages/effects/common-ui/package.json +++ b/web/packages/effects/common-ui/package.json @@ -25,6 +25,10 @@ "./es/loading": { "types": "./src/components/loading/index.ts", "default": "./src/components/loading/index.ts" + }, + "./es/api-component": { + "types": "./src/components/api-component/index.ts", + "default": "./src/components/api-component/index.ts" } }, "dependencies": {