@gct-paas/core 6.0.0-dev.6 → 6.0.0-dev.60

package/es/utils/axios/interceptors.mjs

@@ -6,6 +6,33 @@ import { globalRefStorage } from "../../store/storage-store.mjs";
 import "../../store/index.mjs";
 import { AxiosHeaders } from "axios";
 //#region src/utils/axios/interceptors.ts
+function logApiError(error) {
+	const { config, response, code, message, stack } = error || {};
+	console.error("[API 请求失败]", {
+		url: config?.url,
+		method: config?.method,
+		status: response?.status,
+		statusText: response?.statusText,
+		code,
+		message,
+		responseData: response?.data,
+		stack
+	});
+}
+function logBusinessError(response) {
+	const { config, data, status, statusText } = response;
+	const message = data?.subMessage || data?.message || "接口业务处理失败";
+	console.error("[API 业务错误]", {
+		url: config?.url,
+		method: config?.method,
+		status,
+		statusText,
+		code: data?.code,
+		subCode: data?.subCode,
+		message,
+		responseData: data
+	}, new Error(message));
+}
 /**
 * 安装拦截器
 *
@@ -17,7 +44,7 @@ function interceptors(axios) {
 		if (!config.headers) config.headers = new AxiosHeaders();
 		Object.assign(config.headers, {
 			Token: getToken(),
-			Lang: _gct.store.lang,
+			Lang: globalRefStorage.value.lang,
 			"Tenant-Id": getTenant(),
 			Timezone: globalRefStorage.value.timezone
 		});
@@ -26,19 +53,22 @@ function interceptors(axios) {
 	axios.interceptors.response.use((response) => {
 		if (response.data.code === 200) return response;
 		else {
+			logBusinessError(response);
 			const { errorMessageMode } = response.config || {};
-			const { subMessage, message, subCode } = response.data;
+			const { code, subMessage, message, subCode } = response.data;
 			if (subCode === "sys.global.tenantId.required") {
 				console.error("租户信息缺失", response.data);
 				AuthUtil.getInstance().goTenantSelect();
 			} else if (subCode === "sys.plat.api.pass.failure.over.max_times") console.error("账号锁定", response.data);
 			else if (errorMessageMode === "none") console.error(response.data);
 			else if (subMessage || message) _gct.message.error(subMessage || message);
+			if (code && code >= 400) checkStatus(code, message, errorMessageMode);
 		}
 		return response;
 	}, (error) => {
+		logApiError(error);
 		const { response, code, message, status } = error || {};
-		const errorMessageMode = response.config?.errorMessageMode || "none";
+		const errorMessageMode = response?.config?.errorMessageMode || "none";
 		let errMessage = "";
 		if (code === "ECONNABORTED" && message?.indexOf("timeout") !== -1) errMessage = t("sys.apiTimeoutMessage");
 		if (message?.includes("Network Error")) errMessage = t("sys.networkExceptionMsg");

package/es/utils/kit-pkg-util/kit-pkg-util.d.ts

@@ -18,6 +18,10 @@ export declare class KitPkgUtil {
      * @return {*}  {(Promise<IPluginKitModule | null>)}
      */
     static loadKit(kit: string, mode: PluginModeEnum): Promise<IPluginKitModule | null>;
