@gct-paas/design 6.0.0-dev.2 → 6.0.0-dev.20

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/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
 		};
 	}
@@ -269,7 +287,7 @@ 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;
@@ -289,12 +307,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

@@ -156,14 +156,13 @@ var instance = class ComponentUtils {
 		if (this.groupType === ComponentUtils.TxnPageGroup) return [
 			CategoryTypeEnum.FORM,
 			CategoryTypeEnum.LAYOUT,
-			CategoryTypeEnum.BUTTON,
-			CategoryTypeEnum.DATA
+			CategoryTypeEnum.DATA,
+			CategoryTypeEnum.BUTTON
 		];
 		if (this.groupType === ComponentUtils.DetailPageGroup) return [
 			CategoryTypeEnum.FORM,
 			CategoryTypeEnum.LAYOUT,
-			CategoryTypeEnum.DATA,
-			CategoryTypeEnum.KIT
+			CategoryTypeEnum.DATA
 		];
 		return [
 			CategoryTypeEnum.FORM,

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

@@ -54,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

@@ -208,8 +208,8 @@ 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();
 }
 /**
@@ -279,10 +279,10 @@ 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();
 }
 /**
@@ -312,13 +312,15 @@ async function toggleTxnPageInfo(mode) {
 /**
 * 初始化界面占用信息
 */
-function initLockState() {
-	if (_gct.store.context.scene === ContextSceneEnum.TXN || _gct.store.context.scene === ContextSceneEnum.DETAIL) 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,

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

@@ -1096,7 +1096,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/schema/common-config/common-field-editor-config.mjs

@@ -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, 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/es/setup-app.mjs

@@ -4,7 +4,13 @@ import "./utils/index.mjs";
 import { registerDesignLocale } from "./locale/auto-register.mjs";
 import { HttpUtil } from "@gct-paas/api";
 //#region src/setup-app.ts
+var designSetupAppKey = Symbol.for("@gct-paas/design/setupApp");
 async function designSetupApp(_app) {
+	if (Reflect.get(window, designSetupAppKey)) {
+		console.error("@gct-paas/design designSetupApp 已执行，请勿重复调用。");
+		return;
+	}
+	Reflect.set(window, designSetupAppKey, true);
 	registerDesignLocale();
 	onWidgetInfoInit();
 	HttpUtil.use(designInterceptors);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gct-paas/design",
-  "version": "6.0.0-dev.2",
+  "version": "6.0.0-dev.20",
   "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.8",
     "@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.2",
-    "@gct-paas/core": "6.0.0-dev.2",
-    "@gct-paas/schema": "6.0.0-dev.2",
-    "@gct-paas/scss": "6.0.0-dev.2"
+    "@gct-paas/scss": "6.0.0-dev.20",
+    "@gct-paas/schema": "6.0.0-dev.20",
+    "@gct-paas/core": "6.0.0-dev.20",
+    "@gct-paas/core-web": "6.0.0-dev.20"
   },
   "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.8",
     "vue": ">=3",
-    "@gct-paas/core": "6.0.0-dev.2",
-    "@gct-paas/core-web": "6.0.0-dev.2",
-    "@gct-paas/scss": "6.0.0-dev.2",
-    "@gct-paas/schema": "6.0.0-dev.2"
+    "@gct-paas/core": "6.0.0-dev.20",
+    "@gct-paas/schema": "6.0.0-dev.20",
+    "@gct-paas/core-web": "6.0.0-dev.20",
+    "@gct-paas/scss": "6.0.0-dev.20"
   },
   "scripts": {
     "dev": "cross-env NODE_ENV=development vite build --watch --config vite.dev.config.ts",