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

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

@@ -269,7 +269,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 +289,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/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

@@ -279,7 +279,7 @@ async function loadDetailPageInfo(app) {
 	initToolkitWidgets();
 	loadPageDesignHistoryList();
 	pagePermissions.value = await _api.apaas.permission.getList({ relationId: _gct.store.context.pid }) || [];
-	if (!pid.startsWith("___new___")) initLockState();
+	if (!pid.startsWith("___new___")) initLockState("detail_page");
 	pageJson.pageConfig.title = pageJson.pageConfig.title || "详情";
 	pageJson.pageConfig.unitType = "%";
 	pageJson.pageConfig.pageWidth = 80;
@@ -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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gct-paas/design",
-  "version": "6.0.0-dev.3",
+  "version": "6.0.0-dev.5",
   "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.3",
+    "@gct-paas/api": "^6.0.0-dev.4",
     "@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/schema": "6.0.0-dev.3",
-    "@gct-paas/core": "6.0.0-dev.3",
-    "@gct-paas/scss": "6.0.0-dev.3",
-    "@gct-paas/core-web": "6.0.0-dev.3"
+    "@gct-paas/scss": "6.0.0-dev.5",
+    "@gct-paas/core-web": "6.0.0-dev.5",
+    "@gct-paas/schema": "6.0.0-dev.5",
+    "@gct-paas/core": "6.0.0-dev.5"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",
@@ -62,12 +62,12 @@
     "@types/estraverse": "^5.1.7"
   },
   "peerDependencies": {
-    "@gct-paas/api": "^6.0.0-dev.3",
+    "@gct-paas/api": "^6.0.0-dev.4",
     "vue": ">=3",
-    "@gct-paas/core": "6.0.0-dev.3",
-    "@gct-paas/core-web": "6.0.0-dev.3",
-    "@gct-paas/scss": "6.0.0-dev.3",
-    "@gct-paas/schema": "6.0.0-dev.3"
+    "@gct-paas/core-web": "6.0.0-dev.5",
+    "@gct-paas/schema": "6.0.0-dev.5",
+    "@gct-paas/core": "6.0.0-dev.5",
+    "@gct-paas/scss": "6.0.0-dev.5"
   },
   "scripts": {
     "dev": "cross-env NODE_ENV=development vite build --watch --config vite.dev.config.ts",