@gct-paas/core 0.1.6-dev.1 → 0.1.6-dev.10

package/es/store/global-store.mjs

@@ -25,6 +25,9 @@ var useGlobalStore = defineStore("global-store", {
 		async setContext(ctx = {}) {
 			Object.assign(this.context, ctx);
 		},
+		async setAid(aid) {
+			this.setContext({ aid });
+		},
 		async init() {
 			const paramStr = location.pathname.split("/")[2];
 			if (paramStr) {
@@ -33,12 +36,14 @@ var useGlobalStore = defineStore("global-store", {
 			}
 		},
 		async loadAppInfo() {
-			this.appInfo = await _api.apaas.designerCommon.getGetApp();
+			const res = await _api.apaas.designerCommon.getGetApp();
+			this.appInfo = res;
 		},
+		/**加載运行时全局常量显示 */
 		async loadEmptySetting() {
-			const { value } = await _gct.api.apaas.basicConfig.getDetail({ configEnum: PlatformSettingEnum.GLOBAL });
-			if (!value) return;
-			Object.assign(this.globalSetting, JSON.parse(value));
+			const res = await _gct.api.apaas.basicConfig.getDetail({ configEnum: PlatformSettingEnum.GLOBAL });
+			if (!res?.value) return;
+			Object.assign(this.globalSetting, JSON.parse(res.value));
 		},
 		setProjectName(name) {
 			this.projectName = name;

package/es/store/index.d.ts

@@ -1,7 +1,7 @@
 import { IGlobalStore } from './global-store';
 import { IPlatformConfigStore } from '../modules/platform-config';
 export { globalRefStorage } from './storage-store';
-export { globalRefSession } from './session-store';
+export { globalRefSession, ENV } from './session-store';
 /**
  * 全局的状态管理工具类
  *

package/es/store/session-store.d.ts

@@ -5,3 +5,4 @@ export declare const globalRefSession: import('@vueuse/core').RemovableRef<{
     /**登录登出标识 */
     currentPlatOrAppId: string;
 }>;
+export declare const ENV: import('@vueuse/core').RemovableRef<string>;

package/es/store/session-store.mjs

@@ -2,6 +2,9 @@ import { useSessionStorage } from "@vueuse/core";
 /**
 * 全局双向绑定持续化缓存Map
 */
-var globalRefSession = useSessionStorage("GCT_GLOBAL_SESSION:PAAS", { currentPlatOrAppId: "" });
+var globalRefSession = useSessionStorage("GCT_GLOBAL_SESSION:PAAS", { 
+/**登录登出标识 */
+currentPlatOrAppId: "" });
+var ENV = useSessionStorage("ENV", "");
 //#endregion
-export { globalRefSession };
+export { ENV, globalRefSession };

package/es/store/storage-store.mjs

@@ -3,8 +3,11 @@ import { useStorage } from "@vueuse/core";
 * 全局双向绑定持续化缓存Map
 */
 var globalRefStorage = useStorage("GCT_GLOBAL_STORAGE:PAAS", {
+	/**时区 */
 	timezone: "UTC+08:00",
+	/**语言标识 */
 	lang: "",
+	/**登录登出专用标识 */
 	signWay: ""
 });
 //#endregion

package/es/types/index.d.ts

@@ -61,6 +61,12 @@ declare global {
      * @type {ModuleFederation}
      */
     // _mf: ModuleFederation;
+    /**
+     * 安卓混合开发模式标识,由原生层注入，值为 true 时表示在安卓混合开发模式下运行
+     *
+     * @type {boolean}
+     */
+    __GCT_ANDROID__?: boolean;
   }
 
   interface ImportMetaEnv {

package/es/utils/data-prems/const.mjs

@@ -49,6 +49,7 @@ var moduleConfig = {
 	}
 };
 var getInterfaceApi = {
+	/** 获取分类列表 */
 	getCategoryList: ({ moduleType }) => {
 		if (moduleType === CategoryModuleEnum.CHECK_LIST) return _api.apaas.formRelate.getCategory({ moduleType });
 		const { modelKey, bsKeyList } = moduleConfig[moduleType] || {};
@@ -58,6 +59,7 @@ var getInterfaceApi = {
 			bsKey: bsKeyList.list
 		}, {}, {});
 	},
+	/** 获取模板列表 */
 	getTmplsList: (params, config) => {
 		if (params.moduleType === CategoryModuleEnum.CHECK_LIST) throw new Error("该模块不支持模板列表接口");
 		const { isQuery, ...otherParams } = params || {};

package/es/utils/index.d.ts

@@ -13,7 +13,7 @@ export * from './openUtil';
 export { KitPkgUtil } from './kit-pkg-util/kit-pkg-util';
 export { PluginPgkUtil, type IModuleMap, type LoadPluginResult, } from './plugin-pkg-util/plugin-pkg-util';
 export { PluginStaticResource } from './plugin-static-resource/plugin-static-resource';
-export { getToken, setToken, getTenant, isMobile, setTenant, deepMerge, stringifyMatrixParams, parseMatrixParams, createWhiteImageWithText, } from './tools/tools';
+export { getToken, setToken, getTenant, tenantRef, isMobile, setTenant, deepMerge, stringifyMatrixParams, parseMatrixParams, createWhiteImageWithText, } from './tools/tools';
 export * from './uuid/uuid';
 export * from './value-helper/value-helper';
 export { interceptors } from './axios/interceptors';

package/es/utils/namespace/namespace.mjs

@@ -30,6 +30,7 @@ function _bem(namespace, block, blockSuffix, element, modifier) {
 * @class Namespace
 */
 var Namespace = class {
+	block;
 	/**
 	* 命名空间
 	*

package/es/utils/openUtil/overlay-container/overlay-container.d.ts

@@ -61,7 +61,7 @@ export declare class OverlayContainer<O> implements IOverlayContainer {
      * @param {O} [opts]
      */
     constructor(component: unknown, render: (...args: any[]) => VNode, opts?: O | undefined);
-    static createVueApp(rootComponent: Component, rootProps?: IData): Promise<App<Element>>;
+    static createVueApp(rootComponent: Component, rootProps?: IData): App<Element>;
     /**
      * 初始化飘窗
      *

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

@@ -1,4 +1,4 @@
-import { createApp, h, nextTick } from "vue";
+import { createApp, h } from "vue";
 import { QXEvent } from "qx-util";
 //#region src/utils/openUtil/overlay-container/overlay-container.ts
 /**
@@ -12,6 +12,9 @@ import { QXEvent } from "qx-util";
 * @template O
 */
 var OverlayContainer = class OverlayContainer {
+	component;
+	render;
+	opts;
 	vm;
 	/**
 	* 具体模态组件对象
@@ -61,7 +64,7 @@ var OverlayContainer = class OverlayContainer {
 		this.opts = opts;
 		this._initPromise = this.init();
 	}
-	static async createVueApp(rootComponent, rootProps) {
+	static createVueApp(rootComponent, rootProps) {
 		console.error("没有注入createVueApp方法");
 		return createApp(rootComponent, rootProps);
 	}
@@ -78,27 +81,30 @@ var OverlayContainer = class OverlayContainer {
 		const { render, opts } = this;
 		const container = document.createElement("div");
 		document.body.appendChild(container);
-		const vm = await OverlayContainer.createVueApp({
-			mounted() {
-				self.modal = this.$refs.root;
-			},
-			unmounted() {
-				document.body.removeChild(container);
-				self.evt.emit("dismiss", self.result);
-			},
-			render() {
-				return h(self.component, {
-					ref: "root",
-					opts,
-					onDismiss(data) {
-						self.result = data;
-						vm.unmount();
-					}
-				}, { default: render });
-			}
+		return new Promise((resolve) => {
+			const vm = OverlayContainer.createVueApp({
+				mounted() {
+					self.modal = this.$refs.root;
+					resolve();
+				},
+				unmounted() {
+					document.body.removeChild(container);
+					self.evt.emit("dismiss", self.result);
+				},
+				render() {
+					return h(self.component, {
+						ref: "root",
+						opts,
+						onDismiss(data) {
+							self.result = data;
+							vm.unmount();
+						}
+					}, { default: render });
+				}
+			});
+			vm.mount(container);
+			this.vm = vm;
 		});
-		vm.mount(container);
-		this.vm = vm;
 	}
 	/**
 	* 打开飘窗
@@ -109,7 +115,6 @@ var OverlayContainer = class OverlayContainer {
 	*/
 	async present() {
 		await this._initPromise;
-		await nextTick();
 		return this.modal.present();
 	}
 	/**

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

@@ -1,3 +1,5 @@
+import { Ref } from 'vue';
+export declare const tenantRef: Readonly<Ref<string>>;
 /**
  * 获取认证令牌
  *
@@ -23,9 +25,9 @@ export declare function getTenant(): string | null;
  * 设置租户标识至 cookie
  *
  * @export
- * @param {string} tenant
+ * @param {string} [tenant]
  */
-export declare function setTenant(tenant: string): void;
+export declare function setTenant(tenant?: string): void;
 /**
  * 是否为移动端设备
  */

package/es/utils/tools/tools.mjs

@@ -2,9 +2,25 @@ import { CoreConst } from "../../constants/core.mjs";
 import "../../constants/index.mjs";
 import qs from "qs";
 import { cloneDeep, isEqual, mergeWith, unionWith } from "lodash-es";
+import { customRef, readonly } from "vue";
 import { clearCookie, getCookie, setCookie } from "qx-util";
 //#region src/utils/tools/tools.ts
 /**
+* 租户 cookie 双向绑定响应式引用：get 直接读 cookie，set 直接写 cookie
+*/
+var _tenantRef = customRef((track, trigger) => ({
+	get() {
+		track();
+		return getCookie(CoreConst.TENANT) || "";
+	},
+	set(value) {
+		if (value) setCookie(CoreConst.TENANT, value, 7, true);
+		else clearCookie(CoreConst.TENANT, true);
+		trigger();
+	}
+}));
+var tenantRef = readonly(_tenantRef);
+/**
 * 获取认证令牌
 *
 * @export
@@ -30,17 +46,16 @@ function setToken(token) {
 * @returns {*}  {(string | null)}
 */
 function getTenant() {
-	return getCookie(CoreConst.TENANT);
+	return _tenantRef.value || null;
 }
 /**
 * 设置租户标识至 cookie
 *
 * @export
-* @param {string} tenant
+* @param {string} [tenant]
 */
 function setTenant(tenant) {
-	if (tenant) setCookie(CoreConst.TENANT, tenant, 7, true);
-	else clearCookie(CoreConst.TENANT, true);
+	_tenantRef.value = tenant || "";
 }
 /**
 * 是否为移动端设备
@@ -140,4 +155,4 @@ function createWhiteImageWithText(name, width, height) {
 	return canvas.toDataURL("image/png");
 }
 //#endregion
-export { createWhiteImageWithText, deepMerge, getTenant, getToken, isMobile, parseMatrixParams, setTenant, setToken, stringifyMatrixParams };
+export { createWhiteImageWithText, deepMerge, getTenant, getToken, isMobile, parseMatrixParams, setTenant, setToken, stringifyMatrixParams, tenantRef };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gct-paas/core",
-  "version": "0.1.6-dev.1",
+  "version": "0.1.6-dev.10",
   "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": "^0.1.4-dev.4",
+    "@gct-paas/api": "^0.1.6-dev.5",
     "@module-federation/runtime": "^2.2.3",
     "@vueuse/core": "^14.1.0",
     "async-validator": "^4.2.5",
@@ -58,7 +58,7 @@
     "playwright": "^1.58.0"
   },
   "peerDependencies": {
-    "@gct-paas/api": "^0.1.4-dev.4",
+    "@gct-paas/api": "^0.1.6-dev.5",
     "vue": ">=3",
     "vue-i18n": ">=11",
     "vue-router": ">=4"