From fee2f2532144fca6c81b1523aeef54165c5263b2 Mon Sep 17 00:00:00 2001
From: hsy <1029150275@qq.com>
Date: 星期二, 25 八月 2026 16:50:38 +0800
Subject: [PATCH] Merge branch 'refs/heads/dev_pro2.0' into fix/hsy/20260812
---
src/bootstrap.ts | 31 +++++++++++++++++++++++--------
1 files changed, 23 insertions(+), 8 deletions(-)
diff --git a/src/bootstrap.ts b/src/bootstrap.ts
index ed45974..bbfb549 100644
--- a/src/bootstrap.ts
+++ b/src/bootstrap.ts
@@ -1,12 +1,12 @@
import { createApp, watchEffect } from 'vue';
import VueDOMPurifyHTML from 'vue-dompurify-html';
-import { registerAccessDirective } from './packages\effects\access\src';
-import { registerLoadingDirective } from './packages\effects\common-ui\src\loading';
-import { preferences } from './packages\preferences\src';
-import { initStores } from './packages\stores\src';
+import { registerAccessDirective } from './packages/effects/access/src';
+import { registerLoadingDirective } from './packages/effects/common-ui/src/components/loading';
+import { preferences } from './packages/preferences/src';
+import { initStores } from './packages/stores/src';
import './packages/styles/src';
-import './packages/styles/src/antd';
+import './packages/styles/src/antd/index.css';
import { useTitle } from '@vueuse/core';
@@ -17,6 +17,9 @@
import { initSetupVbenForm } from './adapter/form';
import App from './app.vue';
import { router } from './router';
+
+import { getCompanyConfig } from '#/api/system/company-config';
+import { applyCompanyConfig } from '#/utils/company-config';
async function bootstrap(namespace: string) {
// 鍒濆鍖栫粍浠堕�傞厤鍣�
@@ -49,11 +52,22 @@
// 閰嶇疆 pinia-store
await initStores(app, { namespace });
+ // 鍔犺浇鍏徃鍝佺墝淇℃伅锛堜粠鍚庣锛屽厤鐧诲綍鎺ュ彛锛夛紝鑱斿姩鐧诲綍椤�/鑿滃崟鏍�/缃戦〉鏍囬銆�
+ // 娉細姝ゆ椂 pinia 灏氭湭鍦ㄧ粍浠跺婵�娲伙紝杩欓噷鐢ㄧ函鍑芥暟锛屼笉渚濊禆 store銆�
+ try {
+ const companyConfig = await getCompanyConfig();
+ if (companyConfig) {
+ applyCompanyConfig(companyConfig);
+ }
+ } catch {
+ // 鍚庣涓嶅彲鐢ㄦ垨鏈厤缃紝淇濇寔缂栬瘧鏈熼粯璁�
+ }
+
// 瀹夎鏉冮檺鎸囦护
registerAccessDirective(app);
// 鍒濆鍖� tippy
- const { initTippy } = await import('./packages\effects\common-ui\src\tippy');
+ const { initTippy } = await import('./packages/effects/common-ui/src/components/tippy');
initTippy(app);
// 閰嶇疆璺敱鍙婅矾鐢卞畧鍗�
@@ -63,7 +77,7 @@
setupFormCreate(app);
// 閰嶇疆Motion鎻掍欢
- const { MotionPlugin } = await import('./packages\effects\plugins\src\motion');
+ const { MotionPlugin } = await import('./packages/effects/plugins/src/motion');
app.use(MotionPlugin);
// 鍔ㄦ�佹洿鏂版爣棰�
@@ -71,7 +85,8 @@
if (preferences.app.dynamicTitle) {
const routeTitle = router.currentRoute.value.meta?.title;
const pageTitle =
- (routeTitle ? `${$t(routeTitle)} - ` : '') + preferences.app.name;
+ (routeTitle ? `${$t(routeTitle)} - ` : '') +
+ preferences.copyright.companyName;
useTitle(pageTitle);
}
});
--
Gitblit v1.9.3