@gct-paas/design 0.1.6-dev.21 → 0.1.6-dev.23

package/es/components/user-occupy/useUserOccupy.mjs

@@ -17,42 +17,42 @@ var i18nKeyMap = {
 };
 /** 参数 */
 var params = {};
+/** 占用信息 */
+var occupyInfo = ref({});
+/** 锁定信息 */
+var lockInfo = ref({});
+var timeout = computed(() => {
+	return occupyInfo.value.querySpanNum * 1e3;
+});
+var wait = computed(() => {
+	return (occupyInfo.value.cacheNum - 10) / 2 * 1e3;
+});
+var unlockAvailable = computed(() => {
+	const { userId, username } = _gct.store.userInfo;
+	return lockInfo.value.id === userId || username === "admin";
+});
+/** 查询占用定时器 */
+var occupyTimer = null;
+async function _loadOccupyInfo() {
+	if (!params.id || !params.type || params.id.startsWith("___new___")) return;
+	const res = await _api.apaas.designerLock.getGetPageOccupyMsg(params);
+	const data = { ...res };
+	if (!data.querySpanNum) data.querySpanNum = 120;
+	if (!data.cacheNum) data.cacheNum = 500;
+	occupyInfo.value = data;
+	if (res?.occupyId) destoryOccupyTimer();
+	else if (!occupyTimer) occupyTimer = setInterval(() => {
+		_loadOccupyInfo();
+	}, timeout.value);
+}
+function destoryOccupyTimer() {
+	console.log("【销毁占用轮询】");
+	if (!occupyTimer) return;
+	console.log("【销毁占用轮询 清除定时器】");
+	clearInterval(occupyTimer);
+	occupyTimer = null;
+}
 function useUserOccupy() {
-	/** 占用信息 */
-	const occupyInfo = ref({});
-	/** 锁定信息 */
-	const lockInfo = ref({});
-	const timeout = computed(() => {
-		return occupyInfo.value.querySpanNum * 1e3;
-	});
-	const wait = computed(() => {
-		return (occupyInfo.value.cacheNum - 10) / 2 * 1e3;
-	});
-	const unlockAvailable = computed(() => {
-		const { userId, username } = _gct.store.userInfo;
-		return lockInfo.value.id === userId || username === "admin";
-	});
-	/** 查询占用定时器 */
-	let occupyTimer = null;
-	async function _loadOccupyInfo() {
-		if (!params.id || !params.type || params.id.startsWith("___new___")) return;
-		const res = await _api.apaas.designerLock.getGetPageOccupyMsg(params);
-		const data = { ...res };
-		if (!data.querySpanNum) data.querySpanNum = 120;
-		if (!data.cacheNum) data.cacheNum = 500;
-		occupyInfo.value = data;
-		if (res?.occupyId) destoryOccupyTimer();
-		else if (!occupyTimer) occupyTimer = setInterval(() => {
-			_loadOccupyInfo();
-		}, timeout.value);
-	}
-	function destoryOccupyTimer() {
-		console.log("【销毁占用轮询】");
-		if (!occupyTimer) return;
-		console.log("【销毁占用轮询 清除定时器】");
-		clearInterval(occupyTimer);
-		occupyTimer = null;
-	}
 	function initMqttOccupy(data) {
 		/** 强制刷新主题 */
 		const CLEAN_CACHE = `CLEAN_CACHE`;
@@ -67,13 +67,9 @@ function useUserOccupy() {
 				})
 			}
 		}).subscribe(CLEAN_CACHE, () => {
-			const currentUrl = window.location.href;
-			if (currentUrl.includes("?")) if (currentUrl.includes("reloadTime")) {
-				const arr = currentUrl.split("reloadTime=");
-				arr[1] = Date.now().toString();
-				window.location.href = arr.join("reloadTime=");
-			} else window.location.href = currentUrl + "&reloadTime=" + Date.now();
-			else window.location.href = currentUrl + "?reloadTime=" + Date.now();
+			const url = new URL(window.location.href);
+			url.searchParams.set("reloadTime", Date.now().toString());
+			window.location.href = url.toString();
 			location.reload();
 		});
 	}
