@gct-paas/design 6.0.0-dev.3 → 6.0.0-dev.31

package/es/hooks/design-view/components/useUserOccupy.mjs

@@ -138,8 +138,9 @@ function _useUserOccupy() {
 	async function lock() {
 		if (occupyInfo.value.occupyId) return;
 		if (lockInfo.value.id) return;
+		const sthText = i18nKeyMap[params.type] || "sys.page";
 		Modal.confirm({
-			title: t("sys.sureToLockSth", { sth: t(i18nKeyMap[params.type]) }),
+			title: t("sys.sureToLockSth", { sth: t(sthText) }),
 			icon: createVNode(ExclamationCircleOutlined),
 			okText: t("sys.ok"),
 			cancelText: t("sys.cancel"),

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

@@ -1171,6 +1171,7 @@ export declare const pageJson: {
         unitType?: "px" | "%" | undefined;
         pageWidth?: number | undefined;
         independentDetailPage?: boolean | undefined;
+        detailPageCustom?: boolean | undefined;
     };
     pageVars: {
         id: string;
@@ -2622,6 +2623,8 @@ export declare const pageDesignHistoryList: import('vue').Ref<{
     createUserId?: string | undefined;
     createUserName?: string | undefined;
     designerJson?: string | undefined;
+    detailDesignerJson?: string | undefined;
+    detailRuntimeJson?: string | undefined;
     id?: string | undefined;
     modifyTime?: string | undefined;
     modifyUserId?: string | undefined;
@@ -2636,6 +2639,8 @@ export declare const pageDesignHistoryList: import('vue').Ref<{
     createUserId?: string | undefined;
     createUserName?: string | undefined;
     designerJson?: string | undefined;
+    detailDesignerJson?: string | undefined;
+    detailRuntimeJson?: string | undefined;
     id?: string | undefined;
     modifyTime?: string | undefined;
     modifyUserId?: string | undefined;

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

@@ -1,8 +1,13 @@
 import { loading, noMore, pageDesignHistoryList, pageJson, pageNo } from "../design-state.mjs";
 import { useDesignPreview } from "./useDesignPreview.mjs";
 import { useDesignSave } from "./useDesignSave.mjs";
-import "@gct-paas/core";
+import { ContextSceneEnum } from "@gct-paas/core";
 //#region src/hooks/design-view/designer/useDesignHistory.ts
+/**
+* 历史版本管理 Hook
+*
+* 管理设计器的历史版本列表的加载、预览、恢复和删除等操作。
+*/
 function useDesignHistory() {
 	/**
 	* 获取历史版本列表（分页加载，支持滚动加载更多）
@@ -11,11 +16,14 @@ function useDesignHistory() {
 		if (loading.value || noMore.value) return;
 		loading.value = true;
 		try {
-			const res = await _api.apaas.pageDesignerLog.getPageList({
+			const config = {
 				relationId: _gct.store.context.pid,
 				pageNo: pageNo.value ?? 1,
 				pageSize: 50
-			});
+			};
+			if (_gct.store.context.scene === ContextSceneEnum.DETAIL) config.relationType = 4;
+			else if (_gct.store.context.scene === ContextSceneEnum.TXN) config.relationType = 5;
+			const res = await _api.apaas.pageDesignerLog.getPageList(config);
 			if (res) {
 				if (pageNo.value === 1) pageDesignHistoryList.value = res.data || [];
 				else pageDesignHistoryList.value = [...pageDesignHistoryList.value, ...res.data || []];
@@ -70,7 +78,8 @@ function useDesignHistory() {
 				}
 			});
 			const { save } = useDesignSave();
-			await save(false);
+			const scene = _gct.store.context.scene;
+			await save(false, true, scene);
 			loadPageDesignHistoryList();
 		}
 	}

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

@@ -26,16 +26,20 @@ function deepFindPlugins(widgets) {
 	return items;
 }
 function getDefaultTxnDetailPageJson() {
-	return {
-		newDesigner: true,
-		style: {
-			paddingAll: "",
-			paddingTop: "",
-			paddingRight: "16",
-			paddingBottom: "16",
-			paddingLeft: "16"
-		}
+	const _json = cloneDeep(defaultPageJson);
+	_json.style = {
+		paddingAll: "",
+		paddingTop: "",
+		paddingRight: "16",
+		paddingBottom: "16",
+		paddingLeft: "16"
 	};
+	_json.pageConfig = {
+		title: "",
+		i18n: {},
+		hasFooter: false
+	};
+	return _json;
 }
 function useDesignSave() {
 	const { cancelOccupy } = useUserOccupy();
@@ -144,15 +148,29 @@ function useDesignSave() {
 		return plugins;
 	}
 	/**
+	* 事务页专用兜底：老数据或默认 JSON 可能缺 widgets/modals/pageConfig 等字段，
+	* 只在事务保存路径补齐，避免影响页面设计、详情卡片等其他入口
+	*/
+	function normalizeTxnPageJson(json) {
+		json.widgets = json.widgets ?? [];
+		json.modals = json.modals ?? [];
+		if (!json.pageConfig) json.pageConfig = {
+			title: "",
+			i18n: {},
+			hasFooter: false
+		};
+		return json;
+	}
+	/**
 	* 根据 txnPageMode 解析创建页 / 详情页两份 pageJson
 	*/
 	function resolveTxnPageJsonPair() {
 		if (pageInfo.value.txnPageMode === "create") return {
 			createPageJson: pageJson,
-			detailPageJson: pageInfo.value.detailDesignerJson ? JSON.parse(pageInfo.value.detailDesignerJson) : getDefaultTxnDetailPageJson()
+			detailPageJson: pageInfo.value.detailDesignerJson ? normalizeTxnPageJson(JSON.parse(pageInfo.value.detailDesignerJson)) : getDefaultTxnDetailPageJson()
 		};
 		return {
-			createPageJson: pageInfo.value._designerJson ? JSON.parse(pageInfo.value._designerJson) : cloneDeep(defaultPageJson),
+			createPageJson: pageInfo.value._designerJson ? normalizeTxnPageJson(JSON.parse(pageInfo.value._designerJson)) : cloneDeep(defaultPageJson),
 			detailPageJson: pageJson
 		};
 	}
@@ -249,6 +267,13 @@ function useDesignSave() {
 	async function saveTxn(flag = true, showSuccess = true) {
 		const pageId = _gct.store.context.pid;
 		const { createPageJson, detailPageJson } = resolveTxnPageJsonPair();
+		const MAX_TITLE_LENGTH = 100;
+		const createTitle = createPageJson.pageConfig?.title;
+		const detailTitle = detailPageJson.pageConfig?.title;
+		if (createTitle && createTitle.length > MAX_TITLE_LENGTH || detailTitle && detailTitle.length > MAX_TITLE_LENGTH) {
+			message.error(t("sys.pageDesigner.titleMaxLength"));
+			return false;
+		}
 		const createPayload = await preparePagePayload(createPageJson);
 		if (!createPayload) return false;
 		const detailPayload = await preparePagePayload(detailPageJson);
@@ -257,7 +282,7 @@ function useDesignSave() {
 		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 }, {
+		await _api.apaas.transaction.putUpdateDesignerJsonId({ id: pageId }, {
 			designerJson: JSON.stringify(_designerJson),
 			runtimeJson: JSON.stringify(runtimeJson),
 			detailDesignerJson: JSON.stringify(_detailDesignerJson),
@@ -265,11 +290,12 @@ function useDesignSave() {
 			modelKey: pageInfo.value.modelKey,
 			name: pageInfo.value.name,
 			version: pageInfo.value.version,
-			default: pageInfo.value.default,
-			key: pageInfo.value.key
+			default: Number(pageInfo.value.default),
+			key: pageInfo.value.key,
+			logId: (pageDesignHistoryList.value[0] ?? {}).id
 		});
 		savePageJsonSnapshot(pageInfo.value.txnPageMode === "create" ? _designerJson : _detailDesignerJson);
-		if (showSuccess) _gct.message.success(flag ? "sys.saveSuccess" : "sys.recoverSuccess");
+		if (showSuccess) _gct.message.success(flag ? t("sys.saveSuccess") : t("sys.recoverSuccess"));
 		cancelOccupy();
 		noMore.value = false;
 		pageNo.value = 1;
@@ -289,12 +315,14 @@ function useDesignSave() {
 		pageInfo.value._designerJson = JSON.stringify(_designerJson);
 		await _api.apaas.detailPage.putUpdateDesignerJsonId({ id: pageId }, {
 			designerJson: JSON.stringify(_designerJson),
-			runtimeJson: JSON.stringify(runtimeJson),
+			description: pageInfo.value.description,
 			key: pageInfo.value.key,
 			name: pageInfo.value.name,
-			description: pageInfo.value.description
+			logId: (pageDesignHistoryList.value[0] ?? {}).id,
+			runtimeJson: JSON.stringify(runtimeJson)
 		});
-		if (showSuccess) _gct.message.success(flag ? "sys.saveSuccess" : "sys.recoverSuccess");
+		savePageJsonSnapshot();
+		if (showSuccess) _gct.message.success(flag ? t("sys.saveSuccess") : t("sys.recoverSuccess"));
 		cancelOccupy();
 		noMore.value = false;
 		pageNo.value = 1;

package/es/hooks/design-view/global/useGlobal.d.ts

@@ -6,9 +6,9 @@ export declare function useGlobal(): {
     updateInfo: (id: string, data: AppGlobalSettingsRequest) => Promise<void>;
     addInfo: (data: AppGlobalSettingsRequest) => Promise<void>;
     deleteInfo: (ids: string) => Promise<void>;
-    queryGModal: (fullInfo?: boolean) => Promise<void>;
-    queryGVar: (fullInfo?: boolean) => Promise<void>;
-    queryGEvent: (fullInfo?: boolean) => Promise<void>;
+    queryGModal: (fullInfo?: boolean, configObj?: Record<string, string>) => Promise<void>;
+    queryGVar: (fullInfo?: boolean, configObj?: Record<string, string>) => Promise<void>;
+    queryGEvent: (fullInfo?: boolean, configObj?: Record<string, string>) => Promise<void>;
     gVar: import('vue').Ref<{
         id: string;
         key: string;

package/es/hooks/design-view/global/useGlobal.mjs

@@ -8,11 +8,16 @@ var gModal = ref([]);
 /**全局事件 */
 var gEvent = ref([]);
 function useGlobal() {
-	async function queryGModal(fullInfo = false) {
-		gModal.value = (await _api.apaas.appGlobalSettings.getList({
+	async function queryGModal(fullInfo = false, configObj) {
+		let queryObj = {
 			type: GLOBAL_TYPE.MODAL,
 			fullInfo
-		}))?.map((modal) => {
+		};
+		if (configObj) queryObj = {
+			...queryObj,
+			...configObj
+		};
+		gModal.value = (await _api.apaas.appGlobalSettings.getList(queryObj))?.map((modal) => {
 			return {
 				id: modal.id,
 				name: modal.name,
@@ -21,11 +26,16 @@ function useGlobal() {
 			};
 		}) || [];
 	}
-	async function queryGVar(fullInfo = true) {
-		gVar.value = (await _api.apaas.appGlobalSettings.getList({
+	async function queryGVar(fullInfo = true, configObj) {
+		let queryObj = {
 			type: GLOBAL_TYPE.VAR,
 			fullInfo
-		}))?.map((variable) => {
+		};
+		if (configObj) queryObj = {
+			...queryObj,
+			...configObj
+		};
+		gVar.value = (await _api.apaas.appGlobalSettings.getList(queryObj))?.map((variable) => {
 			return {
 				id: variable.id,
 				key: variable.key,
@@ -33,11 +43,16 @@ function useGlobal() {
 			};
 		}) || [];
 	}
-	async function queryGEvent(fullInfo = false) {
-		gEvent.value = (await _api.apaas.appGlobalSettings.getList({
+	async function queryGEvent(fullInfo = false, configObj) {
+		let queryObj = {
 			type: GLOBAL_TYPE.EVENT,
 			fullInfo
-		}))?.map((event) => {
+		};
+		if (configObj) queryObj = {
+			...queryObj,
+			...configObj
+		};
+		gEvent.value = (await _api.apaas.appGlobalSettings.getList(queryObj))?.map((event) => {
 			return {
 				id: event.id,
 				key: event.key,

package/es/hooks/design-view/layout/useToolkit.mjs

@@ -2,7 +2,7 @@ import { useWidgetRegistry } from "../widget/useWidgetRegistry.mjs";
 import { useModelField } from "../../use-model-field/use-model-field.mjs";
 import "../../index.mjs";
 import { clone, cloneDeep } from "lodash-es";
-import { CategoryTypeEnum, ContextSceneEnum, FormComponents, Platform, ToolkitEnum } from "@gct-paas/core";
+import { CategoryTypeEnum, ContextSceneEnum, ContextTxnPageModeEnum, FormComponents, Platform, ToolkitEnum } from "@gct-paas/core";
 import { ref } from "vue";
 import { getWidgetInfo } from "@gct-paas/schema";
 //#region src/hooks/design-view/layout/useToolkit.ts
@@ -148,24 +148,25 @@ var instance = class ComponentUtils {
 	}
 	/** 根据当前分组上下文返回应显示的分类列表 */
 	get categoryTypes() {
-		if (this.groupType === ComponentUtils.SubTableGroup) return [
+		let categoryTypes;
+		if (this.groupType === ComponentUtils.SubTableGroup) categoryTypes = [
 			CategoryTypeEnum.FORM,
 			CategoryTypeEnum.LAYOUT,
 			CategoryTypeEnum.ADVANCED
 		];
-		if (this.groupType === ComponentUtils.TxnPageGroup) return [
+		else if (this.groupType === ComponentUtils.TxnPageGroup) {
+			categoryTypes = [
+				CategoryTypeEnum.FORM,
+				CategoryTypeEnum.LAYOUT,
+				CategoryTypeEnum.DATA
+			];
+			if (_gct.store.context.txnPageMode === ContextTxnPageModeEnum.CREATE) categoryTypes = [...categoryTypes, CategoryTypeEnum.BUTTON];
+		} else if (this.groupType === ComponentUtils.DetailPageGroup) categoryTypes = [
 			CategoryTypeEnum.FORM,
 			CategoryTypeEnum.LAYOUT,
-			CategoryTypeEnum.BUTTON,
 			CategoryTypeEnum.DATA
 		];
-		if (this.groupType === ComponentUtils.DetailPageGroup) return [
-			CategoryTypeEnum.FORM,
-			CategoryTypeEnum.LAYOUT,
-			CategoryTypeEnum.DATA,
-			CategoryTypeEnum.KIT
-		];
-		return [
+		else categoryTypes = [
 			CategoryTypeEnum.FORM,
 			CategoryTypeEnum.LAYOUT,
 			CategoryTypeEnum.ADVANCED,
@@ -174,6 +175,8 @@ var instance = class ComponentUtils {
 			CategoryTypeEnum.KIT,
 			CategoryTypeEnum.PROCESS
 		];
+		if (_gct.store.context.txnPageMode === ContextTxnPageModeEnum.CREATE) return categoryTypes.filter((categoryType) => categoryType !== CategoryTypeEnum.ADVANCED);
+		return categoryTypes;
 	}
 	/**
 	* 根据分类类型返回当前上下文下允许使用的组件 key 列表

package/es/hooks/design-view/page/usePage.d.ts

@@ -1,5 +1,5 @@
 import { Ref, App } from 'vue';
-import { PanelEnum } from '@gct-paas/core';
+import { PanelEnum, ContextTxnPageModeEnum } from '@gct-paas/core';
 import { PermissionResponse } from '@gct-paas/api/apaas';
 export type { PageInfo } from '../design-state';
 export { pageInfo } from '../design-state';
@@ -50,11 +50,11 @@ export declare function loadDetailPageInfo(app: App): Promise<void>;
 /**
  * @param mode 切换模式
  */
-export declare function toggleTxnPageInfo(mode: 'create' | 'detail'): Promise<void>;
+export declare function toggleTxnPageInfo(mode: ContextTxnPageModeEnum): Promise<void>;
 /**
- * 初始化界面占用信息
+ * 初始化界面占用信息，目前针对详情和事务，补充2个锁了type，分别是detail_page和transaction_module
  */
-declare function initLockState(): void;
+declare function initLockState(type?: string): void;
 /**
  * 更新页面锁定状态
  * @param {boolean} value

package/es/hooks/design-view/page/usePage.mjs

@@ -10,7 +10,7 @@ import { useCacheHistory } from "../../develop/useCacheHistory.mjs";
 import { useToolkit } from "../layout/useToolkit.mjs";
 import { useDesigner } from "../useDesigner.mjs";
 import { isEmpty, isNil } from "lodash-es";
-import { ButtonSize, ButtonStyle, ContextSceneEnum, FormComponents, KitPkgUtil, PanelEnum, Platform, t } from "@gct-paas/core";
+import { ButtonSize, ButtonStyle, ContextTxnPageModeEnum, FormComponents, KitPkgUtil, PanelEnum, Platform, t } from "@gct-paas/core";
 import { computed, createVNode, ref } from "vue";
 import { ExclamationCircleOutlined } from "@ant-design/icons-vue";
 import { Modal } from "ant-design-vue";
@@ -117,37 +117,40 @@ async function loadPageInfo(app) {
 * @returns
 */
 async function loadTxnPageInfo(app) {
+	await _gct.store.setContext({ txnPageMode: ContextTxnPageModeEnum.CREATE });
 	const { initToolkitWidgets } = useToolkit();
-	const { setPageJson, loadPageDesignHistoryList, emitCache, pageJson, setPluginConfigs, savePageJsonSnapshot } = useDesigner();
+	const { setTxnPageJson, loadPageDesignHistoryList, emitCache, pageJson, setPluginConfigs, savePageJsonSnapshot } = useDesigner();
 	const { historyUtils } = useCacheHistory();
 	platform.value = _gct.store.context.platform || Platform.WEB;
-	const baseid = _gct.store.context.baseid || "";
 	const pid = _gct.store.context.pid || "";
-	if (baseid) {
-		const res = await _api.apaas.transaction.getGetVersionById({ id: baseid });
-		pageInfo.value = {
+	if (pid.startsWith("___new___")) {
+		const baseid = _gct.store.context.baseid || "";
+		if (baseid) {
+			const res = await _api.apaas.transaction.getGetVersionById({ id: baseid });
+			pageInfo.value = {
+				id: newKeyTag,
+				name: res.name,
+				key: res.key,
+				modelKey: res.modelKey,
+				designerJson: "",
+				_designerJson: "",
+				detailDesignerJson: "",
+				txnPageMode: "create",
+				baseId: baseid
+			};
+		} else pageInfo.value = {
 			id: newKeyTag,
-			name: res.name,
-			key: res.key,
-			modelKey: res.modelKey,
+			name: "",
+			key: pid.replace(`${newKeyTag}:`, ""),
 			designerJson: "",
 			_designerJson: "",
 			detailDesignerJson: "",
-			txnPageMode: "create",
-			baseId: baseid
+			txnPageMode: "create"
 		};
-	} else if (pid.startsWith("___new___")) pageInfo.value = {
-		id: newKeyTag,
-		name: "",
-		key: pid.replace(`${newKeyTag}:`, ""),
-		designerJson: "",
-		_designerJson: "",
-		detailDesignerJson: "",
-		txnPageMode: "create"
-	};
-	else {
+	} else {
 		const pageInfoRes = await _api.apaas.transaction.getInfo({ id: _gct.store.context.pid });
 		pageInfo.value = pageInfoRes;
+		pageInfo.value.default = Boolean(pageInfoRes.defaulted ?? false);
 		pageInfo.value._designerJson = pageInfoRes.designerJson;
 		pageInfo.value.txnPageMode = "create";
 	}
@@ -175,13 +178,13 @@ async function loadTxnPageInfo(app) {
 			i18n: {},
 			hasFooter: false
 		};
-		setPageJson({
+		setTxnPageJson({
 			..._json,
 			id: pageInfo.value.id
 		}, true);
 	} else {
 		emitCache();
-		setPageJson({
+		setTxnPageJson({
 			newDesigner: true,
 			style: {
 				paddingAll: "",
@@ -202,14 +205,13 @@ async function loadTxnPageInfo(app) {
 			data.props.noDelete = true;
 			bottomBtnWidget.children?.push(data);
 		});
+		pageJson.pageConfig.hasFooter = true;
 		pageJson.widgets.push(bottomBtnWidget);
 	}
 	initToolkitWidgets();
 	loadPageDesignHistoryList();
 	pagePermissions.value = await _api.apaas.permission.getList({ relationId: _gct.store.context.pid }) || [];
-	if (!pid.startsWith("___new___")) initLockState();
-	pageJson.pageConfig.unitType = "%";
-	pageJson.pageConfig.pageWidth = 80;
+	if (!pid.startsWith("___new___")) initLockState("transaction_module");
 	savePageJsonSnapshot();
 }
 /**
@@ -279,21 +281,22 @@ async function loadDetailPageInfo(app) {
 	initToolkitWidgets();
 	loadPageDesignHistoryList();
 	pagePermissions.value = await _api.apaas.permission.getList({ relationId: _gct.store.context.pid }) || [];
-	if (!pid.startsWith("___new___")) initLockState();
-	pageJson.pageConfig.title = pageJson.pageConfig.title || "详情";
-	pageJson.pageConfig.unitType = "%";
-	pageJson.pageConfig.pageWidth = 80;
+	if (!pid.startsWith("___new___")) initLockState("detail_page");
+	pageJson.pageConfig.title = pageJson.pageConfig.title || t("sys.detail");
+	pageJson.pageConfig.unitType = pageJson.pageConfig.unitType || "%";
+	pageJson.pageConfig.pageWidth = pageJson.pageConfig.pageWidth || 80;
 	savePageJsonSnapshot();
 }
 /**
 * @param mode 切换模式
 */
 async function toggleTxnPageInfo(mode) {
+	await _gct.store.setContext({ txnPageMode: mode });
 	const { setTxnPageJson, pageJson } = useDesigner();
-	if (mode === "create") {
+	if (mode === ContextTxnPageModeEnum.CREATE) {
 		pageInfo.value.detailDesignerJson = JSON.stringify(pageJson);
 		pageInfo.value.txnPageMode = mode;
-		setTxnPageJson({ ...JSON.parse(pageInfo.value._designerJson) });
+		setTxnPageJson({ ...JSON.parse(pageInfo.value._designerJson) }, true);
 	} else {
 		pageInfo.value._designerJson = JSON.stringify(pageJson);
 		pageInfo.value.txnPageMode = mode;
@@ -306,19 +309,20 @@ async function toggleTxnPageInfo(mode) {
 				paddingBottom: "16",
 				paddingLeft: "16"
 			}
-		} });
+		} }, false);
 	}
 }
 /**
-* 初始化界面占用信息
+* 初始化界面占用信息，目前针对详情和事务，补充2个锁了type，分别是detail_page和transaction_module
 */
-function initLockState() {
-	if (_gct.store.context.scene === ContextSceneEnum.TXN || _gct.store.context.scene === ContextSceneEnum.DETAIL) return;
+function initLockState(type) {
 	const { setLockInfo, initOccupy, loadOccupyInfo } = useUserOccupy();
-	initOccupy({
+	const initData = {
 		id: _gct.store.context.pid || "",
 		type: (platform.value === Platform.WEB ? PageTypeEnum.WEB : platform.value === Platform.PAD ? PageTypeEnum.PAD : PageTypeEnum.MOBILE).toString()
-	});
+	};
+	if (type) initData.type = type;
+	initOccupy(initData);
 	loadOccupyInfo();
 	setLockInfo({
 		id: pageInfo.value?.lockUserId,

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

@@ -1072,6 +1072,7 @@ export declare function useDesigner(): {
             unitType?: "px" | "%" | undefined;
             pageWidth?: number | undefined;
             independentDetailPage?: boolean | undefined;
+            detailPageCustom?: boolean | undefined;
         };
         pageVars: {
             id: string;
@@ -1096,7 +1097,6 @@ export declare function useDesigner(): {
     handleAddDrag: (newIndex: number, childrenList: LowCodeWidget.BasicSchema[], scope: SCOPE, formID?: string) => void;
     setPageJson: (json: PageJson, hasFooter?: boolean) => Promise<void>;
     setTxnPageJson: (json: PageJson, hasFooter?: boolean) => Promise<void>;
-    setDetailPageJson: (json: PageJson, hasFooter?: boolean) => Promise<void>;
     save: (flag?: boolean, showSuccess?: boolean, scene?: string) => Promise<boolean>;
     savePageJsonSnapshot: (json?: PageJson) => void;
     emitCache: () => void;

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

@@ -56,16 +56,6 @@ function useDesigner() {
 		if (!pageJson.pageConfig.pageWidth) pageJson.pageConfig.pageWidth = 80;
 		cache.emitCache();
 	}
-	async function setDetailPageJson(json, hasFooter = false) {
-		pageJson.pageConfig.hasFooter = hasFooter || platform.value === Platform.MOBILE || platform.value === Platform.PAD;
-		Object.assign(pageJson, defaultPageJson, json);
-		initMethodMap(pageJson.js).then((map) => {
-			methodMap.value = map;
-		});
-		if (!pageJson.pageConfig.unitType) pageJson.pageConfig.unitType = "%";
-		if (!pageJson.pageConfig.pageWidth) pageJson.pageConfig.pageWidth = 80;
-		cache.emitCache();
-	}
 	/** 检查是否可以拖拽进入的方法，比如某些组件不能拖到某些组件内 */
 	function checkWidgetMove() {
 		return true;
@@ -87,7 +77,6 @@ function useDesigner() {
 		handleAddDrag,
 		setPageJson,
 		setTxnPageJson,
-		setDetailPageJson,
 		save: saveHook.save,
 		savePageJsonSnapshot: saveHook.savePageJsonSnapshot,
 		emitCache: cache.emitCache,

package/es/hooks/design-view/widget/useWidget.mjs

@@ -55,8 +55,8 @@ function useWidget(props) {
 	});
 	const widgetdesigner = designRegister.value.getProvider(widget.type)?.designerConfig || {};
 	const hideMaskValue = computed(() => {
-		if (typeof widgetdesigner[widget.type]?.hideMask === "function") return widgetdesigner[widget.type].hideMask(widget);
-		return widgetdesigner[widget.type]?.hideMask;
+		if (typeof widgetdesigner.hideMask === "function") return widgetdesigner.hideMask(widget);
+		return widgetdesigner.hideMask;
 	});
 	return {
 		isWidgetSelected,

package/es/locale/sys.d.ts

@@ -20,5 +20,6 @@ declare const _default: {
     sureToLock: string;
     saveText: string;
     nextStep: string;
+    detail: string;
 };
 export default _default;

package/es/locale/sys.mjs

@@ -20,7 +20,8 @@ var sys_default = {
 	recoverSuccess: "版本恢复成功",
 	sureToLock: "你确定要锁定吗?",
 	saveText: "保存",
-	nextStep: "下一步"
+	nextStep: "下一步",
+	detail: "详情"
 };
 //#endregion
 export { sys_exports };

package/es/schema/common-config/common-field-editor-config.mjs

@@ -3,7 +3,7 @@ import { useScope } from "../../hooks/design-view/layout/useScope.mjs";
 import { useDesigner } from "../../hooks/design-view/useDesigner.mjs";
 import "../../hooks/index.mjs";
 import { has } from "lodash-es";
-import { BindCmpStyleEnum, BindCmpStyleTypeEnum, ContextSceneEnum, EntityModelTypeEnum, FIELD_TYPE, FormComponents, MaterialEnum, Platform, PropGroup, TreeHelper } from "@gct-paas/core";
+import { BindCmpStyleEnum, BindCmpStyleTypeEnum, ContextSceneEnum, ContextTxnPageModeEnum, EntityModelTypeEnum, FIELD_TYPE, FormComponents, MaterialEnum, Platform, PropGroup, TreeHelper } from "@gct-paas/core";
 import { isFormFieldType } from "@gct-paas/schema";
 //#region src/schema/common-config/common-field-editor-config.ts
 /** 字段名称和显示标题config */
@@ -62,7 +62,7 @@ var getInputAttrEditor = (needFieldAttrs) => {
 			}
 		},
 		hidden(widget) {
-			return widget.props.field === "operating_state_" || widget.props.bindFieldKey || widget.materialType === MaterialEnum.DescriptionsFormField || widget.props.fieldReadonly || _gct.store.context.scene === ContextSceneEnum.DETAIL;
+			return widget.props.field === "operating_state_" || widget.props.bindFieldKey || widget.materialType === MaterialEnum.DescriptionsFormField || widget.props.fieldReadonly || _gct.store.context.scene === ContextSceneEnum.DETAIL || _gct.store.context.txnPageMode === ContextTxnPageModeEnum.DETAIL;
 		}
 	}];
 };
@@ -118,7 +118,7 @@ var explainEditor = [{
 	formItemStyle: { marginBottom: "12px" },
 	group: PropGroup.FIELD_CONFIG,
 	hidden: (widget) => {
-		if (_gct.store.context.scene === ContextSceneEnum.DETAIL) return true;
+		if (widget.props.hiddenInDetail) return true;
 		if (widget.props.bindFieldKey || widget.props.fieldReadonly) return true;
 		if ((widget.materialType === MaterialEnum.MaterialFormField || widget.materialType === MaterialEnum.MaterialSubTableModalField) && widget.platform === Platform.PAD) return true;
 		return widget.platform !== Platform.WEB && widget.platform !== Platform.PAD;
@@ -162,8 +162,8 @@ var validatorEditor = [{
 	label: "sys.pageDesigner.closeValidator",
 	group: PropGroup.FIELD_CONFIG,
 	formField: true,
-	hidden() {
-		return _gct.store.context.scene === ContextSceneEnum.DETAIL;
+	hidden(widget) {
+		return widget.props.hiddenInDetail;
 	}
 }];
 /** 下拉列表、单选、多选公共config */

package/es/schema/common-config/display-editor-config.mjs

@@ -1,5 +1,5 @@
 import { hiddenButtonProps } from "./button-props-func.mjs";
-import { ASSIGNMENTSTRATEGY_ENUM, ContextSceneEnum, Dependency_ENUM, FIELD_TYPE, FormComponents, MaterialEnum, Platform, PropGroup } from "@gct-paas/core";
+import { ASSIGNMENTSTRATEGY_ENUM, Dependency_ENUM, FIELD_TYPE, FormComponents, MaterialEnum, Platform, PropGroup } from "@gct-paas/core";
 import { padVTableSupportEditFieldTypes } from "@gct-paas/schema";
 //#region src/schema/common-config/display-editor-config.ts
 var displayProps = {
@@ -66,7 +66,7 @@ var displayEditor = [
 		label: "sys.pageDesigner.deviceConnectivity",
 		group: PropGroup.FIELD_CONFIG,
 		hidden: (widget) => {
-			return widget.platform !== Platform.WEB || ![MaterialEnum.MaterialFormField].includes(widget.materialType) || !deviceFields.includes(widget.props.fieldType) || widget.props.fieldReadonly || _gct.store.context.scene === ContextSceneEnum.DETAIL;
+			return widget.platform !== Platform.WEB || ![MaterialEnum.MaterialFormField].includes(widget.materialType) || !deviceFields.includes(widget.props.fieldType) || widget.props.fieldReadonly || widget.props.hiddenInDetail;
 		}
 	}
 ];

package/es/schema/modal/modal.mjs

@@ -1,7 +1,7 @@
 import { __exportAll } from "../../_virtual/_rolldown/runtime.mjs";
 import { widget as widget$1 } from "./modal-body.mjs";
 import { widget as widget$2 } from "./modal-footer.mjs";
-import { BuiltinType, Platform, PropGroup, StyleGroup, buildShortUUID } from "@gct-paas/core";
+import { BuiltinType, ContextSceneEnum, ContextTxnPageModeEnum, Platform, PropGroup, StyleGroup } from "@gct-paas/core";
 //#region src/schema/modal/modal.ts
 var modal_exports = /* @__PURE__ */ __exportAll({
 	beforeCreate: () => beforeCreate,
@@ -145,7 +145,7 @@ var propEditorList = [
 		label: "sys.pageDesigner.operateButton",
 		group: PropGroup.BUTTON,
 		hidden: (widget) => {
-			return widget.props.isSubTableModal;
+			return widget.props.isSubTableModal || _gct.store.context.scene === ContextSceneEnum.DETAIL || _gct.store.context.txnPageMode === ContextTxnPageModeEnum.DETAIL;
 		}
 	}
 ];
@@ -166,8 +166,7 @@ var eventList = [{
 }];
 var runCallback = () => {};
 var beforeCreate = (widget) => {
-	widget.children[0].id = buildShortUUID(widget.children[0].type);
-	widget.children[1].id = buildShortUUID(widget.children[1].type);
+	if (_gct.store.context.scene === ContextSceneEnum.DETAIL || _gct.store.context.txnPageMode === ContextTxnPageModeEnum.DETAIL) widget.props.hasFooter = false;
 };
 var designerConfig = { basicProps: {
 	key_label: "弹窗",