@gct-paas/core 0.1.6-dev.2 → 0.1.6-dev.21

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/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

@@ -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.2",
+  "version": "0.1.6-dev.21",
   "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.14",
     "@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.14",
     "vue": ">=3",
     "vue-i18n": ">=11",
     "vue-router": ">=4"