+    /**
+     * 按给定顺序加载多个套件包。单个套件包加载失败不会中断后续加载。
+     */
+    static loadKits(kits: string[], mode: PluginModeEnum): Promise<IPluginKitModule[]>;
     /**
      * 加载设计模式套件包
      *

package/es/utils/kit-pkg-util/kit-pkg-util.mjs

@@ -37,13 +37,24 @@ var KitPkgUtil = class {
 				loaderUrl
 );
 			if (module) return module;
-			else console.warn(`Kit ${kit} does not export a default function`);
+			else console.error(`Kit ${kit} does not export a default function`);
 		} catch (error) {
-			console.warn(`Error loading kit ${kit} from ${loaderUrl}:`, error);
+			console.error(`Error loading kit ${kit} from ${loaderUrl}:`, error);
 		}
 		return null;
 	}
 	/**
+	* 按给定顺序加载多个套件包。单个套件包加载失败不会中断后续加载。
+	*/
+	static async loadKits(kits, mode) {
+		const modules = [];
+		for (const kit of kits) {
+			const module = await this.loadKit(kit, mode);
+			if (module) modules.push(module);
+		}
+		return modules;
+	}
+	/**
 	* 加载设计模式套件包
 	*
 	* @static

package/es/utils/openUtil/overlay-container/overlay-container.mjs

@@ -1,3 +1,5 @@
+import { PluginModeEnum } from "../../../enums/plugin-enum.mjs";
+import "../../../enums/index.mjs";
 import { KitPkgUtil } from "../../kit-pkg-util/kit-pkg-util.mjs";
 import "../../index.mjs";
 import { QXEvent } from "qx-util";
@@ -108,6 +110,9 @@ var OverlayContainer = class OverlayContainer {
 				const module = await KitPkgUtil.loadWeb(_gct.store.appInfo.suiteKey);
 				if (module && module.createAppVue) module.createAppVue(vm);
 			}
+			const pluginKits = (_gct.store.appInfo.plugins ?? "").split(",").map((item) => item.trim()).filter(Boolean);
+			const pluginModules = await KitPkgUtil.loadKits(pluginKits, PluginModeEnum.WEB);
+			for (const module of pluginModules) module.createAppVue(vm);
 			vm.mount(container);
 			this.vm = vm;
 		});

package/es/utils/openUtil/overlay-popover-container/overlay-popover-container.mjs

@@ -11,7 +11,8 @@ import { OverlayContainer } from "../overlay-container/overlay-container.mjs";
 * @implements {IOverlayPopoverContainer}
 */
 var OverlayPopoverContainer = class extends OverlayContainer {
-	present(target) {
+	async present(target) {
+		await this._initPromise;
 		return this.modal.present(target);
 	}
 };

package/es/utils/tools/tools.d.ts

@@ -10,6 +10,8 @@ export declare function getToken(): string | null;
 /**
  * 设置认证令牌（目前只有 session 级别生效）
  *
+ * cookie 不设置 domain 属性，绑定当前完整 hostname（host-only），按域名隔离
+ *
  * @export
  * @param {string} token
  */

package/es/utils/tools/tools.mjs

@@ -7,6 +7,8 @@ import { customRef, readonly } from "vue";
 //#region src/utils/tools/tools.ts
 /**
 * 租户 cookie 双向绑定响应式引用：get 直接读 cookie，set 直接写 cookie
+*
+* cookie 不设置 domain 属性，绑定当前完整 hostname（host-only），按域名隔离
 */
 var _tenantRef = customRef((track, trigger) => ({
 	get() {
@@ -14,8 +16,8 @@ var _tenantRef = customRef((track, trigger) => ({
 		return getCookie(CoreConst.TENANT) || "";
 	},
 	set(value) {
-		if (value) setCookie(CoreConst.TENANT, value, 7, true);
-		else clearCookie(CoreConst.TENANT, true);
+		if (value) setCookie(CoreConst.TENANT, value, 7, false);
+		else clearCookie(CoreConst.TENANT, false);
 		trigger();
 	}
 }));
@@ -32,12 +34,14 @@ function getToken() {
 /**
 * 设置认证令牌（目前只有 session 级别生效）
 *
+* cookie 不设置 domain 属性，绑定当前完整 hostname（host-only），按域名隔离
+*
 * @export
 * @param {string} token
 */
 function setToken(token) {
-	if (token) setCookie(CoreConst.TOKEN, token, 7, true);
-	else clearCookie(CoreConst.TOKEN, true);
+	if (token) setCookie(CoreConst.TOKEN, token, 7, false);
+	else clearCookie(CoreConst.TOKEN, false);
 }
 /**
 * 从 cookie 获取租户标识

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gct-paas/core",
-  "version": "6.0.0-dev.6",
+  "version": "6.0.0-dev.60",
   "type": "module",
   "description": "paas 平台核心包",
   "loader": "dist/index.esm.min.js",
@@ -33,7 +33,7 @@
   "dependencies": {
     "@fingerprintjs/fingerprintjs": "^5.1.0",
     "@floating-ui/dom": "^1.7.6",
-    "@gct-paas/api": "^6.0.0-dev.6",
+    "@gct-paas/api": "^6.0.0-dev.17",
     "@module-federation/runtime": "^2.2.3",
     "@vueuse/core": "^14.1.0",
     "async-validator": "^4.2.5",
@@ -60,7 +60,7 @@
     "playwright": "^1.58.0"
   },
   "peerDependencies": {
-    "@gct-paas/api": "^6.0.0-dev.6",
+    "@gct-paas/api": "^6.0.0-dev.17",
     "vue": ">=3",
     "vue-i18n": ">=11",
     "vue-router": ">=4"