@gct-paas/core 0.1.6-dev.17 → 0.1.6-dev.18

package/es/interface/open-util/i-drawer-options/i-drawer-options.d.ts

@@ -0,0 +1,298 @@
+import { CSSProperties } from 'vue';
+/**
+ * 模态飘窗配置项
+ *
+ * @author zhanghanrui
+ * @date 2024-03-29 13:03:31
+ * @export
+ * @interface IDrawerOptions
+ */
+export interface IDrawerOptions {
+    /**
+     * 抽屉展开后是否将焦点切换至其 Dom 节点
+     *
+     * @default true
+     * @author zhanghanrui
+     * @date 2024-03-29 13:03:51
+     * @type {boolean}
+     */
+    autofocus?: boolean;
+    /**
+     * 可用于设置 Drawer 内容部分的样式
+     *
+     * @author zhanghanrui
+     * @date 2024-03-29 13:03:26
+     * @type {CSSProperties}
+     */
+    bodyStyle?: CSSProperties;
+    /**
+     * 对话框外层容器的类名
+     *
+     * @author zhanghanrui
+     * @date 2024-03-29 13:03:57
+     * @type {string}
+     */
+    class?: string;
+    /**
+     * 是否显示左上角的关闭按钮
+     *
+     * @default true
+     * @author zhanghanrui
+     * @date 2024-03-29 13:03:23
+     * @type {boolean}
+     */
+    closable?: boolean;
+    /**
+     * 自定义关闭图标
+     *
+     * @author zhanghanrui
+     * @date 2024-03-29 13:03:30
+     * @type {*}
+     */
+    closeIcon?: unknown;
+    /**
+     * 可用于设置 Drawer 包裹内容部分的样式
+     *
+     * @author zhanghanrui
+     * @date 2024-03-29 13:03:39
+     * @type {CSSProperties}
+     */
+    contentWrapperStyle?: CSSProperties;
+    /**
+     * 关闭时销毁 Drawer 里的子元素
+     *
+     * @default false
+     * @author zhanghanrui
+     * @date 2024-03-29 13:03:25
+     * @type {boolean}
+     */
+    destroyOnClose?: boolean;
+    /**
+     * 用于设置 Drawer 弹出层的样式
+     *
+     * @author zhanghanrui
+     * @date 2024-03-29 13:03:52
+     * @type {Object}
+     */
+    drawerStyle?: object;
+    /**
+     * 抽屉右上角的操作区域
+     *
+     * @author zhanghanrui
+     * @date 2024-03-29 13:03:16
+     * @type {(VNode | slot)}
+     */
+    extra?: unknown;
+    /**
+     * 抽屉的页脚
+     *
+     * @author zhanghanrui
+     * @date 2024-03-29 13:03:04
+     * @type {(VNode | slot)}
+     */
+    footer?: unknown;
+    /**
+     * 抽屉页脚部件的样式
+     *
+     * @author zhanghanrui
+     * @date 2024-03-29 13:03:23
+     * @type {CSSProperties}
+     */
+    footerStyle?: CSSProperties;
+    /**
+     * 预渲染 Drawer 内元素
+     *
+     * @default false
+     * @author zhanghanrui
+     * @date 2024-03-29 13:03:10
+     * @type {boolean}
+     */
+    forceRender?: boolean;
+    /**
+     * 指定 Drawer 挂载的 HTML 节点
+     *
+     * @author zhanghanrui
+     * @date 2024-03-29 13:03:49
+     */
+    getContainer?: HTMLElement;
+    /**
+     * 用于设置 Drawer 头部的样式
+     *
+     * @author zhanghanrui
+     * @date 2024-03-29 13:03:25
+     * @type {CSSProperties}
+     */
+    headerStyle?: CSSProperties;
+    /**
+     * 高度, 在 placement 为 top 或 bottom 时使用
+     *
+     * @author zhanghanrui
+     * @date 2024-03-29 13:03:40
+     * @type {(string | number)}
+     */
+    height?: string | number;
+    /**
+     * 是否支持键盘 esc 关闭
+     *
+     * @default true
+     * @author zhanghanrui
+     * @date 2024-03-29 13:03:54
+     * @type {boolean}
+     */
+    keyboard?: boolean;
+    /**
+     * 是否展示遮罩
+     *
+     * @default true
+     * @author zhanghanrui
+     * @date 2024-03-29 13:03:17
+     * @type {boolean}
+     */
+    mask?: boolean;
+    /**
+     * 点击蒙层是否允许关闭
+     *
+     * @default true
+     * @author zhanghanrui
+     * @date 2024-03-29 13:03:34
+     * @type {boolean}
+     */
+    maskClosable?: boolean;
+    /**
+     * 遮罩样式
+     *
+     * @author zhanghanrui
+     * @date 2024-03-29 13:03:49
+     * @type {CSSProperties}
+     */
+    maskStyle?: CSSProperties;
+    /**
+     * 抽屉的方向
+     *
+     * @default 'right'
+     * @author zhanghanrui
+     * @date 2024-03-29 13:03:05
+     * @type {('top' | 'right' | 'bottom' | 'left')}
+     */
+    placement?: 'top' | 'right' | 'bottom' | 'left';
+    /**
+     * 用于设置多层 Drawer 的推动行为
+     *
+     * @default { distance: 180 }
+     * @author zhanghanrui
+     * @date 2024-03-29 13:03:27
+     * @type {(boolean | { distance: string | number })}
+     */
+    push?: boolean | {
+        distance: string | number;
+    };
+    /**
+     * 预设抽屉宽度（或高度）
+     *
+     * @default 'default'
+     * @author zhanghanrui
+     * @date 2024-03-29 13:03:01
+     * @type {('default' | 'large')}
+     */
+    size?: 'default' | 'large';
+    /**
+     * 可用于设置 Drawer 最外层容器的样式，和 drawerStyle 的区别是作用节点包括 mask
+     *
+     * @author zhanghanrui
+     * @date 2024-03-29 13:03:23
+     * @type {CSSProperties}
+     */
+    style?: CSSProperties;
+    /**
+     * 抽屉的标题
+     *
+     * @author zhanghanrui
+     * @date 2024-03-29 13:03:32
+     * @type {string}
+     */
+    title?: string;
+    /**
+     * (v-model)	Drawer 是否可见
+     *
+     * @author zhanghanrui
+     * @date 2024-03-29 13:03:41
+     * @type {boolean}
+     */
+    visible?: boolean;
+    /**
+     * 宽度
+     *
+     * @default 378
+     * @author zhanghanrui
+     * @date 2024-03-29 13:03:58
+     * @type {(string | number)}
+     */
+    width?: string | number;
+    /**
+     * 设置 Drawer 的 z-index
+     *
+     * @default 1000
+     * @author zhanghanrui
+     * @date 2024-03-29 13:03:21
+     * @type {number}
+     */
+    zIndex?: number;
+    /**
+     * 是否为详情模式
+     *
+     * @author zhanghanrui
+     * @date 2024-03-29 13:03:34
+     * @type {boolean}
+     */
+    isDetail?: boolean;
+    /**
+     * loading 状态
+     *
+     * @default false
+     * @author zhanghanrui
+     * @date 2024-03-29 13:03:48
+     * @type {boolean}
+     */
+    loading?: boolean;
+    /**
+     * loading 文本
+     *
+     * @author zhanghanrui
+     * @date 2024-03-29 13:03:02
+     * @type {string}
+     */
+    loadingText?: string;
+    /**
+     * isDetail=true 状态下是否显示返回按钮
+     *
+     * @default true
+     * @author zhanghanrui
+     * @date 2024-03-29 14:03:03
+     * @type {boolean}
+     */
+    showDetailBack?: boolean;
+    /**
+     * 自定义关闭函数，返回true关闭，否则不关闭
+     *
+     * @author zhanghanrui
+     * @date 2024-03-29 14:03:42
+     */
+    closeFunc?: () => Promise<boolean>;
+    /**
+     * 是否显示底部
+     *
+     * @author zhanghanrui
+     * @date 2024-03-29 14:03:55
+     * @type {boolean}
+     */
+    showFooter?: boolean;
+    /**
+     * 底部区域高度
+     *
+     * @default 60
+     * @author zhanghanrui
+     * @date 2024-03-29 14:03:22
+     * @type {number}
+     */
+    footerHeight?: number;
+}

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

