@gct-paas/core 0.1.6-dev.28 → 0.1.6-dev.29

package/dist/{redirect-index-BFuhimnn.js → redirect-index-BI-ZN18W.js}

@@ -1,2 +1,2 @@
-/*! @gct-paas/core v0.1.6-dev.28 */
+/*! @gct-paas/core v0.1.6-dev.29 */
 import{createElementBlock as e,defineComponent as r,openBlock as t,unref as a}from"vue";import{useRouter as p}from"vue-router";var o=/* @__PURE__ */r({__name:"redirect-index",setup(r){const{currentRoute:o,replace:i}=p(),{params:s,query:u}=a(o),{path:m,_redirect_type:n="path"}=s;Reflect.deleteProperty(s,"_redirect_type"),Reflect.deleteProperty(s,"path");const c=Array.isArray(m)?m.join("/"):m;return i("name"===n?{name:c,query:u,params:JSON.parse(s._origin_params??"{}")}:{path:c.startsWith("/")?c:"/"+c,query:u}),(r,a)=>(t(),e("div"))}});export{o as default};

package/es/global/gct/gct.d.ts

@@ -1,7 +1,7 @@
 import { I18n } from 'vue-i18n';
 import { ApiMap } from '@gct-paas/api';
 import { GlobalStoreUtil } from '../../store';
-import { IGlobalRegister, IMessageUtil, IOverlayController } from '../../interface';
+import { IConfirmUtil, IGlobalRegister, IMessageUtil, IOverlayController } from '../../interface';
 import { DictionaryUtil } from '../../utils';
 import { EnvironmentManager } from '../../modules/env-manager';
 import { MqttManager } from '../../modules/mqtt';
