@gct-paas/core 0.1.6-dev.9 → 6.0.0-dev.10

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

@@ -0,0 +1,64 @@
+import { AuthUtil } from "../auth-util/auth-util.mjs";
+import { t } from "../i18n/index.mjs";
+//#region src/utils/axios/check-status.ts
+function checkStatus(status, msg, errorMessageMode = "message") {
+	let errMessage = "";
+	switch (status) {
+		case 400:
+			errMessage = `${msg}`;
+			break;
+		case 401:
+			errMessage = msg || t("sys.errMsg401");
+			AuthUtil.getInstance().clearAuthAndGoLogin();
+			break;
+		case 402:
+			setTimeout(() => {
+				if (_gct.env.isSandbox || _gct.env.isAppSingle) AuthUtil.getInstance().logout(true);
+				else AuthUtil.getInstance().goHome();
+			}, 3e3);
+			break;
+		case 403:
+			errMessage = t("sys.errMsg403");
+			break;
+		case 404:
+			errMessage = t("sys.errMsg404");
+			break;
+		case 405:
+			errMessage = t("sys.errMsg405");
+			break;
+		case 408:
+			errMessage = t("sys.errMsg408");
+			break;
+		case 500:
+			errMessage = t("sys.errMsg500");
+			break;
+		case 501:
+			errMessage = t("sys.errMsg501");
+			break;
+		case 502:
+			errMessage = t("sys.errMsg502");
+			break;
+		case 503:
+			errMessage = t("sys.errMsg503");
+			break;
+		case 504:
+			errMessage = t("sys.errMsg504");
+			break;
+		case 505:
+			errMessage = t("sys.errMsg505");
+			break;
+		case 510:
+			if (_gct.env.isSandbox) _gct.router.replace({
+				force: true,
+				path: "/notFound"
+			});
+			break;
+		default:
+	}
+	if (errMessage) {
+		if (errorMessageMode === "modal") console.warn("errorMessageMode === \"modal\" 暂未支持", errMessage);
+		else if (errorMessageMode === "message") _gct.message.error(errMessage);
+	}
+}
+//#endregion
+export { checkStatus };

package/es/utils/axios/interceptors.mjs

@@ -1,4 +1,7 @@
 import { getTenant, getToken } from "../tools/tools.mjs";
+import { AuthUtil } from "../auth-util/auth-util.mjs";
+import { t } from "../i18n/index.mjs";
+import { checkStatus } from "./check-status.mjs";
 import { globalRefStorage } from "../../store/storage-store.mjs";
 import "../../store/index.mjs";
 import { AxiosHeaders } from "axios";
@@ -20,6 +23,33 @@ 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 (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);
+		}
+		return response;
+	}, (error) => {
+		const { response, code, message, status } = error || {};
+		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");
+		if (errMessage) {
+			if (errorMessageMode === "modal") console.warn("errorMessageMode === \"modal\" 暂未支持", errMessage);
+			else if (errorMessageMode === "message") _gct.message.error(errMessage);
+			return Promise.reject(error);
+		}
+		checkStatus(status, message, errorMessageMode);
+		return Promise.reject(error);
+	});
 }
 //#endregion
 export { interceptors };

package/es/utils/deviceFingerprint.mjs

@@ -70,6 +70,10 @@ async function getDeviceFingerprint() {
 	if (isWeb) localStorage.setItem(FINGERPRINT_KEY, visitorId);
 	return `${name}/${visitorId}`;
 }
