@gct-paas/design 0.1.6-dev.26 → 0.1.6-dev.28

package/es/components/mobile-container/mobile-container.d.ts

@@ -9,7 +9,7 @@ export declare const MobileContainer: import('vue').DefineComponent<import('vue'
     };
     title: {
         type: StringConstructor;
-        default: () => any;
+        default: () => string | undefined;
     };
 }>, {
     ns: import('@gct-paas/core').Namespace;
@@ -25,7 +25,7 @@ export declare const MobileContainer: import('vue').DefineComponent<import('vue'
     };
     title: {
         type: StringConstructor;
-        default: () => any;
+        default: () => string | undefined;
     };
 }>> & Readonly<{}>, {
     headerBgColor: boolean;

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

@@ -1,5 +1,6 @@
 import { PageTypeEnum } from "../../../constant/page-designer.mjs";
 import { OCCUPY_MQTT_KEY } from "../../../constant/index.mjs";
+import { pageInfo } from "../design-state.mjs";
 import { throttle } from "lodash-es";
 import { ScriptTypeEnum, t } from "@gct-paas/core";
 import { computed, createVNode, ref } from "vue";
@@ -28,8 +29,15 @@ function _useUserOccupy() {
 	});
 	const unlockAvailable = computed(() => {
 		const { userId, username } = _gct.store.userInfo;
-		return lockInfo.value.id === userId || username === "admin";
+		const lockUserId = lockInfo.value.id;
+		if (!lockUserId) return false;
+		return String(lockUserId) === String(userId) || username === "admin";
 	});
+	function applyLockInfo(data) {
+		lockInfo.value = data;
+		pageInfo.value.lockUserId = data.id || "";
+		pageInfo.value.lockUserName = data.name || "";
+	}
 	/** 查询占用定时器 */
 	let occupyTimer = null;
 	/** 节流 wait 是否已按真实 cacheNum 初始化 */