@@ -273,6 +273,12 @@ export declare class GctGlobal {
      * @type {IMessageUtil}
      */
     message: IMessageUtil;
+    /**
+     * 确认工具类（预览、移动、网页，需要分别实现）
+     *
+     * @type {IConfirmUtil}
+     */
+    confirm: IConfirmUtil;
     /**
      * 全局数据字典工具类
      *

package/es/global/gct/gct.mjs

@@ -56,6 +56,12 @@ var GctGlobal = class {
 	*/
 	message;
 	/**
+	* 确认工具类（预览、移动、网页，需要分别实现）
+	*
+	* @type {IConfirmUtil}
+	*/
+	confirm;
+	/**
 	* 全局数据字典工具类
 	*
 	*/

package/es/interface/open-util/i-confirm-util/i-confirm-util.d.ts

@@ -0,0 +1,65 @@
+/**
+ * 确认工具接口
+ *
+ * @export
+ * @interface IConfirmParams
+ */
+export interface IConfirmParams {
+    /**
+     * 确认框标题
+     *
+     * @type {string}
+     */
+    title: string;
+    /**
+     * 确认框内容
+     *
+     * @type {string}
+     */
+    content: string;
+    /**
+     * 确认框确认按钮文本
+     *
+     * @type {string}
+     */
+    okText?: string;
+    /**
+     * 确认框取消按钮文本
+     *
+     * @type {string}
+     */
+    cancelText?: string;
+}
+/**
+ * 确认工具接口
+ *
+ * @export
+ * @interface IConfirmUtil
+ */
+export interface IConfirmUtil {
+    /**
+     * 弹出确认框
+     *
+     */
+    confirm(options: IConfirmParams): Promise<boolean>;
+    /**
+     * 弹出信息提示框
+     *
+     */
+    info(options: IConfirmParams): Promise<void>;
+    /**
+     * 弹出成功提示框
+     *
+     */
+    success(options: IConfirmParams): Promise<void>;
+    /**
+     * 弹出警告提示框
+     *
+     */
+    warning(options: IConfirmParams): Promise<void>;
+    /**
+     * 弹出错误提示框
+     *
+     */
+    error(options: IConfirmParams): Promise<void>;
+}

package/es/interface/open-util/index.d.ts

@@ -1,5 +1,6 @@
 export type { IDrawerOptions } from './i-drawer-options/i-drawer-options';
 export type { IAppFullScreenContainerOptions } from './i-app-full-screen-container-options/i-app-full-screen-container-options';
+export type { IConfirmParams, IConfirmUtil, } from './i-confirm-util/i-confirm-util';
 export type { IMessageParams, IMessageUtil, } from './i-message-util/i-message-util';
 export type { IModal } from './i-modal/i-modal';
 export type { IModalData } from './i-modal-data/i-modal-data';

package/es/locale/sys.d.ts

@@ -15,5 +15,8 @@ declare const _default: {
     networkExceptionMsg: string;
     notNull: string;
     regError: string;
+    loginWarning: string;
+    loginWarningContent: string;
+    understood: string;
 };
 export default _default;

package/es/locale/sys.mjs

@@ -17,7 +17,10 @@ var sys_default = {
 	apiTimeoutMessage: "接口请求超时,请刷新页面重试!",
 	networkExceptionMsg: "网络异常，请检查您的网络连接是否正常!",
 	notNull: "该值不能为空",
-	regError: "校验格式不正确"
+	regError: "校验格式不正确",
+	loginWarning: "登录警告",
+	loginWarningContent: "当前账号已在其他设备登录",
+	understood: "知道了"
 };
 //#endregion
 export { sys_exports };

package/es/modules/system-mqtt/system-mqtt.service.d.ts

@@ -10,7 +10,7 @@ export declare class SystemMqttService {
     private static isInitialized;
     protected static client: IMqttClient | undefined;
     protected static fingerprint: string | undefined;
-    protected static client_id: string;
+    protected static readonly LOGOUT_CLIENT_TAG = "USER_LOGOUT";
     /**
      * 用户登出消息 topic
      *
@@ -54,6 +54,8 @@ export declare class SystemMqttService {
      * @return {*}  {Promise<void>}
      */
     static init(): Promise<void>;
+    protected static createMqtt(): Promise<void>;
+    protected static subs(): void;
     /**
      * 订阅系统级 MQTT 消息
      *
@@ -68,7 +70,7 @@ export declare class SystemMqttService {
      * @param {MqttSubCallback<IKickOutPayload>} callback
      * @return {*}  {MqttCancelSub}
      */
-    static subKickOut(callback: MqttSubCallback<IKickOutPayload>): MqttCancelSub;
+    protected static subKickOut(callback?: MqttSubCallback<IKickOutPayload>): MqttCancelSub;
     /**
      * 订阅未读消息变化
      *

package/es/modules/system-mqtt/system-mqtt.service.mjs

@@ -1,5 +1,7 @@
-import { getTenant } from "../../utils/tools/tools.mjs";
-import { getPageIdentification } from "../../utils/deviceFingerprint.mjs";
+import { getTenant, getToken } from "../../utils/tools/tools.mjs";
+import { AuthUtil } from "../../utils/auth-util/auth-util.mjs";
+import { t } from "../../utils/i18n/index.mjs";
+import { getBrowserFingerprint, getPageIdentification } from "../../utils/deviceFingerprint.mjs";
 import "../../utils/index.mjs";
 import "../mqtt/index.mjs";
 import { ProjectNameType } from "./system-mqtt.const.mjs";
@@ -14,7 +16,7 @@ var SystemMqttService = class {
 	static isInitialized = false;
 	static client;
 	static fingerprint;
-	static client_id = "";
+	static LOGOUT_CLIENT_TAG = "USER_LOGOUT";
 	/**
 	* 用户登出消息 topic
 	*
@@ -39,7 +41,7 @@ var SystemMqttService = class {
 	* @type {string}
 	*/
 	static get INTERNAL_MESSAGE_TOPIC() {
-		return `${_gct.env.getEnv()}/USER/${getTenant()}/${_gct.store.userInfo.userId}/INTERNAL_MESSAGE`;
+		return `${_gct.env.getEnv().toUpperCase()}/USER/${getTenant()}/${_gct.store.userInfo.userId}/INTERNAL_MESSAGE`;
 	}
 	/**
 	* 待办消息数量 topic
@@ -49,7 +51,7 @@ var SystemMqttService = class {
 	* @type {string}
 	*/
 	static get TASK_TODO_COUNT_TOPIC() {
-		return `${_gct.env.getEnv()}/USER/${getTenant()}/${_gct.store.userInfo.userId}/TASK_TODO_COUNT`;
+		return `${_gct.env.getEnv().toUpperCase()}/USER/${getTenant()}/${_gct.store.userInfo.userId}/TASK_TODO_COUNT`;
 	}
 	/**
 	* 强制刷新并清空缓存 topic
@@ -69,10 +71,15 @@ var SystemMqttService = class {
 			return;
 		}
 		this.isInitialized = true;
+		this.fingerprint = await getBrowserFingerprint();
+		await this.createMqtt();
+		this.subs();
+	}
+	static async createMqtt() {
 		const willDelayInterval = 20;
 		const userInfo = _gct.store.userInfo;
 		const mqttProperties = userInfo.mqttProperties || {};
-		_gct.mqtt.create("USER_LOGOUT", {
+		this.client = _gct.mqtt.create(this.LOGOUT_CLIENT_TAG, {
 			...mqttProperties,
 			clientId: "logout" + this.fingerprint + getPageIdentification(),
 			protocolVersion: 5,
@@ -94,7 +101,10 @@ var SystemMqttService = class {
 			},
 			properties: { sessionExpiryInterval: willDelayInterval * 2 }
 		});
+	}
+	static subs() {
 		this.subCleanCache();
+		this.subKickOut();
 	}
 	/**
 	* 订阅系统级 MQTT 消息
@@ -104,10 +114,10 @@ var SystemMqttService = class {
 	*/
 	static subscribe(topic, callback) {
 		if (!this.client) throw new Error("MQTT client is not initialized");
-		return this.client.subscribe(topic, (topic, payload) => {
-			console.debug(`收到系统级 MQTT 消息，topic: ${topic}, payload:`, payload);
+		return this.client.subscribe(topic, (_topic, payload) => {
 			try {
-				callback(JSON.parse(payload.toString()));
+				const payloadStr = payload.toString();
+				callback(JSON.parse(payloadStr));
 			} catch (error) {
 				console.error("解析 MQTT 消息 payload 失败:", error);
 			}
@@ -121,7 +131,19 @@ var SystemMqttService = class {
 	* @return {*}  {MqttCancelSub}
 	*/
 	static subKickOut(callback) {
-		return this.subscribe(this.KICK_OUT_TOPIC, callback);
+		return this.subscribe(this.KICK_OUT_TOPIC, (data) => {
+			const token = getToken();
+			if (token && token === data?.token) {
+				_gct.confirm.warning({
+					title: t("sys.loginWarning"),
+					content: t("sys.loginWarningContent"),
+					okText: t("sys.understood")
+				}).then(() => {
+					AuthUtil.getInstance().clearAuthAndGoLogin();
+				});
+				callback?.(data);
+			}
+		});
 	}
 	/**
 	* 订阅未读消息变化

package/es/modules/user-stores/store/permission.store.d.ts

@@ -16,6 +16,7 @@ export declare const usePermissionStore: import('pinia').StoreDefinition<"permis
         };
     }>): boolean;
 }, {
+    initPremission(): Promise<void>;
     getPermissionByKey(pageId: string, key?: string): boolean;
     initPermission(): Promise<void>;
 }>;

package/es/modules/user-stores/store/permission.store.mjs

@@ -9,6 +9,16 @@ var usePermissionStore = defineStore("permission", {
 		return !!state.userPermissions.appSuperAdmin || !!state.userPermissions.permissions["POINT.*"];
 	} },
 	actions: {
+		async initPremission() {
+			const res = await _api.apaas.designerCommon.getUserInfo();
+			Object.assign(this.userPermissions, {
+				...res,
+				permissions: res?.permissions ? res?.permissions.reduce((map, item) => {
+					map[item] = true;
+					return map;
+				}, {}) : {}
+			});
+		},
 		getPermissionByKey(pageId, key) {
 			if (this.hasAllPermissions) return true;
 			if (!key) return this.userPermissions.permissions[pageId];

package/es/utils/auth-util/auth-util.d.ts

@@ -15,6 +15,12 @@ export declare class AuthUtil {
      */
     loadUser(): Promise<void>;
     logout(goLogin?: boolean): Promise<void>;
+    /**
+     * 清除认证信息并跳转到登录页
+     *
+     * @return {*}  {Promise<void>}
+     */
+    clearAuthAndGoLogin(): Promise<void>;
     /**
      * 跳转到首页
      *

package/es/utils/auth-util/auth-util.mjs

@@ -1,6 +1,6 @@
 import { useUserStore } from "../../modules/user-stores/store/user.store.mjs";
 import "../../modules/user-stores/index.mjs";
-import { getToken } from "../tools/tools.mjs";
+import { getToken, setTenant, setToken } from "../tools/tools.mjs";
 //#region src/utils/auth-util/auth-util.ts
 /**
 * 认证工具类
@@ -39,6 +39,18 @@ var AuthUtil = class AuthUtil {
 		}
 	}
 	/**
+	* 清除认证信息并跳转到登录页
+	*
+	* @return {*}  {Promise<void>}
+	*/
+	async clearAuthAndGoLogin() {
+		setToken();
+		setTenant();
+		const url = new URL(`${location.origin}/paas-front/portal`);
+		url.hash = `/login`;
+		window.location.href = url.toString();
+	}
+	/**
 	* 跳转到首页
 	*
 	* @return {*}  {Promise<void>}

package/es/utils/axios/check-status.mjs

@@ -9,7 +9,7 @@ function checkStatus(status, msg, errorMessageMode = "message") {
 			break;
 		case 401:
 			errMessage = msg || t("sys.errMsg401");
-			AuthUtil.getInstance().logout(true);
+			AuthUtil.getInstance().clearAuthAndGoLogin();
 			break;
 		case 402:
 			setTimeout(() => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gct-paas/core",
-  "version": "0.1.6-dev.28",
+  "version": "0.1.6-dev.29",
   "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.6-dev.14",
+    "@gct-paas/api": "^0.1.6-dev.15",
     "@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": "^0.1.6-dev.14",
+    "@gct-paas/api": "^0.1.6-dev.15",
     "vue": ">=3",
     "vue-i18n": ">=11",
     "vue-router": ">=4"