+/** web 端指纹（语义兼容） */
+function getBrowserFingerprint() {
+	return getDeviceFingerprint();
+}
 /** mobile 端指纹（语义兼容） */
 function getMobileBrowserFingerprint() {
 	return getDeviceFingerprint();
@@ -84,4 +88,4 @@ function getPageIdentification() {
 	return pageTag;
 }
 //#endregion
-export { getDeviceFingerprint, getMobileBrowserFingerprint, getPageIdentification };
+export { getBrowserFingerprint, getDeviceFingerprint, getMobileBrowserFingerprint, getPageIdentification };

package/es/utils/i18n/index.mjs

@@ -15,5 +15,6 @@ var t = (...args) => {
 	if (!key || typeof key !== "string" || key.trim() === "") return "";
 	return _gct.i18n.global.t(...args);
 };
+window.$t = t;
 //#endregion
 export { t };

package/es/utils/index.d.ts

@@ -1,3 +1,4 @@
+export { AuthUtil } from './auth-util/auth-util';
 export { cssLoader } from './css-loader/css-loader';
 export { gctMemoizeAsync } from './cache-adapter/cache-adapter';
 export { DictionaryUtil } from './dictionary/dictionary';
@@ -13,11 +14,11 @@ 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, tenantRef, isMobile, setTenant, deepMerge, stringifyMatrixParams, parseMatrixParams, createWhiteImageWithText, } from './tools/tools';
+export { getToken, setToken, getTenant, tenantRef, isMobile, setTenant, deepMerge, stringifyMatrixParams, parseMatrixParams, createWhiteImageWithText, isRdoUniqueField, } from './tools/tools';
 export * from './uuid/uuid';
 export * from './value-helper/value-helper';
 export { interceptors } from './axios/interceptors';
-export { getDeviceFingerprint, getPageIdentification, getMobileBrowserFingerprint, } from './deviceFingerprint';
+export { getDeviceFingerprint, getPageIdentification, getMobileBrowserFingerprint, getBrowserFingerprint, } from './deviceFingerprint';
 export { TreeHelper } from './treeHelper/treeHelper';
 export * from './style';
 export * from './util';
@@ -34,3 +35,4 @@ export { scriptLoader, type IScriptOptions, } from './script-loader/script-loade
 export { permission } from './permission';
 export { getVueComponentByCode } from './vue-component-code';
 export * from './data-prems/const';
+export * from './select-user-utils';

package/es/utils/index.mjs

@@ -1,3 +1,5 @@
+import "./tools/tools.mjs";
+import "./auth-util/auth-util.mjs";
 import "./css-loader/css-loader.mjs";
 import "./cache-adapter/cache-adapter.mjs";
 import "./dictionary/dictionary.mjs";
@@ -16,7 +18,6 @@ import "./openUtil/index.mjs";
 import "./kit-pkg-util/kit-pkg-util.mjs";
 import "./plugin-pkg-util/plugin-pkg-util.mjs";
 import "./plugin-static-resource/plugin-static-resource.mjs";
-import "./tools/tools.mjs";
 import "./uuid/uuid.mjs";
 import "./value-helper/value-helper.mjs";
 import "./axios/interceptors.mjs";
@@ -37,3 +38,4 @@ import "./script-loader/script-loader.mjs";
 import "./permission.mjs";
 import "./vue-component-code.mjs";
 import "./data-prems/const.mjs";
+import "./select-user-utils.mjs";

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

@@ -39,7 +39,7 @@ var KitPkgUtil = class {
 			if (module) return module;
 			else console.warn(`Kit ${kit} does not export a default function`);
 		} catch (error) {
-			console.error(`Error loading kit ${kit} from ${loaderUrl}:`, error);
+			console.warn(`Error loading kit ${kit} from ${loaderUrl}:`, error);
 		}
 		return null;
 	}

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/es/utils/openUtil/modal/modal.mjs

@@ -1,5 +1,5 @@
-import { reactive } from "vue";
 import { AsyncSeriesHook } from "qx-util";