@@ -122,7 +130,7 @@ function _useUserOccupy() {
 		await _loadOccupyInfo();
 	}
 	function setLockInfo(data) {
-		lockInfo.value = data;
+		applyLockInfo(data);
 	}
 	/**
 	* 锁定
@@ -138,10 +146,10 @@ function _useUserOccupy() {
 			async onOk() {
 				await _api.apaas.designerLock.postLockPage(params);
 				_gct.message.success(t("sys.operationSuccess"));
-				lockInfo.value = {
-					id: _gct.store.userInfo.userId,
+				applyLockInfo({
+					id: String(_gct.store.userInfo.userId),
 					name: _gct.store.userInfo.fullname
-				};
+				});
 			}
 		});
 	}
@@ -149,12 +157,13 @@ function _useUserOccupy() {
 	* 解锁
 	*/
 	async function unlock() {
+		if (!unlockAvailable.value) return;
 		await _api.apaas.designerLock.postUnLockPage(params);
 		_gct.message.success(t("sys.operationSuccess"));
-		lockInfo.value = {
+		applyLockInfo({
 			id: "",
 			name: ""
-		};
+		});
 	}
 	return {
 		initOccupy,

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

@@ -34,7 +34,11 @@ function useDesignPreview() {
 			bid: _gct.store.context.bid,
 			env: env || _gct.env.getEnv()
 		};
-		const hasUrl = `/PagePreview/${pid}`;
+		let hasUrl = `/PagePreview/${pid}`;
+		if (_gct.store.context.scene === "txn") {
+			matrixParams.scene = "txn";
+			hasUrl = `/TxnPagePreview/${pid}`;
+		}
 		if (platform.value === Platform.MOBILE) openWindow(buildPreviewUrl(mobileUrl, hasUrl, matrixParams), {
 			noopener: false,
 			noreferrer: false,

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

@@ -108,6 +108,12 @@ var instance = class ComponentUtils {
 				FormComponents.LeftRightColumns,
 				FormComponents.Tabs
 			],
+			[CategoryTypeEnum.BUTTON]: [
+				FormComponents.CustomButton,
+				FormComponents.SubmitButton,
+				FormComponents.RefreshButton,
+				FormComponents.ResetButton
+			],
 			[CategoryTypeEnum.DATA]: [FormComponents.DataTable, FormComponents.Descriptions]
 		}
 	};
@@ -129,6 +135,7 @@ var instance = class ComponentUtils {
 		if (this.groupType === ComponentUtils.TxnPageGroup) return [
 			CategoryTypeEnum.FORM,
 			CategoryTypeEnum.LAYOUT,
+			CategoryTypeEnum.BUTTON,
 			CategoryTypeEnum.DATA
 		];
 		return [

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

@@ -208,6 +208,9 @@ async function loadTxnPageInfo(app) {
 	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;
 	savePageJsonSnapshot();
 }
 /**
@@ -238,6 +241,7 @@ async function toggleTxnPageInfo(mode) {
 * 初始化界面占用信息
 */
 function initLockState() {
+	if (_gct.store.context.scene === "txn") return;
 	initOccupy({
 		id: _gct.store.context.pid || "",
 		type: (platform.value === Platform.WEB ? PageTypeEnum.WEB : platform.value === Platform.PAD ? PageTypeEnum.PAD : PageTypeEnum.MOBILE).toString()

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

@@ -52,6 +52,8 @@ function useDesigner() {
 		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();
 	}
 	/** 检查是否可以拖拽进入的方法，比如某些组件不能拖到某些组件内 */

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

@@ -126,22 +126,31 @@ function useSelectedWidget() {
 	});
 	/**被选择的组件/弹框拥有的所有事件 */
 	const selectedAllEvents = computed(() => {
-		const { type } = selectedRef.value;
+		const { type, materialType } = selectedRef.value;
 		const widgetEvents = widgetInfo.value.events;
-		if (widgetEvents[type] && isArray(widgetEvents[type])) return widgetEvents[type];
-		const provider = designRegister.value.getProvider(type);
-		if (!provider) {
-			console.warn(`selectedAllEvents 未找到组件 ${type} 的设计器项配置信息，请确保该组件已正确注册`);
-			return [];
+		let defaultEvents = [];
+		if (widgetEvents[type] && isArray(widgetEvents[type])) defaultEvents = widgetEvents[type];
+		if (defaultEvents.length === 0) {
+			const provider = designRegister.value.getProvider(type);
+			if (!provider) {
+				console.warn(`selectedAllEvents 未找到组件 ${type} 的设计器项配置信息，请确保该组件已正确注册`);
+				return [];
+			}
+			defaultEvents = provider.events || [];
 		}
-		if (selectedRef.value.props.fieldReadonly) return (provider.events || []).filter((event) => event.name === "onClick");
-		const overrideEvents = FieldEditorOverrideRegistry.get(type)?.events;
-		const defaultEvents = provider.events || [];
-		return overrideEvents?.(selectedRef.value, defaultEvents) || defaultEvents;
+		if (selectedRef.value.props.fieldReadonly) return defaultEvents.filter((event) => event.name === "onClick");
+		if (materialType) {
+			const overrideEvents = FieldEditorOverrideRegistry.get(materialType)?.events;
+			if (overrideEvents) {
+				const items = overrideEvents(selectedRef.value, defaultEvents);
+				if (items) return items;
+			}
+		}
+		return defaultEvents;
 	});
 	/**被选择的组件/弹框拥有的所有属性编辑器的描述集合 */
 	const selectedAllPropEditors = computed(() => {
-		const { type } = selectedRef.value;
+		const { type, materialType } = selectedRef.value;
 		const widgetPropsEditors = widgetInfo.value.propEditors;
 		let preCompInfo;
 		if (has(selectedRef.value, "preLocation")) {
@@ -150,28 +159,46 @@ function useSelectedWidget() {
 				return widget.id === get(selectedRef.value, "preLocation");
 			});
 		}
-		if (widgetPropsEditors[type] && isArray(widgetPropsEditors[type])) return widgetPropsEditors[type];
-		const provider = designRegister.value.getProvider(type);
-		if (!provider) {
-			console.warn(`selectedAllPropEditors 未找到组件 ${type} 的设计器项配置信息，请确保该组件已正确注册`);
-			return [];
+		let defaultPropEditors = [];
+		if (widgetPropsEditors[type] && isArray(widgetPropsEditors[type])) defaultPropEditors = widgetPropsEditors[type];
+		if (defaultPropEditors.length === 0) {
+			const provider = designRegister.value.getProvider(type);
+			if (!provider) {
+				console.warn(`selectedAllPropEditors 未找到组件 ${type} 的设计器项配置信息，请确保该组件已正确注册`);
+				return [];
+			}
+			defaultPropEditors = provider.propEditors || [];
+		}
+		if (materialType) {
+			const overridePropEditor = FieldEditorOverrideRegistry.get(materialType)?.propEditor;
+			if (overridePropEditor) {
+				const items = overridePropEditor(selectedRef.value, defaultPropEditors, preCompInfo);
+				if (items) return items;
+			}
 		}
-		const overridePropEditor = FieldEditorOverrideRegistry.get(type)?.propEditor;
-		const defaultPropEditors = provider.propEditors || [];
-		return overridePropEditor?.(selectedRef.value, defaultPropEditors, preCompInfo) || defaultPropEditors;
+		return defaultPropEditors;
 	});
 	/**被选择的组件/弹框拥有的所有样式编辑器的描述集合 */
 	const selectedAllStyleEditors = computed(() => {
-		const { type } = selectedRef.value;
-		if (widgetInfo.value.styleEditors[type] && isArray(widgetInfo.value.styleEditors[type])) return widgetInfo.value.styleEditors[type];
-		const provider = designRegister.value.getProvider(type);
-		if (!provider) {
-			console.warn(`selectedAllStyleEditors 未找到组件 ${type} 的设计器项配置信息，请确保该组件已正确注册`);
-			return [];
+		const { type, materialType } = selectedRef.value;
+		let defaultStyleEditors = [];
+		if (widgetInfo.value.styleEditors[type] && isArray(widgetInfo.value.styleEditors[type])) defaultStyleEditors = widgetInfo.value.styleEditors[type];
+		if (defaultStyleEditors.length === 0) {
+			const provider = designRegister.value.getProvider(type);
+			if (!provider) {
+				console.warn(`selectedAllStyleEditors 未找到组件 ${type} 的设计器项配置信息，请确保该组件已正确注册`);
+				return [];
+			}
+			defaultStyleEditors = provider.styleEditors || [];
+		}
+		if (materialType) {
+			const overrideStyleEditor = FieldEditorOverrideRegistry.get(materialType)?.styleEditor;
+			if (overrideStyleEditor) {
+				const items = overrideStyleEditor(selectedRef.value, defaultStyleEditors);
+				if (items) return items;
+			}
 		}
-		const overrideStyleEditor = FieldEditorOverrideRegistry.get(type)?.styleEditor;
-		const defaultStyleEditors = provider.styleEditors || [];
-		return overrideStyleEditor?.(selectedRef.value, defaultStyleEditors) || defaultStyleEditors;
+		return defaultStyleEditors;
 	});
 	/**被选择的组件所有设计相关配置信息集合 */
 	const selectedAllDesingerConfig = computed(() => {

package/es/schema/field/index.mjs

@@ -29,18 +29,27 @@ function setupOverride() {
 	console.debug("正在注册字段编辑器覆写配置");
 	FieldEditorOverrideRegistry.register(MaterialEnum.MaterialTableField, {
 		propEditor: (selectedRef, defaultList) => {
+			if (selectedRef.isField !== true) return;
 			return FieldOverrideUtil.tableVTablePropEditor(selectedRef, defaultList);
 		},
-		styleEditor: (_selectedRef, _defaultWidget) => runStyleEditor()
+		styleEditor: (selectedRef, _defaultWidget) => {
+			if (selectedRef.isField !== true) return;
+			return runStyleEditor();
+		}
 	});
 	FieldEditorOverrideRegistry.register(MaterialEnum.MaterialEmbedTableField, {
 		propEditor: (selectedRef, defaultList) => {
+			if (selectedRef.isField !== true) return;
 			return FieldOverrideUtil.tableVTablePropEditor(selectedRef, defaultList);
 		},
-		styleEditor: (_selectedRef, _defaultWidget) => runStyleEditor()
+		styleEditor: (selectedRef, _defaultWidget) => {
+			if (selectedRef.isField !== true) return;
+			return runStyleEditor();
+		}
 	});
 	FieldEditorOverrideRegistry.register(MaterialEnum.MaterialSubTableField, {
 		propEditor: (selectedRef, defaultList, preCompInfo) => {
+			if (selectedRef.isField !== true) return;
 			if (preCompInfo && preCompInfo.props?.editMode === SUB_TABLE_EDIT_MODE.MODAL) return FieldOverrideUtil.runTableSelectPropEditor(selectedRef, "subTable2Field");
 			const { platform } = selectedRef;
 			if (platform === Platform.PAD) {
@@ -50,14 +59,19 @@ function setupOverride() {
 			if (platform === Platform.WEB) return webRunPropEditor(defaultList);
 		},
 		styleEditor: (selectedRef, _defaultWidget) => {
+			if (selectedRef.isField !== true) return;
 			return selectedRef.platform === Platform.WEB ? runStyleEditor() : mobileRunSubTableStyleEditor();
 		}
 	});
 	FieldEditorOverrideRegistry.register(MaterialEnum.MaterialTableSelectField, {
 		propEditor: (selectedRef, _defaultList) => {
+			if (selectedRef.isField !== true) return;
 			return FieldOverrideUtil.runTableSelectPropEditor(selectedRef);
 		},
-		styleEditor: (_selectedRef, _defaultWidget) => runStyleEditor()
+		styleEditor: (selectedRef, _defaultWidget) => {
+			if (selectedRef.isField !== true) return;
+			return runStyleEditor();
+		}
 	});
 }
 setupOverride();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gct-paas/design",
-  "version": "0.1.6-dev.26",
+  "version": "0.1.6-dev.28",
   "type": "module",
   "description": "paas 平台设计界面底包",
   "loader": "dist/loader.esm.min.js",
@@ -51,10 +51,10 @@
     "react-dnd-html5-backend": "^16.0.1",
     "vue": "^3.5.30",
     "vue3-dnd": "^2.1.0",
-    "@gct-paas/core": "0.1.6-dev.26",
-    "@gct-paas/core-web": "0.1.6-dev.26",
-    "@gct-paas/schema": "0.1.6-dev.26",
-    "@gct-paas/scss": "0.1.6-dev.26"
+    "@gct-paas/core": "0.1.6-dev.28",
+    "@gct-paas/core-web": "0.1.6-dev.28",
+    "@gct-paas/schema": "0.1.6-dev.28",
+    "@gct-paas/scss": "0.1.6-dev.28"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",
@@ -64,10 +64,10 @@
   "peerDependencies": {
     "@gct-paas/api": "^0.1.6-dev.14",
     "vue": ">=3",
-    "@gct-paas/core": "0.1.6-dev.26",
-    "@gct-paas/core-web": "0.1.6-dev.26",
-    "@gct-paas/schema": "0.1.6-dev.26",
-    "@gct-paas/scss": "0.1.6-dev.26"
+    "@gct-paas/core": "0.1.6-dev.28",
+    "@gct-paas/core-web": "0.1.6-dev.28",
+    "@gct-paas/schema": "0.1.6-dev.28",
+    "@gct-paas/scss": "0.1.6-dev.28"
   },
   "scripts": {
     "dev": "cross-env NODE_ENV=development vite build --watch --config vite.dev.config.ts",