@gct-paas/design 6.0.0-dev.7 → 6.0.0-dev.9

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/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();
 }
 /**
@@ -280,9 +280,9 @@ async function loadDetailPageInfo(app) {
 	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 || "详情";
-	pageJson.pageConfig.unitType = "%";
-	pageJson.pageConfig.pageWidth = 80;
+	pageJson.pageConfig.title = pageJson.pageConfig.title || t("sys.detail");
+	pageJson.pageConfig.unitType = pageJson.pageConfig.unitType || "%";
+	pageJson.pageConfig.pageWidth = pageJson.pageConfig.pageWidth || 80;
 	savePageJsonSnapshot();
 }
 /**

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