+import { reactive } from "vue";
 //#region src/utils/openUtil/modal/modal.ts
 var Modal = class {
 	ignoreDismissCheck = false;

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

@@ -1,5 +1,7 @@
-import { createApp, h } from "vue";
+import { KitPkgUtil } from "../../kit-pkg-util/kit-pkg-util.mjs";
+import "../../index.mjs";
 import { QXEvent } from "qx-util";
+import { createApp, h } from "vue";
 //#region src/utils/openUtil/overlay-container/overlay-container.ts
 /**
 * 全局弹出承载组件
@@ -81,7 +83,7 @@ var OverlayContainer = class OverlayContainer {
 		const { render, opts } = this;
 		const container = document.createElement("div");
 		document.body.appendChild(container);
-		return new Promise((resolve) => {
+		return new Promise(async (resolve) => {
 			const vm = OverlayContainer.createVueApp({
 				mounted() {
 					self.modal = this.$refs.root;
@@ -102,6 +104,10 @@ var OverlayContainer = class OverlayContainer {
 					}, { default: render });
 				}
 			});
+			if (_gct.store.appInfo.suiteKey) {
+				const module = await KitPkgUtil.loadWeb(_gct.store.appInfo.suiteKey);
+				if (module && module.createAppVue) 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/select-user-utils.d.ts

@@ -0,0 +1,50 @@
+import { FIELD_TYPE } from '../enums';
+/** 动态类型 */
+export declare enum DYN_FORMAT_TYPE_ENUM {
+    /** 申请人直属上级 */
+    DYN_SUBMITTER_MANAGER = "DYN_SUBMITTER_MANAGER",
+    /** 申请人部门负责人 */
+    DYN_SUBMITTER_DEPT_PRINCIPAL = "DYN_SUBMITTER_DEPT_PRINCIPAL",
+    /** 指定人员字段 */
+    DYN_MODEL_USERS = "DYN_MODEL_USERS",
+    /** 指定人员字段直属上级 */
+    DYN_MODEL_USER_MANAGER = "DYN_MODEL_USER_MANAGER",
+    /** 指定部门负责人 */
+    DYN_DEPT_PRINCIPAL = "DYN_DEPT_PRINCIPAL",
+    /** 指定部门字段 */
+    DYN_MODEL_ORG = "DYN_MODEL_ORG",
+    /** 指定部门字段负责人 */
+    DYN_MODEL_DEPT_PRINCIPAL = "DYN_MODEL_DEPT_PRINCIPAL"
+}
+export declare const DynFormatTypes: DYN_FORMAT_TYPE_ENUM[];
+export declare const filterDynFormatTypes: string[];
+export declare const dynamicData: ({
+    id: string;
+    formatId: DYN_FORMAT_TYPE_ENUM;
+    name: string;
+    desc: string;
+    panelKey?: undefined;
+    showPanel?: undefined;
+    panelType?: undefined;
+} | {
+    id: string;
+    formatId: DYN_FORMAT_TYPE_ENUM;
+    name: string;
+    desc: string;
+    showPanel: boolean;
+    panelType: string;
+    panelKey: FIELD_TYPE[];
+} | {
+    panelKey?: undefined;
+    id: string;
+    formatId: DYN_FORMAT_TYPE_ENUM;
+    name: string;
+    desc: string;
+    showPanel: boolean;
+    panelType: string;
+})[];
+export declare function list2Tree(list: IObject[]): IObject[];
+export declare function highlightName(str: string, searchValue?: string): string | null;
+export declare const filterTree: (tree: IObject[], searchValue: string) => IObject[];
+export declare const findUniqueNode: (tree: IObject[], tid: string) => IObject | null;
+export declare function showDynamicTitle(id: string, name: string): string;

package/es/utils/select-user-utils.mjs

@@ -0,0 +1,129 @@
+import { FIELD_TYPE } from "../enums/appEnum.mjs";
+import "../enums/index.mjs";
+import { cloneDeep } from "lodash-es";
+//#region src/utils/select-user-utils.ts
+/** 动态类型 */
+var DYN_FORMAT_TYPE_ENUM = /* @__PURE__ */ function(DYN_FORMAT_TYPE_ENUM) {
+	/** 申请人直属上级 */
+	DYN_FORMAT_TYPE_ENUM["DYN_SUBMITTER_MANAGER"] = "DYN_SUBMITTER_MANAGER";
+	/** 申请人部门负责人 */
+	DYN_FORMAT_TYPE_ENUM["DYN_SUBMITTER_DEPT_PRINCIPAL"] = "DYN_SUBMITTER_DEPT_PRINCIPAL";
+	/** 指定人员字段 */
+	DYN_FORMAT_TYPE_ENUM["DYN_MODEL_USERS"] = "DYN_MODEL_USERS";
+	/** 指定人员字段直属上级 */
+	DYN_FORMAT_TYPE_ENUM["DYN_MODEL_USER_MANAGER"] = "DYN_MODEL_USER_MANAGER";
+	/** 指定部门负责人 */
+	DYN_FORMAT_TYPE_ENUM["DYN_DEPT_PRINCIPAL"] = "DYN_DEPT_PRINCIPAL";
+	/** 指定部门字段 */
+	DYN_FORMAT_TYPE_ENUM["DYN_MODEL_ORG"] = "DYN_MODEL_ORG";
+	/** 指定部门字段负责人 */
+	DYN_FORMAT_TYPE_ENUM["DYN_MODEL_DEPT_PRINCIPAL"] = "DYN_MODEL_DEPT_PRINCIPAL";
+	return DYN_FORMAT_TYPE_ENUM;
+}({});
+var DynFormatTypes = Object.values(DYN_FORMAT_TYPE_ENUM);
+var filterDynFormatTypes = Object.values(DYN_FORMAT_TYPE_ENUM).filter((item) => ![DYN_FORMAT_TYPE_ENUM.DYN_SUBMITTER_MANAGER, DYN_FORMAT_TYPE_ENUM.DYN_SUBMITTER_DEPT_PRINCIPAL].includes(item)).map((type) => `${type}:current`);
+var dynamicData = [
+	{
+		id: "currentDs",
+		formatId: DYN_FORMAT_TYPE_ENUM.DYN_SUBMITTER_MANAGER,
+		name: "申请人直属上级",
+		desc: "可将申请人直属上级设为节点处理人"
+	},
+	{
+		id: "currentDeptDs",
+		formatId: DYN_FORMAT_TYPE_ENUM.DYN_SUBMITTER_DEPT_PRINCIPAL,
+		name: "申请人部门负责人",
+		desc: "可将申请人所在部门负责人设为节点处理人"
+	},
+	{
+		id: "userField",
+		formatId: DYN_FORMAT_TYPE_ENUM.DYN_MODEL_USERS,
+		name: "指定人员字段",
+		desc: "字段所选用户作为节点处理人",
+		showPanel: true,
+		panelType: "area",
+		panelKey: [FIELD_TYPE.USER, FIELD_TYPE.USER_MULTI]
+	},
+	{
+		id: "userFieldDs",
+		formatId: DYN_FORMAT_TYPE_ENUM.DYN_MODEL_USER_MANAGER,
+		name: "指定人员字段直属上级",
+		desc: "字段所选用户的直属上级为节点处理人",
+		showPanel: true,
+		panelType: "area",
+		panelKey: [FIELD_TYPE.USER, FIELD_TYPE.USER_MULTI]
+	},
+	{
+		id: "orgDs",
+		formatId: DYN_FORMAT_TYPE_ENUM.DYN_DEPT_PRINCIPAL,
+		name: "指定部门负责人",
+		desc: "所选部门负责人作为节点处理人",
+		showPanel: true,
+		panelType: "select"
+	},
+	{
+		id: "orgFieldDs",
+		formatId: DYN_FORMAT_TYPE_ENUM.DYN_MODEL_DEPT_PRINCIPAL,
+		name: "指定部门字段负责人",
+		desc: "字段所选部门负责人作为节点处理人",
+		showPanel: true,
+		panelType: "area",
+		panelKey: [FIELD_TYPE.ORG, FIELD_TYPE.ORG_MULTI]
+	}
+];
+function list2Tree(list) {
+	const treeOptions = [];
+	const arrClone = cloneDeep(list);
+	const mapInfo = arrClone.reduce((obj, item) => {
+		item.children = [];
+		obj[item.id] = item;
+		return obj;
+	}, {});
+	arrClone.forEach((i) => {
+		const parent = mapInfo[i.parentId];
+		if (parent) parent.children.push(i);
+		else treeOptions.push(i);
+	});
+	return treeOptions;
+}
+function highlightName(str, searchValue = "") {
+	const displayName = str;
+	const rDisplayName = displayName?.replace(new RegExp(searchValue?.replace(/* @__PURE__ */ new RegExp(/(?=[$.?+[\]*^|\\(){}/])/g), "\\"), "g"), (s) => `<span class="is-highlight">${s}</span>`);
+	if (rDisplayName === displayName) return null;
+	return rDisplayName;
+}
+var filterTree = (tree, searchValue) => {
+	return tree.map((node) => {
+		if (node.children) {
+			const filteredChildren = filterTree(node.children, searchValue);
+			if (filteredChildren.length > 0) return {
+				...node,
+				children: filteredChildren
+			};
+		}
+		const hlName = highlightName(node.name, searchValue);
+		if (hlName) return {
+			...node,
+			highlightName: hlName
+		};
+		return null;
+	}).filter((node) => node !== null);
+};
+var findUniqueNode = (tree, tid) => {
+	for (const node of tree) {
+		if (node.id === tid) return node;
+		if (node.children) {
+			const foundNode = findUniqueNode(node.children, tid);
+			if (foundNode) return foundNode;
+		}
+	}
+	return null;
+};
+function showDynamicTitle(id, name) {
+	if (id.includes(DYN_FORMAT_TYPE_ENUM.DYN_MODEL_USER_MANAGER)) return `${name}:直属上级`;
+	if (id.includes(DYN_FORMAT_TYPE_ENUM.DYN_DEPT_PRINCIPAL)) return `${name}:负责人`;
+	if (id.includes(DYN_FORMAT_TYPE_ENUM.DYN_MODEL_DEPT_PRINCIPAL)) return `${name}:负责人`;
+	return name;
+}
+//#endregion
+export { DYN_FORMAT_TYPE_ENUM, DynFormatTypes, dynamicData, filterDynFormatTypes, filterTree, findUniqueNode, highlightName, list2Tree, showDynamicTitle };

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

@@ -64,3 +64,9 @@ export declare function parseMatrixParams(path: string): IObject;
  * @return {string} 图片 base64 编码（png 格式）
  */
 export declare function createWhiteImageWithText(name: string, width: number, height: number): string;
+/**
+ * 是否是rdo唯一字段
+ * @param key 字段key
+ * @returns
+ */
+export declare function isRdoUniqueField(key: string): boolean;

package/es/utils/tools/tools.mjs

@@ -1,9 +1,9 @@
 import { CoreConst } from "../../constants/core.mjs";
 import "../../constants/index.mjs";
-import qs from "qs";
+import { clearCookie, getCookie, setCookie } from "qx-util";
 import { cloneDeep, isEqual, mergeWith, unionWith } from "lodash-es";
+import qs from "qs";
 import { customRef, readonly } from "vue";
-import { clearCookie, getCookie, setCookie } from "qx-util";
 //#region src/utils/tools/tools.ts
 /**
 * 租户 cookie 双向绑定响应式引用：get 直接读 cookie，set 直接写 cookie
@@ -154,5 +154,14 @@ function createWhiteImageWithText(name, width, height) {
 	});
 	return canvas.toDataURL("image/png");
 }
+/**
+* 是否是rdo唯一字段
+* @param key 字段key
+* @returns
+*/
+function isRdoUniqueField(key) {
+	if (!key) return false;
+	return /^version_,.*?,default_$/.test(key);
+}
 //#endregion
-export { createWhiteImageWithText, deepMerge, getTenant, getToken, isMobile, parseMatrixParams, setTenant, setToken, stringifyMatrixParams, tenantRef };
+export { createWhiteImageWithText, deepMerge, getTenant, getToken, isMobile, isRdoUniqueField, parseMatrixParams, setTenant, setToken, stringifyMatrixParams, tenantRef };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gct-paas/core",
-  "version": "0.1.6-dev.9",
+  "version": "6.0.0-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.6-dev.5",
+    "@gct-paas/api": "^6.0.0-dev.7",
     "@module-federation/runtime": "^2.2.3",
     "@vueuse/core": "^14.1.0",
     "async-validator": "^4.2.5",
@@ -43,6 +43,7 @@
     "lodash-es": "^4.17.23",
     "mitt": "^3.0.1",
     "mqtt": "^5.15.0",
+    "nprogress": "^0.2.0",
     "overlayscrollbars": "^2.14.0",
     "pinia": "^3.0.4",
     "qs": "^6.15.0",
@@ -53,12 +54,13 @@
     "wujie": "^1.0.29"
   },
   "devDependencies": {
+    "@types/nprogress": "^0.2.3",
     "@vue/test-utils": "^2.4.6",
     "fs-extra": "^11.3.3",
     "playwright": "^1.58.0"
   },
   "peerDependencies": {
-    "@gct-paas/api": "^0.1.6-dev.5",
+    "@gct-paas/api": "^6.0.0-dev.7",
     "vue": ">=3",
     "vue-i18n": ">=11",
     "vue-router": ">=4"