Merge remote-tracking branch 'origin/main' into feature/v1.2灵机空间-内容上传审核_rxd
# Conflicts: # pnpm-lock.yaml # src/components/_base/navbar/index.vue # src/components/text-over-tips/index.vue # src/layouts/Basic.vue # src/layouts/Page.vue # src/main.ts # src/router/constants.ts # src/router/index.ts # src/router/typeings.d.ts # src/utils/tools.ts
This commit is contained in:
10
src/main.ts
10
src/main.ts
@ -5,6 +5,7 @@
|
||||
import App from './App.vue';
|
||||
import router from './router';
|
||||
import store from './stores';
|
||||
import * as directives from '@/directives';
|
||||
|
||||
import NoData from '@/components/no-data/index.vue';
|
||||
import SvgIcon from '@/components/svg-icon/index.vue';
|
||||
@ -24,4 +25,11 @@ const app = createApp(App);
|
||||
app.component('NoData', NoData);
|
||||
app.component('SvgIcon', SvgIcon);
|
||||
|
||||
app.use(store).use(router).mount('#app');
|
||||
app.use(store);
|
||||
app.use(router);
|
||||
|
||||
Object.values(directives).forEach((directive) => {
|
||||
app.use(directive);
|
||||
}); // 注册指令
|
||||
|
||||
app.mount('#app');
|
||||
|
||||
Reference in New Issue
Block a user