@gct-paas/design 0.1.6-dev.27 → 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/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

@@ -209,6 +209,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;
 	savePageJsonSnapshot();
 }
 /**
@@ -239,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.d.ts

@@ -7,8 +7,8 @@ export declare function useSelectedWidget(): {
     resetSelectedModal: () => void;
     setSelectedWidget: (widget: Partial<LowCodeWidget.BasicSchema>, scope?: SCOPE) => void;
     resetSelectedWidget: (scope?: SCOPE) => void;
-    selectedAllPropEditors: import('vue').ComputedRef<import('@gct-paas/schema').IPropEditor[] | undefined>;
-    selectedAllStyleEditors: import('vue').ComputedRef<import('@gct-paas/schema').IStyleEditor[] | undefined>;
+    selectedAllPropEditors: import('vue').ComputedRef<import('@gct-paas/schema').IPropEditor[]>;
+    selectedAllStyleEditors: import('vue').ComputedRef<import('@gct-paas/schema').IStyleEditor[]>;
     selectedAllEvents: import('vue').ComputedRef<IObject[]>;
     selectedEvents: import('vue').WritableComputedRef<import('@gct-paas/schema').IBasicEvents, import('@gct-paas/schema').IBasicEvents>;
     selectedProps: import('vue').ComputedRef<import('@gct-paas/schema').ICommonProps & import('@gct-paas/schema').IWidgetProps>;

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

@@ -139,8 +139,13 @@ function useSelectedWidget() {
 			defaultEvents = provider.events || [];
 		}
 		if (selectedRef.value.props.fieldReadonly) return defaultEvents.filter((event) => event.name === "onClick");
-		const overrideEvents = FieldEditorOverrideRegistry.get(materialType)?.events;
-		if (overrideEvents) return overrideEvents(selectedRef.value, defaultEvents);
+		if (materialType) {
+			const overrideEvents = FieldEditorOverrideRegistry.get(materialType)?.events;
+			if (overrideEvents) {
+				const items = overrideEvents(selectedRef.value, defaultEvents);
+				if (items) return items;
+			}
+		}
 		return defaultEvents;
 	});
 	/**被选择的组件/弹框拥有的所有属性编辑器的描述集合 */
@@ -164,8 +169,13 @@ function useSelectedWidget() {
 			}
 			defaultPropEditors = provider.propEditors || [];
 		}
-		const overridePropEditor = FieldEditorOverrideRegistry.get(materialType)?.propEditor;
-		if (overridePropEditor) return overridePropEditor(selectedRef.value, defaultPropEditors, preCompInfo);
+		if (materialType) {
+			const overridePropEditor = FieldEditorOverrideRegistry.get(materialType)?.propEditor;
+			if (overridePropEditor) {
+				const items = overridePropEditor(selectedRef.value, defaultPropEditors, preCompInfo);
+				if (items) return items;
+			}
+		}
 		return defaultPropEditors;
 	});
 	/**被选择的组件/弹框拥有的所有样式编辑器的描述集合 */
@@ -181,8 +191,13 @@ function useSelectedWidget() {
 			}
 			defaultStyleEditors = provider.styleEditors || [];
 		}
-		const overrideStyleEditor = FieldEditorOverrideRegistry.get(materialType)?.styleEditor;
-		if (overrideStyleEditor) return overrideStyleEditor(selectedRef.value, defaultStyleEditors);
+		if (materialType) {
+			const overrideStyleEditor = FieldEditorOverrideRegistry.get(materialType)?.styleEditor;
+			if (overrideStyleEditor) {
+				const items = overrideStyleEditor(selectedRef.value, defaultStyleEditors);
+				if (items) return items;
+			}
+		}
 		return defaultStyleEditors;
 	});
 	/**被选择的组件所有设计相关配置信息集合 */

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.27",
+  "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.27",
-    "@gct-paas/core-web": "0.1.6-dev.27",
-    "@gct-paas/schema": "0.1.6-dev.27",
-    "@gct-paas/scss": "0.1.6-dev.27"
+    "@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-web": "0.1.6-dev.27",
-    "@gct-paas/scss": "0.1.6-dev.27",
-    "@gct-paas/core": "0.1.6-dev.27",
-    "@gct-paas/schema": "0.1.6-dev.27"
+    "@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",