@@ -58,8 +58,9 @@ export interface IModal {
      * @author zhanghanrui
      * @date 2024-03-29 11:03:03
      * @param {(() => Promise<IModalData | null>)} ok
+     * @param {(() => Promise<boolean>)} [cancel]
      */
-    callback(ok: () => Promise<IModalData | null>): void;
+    callback(ok: () => Promise<IModalData | null>, cancel?: () => Promise<boolean>): void;
     /**
      * 取消操作
      *

package/es/interface/open-util/i-modal-data/i-modal-data.d.ts

@@ -6,7 +6,7 @@
  * @export
  * @interface IModalData
  */
-export interface IModalData {
+export interface IModalData<T = IData> {
     /**
      * 关闭模态窗时是否操作成功
      *
@@ -26,9 +26,9 @@ export interface IModalData {
      *
      * @author zhanghanrui
      * @date 2024-03-19 20:03:44
-     * @type {IData[]}
+     * @type {T[]}
      */
-    data?: IData[];
+    data?: T[];
     /**
      * 额外参数
      *

package/es/interface/open-util/i-modal-options/i-modal-options.d.ts

@@ -1,3 +1,4 @@
+import { VNode } from 'vue';
 /**
  * 模态打开参数，此为具体端实现，具体扩充参数由各端定义
  *
@@ -6,7 +7,7 @@
  */
 export interface IModalOptions {
     [key: string]: any;
-    title?: string;
+    title?: string | VNode;
     width?: string | number;
     zIndex?: number;
 }

package/es/interface/open-util/i-overlay-controller/i-overlay-controller.d.ts

@@ -2,6 +2,7 @@ import { ComputePositionConfig } from '@floating-ui/dom';
 import { IOverlayContainer } from '../i-overlay-container/i-overlay-container';
 import { IModalOptions } from '../i-modal-options/i-modal-options';
 import { IModalData } from '../i-modal-data/i-modal-data';
+import { IDrawerOptions } from '../i-drawer-options/i-drawer-options';
 import { IPopoverOptions } from '../../i-popover-options/i-popover-options';
 import { IOverlayPopoverContainer } from '../i-overlay-popover-container/i-overlay-popover-container';
 import { IAppFullScreenContainerOptions } from '../i-app-full-screen-container-options/i-app-full-screen-container-options';
@@ -38,6 +39,14 @@ export interface IOverlayController {
      * @return {*}  {IOverlayContainer}
      */
     createModal(component: unknown, props?: IParams, opts?: IModalOptions): IOverlayContainer;
+    /**
+     * 抽屉打开组件
+     */
+    drawer<T = IModalData>(component: unknown, props?: IParams, opts?: IDrawerOptions): Promise<T>;
+    /**
+     * 创建全局抽屉容器
+     */
+    createDrawer(component: unknown, props?: IParams, opts?: IDrawerOptions): IOverlayContainer;
     /**
      * 飘窗打开组件
      *

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

@@ -1,3 +1,4 @@
+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 { IMessageParams, IMessageUtil, } from './i-message-util/i-message-util';
 export type { IModal } from './i-modal/i-modal';

package/es/locale/index.d.ts

@@ -1,6 +1,7 @@
 import { I18n } from 'vue-i18n';
 import { App } from 'vue';
 import { I18nConfigResponse } from '@gct-paas/api/platform';
+import { EnvironmentType } from '../modules/env-manager';
 type localeItem = Pick<I18nConfigResponse, 'id' | 'configured' | 'defaultLanguage' | 'language' | 'languageTag' | 'state'>;
 type ILocaleMessages = Record<string, string>;
 type ILocaleDeclarations = Record<string, ILocaleMessages>;
@@ -38,7 +39,7 @@ export declare class LocaleUtil {
     } | {
         locale: string;
         app: string;
-        env: 'dev' | 'test' | 'prod';
+        env: EnvironmentType;
         branch?: string;
     }): string;
     /**

package/es/modules/env-manager/env-manager.d.ts

@@ -18,29 +18,13 @@ export declare class EnvironmentManager implements IEnvironmentManager {
     /**安卓混合开发模式下 */
     get isAndroid(): boolean;
     /**
-     * 是否为应用前端运行时
-     */
-    get isAppRun(): boolean;
-    /**
-     * 是否为应用前端运行时生产环境包含测试环境
+     * 是否为生产环境
      */
     get isAppProd(): boolean;
-    /**
-     * 是否为应用前端运行时预览环境
-     */
-    get isAppPreview(): boolean;
-    /**
-     * 是否为dev环境单应用
-     */
-    get isDevSingleEnv(): boolean;
     /**
      * 是否为测试环境
      */
     get isTestEnv(): boolean;
-    /**
-     * 是否是单应用模式
-     */
-    get isAppSingle(): boolean;
     /**
      * 平台地址
      */

package/es/modules/env-manager/env-manager.interface.d.ts

@@ -8,7 +8,9 @@ export declare enum EnvironmentType {
     /** 测试环境 */
     TEST = "test",
     /** 生产环境 */
-    PROD = "prod"
+    PROD = "prod",
+    /** 沙箱环境 */
+    SANDBOX = "sandbox"
 }
 /**
  * 环境管理器接口
@@ -16,14 +18,8 @@ export declare enum EnvironmentType {
 export interface IEnvironmentManager {
     /** 是否为安卓混合模式下运行 */
     readonly isAndroid: boolean;
-    /** 是否为应用前端运行时 */
-    readonly isAppRun: boolean;
-    /** 是否为应用前端运行时生产环境 */
+    /** 是否为生产环境 */
     readonly isAppProd: boolean;
-    /** 是否为应用前端运行时预览环境 */
-    readonly isAppPreview: boolean;
-    /** 是否为dev环境单应用 */
-    readonly isDevSingleEnv: boolean;
     /** 是否为测试环境 */
     readonly isTestEnv: boolean;
     /** 平台地址 */
@@ -34,8 +30,6 @@ export interface IEnvironmentManager {
     readonly testTenantData: Tenant;
     /** 是否为沙箱环境 */
     isSandbox: boolean;
-    /** 是否是单应用模式 */
-    isAppSingle: boolean;
     /**
      * 检测是否为测试环境
      * @param loadTenant 是否加载租户信息

package/es/modules/env-manager/env-manager.interface.mjs

@@ -9,6 +9,8 @@ var EnvironmentType = /* @__PURE__ */ function(EnvironmentType) {
 	EnvironmentType["TEST"] = "test";
 	/** 生产环境 */
 	EnvironmentType["PROD"] = "prod";
+	/** 沙箱环境 */
+	EnvironmentType["SANDBOX"] = "sandbox";
 	return EnvironmentType;
 }({});
 //#endregion

package/es/modules/env-manager/env-manager.mjs

@@ -1,6 +1,6 @@
-import { ENV } from "../../store/session-store.mjs";
 import { EnvironmentType } from "./env-manager.interface.mjs";
-import { APP_PREVIEW_PATH_REG, APP_PROD_PATH_REG, APP_RUN_PATH_REG, DEV_SINGLE_PATH_REG, HOST_REG, IP_REG, SANDBOX_PATH_REG, SINGLE_PATH_REG, TEST_SINGLE_PATH_REG } from "./env-manager.const.mjs";
+import { ENV } from "../../store/session-store.mjs";
+import { HOST_REG, IP_REG } from "./env-manager.const.mjs";
 //#region src/modules/env-manager/env-manager.ts
 /**
 * 环境管理器
@@ -25,40 +25,16 @@ var EnvironmentManager = class {
 		return window.__GCT_ANDROID__ === true;
 	}
 	/**
-	* 是否为应用前端运行时
-	*/
-	get isAppRun() {
-		return APP_RUN_PATH_REG.test(location.pathname);
-	}
-	/**
-	* 是否为应用前端运行时生产环境包含测试环境
+	* 是否为生产环境
 	*/
 	get isAppProd() {
-		return APP_PROD_PATH_REG.test(location.pathname);
-	}
-	/**
-	* 是否为应用前端运行时预览环境
-	*/
-	get isAppPreview() {
-		return APP_PREVIEW_PATH_REG.test(location.pathname);
-	}
-	/**
-	* 是否为dev环境单应用
-	*/
-	get isDevSingleEnv() {
-		return DEV_SINGLE_PATH_REG.test(location.pathname);
+		return _gct.store.context.env === EnvironmentType.PROD;
 	}
 	/**
 	* 是否为测试环境
 	*/
 	get isTestEnv() {
-		return TEST_SINGLE_PATH_REG.test(location.pathname) || this._testEnv;
-	}
-	/**
-	* 是否是单应用模式
-	*/
-	get isAppSingle() {
-		return SINGLE_PATH_REG.test(location.pathname);
+		return this._testEnv || _gct.store.context.env === EnvironmentType.TEST;
 	}
 	/**
 	* 平台地址
@@ -82,7 +58,7 @@ var EnvironmentManager = class {
 	* 是否为沙箱环境
 	*/
 	get isSandbox() {
-		return SANDBOX_PATH_REG.test(location.pathname);
+		return _gct.store.context.env === EnvironmentType.SANDBOX;
 	}
 	/**
 	* 检测是否为测试环境
@@ -107,6 +83,7 @@ var EnvironmentManager = class {
 				}
 			}
 		}
+		if (this._testEnv) await _gct.store.setContext({ env: EnvironmentType.TEST });
 	}
 	/**
 	* 获取当前环境类型
@@ -114,9 +91,9 @@ var EnvironmentManager = class {
 	*/
 	getEnv() {
 		if (ENV.value) return ENV.value;
-		else if (this.isTestEnv) return EnvironmentType.TEST;
-		else if (this.isAppProd || this.isAndroid) return EnvironmentType.PROD;
-		else return EnvironmentType.DEV;
+		if (this.isTestEnv) return EnvironmentType.TEST;
+		if (_gct.store.context.env) return _gct.store.context.env;
+		return EnvironmentType.DEV;
 	}
 };
 //#endregion

package/es/modules/env-manager/env-manager.util.d.ts

@@ -0,0 +1,5 @@
+import { EnvironmentType } from './env-manager.interface';
+/**
+ * 校验并规范化环境类型
+ */
+export declare function normalizeEnv(env: unknown): EnvironmentType | undefined;

package/es/modules/env-manager/env-manager.util.mjs

@@ -0,0 +1,11 @@
+import { EnvironmentType } from "./env-manager.interface.mjs";
+//#region src/modules/env-manager/env-manager.util.ts
+var ENV_VALUES = new Set(Object.values(EnvironmentType));
+/**
+* 校验并规范化环境类型
+*/
+function normalizeEnv(env) {
+	if (typeof env === "string" && ENV_VALUES.has(env)) return env;
+}
+//#endregion
+export { normalizeEnv };

package/es/modules/env-manager/index.d.ts

@@ -1,3 +1,4 @@
 export * from './env-manager.interface';
 export * from './env-manager.const';
+export * from './env-manager.util';
 export { EnvironmentManager } from './env-manager';

package/es/modules/env-manager/index.mjs

@@ -1,3 +1,4 @@
 import "./env-manager.interface.mjs";
+import "./env-manager.util.mjs";
 import "./env-manager.const.mjs";
 import "./env-manager.mjs";

package/es/modules/platform-config/enums/login.enum.d.ts

@@ -21,5 +21,7 @@ export declare enum LoginTypeEnum {
     /** 飞书 */
     FEISHU = "FEISHU",
     /** 企业微信 */
-    QIYEWEIXIN = "QIYEWEIXIN"
+    QIYEWEIXIN = "QIYEWEIXIN",
+    /** 微软 */
+    MICROSOFT = "MICROSOFT"
 }

package/es/modules/platform-config/enums/login.enum.mjs

@@ -24,6 +24,8 @@ var LoginTypeEnum = /* @__PURE__ */ function(LoginTypeEnum) {
 	LoginTypeEnum["FEISHU"] = "FEISHU";
 	/** 企业微信 */
 	LoginTypeEnum["QIYEWEIXIN"] = "QIYEWEIXIN";
+	/** 微软 */
+	LoginTypeEnum["MICROSOFT"] = "MICROSOFT";
 	return LoginTypeEnum;
 }({});
 //#endregion

package/es/store/global-store.mjs

@@ -4,6 +4,7 @@ import { GlobalPiniaState } from "../state/global-pinia-state/global-pinia-state
 import "../state/index.mjs";
 import { parseMatrixParams } from "../utils/tools/tools.mjs";
 import "../utils/index.mjs";
+import { normalizeEnv } from "../modules/env-manager/env-manager.util.mjs";
 import { defineStore } from "pinia";
 //#region src/store/global-store.ts
 var useGlobalStore = defineStore("global-store", {
@@ -32,8 +33,9 @@ var useGlobalStore = defineStore("global-store", {
 			const paramStr = location.pathname.split("/")[2];
 			if (paramStr) {
 				const params = parseMatrixParams(paramStr);
-				if (params) this.context = params;
+				if (params && Object.keys(params).length) Object.assign(this.context, params);
 			}
+			this.context.env = normalizeEnv(this.context.env);
 		},
 		async loadAppInfo() {
 			const res = await _api.apaas.designerCommon.getGetApp();

package/es/utils/axios/interceptors.mjs

@@ -20,6 +20,18 @@ function interceptors(axios) {
 		});
 		return config;
 	});
+	axios.interceptors.response.use((response) => {
+		if (response.data.code === 200) return response;
+		else {
+			const { errorMessageMode } = response.config || {};
+			const { subMessage, message, subCode } = response.data;
+			if (errorMessageMode === "none" || subCode === "sys.plat.api.pass.failure.over.max_times") console.error(response.data);
+			else if (subMessage || message) _gct.message.error(subMessage || message);
+		}
+		return response;
+	}, (err) => {
+		return Promise.reject(err);
+	});
 }
 //#endregion
 export { interceptors };

package/es/utils/openUtil/modal/modal.d.ts

@@ -25,7 +25,7 @@ export declare class Modal implements IModal {
         shouldDismiss: AsyncSeriesHook<[], {
             allowClose?: boolean;
         }>;
-        beforeDismiss: AsyncSeriesHook<[], IModalData>;
+        beforeDismiss: AsyncSeriesHook<[], IModalData<IData>>;
     };
     ok?: () => Promise<IModalData | null>;
     setOptions?: (options: object) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gct-paas/core",
-  "version": "0.1.6-dev.17",
+  "version": "0.1.6-dev.18",
   "type": "module",
   "description": "paas 平台核心包",
   "loader": "dist/index.esm.min.js",