@@ -89,7 +85,7 @@ function useUserOccupy() {
 		if (lockInfo.value.id) return;
 		if (_gct.store.userInfo.userId !== occupyInfo.value.occupyId && occupyInfo.value.occupyId) return;
 		try {
-			await _api.apaas.designerLock.getGetPageOccupyMsg(params);
+			await _api.apaas.designerLock.postOccupyPage(params);
 		} catch (err) {
 			console.warn("【占用异常】", err);
 		} finally {

package/es/hooks/design-view/design-state.d.ts

@@ -1,6 +1,6 @@
 import { pageLayoutModeEnum } from '@gct-paas/core';
 import { ExportMethod, LowCodeWidget, PageJson, IModal } from '@gct-paas/schema';
-import { PageDesignerLogResponse } from '@gct-paas/api/apaas';
+import { PageDesignerLogResponse, WebpageResponse } from '@gct-paas/api/apaas';
 import { platform, designRegister } from '../../utils';
 export { platform, designRegister };
 /**
@@ -13,6 +13,112 @@ export declare const widgetInfo: import('vue').ComputedRef<import('@gct-paas/sch
 /**
  * 当前平台的插件注册实例
  */
+export type PageInfo = WebpageResponse & {
+    categoryId?: string;
+    version?: string;
+    default?: boolean;
+    modelKey?: string;
+    _designerJson?: string;
+    detailDesignerJson?: string;
+    txnPageMode?: 'create' | 'detail';
+    baseId?: string;
+};
+/** 当前设计页面基础信息 */
+export declare const pageInfo: import('vue').Ref<{
+    categoryResponse?: {
+        createTime?: string | undefined;
+        createUserId?: string | undefined;
+        createUserName?: string | undefined;
+        id?: string | undefined;
+        modifyTime?: string | undefined;
+        modifyUserId?: string | undefined;
+        modifyUserName?: string | undefined;
+        module?: string | undefined;
+        name?: string | undefined;
+        sortNum?: number | undefined;
+        sysBuiltin?: number | undefined;
+    } | undefined;
+    createTime?: string | undefined;
+    createUserId?: string | undefined;
+    createUserName?: string | undefined;
+    description?: string | undefined;
+    designerJson?: string | undefined;
+    id?: string | undefined;
+    key?: string | undefined;
+    lockUserId?: string | undefined;
+    lockUserName?: string | undefined;
+    modifyTime?: string | undefined;
+    modifyUserId?: string | undefined;
+    modifyUserName?: string | undefined;
+    name?: string | undefined;
+    newLogId?: string | undefined;
+    runtimeJson?: string | undefined;
+    categoryId?: string | undefined;
+    version?: string | undefined;
+    default?: boolean | undefined;
+    modelKey?: string | undefined;
+    _designerJson?: string | undefined;
+    detailDesignerJson?: string | undefined;
+    txnPageMode?: "create" | "detail" | undefined;
+    baseId?: string | undefined;
+}, {
+    categoryResponse?: {
+        createTime?: string | undefined;
+        createUserId?: string | undefined;
+        createUserName?: string | undefined;
+        id?: string | undefined;
+        modifyTime?: string | undefined;
+        modifyUserId?: string | undefined;
+        modifyUserName?: string | undefined;
+        module?: string | undefined;
+        name?: string | undefined;
+        sortNum?: number | undefined;
+        sysBuiltin?: number | undefined;
+    } | undefined;
+    createTime?: string | undefined;
+    createUserId?: string | undefined;
+    createUserName?: string | undefined;
+    description?: string | undefined;
+    designerJson?: string | undefined;
+    id?: string | undefined;
+    key?: string | undefined;
+    lockUserId?: string | undefined;
+    lockUserName?: string | undefined;
+    modifyTime?: string | undefined;
+    modifyUserId?: string | undefined;
+    modifyUserName?: string | undefined;
+    name?: string | undefined;
+    newLogId?: string | undefined;
+    runtimeJson?: string | undefined;
+    categoryId?: string | undefined;
+    version?: string | undefined;
+    default?: boolean | undefined;
+    modelKey?: string | undefined;
+    _designerJson?: string | undefined;
+    detailDesignerJson?: string | undefined;
+    txnPageMode?: "create" | "detail" | undefined;
+    baseId?: string | undefined;
+} | PageInfo>;
+export declare const defaultPageJson: {
+    id: string;
+    keepAlive: boolean;
+    pageEvents: {};
+    pageVars: never[];
+    widgets: never[];
+    js: string;
+    css: string;
+    modals: never[];
+    globalEvents: {};
+    permissions: {};
+    plugins: never[];
+    style: {};
+    pageConfig: {
+        title: string;
+        i18n: {};
+        hasFooter: undefined;
+    };
+    pageLayoutMode: pageLayoutModeEnum;
+};
 /** 设计页面JSON */
 export declare const pageJson: {
     id: string;

package/es/hooks/design-view/design-state.mjs

@@ -22,11 +22,9 @@ import { getWidgetInfo } from "@gct-paas/schema";
 var widgetInfo = computed(() => {
 	return getWidgetInfo(platform.value);
 });
-/**
-* 当前平台的插件注册实例
-*/
-/** 设计页面JSON */
-var pageJson = reactive({
+/** 当前设计页面基础信息 */
+var pageInfo = ref({});
+var defaultPageJson = {
 	id: "",
 	keepAlive: false,
 	pageEvents: {},
@@ -45,7 +43,9 @@ var pageJson = reactive({
 		hasFooter: void 0
 	},
 	pageLayoutMode: pageLayoutModeEnum.SHOW_ALL_DATA
-});
+};
+/** 设计页面JSON */
+var pageJson = reactive(cloneDeep(defaultPageJson));
 /** 页面数据快照，用于脏检查对比 */
 var pageJsonSnapshot = ref("");
 /** 界面数据是否修改过，通过对比快照和当前数据判断 */
@@ -100,4 +100,4 @@ function transformPageJson(json, isClone = false) {
 	return _json;
 }
 //#endregion
-export { isModified, loading, methodMap, modalDesignId, modalDesignState, modalInfo, noMore, pageDesignHistoryList, pageJson, pageJsonSnapshot, pageNo, pluginConfigs, regRoot, subTableModalId, subTableModalState, transformPageJson, wfNodesModalId, wfNodesModalState, widgetInfo, workflowModalId, workflowModalState };
+export { defaultPageJson, isModified, loading, methodMap, modalDesignId, modalDesignState, modalInfo, noMore, pageDesignHistoryList, pageInfo, pageJson, pageJsonSnapshot, pageNo, pluginConfigs, regRoot, subTableModalId, subTableModalState, transformPageJson, wfNodesModalId, wfNodesModalState, widgetInfo, workflowModalId, workflowModalState };

package/es/hooks/design-view/designer/useDesignCache.mjs

@@ -19,7 +19,7 @@ function useDesignCache() {
 	* 缓存步骤，组件拖入布局画板时更新历史记录
 	*/
 	function emitCache() {
-		const id = _gct.store.context.aid;
+		const id = _gct.store.context.pid;
 		historyUtils.addHistory({
 			historyId: id,
 			past: JSON.stringify(pageJson)

package/es/hooks/design-view/designer/useDesignSave.d.ts

@@ -1,6 +1,6 @@
 import { PageJson, RuntimePageJson } from '@gct-paas/schema';
 export declare function useDesignSave(): {
-    save: (flag?: boolean, showSuccess?: boolean) => Promise<boolean>;
+    save: (flag?: boolean, showSuccess?: boolean, isTxn?: boolean) => Promise<boolean>;
     validateWidgets: (widgets: IData[], parents?: IData[]) => boolean;
     savePageJsonSnapshot: (json?: PageJson) => void;
 };
@@ -9,4 +9,4 @@ export declare function useDesignSave(): {
  *
  * @returns {Promise<RuntimePageJson>} 运行时页面JSON
  */
-export declare function buildRuntimeJson(): Promise<RuntimePageJson>;
+export declare function buildRuntimeJson(source?: PageJson): Promise<RuntimePageJson>;

package/es/hooks/design-view/designer/useDesignSave.mjs

@@ -1,10 +1,10 @@
 import { platform } from "../../../utils/design-view/index.mjs";
 import { buildRunJs } from "../../../utils/transform-js/transform-js.mjs";
 import "../../../utils/index.mjs";
-import { noMore, pageDesignHistoryList, pageJson, pageJsonSnapshot, pageNo, regRoot, transformPageJson, widgetInfo } from "../design-state.mjs";
+import { defaultPageJson, noMore, pageDesignHistoryList, pageInfo, pageJson, pageJsonSnapshot, pageNo, regRoot, transformPageJson, widgetInfo } from "../design-state.mjs";
 import { useUserOccupy } from "../../../components/user-occupy/useUserOccupy.mjs";
 import "../../../components/index.mjs";
-import { isArray, isEmpty, isNil } from "lodash-es";
+import { cloneDeep, isArray, isEmpty, isNil } from "lodash-es";
 import { Platform, SearchComponents, TreeHelper, t } from "@gct-paas/core";
 import { message } from "ant-design-vue";
 //#region src/hooks/design-view/designer/useDesignSave.ts
@@ -14,6 +14,30 @@ import { message } from "ant-design-vue";
 * 管理设计器页面数据的保存、预处理和校验逻辑，
 * 包括组件必填校验、数值范围校验、运行时 JSON 构建等。
 */
+function deepFindPlugins(widgets) {
+	const items = [];
+	widgets.forEach((widget) => {
+		if (widget._plugin) items.push({
+			key: widget._plugin.key,
+			version: widget._plugin.version,
+			url: widget._plugin.url
+		});
+		if (widget.children && widget.children.length > 0) items.push(...deepFindPlugins(widget.children));
+	});
+	return items;
+}
+function getDefaultTxnDetailPageJson() {
+	return {
+		newDesigner: true,
+		style: {
+			paddingAll: "",
+			paddingTop: "",
+			paddingRight: "16",
+			paddingBottom: "16",
+			paddingLeft: "16"
+		}
+	};
+}
 function useDesignSave() {
 	const { cancelOccupy } = useUserOccupy();
 	/**
@@ -90,13 +114,66 @@ function useDesignSave() {
 		return true;
 	}
 	/**
+	* 保存前预处理并校验单个 pageJson
+	*/
+	function preparePageJsonForSave(json) {
+		const _pageJson = transformPageJson(json, true);
+		if (validateWidgets(_pageJson.widgets) === false) return false;
+		if (_pageJson.widgets.some((n) => n.type === "data-list")) _pageJson.widgets.forEach((item) => {
+			if (item.type === "data-list" && !item.props.showFieldExp) item.props.showFieldExpVal = "";
+		});
+		if (validateWidgets(_pageJson.modals) === false) return false;
+		if (_pageJson.modals.length) _pageJson.modals.forEach((item) => {
+			if (!item.props.hasFooter) item.children = item.children.filter((n) => {
+				return n?.type !== "bottom-button-container";
+			});
+			if (item.props.hasFooter && item.children.some((n) => n?.type === "modalFooter")) item.children = item.children.filter((n) => {
+				return n?.type !== "modalFooter";
+			});
+		});
+		_pageJson.plugins = collectPlugins(_pageJson);
+		return _pageJson;
+	}
+	function collectPlugins(_pageJson) {
+		const plugins = [];
+		plugins.push(...deepFindPlugins(_pageJson.widgets));
+		if (_pageJson.modals) _pageJson.modals.forEach((modal) => {
+			if (modal.children) modal.children.forEach((item) => {
+				plugins.push(...deepFindPlugins(item.children));
+			});
+		});
+		return plugins;
+	}
+	/**
+	* 根据 txnPageMode 解析创建页 / 详情页两份 pageJson
+	*/
+	function resolveTxnPageJsonPair() {
+		if (pageInfo.value.txnPageMode === "create") return {
+			createPageJson: pageJson,
+			detailPageJson: pageInfo.value.detailDesignerJson ? JSON.parse(pageInfo.value.detailDesignerJson) : getDefaultTxnDetailPageJson()
+		};
+		return {
+			createPageJson: pageInfo.value._designerJson ? JSON.parse(pageInfo.value._designerJson) : cloneDeep(defaultPageJson),
+			detailPageJson: pageJson
+		};
+	}
+	async function preparePagePayload(json) {
+		const prepared = preparePageJsonForSave(json);
+		if (!prepared) return false;
+		return {
+			designerJson: prepared,
+			runtimeJson: await buildRuntimeJson(prepared)
+		};
+	}
+	/**
 	* 保存完成解除占用
 	*
 	* @param {boolean} flag 是否为保存操作（true为保存，false为恢复）
 	* @param {boolean} showSuccess 是否显示成功提示
 	* @returns {Promise<boolean>} 是否保存成功
 	*/
-	async function save(flag = true, showSuccess = true) {
+	async function save(flag = true, showSuccess = true, isTxn = false) {
+		if (isTxn) return saveTxn(flag, showSuccess);
 		const pageId = _gct.store.context.pid;
 		const _pageJson = transformPageJson(pageJson);
 		if (validateWidgets(_pageJson.widgets) === false) return false;
@@ -161,6 +238,42 @@ function useDesignSave() {
 		pageNo.value = 1;
 		return true;
 	}
+	/**
+	* 保存完成解除占用
+	*
+	* @param {boolean} flag 是否为保存操作（true为保存，false为恢复）
+	* @param {boolean} showSuccess 是否显示成功提示
+	* @returns {Promise<boolean>} 是否保存成功
+	*/
+	async function saveTxn(flag = true, showSuccess = true) {
+		const pageId = _gct.store.context.pid;
+		const { createPageJson, detailPageJson } = resolveTxnPageJsonPair();
+		const createPayload = await preparePagePayload(createPageJson);
+		if (!createPayload) return false;
+		const detailPayload = await preparePagePayload(detailPageJson);
+		if (!detailPayload) return false;
+		const { designerJson: _designerJson, runtimeJson } = createPayload;
+		const { designerJson: _detailDesignerJson, runtimeJson: detailRuntimeJson } = detailPayload;
+		pageInfo.value._designerJson = JSON.stringify(_designerJson);
+		pageInfo.value.detailDesignerJson = JSON.stringify(_detailDesignerJson);
+		await _api.apaas.transaction.putUpdateVersionByIdId({ id: pageId }, {
+			designerJson: JSON.stringify(_designerJson),
+			runtimeJson: JSON.stringify(runtimeJson),
+			detailDesignerJson: JSON.stringify(_detailDesignerJson),
+			detailRuntimeJson: JSON.stringify(detailRuntimeJson),
+			modelKey: pageInfo.value.modelKey,
+			name: pageInfo.value.name,
+			version: pageInfo.value.version,
+			default: pageInfo.value.default,
+			key: pageInfo.value.key
+		});
+		savePageJsonSnapshot(pageInfo.value.txnPageMode === "create" ? _designerJson : _detailDesignerJson);
+		if (showSuccess) _gct.message.success(flag ? "sys.saveSuccess" : "sys.recoverSuccess");
+		cancelOccupy();
+		noMore.value = false;
+		pageNo.value = 1;
+		return true;
+	}
 	return {
 		save,
 		validateWidgets,
@@ -172,13 +285,11 @@ function useDesignSave() {
 *
 * @returns {Promise<RuntimePageJson>} 运行时页面JSON
 */
-async function buildRuntimeJson() {
+async function buildRuntimeJson(source = pageJson) {
 	try {
-		const runtimeWidgets = TreeHelper.traverseAndBuildTree(JSON.parse(JSON.stringify(pageJson.widgets)), (node) => findWidgetCallback(node));
-		/**经过babel转换过的所有函数集合包含未export ES5字符串
-		来源于页面JS和逻辑编排*/
-		const funcStr = await buildRunJs(pageJson.js);
-		const modals = pageJson.modals.map(async (modal) => {
+		const runtimeWidgets = TreeHelper.traverseAndBuildTree(JSON.parse(JSON.stringify(source.widgets)), (node) => findWidgetCallback(node));
+		const funcStr = await buildRunJs(source.js);
+		const modals = source.modals.map(async (modal) => {
 			const modalFuncStr = await buildRunJs(modal.js);
 			const runtimeWidgets = TreeHelper.traverseAndBuildTree(JSON.parse(JSON.stringify(modal.children)), (node) => findWidgetCallback(node, modal));
 			return {
@@ -197,16 +308,16 @@ async function buildRuntimeJson() {
 			widgets: runtimeWidgets,
 			runJs: funcStr,
 			modals: await Promise.all(modals),
-			css: pageJson.css,
-			keepAlive: pageJson.keepAlive,
-			globalEvents: pageJson.globalEvents,
-			pageEvents: pageJson.pageEvents,
-			permissions: pageJson.permissions,
-			pageStyle: pageJson.style,
-			pageConfig: pageJson.pageConfig,
-			pageVars: pageJson.pageVars,
-			plugins: pageJson.plugins,
-			pageLayoutMode: pageJson.pageLayoutMode
+			css: source.css,
+			keepAlive: source.keepAlive,
+			globalEvents: source.globalEvents,
+			pageEvents: source.pageEvents,
+			permissions: source.permissions,
+			pageStyle: source.style,
+			pageConfig: source.pageConfig,
+			pageVars: source.pageVars,
+			plugins: source.plugins,
+			pageLayoutMode: source.pageLayoutMode
 		};
 	} catch (error) {
 		message.warn(t("sys.pageDesigner.codeError"));

package/es/hooks/design-view/layout/useToolkit.d.ts

@@ -392,7 +392,7 @@ export declare function useToolkit(): {
         }[];
     }[]>;
     initToolkitWidgets: () => void;
-    changeToolkitWidgets: ({ data, modalState }: IObject) => void;
+    changeToolkitWidgets: ({ data, modalState, isTxn }: IObject) => void;
     fixedToolkit: () => void;
     setFieldToolkit: ({ modelKey, formId, childParentModelKey, }: {
         modelKey: string;