@gct-paas/design 6.0.0-dev.1 → 6.0.0-dev.11

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/designer/useDesignHistory.mjs

@@ -70,7 +70,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/useDesignPreview.mjs

@@ -1,6 +1,6 @@
 import { platform } from "../../../utils/design-view/index.mjs";
 import "../design-state.mjs";
-import { EnvironmentType, Platform, openWindow, stringifyMatrixParams } from "@gct-paas/core";
+import { ContextSceneEnum, EnvironmentType, Platform, openWindow, stringifyMatrixParams } from "@gct-paas/core";
 import { ref } from "vue";
 import { useDebounceFn } from "@vueuse/core";
 //#region src/hooks/design-view/designer/useDesignPreview.ts
@@ -35,9 +35,13 @@ function useDesignPreview() {
 			env: env || _gct.env.getEnv()
 		};
 		let hasUrl = `/PagePreview/${pid}`;
-		if (_gct.store.context.scene === "txn") {
-			matrixParams.scene = "txn";
+		const scene = _gct.store.context.scene;
+		if (scene === ContextSceneEnum.TXN) {
+			matrixParams.scene = ContextSceneEnum.TXN;
 			hasUrl = `/TxnPagePreview/${pid}`;
+		} else if (scene === ContextSceneEnum.DETAIL) {
+			matrixParams.scene = ContextSceneEnum.DETAIL;
+			hasUrl = `/DetailPagePreview/${pid}`;
 		}
 		if (platform.value === Platform.MOBILE) openWindow(buildPreviewUrl(mobileUrl, hasUrl, matrixParams), {
 			noopener: false,

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, isTxn?: boolean) => Promise<boolean>;
+    save: (flag?: boolean, showSuccess?: boolean, scene?: string) => Promise<boolean>;
     validateWidgets: (widgets: IData[], parents?: IData[]) => boolean;
     savePageJsonSnapshot: (json?: PageJson) => void;
 };

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

@@ -4,7 +4,7 @@ import "../../../utils/index.mjs";
 import { defaultPageJson, noMore, pageDesignHistoryList, pageInfo, pageJson, pageJsonSnapshot, pageNo, regRoot, transformPageJson, widgetInfo } from "../design-state.mjs";
 import { useUserOccupy } from "../components/useUserOccupy.mjs";
 import { cloneDeep, isArray, isEmpty, isNil } from "lodash-es";
-import { Platform, SearchComponents, TreeHelper, t } from "@gct-paas/core";
+import { ContextSceneEnum, Platform, SearchComponents, TreeHelper, t } from "@gct-paas/core";
 import { message } from "ant-design-vue";
 //#region src/hooks/design-view/designer/useDesignSave.ts
 /**
@@ -169,10 +169,12 @@ function useDesignSave() {
 	*
 	* @param {boolean} flag 是否为保存操作（true为保存，false为恢复）
 	* @param {boolean} showSuccess 是否显示成功提示
+	* @param {string} scene 场景, 目前支持"txn"(事务) | "detail"(详情页)
 	* @returns {Promise<boolean>} 是否保存成功
 	*/
-	async function save(flag = true, showSuccess = true, isTxn = false) {
-		if (isTxn) return saveTxn(flag, showSuccess);
+	async function save(flag = true, showSuccess = true, scene = "") {
+		if (scene === ContextSceneEnum.TXN) return saveTxn(flag, showSuccess);
+		if (scene === ContextSceneEnum.DETAIL) return saveDetail(flag, showSuccess);
 		const pageId = _gct.store.context.pid;
 		const _pageJson = transformPageJson(pageJson);
 		if (validateWidgets(_pageJson.widgets) === false) return false;
@@ -267,7 +269,34 @@ function useDesignSave() {
 			key: pageInfo.value.key
 		});
 		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;
+		return true;
+	}
+	/**
+	* 保存详情页
+	* @param {boolean} flag 是否为保存操作（true为保存，false为恢复）
+	* @param {boolean} showSuccess 是否显示成功提示
+	* @returns {Promise<boolean>} 是否保存成功
+	*/
+	async function saveDetail(flag = true, showSuccess = true) {
+		const pageId = _gct.store.context.pid;
+		const createPayload = await preparePagePayload(pageJson);
+		if (!createPayload) return false;
+		const { designerJson: _designerJson, runtimeJson } = createPayload;
+		pageInfo.value._designerJson = JSON.stringify(_designerJson);
+		await _api.apaas.detailPage.putUpdateDesignerJsonId({ id: pageId }, {
+			designerJson: JSON.stringify(_designerJson),
+			description: pageInfo.value.description,
+			key: pageInfo.value.key,
+			name: pageInfo.value.name,
+			logId: (pageDesignHistoryList.value[0] ?? {}).id,
+			runtimeJson: JSON.stringify(runtimeJson)
+		});
+		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.d.ts

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

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, FormComponents, Platform, ToolkitEnum } from "@gct-paas/core";
+import { CategoryTypeEnum, ContextSceneEnum, 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
@@ -16,6 +16,7 @@ var instance = class ComponentUtils {
 	static SubTableGroup = "SubTableGroup";
 	static CardListGroup = "CardListGroup";
 	static TxnPageGroup = "TxnPageGroup";
+	static DetailPageGroup = "DetailPageGroup";
 	/** 按分组上下文存储分类组件映射，仅保留现有两套逻辑 */
 	static _categoryCompsMap = {
 		default: {
@@ -115,6 +116,26 @@ var instance = class ComponentUtils {
 				FormComponents.ResetButton
 			],
 			[CategoryTypeEnum.DATA]: [FormComponents.DataTable, FormComponents.Descriptions]
+		},
+		DetailPageGroup: {
+			[CategoryTypeEnum.FORM]: [
+				FormComponents.GenRadio,
+				FormComponents.GenCheckbox,
+				FormComponents.GenSwitch,
+				FormComponents.Text,
+				FormComponents.GenImage,
+				FormComponents.Form
+			],
+			[CategoryTypeEnum.LAYOUT]: [
+				FormComponents.Collapse,
+				FormComponents.SpaceOccupation,
+				FormComponents.Divider,
+				FormComponents.LayoutContainer,
+				FormComponents.Grid,
+				FormComponents.LeftRightColumns,
+				FormComponents.Tabs
+			],
+			[CategoryTypeEnum.DATA]: [FormComponents.DataTable, FormComponents.Descriptions]
 		}
 	};
 	static _instance;
@@ -138,6 +159,11 @@ var instance = class ComponentUtils {
 			CategoryTypeEnum.BUTTON,
 			CategoryTypeEnum.DATA
 		];
+		if (this.groupType === ComponentUtils.DetailPageGroup) return [
+			CategoryTypeEnum.FORM,
+			CategoryTypeEnum.LAYOUT,
+			CategoryTypeEnum.DATA
+		];
 		return [
 			CategoryTypeEnum.FORM,
 			CategoryTypeEnum.LAYOUT,
@@ -155,7 +181,19 @@ var instance = class ComponentUtils {
 	* @returns 当前上下文下允许使用的组件枚举值列表
 	*/
 	_getCompsForCategory(categoryType) {
-		const groupKey = this.groupType === ComponentUtils.SubTableGroup ? "SubTableGroup" : this.groupType === ComponentUtils.TxnPageGroup ? "TxnPageGroup" : "default";
+		let groupKey;
+		switch (this.groupType) {
+			case ComponentUtils.SubTableGroup:
+				groupKey = "SubTableGroup";
+				break;
+			case ComponentUtils.TxnPageGroup:
+				groupKey = "TxnPageGroup";
+				break;
+			case ComponentUtils.DetailPageGroup:
+				groupKey = "DetailPageGroup";
+				break;
+			default: groupKey = "default";
+		}
 		return ComponentUtils._categoryCompsMap[groupKey][categoryType] ?? [];
 	}
 	/**
@@ -163,9 +201,9 @@ var instance = class ComponentUtils {
 	*
 	* @param data - 当前选中组件数据
 	* @param modalState - 是否处于子表单（弹框）状态
-	* @param isTxn - 是否处于事务页面状态
+	* @param scene - 修改成场景，目前存在事务和详情两个场景 // _gct.store.context.scene
 	*/
-	changeGroupType({ data, modalState, isTxn }) {
+	changeGroupType({ data, modalState, scene }) {
 		if (data.type === FormComponents.CardList) {
 			this._setGroupType(ComponentUtils.CardListGroup);
 			return;
@@ -174,10 +212,14 @@ var instance = class ComponentUtils {
 			this._setGroupType(ComponentUtils.SubTableGroup);
 			return;
 		}
-		if (isTxn) {
+		if (scene === ContextSceneEnum.TXN) {
 			this._setGroupType(ComponentUtils.TxnPageGroup);
 			return;
 		}
+		if (scene === ContextSceneEnum.DETAIL) {
+			this._setGroupType(ComponentUtils.DetailPageGroup);
+			return;
+		}
 		this._setGroupType("");
 	}
 	/** 更新组件分组上下文 */
@@ -297,12 +339,12 @@ function useToolkit() {
 		});
 	}
 	/** 根据当前选中组件的上下文刷新组件列表 */
-	function changeToolkitWidgets({ data, modalState, isTxn }) {
+	function changeToolkitWidgets({ data, modalState, scene }) {
 		const oldGroupType = instance.groupType;
 		instance.changeGroupType({
 			data,
 			modalState,
-			isTxn
+			scene
 		});
 		if (oldGroupType !== instance.groupType) toolkitWidgets.value = instance.getWidgetsToolkit({
 			platform: _gct.store.context.platform,

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

@@ -42,6 +42,11 @@ export declare function loadPageInfo(app: App): Promise<void>;
  * @returns
  */
 export declare function loadTxnPageInfo(app: App): Promise<void>;
+/**
+ * 加载详情页面信息
+ * @returns
+ */
+export declare function loadDetailPageInfo(app: App): Promise<void>;
 /**
  * @param mode 切换模式
  */
@@ -49,7 +54,7 @@ export declare function toggleTxnPageInfo(mode: 'create' | 'detail'): Promise<vo
 /**
  * 初始化界面占用信息
  */
-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, FormComponents, KitPkgUtil, PanelEnum, Platform, t } from "@gct-paas/core";
+import { ButtonSize, ButtonStyle, ContextSceneEnum, 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";
@@ -208,8 +208,81 @@ async function loadTxnPageInfo(app) {
 	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;
+	pageJson.pageConfig.unitType = pageJson.pageConfig.unitType || "%";
+	pageJson.pageConfig.pageWidth = pageJson.pageConfig.pageWidth || 80;
+	savePageJsonSnapshot();
+}
+/**
+* 加载详情页面信息
+* @returns
+*/
+async function loadDetailPageInfo(app) {
+	const { initToolkitWidgets } = useToolkit();
+	const { setPageJson, loadPageDesignHistoryList, emitCache, pageJson, setPluginConfigs, savePageJsonSnapshot } = useDesigner();
+	const { historyUtils } = useCacheHistory();
+	platform.value = _gct.store.context.platform || Platform.WEB;
+	const pid = _gct.store.context.pid || "";
+	if (pid.startsWith("___new___")) pageInfo.value = {
+		id: newKeyTag,
+		name: "",
+		key: pid.replace(`${newKeyTag}:`, ""),
+		designerJson: "",
+		_designerJson: "",
+		detailDesignerJson: ""
+	};
+	else {
+		const pageInfoRes = await _api.apaas.detailPage.getInfo({ id: _gct.store.context.pid });
+		pageInfo.value = pageInfoRes;
+		pageInfo.value._designerJson = pageInfoRes.designerJson;
+	}
+	const all = [];
+	if (_gct.store.appInfo.suiteKey) all.push(KitPkgUtil.loadDesign(_gct.store.appInfo.suiteKey).then((module) => {
+		if (module) module.setupApp(app);
+	}));
+	const _configs = [];
+	all.push(DesignPluginPgkUtil.loadDesignPlugin(app, platform.value, _gct.store.appInfo.suiteKey ? [_gct.store.appInfo.suiteKey] : void 0).then(([configs]) => {
+		_configs.push(...configs);
+		setPluginConfigs(configs);
+	}));
+	await Promise.all(all);
+	if (!historyUtils.isHistoryInfoExist(_gct.store.context.pid)) historyUtils.init({ historyId: _gct.store.context.pid ?? "" });
+	if (pageInfo.value.designerJson && !isNil(pageInfo.value.designerJson) && !isEmpty(pageInfo.value.designerJson)) {
+		const _json = JSON.parse(pageInfo.value.designerJson);
+		if (_json && _json.plugins) {
+			const items = _json.plugins.filter((item) => {
+				return _configs.findIndex((config) => config.key === item.key) === -1;
+			});
+			await DesignPluginPgkUtil.loadDesignDeletedPlugins(platform.value, items);
+		}
+		if (!_json.pageConfig) _json.pageConfig = {
+			title: "详情",
+			i18n: {},
+			hasFooter: false
+		};
+		setPageJson({
+			..._json,
+			id: pageInfo.value.id
+		}, true);
+	} else {
+		emitCache();
+		setPageJson({
+			newDesigner: true,
+			style: {
+				paddingAll: "",
+				paddingTop: "",
+				paddingRight: "16",
+				paddingBottom: "16",
+				paddingLeft: "16"
+			}
+		}, true);
+	}
+	initToolkitWidgets();
+	loadPageDesignHistoryList();
+	pagePermissions.value = await _api.apaas.permission.getList({ relationId: _gct.store.context.pid }) || [];
+	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();
 }
 /**
@@ -239,13 +312,15 @@ async function toggleTxnPageInfo(mode) {
 /**
 * 初始化界面占用信息
 */
-function initLockState() {
-	if (_gct.store.context.scene === "txn") return;
+function initLockState(type) {
+	if (_gct.store.context.scene === ContextSceneEnum.TXN) return;
 	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,
@@ -289,4 +364,4 @@ function usePage() {
 	};
 }
 //#endregion
-export { currentPanel, loadPageInfo, loadTxnPageInfo, lockPage, pagePermissions, togglePanel, toggleTxnPageInfo, unlockAvailable, usePage };
+export { currentPanel, loadDetailPageInfo, loadPageInfo, loadTxnPageInfo, lockPage, pagePermissions, togglePanel, toggleTxnPageInfo, unlockAvailable, usePage };

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

@@ -1096,7 +1096,7 @@ 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>;
-    save: (flag?: boolean, showSuccess?: boolean, isTxn?: boolean) => Promise<boolean>;
+    save: (flag?: boolean, showSuccess?: boolean, scene?: string) => Promise<boolean>;
     savePageJsonSnapshot: (json?: PageJson) => void;
     emitCache: () => void;
     undoOrRestore: (content: string) => void;

package/es/index.mjs

@@ -48,7 +48,7 @@ import { useDesignPreview } from "./hooks/design-view/designer/useDesignPreview.
 import { useCacheHistory, useCacheHistoryInner } from "./hooks/develop/useCacheHistory.mjs";
 import { useWidgetRegistry } from "./hooks/design-view/widget/useWidgetRegistry.mjs";
 import { useToolkit } from "./hooks/design-view/layout/useToolkit.mjs";
-import { currentPanel, loadPageInfo, loadTxnPageInfo, lockPage, pagePermissions, togglePanel, toggleTxnPageInfo, unlockAvailable, usePage } from "./hooks/design-view/page/usePage.mjs";
+import { currentPanel, loadDetailPageInfo, loadPageInfo, loadTxnPageInfo, lockPage, pagePermissions, togglePanel, toggleTxnPageInfo, unlockAvailable, usePage } from "./hooks/design-view/page/usePage.mjs";
 import { useWidgetQuery } from "./hooks/design-view/widget/useWidgetQuery.mjs";
 import { useSelectedWidget } from "./hooks/design-view/widget/useSelectedWidget.mjs";
 import { useDesignCache } from "./hooks/design-view/designer/useDesignCache.mjs";
@@ -105,4 +105,4 @@ function onInit() {
 }
 onInit();
 //#endregion
-export { BaseDate, BaseSearch, CategoryEnum, ControllerType, DesignContainerNode, DesignContent, DesignEditorNode, DesignEditorNodeProvider, DesignEditorType, DesignItemActionTag, DesignItemAttribute, DesignItemPreview, DesignNode, DesignNodePrefix, DesignNodeType, DesignPluginPgkUtil, DesignViewController, DesignViewHooks, DesignViewPrefix, DesignerRegister, FieldCascader_default as FieldCascader, FieldOverrideUtil, FieldSchema, InsertNodeMode, MaterialContent, MaterialGroup, MaterialRegister, MenuClickEvent, multi_field_display_default as MultiFieldDisplay, NodeBaseProvider, NodeRegister, NotMask, OCCUPY_MQTT_KEY, PageTypeEnum, PanelContent, PropsEditorRegister, SCREditorUtils, user_lock_default as UserLock, user_occupy_default as UserOccupy, asyncIdentify, baseBtnEditor, baseBtnProp, basicAttrsUtils, basicFieldEditor, beginDrag, BTN_TYPE_COLOR as btnTypeColor, buildRunJs, buildRuntimeJson, buttonEditor, buttonProps, buttonStyleEditor, changeCmpData, commonStyle, createWidgetByType, createWidgetProvider, createdSearchField, currentPanel, customMenu, deptFilter, designCreateAppVue, designInterceptors, designRegister, designSetupApp, destroyOccupyTimer, deviceEvent, displayEditor, displayProps, explainEditor, findAllChildrenTypes, fixedAlignEditor, flatten, formItemProps, formulaFilter, getAutofillEditor, getBindCmpTypeEditor, getInputAttrEditor, getSearchOptions, hiddenButtonProps, initFieldWidgetRuntime, initMethodMap, isCanCrop, isModified, loadPageInfo, loadPageOccupyInfo, loadTxnPageInfo, loading, lockPage, methodMap, modal_exports as modalCfg, modalDesignId, modalDesignState, modalInfo, multiFieldEditor, newKeyTag, noMore, nodeContainerProps, nodeEditorProps, nodeProps, notNeedPxStyle, occupyPage, onWidgetInfoInit, openFormulaEditorByDesign, pageDesignHistoryList, pageInfo, pageJson, pageJsonSnapshot, pageNo, pageOccupyInfo, pagePermissions, permissionEditor, placeholderEditor, platform, pluginConfigs, PRESET_COLOR as presetColor, propEditorProps, propsToStyle, regRoot, regexEditor, rgba2hex, schemaToStyle, setupOverride, shadeColor, styleEditorProps, subTableModalId, subTableModalState, submitInHideEditor, togglePanel, toggleTxnPageInfo, transformField2Component, transformPageJson, unlockAvailable, uploadDraggerEditor, useAsyncFieldConfig, useAsyncFileAttrs, useAsyncOperateField, useCacheHistory, useCacheHistoryInner, useDesignCache, useDesignHistory, useDesignModal, useDesignPreview, useDesignSave, useDesignViewController, useDesignViewStore, useDesigner, useDesignerController, useFieldTransfer, useGlobal, useModelField, usePage, usePageOccupy, usePropEditor, useScope, useSelectedWidget, useStyle, useStyleEditor, useToolkit, useUserOccupy, useWidget, useWidgetQuery, useWidgetRegistry, validatorEditor, wfNodesModalId, wfNodesModalState, widgetInfo, widgetProps, widgetWrapperProps, workflowModalId, workflowModalState };
+export { BaseDate, BaseSearch, CategoryEnum, ControllerType, DesignContainerNode, DesignContent, DesignEditorNode, DesignEditorNodeProvider, DesignEditorType, DesignItemActionTag, DesignItemAttribute, DesignItemPreview, DesignNode, DesignNodePrefix, DesignNodeType, DesignPluginPgkUtil, DesignViewController, DesignViewHooks, DesignViewPrefix, DesignerRegister, FieldCascader_default as FieldCascader, FieldOverrideUtil, FieldSchema, InsertNodeMode, MaterialContent, MaterialGroup, MaterialRegister, MenuClickEvent, multi_field_display_default as MultiFieldDisplay, NodeBaseProvider, NodeRegister, NotMask, OCCUPY_MQTT_KEY, PageTypeEnum, PanelContent, PropsEditorRegister, SCREditorUtils, user_lock_default as UserLock, user_occupy_default as UserOccupy, asyncIdentify, baseBtnEditor, baseBtnProp, basicAttrsUtils, basicFieldEditor, beginDrag, BTN_TYPE_COLOR as btnTypeColor, buildRunJs, buildRuntimeJson, buttonEditor, buttonProps, buttonStyleEditor, changeCmpData, commonStyle, createWidgetByType, createWidgetProvider, createdSearchField, currentPanel, customMenu, deptFilter, designCreateAppVue, designInterceptors, designRegister, designSetupApp, destroyOccupyTimer, deviceEvent, displayEditor, displayProps, explainEditor, findAllChildrenTypes, fixedAlignEditor, flatten, formItemProps, formulaFilter, getAutofillEditor, getBindCmpTypeEditor, getInputAttrEditor, getSearchOptions, hiddenButtonProps, initFieldWidgetRuntime, initMethodMap, isCanCrop, isModified, loadDetailPageInfo, loadPageInfo, loadPageOccupyInfo, loadTxnPageInfo, loading, lockPage, methodMap, modal_exports as modalCfg, modalDesignId, modalDesignState, modalInfo, multiFieldEditor, newKeyTag, noMore, nodeContainerProps, nodeEditorProps, nodeProps, notNeedPxStyle, occupyPage, onWidgetInfoInit, openFormulaEditorByDesign, pageDesignHistoryList, pageInfo, pageJson, pageJsonSnapshot, pageNo, pageOccupyInfo, pagePermissions, permissionEditor, placeholderEditor, platform, pluginConfigs, PRESET_COLOR as presetColor, propEditorProps, propsToStyle, regRoot, regexEditor, rgba2hex, schemaToStyle, setupOverride, shadeColor, styleEditorProps, subTableModalId, subTableModalState, submitInHideEditor, togglePanel, toggleTxnPageInfo, transformField2Component, transformPageJson, unlockAvailable, uploadDraggerEditor, useAsyncFieldConfig, useAsyncFileAttrs, useAsyncOperateField, useCacheHistory, useCacheHistoryInner, useDesignCache, useDesignHistory, useDesignModal, useDesignPreview, useDesignSave, useDesignViewController, useDesignViewStore, useDesigner, useDesignerController, useFieldTransfer, useGlobal, useModelField, usePage, usePageOccupy, usePropEditor, useScope, useSelectedWidget, useStyle, useStyleEditor, useToolkit, useUserOccupy, useWidget, useWidgetQuery, useWidgetRegistry, validatorEditor, wfNodesModalId, wfNodesModalState, widgetInfo, widgetProps, widgetWrapperProps, workflowModalId, workflowModalState };

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, EntityModelTypeEnum, FIELD_TYPE, FormComponents, MaterialEnum, Platform, PropGroup, TreeHelper } from "@gct-paas/core";
+import { BindCmpStyleEnum, BindCmpStyleTypeEnum, ContextSceneEnum, 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;
+			return widget.props.field === "operating_state_" || widget.props.bindFieldKey || widget.materialType === MaterialEnum.DescriptionsFormField || widget.props.fieldReadonly || _gct.store.context.scene === ContextSceneEnum.DETAIL;
 		}
 	}];
 };
@@ -118,6 +118,7 @@ var explainEditor = [{
 	formItemStyle: { marginBottom: "12px" },
 	group: PropGroup.FIELD_CONFIG,
 	hidden: (widget) => {
+		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;
@@ -160,7 +161,10 @@ var validatorEditor = [{
 	name: "closeValidator",
 	label: "sys.pageDesigner.closeValidator",
 	group: PropGroup.FIELD_CONFIG,
-	formField: true
+	formField: true,
+	hidden(widget) {
+		return widget.props.hiddenInDetail;
+	}
 }];
 /** 下拉列表、单选、多选公共config */
 var SCREditorUtils = {

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

@@ -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;
+			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, 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;
 		}
 	}
 ];
@@ -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) widget.props.hasFooter = false;
 };
 var designerConfig = { basicProps: {
 	key_label: "弹窗",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gct-paas/design",
-  "version": "6.0.0-dev.1",
+  "version": "6.0.0-dev.11",
   "type": "module",
   "description": "paas 平台设计界面底包",
   "loader": "dist/loader.esm.min.js",
@@ -34,7 +34,7 @@
     "@ant-design/icons-vue": "^7.0.1",
     "@babel/core": "^7.29.0",
     "@babel/standalone": "^7.29.2",
-    "@gct-paas/api": "^6.0.0-dev.2",
+    "@gct-paas/api": "^6.0.0-dev.7",
     "@jsplumb/browser-ui": "^6.2.10",
     "@vueuse/core": "^14.1.0",
     "ant-design-vue": "npm:@gct-paas/ant-design-vue@3.2.21",
@@ -51,10 +51,10 @@
     "react-dnd-html5-backend": "^16.0.1",
     "vue": "^3.5.30",
     "vue3-dnd": "^2.1.0",
-    "@gct-paas/core-web": "6.0.0-dev.1",
-    "@gct-paas/core": "6.0.0-dev.1",
-    "@gct-paas/schema": "6.0.0-dev.1",
-    "@gct-paas/scss": "6.0.0-dev.1"
+    "@gct-paas/core": "6.0.0-dev.11",
+    "@gct-paas/core-web": "6.0.0-dev.11",
+    "@gct-paas/schema": "6.0.0-dev.11",
+    "@gct-paas/scss": "6.0.0-dev.11"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",
@@ -62,12 +62,12 @@
     "@types/estraverse": "^5.1.7"
   },
   "peerDependencies": {
-    "@gct-paas/api": "^6.0.0-dev.2",
+    "@gct-paas/api": "^6.0.0-dev.7",
     "vue": ">=3",
-    "@gct-paas/core": "6.0.0-dev.1",
-    "@gct-paas/core-web": "6.0.0-dev.1",
-    "@gct-paas/schema": "6.0.0-dev.1",
-    "@gct-paas/scss": "6.0.0-dev.1"
+    "@gct-paas/scss": "6.0.0-dev.11",
+    "@gct-paas/core-web": "6.0.0-dev.11",
+    "@gct-paas/core": "6.0.0-dev.11",
+    "@gct-paas/schema": "6.0.0-dev.11"
   },
   "scripts": {
     "dev": "cross-env NODE_ENV=development vite build --watch --config vite.dev.config.ts",