@gct-paas/design 6.0.0-dev.22 → 6.0.0-dev.24

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

@@ -2,7 +2,7 @@ import { useWidgetRegistry } from "../widget/useWidgetRegistry.mjs";
 import { useModelField } from "../../use-model-field/use-model-field.mjs";
 import "../../index.mjs";
 import { clone, cloneDeep } from "lodash-es";
-import { CategoryTypeEnum, ContextSceneEnum, FormComponents, Platform, ToolkitEnum } from "@gct-paas/core";
+import { CategoryTypeEnum, ContextSceneEnum, ContextTxnPageModeEnum, FormComponents, Platform, ToolkitEnum } from "@gct-paas/core";
 import { ref } from "vue";
 import { getWidgetInfo } from "@gct-paas/schema";
 //#region src/hooks/design-view/layout/useToolkit.ts
@@ -148,23 +148,25 @@ var instance = class ComponentUtils {
 	}
 	/** 根据当前分组上下文返回应显示的分类列表 */
 	get categoryTypes() {
-		if (this.groupType === ComponentUtils.SubTableGroup) return [
+		let categoryTypes;
+		if (this.groupType === ComponentUtils.SubTableGroup) categoryTypes = [
 			CategoryTypeEnum.FORM,
 			CategoryTypeEnum.LAYOUT,
 			CategoryTypeEnum.ADVANCED
 		];
-		if (this.groupType === ComponentUtils.TxnPageGroup) return [
-			CategoryTypeEnum.FORM,
-			CategoryTypeEnum.LAYOUT,
-			CategoryTypeEnum.DATA,
-			CategoryTypeEnum.BUTTON
-		];
-		if (this.groupType === ComponentUtils.DetailPageGroup) return [
+		else if (this.groupType === ComponentUtils.TxnPageGroup) {
+			categoryTypes = [
+				CategoryTypeEnum.FORM,
+				CategoryTypeEnum.LAYOUT,
+				CategoryTypeEnum.DATA
+			];
+			if (_gct.store.context.txnPageMode === ContextTxnPageModeEnum.CREATE) categoryTypes = [...categoryTypes, CategoryTypeEnum.BUTTON];
+		} else if (this.groupType === ComponentUtils.DetailPageGroup) categoryTypes = [
 			CategoryTypeEnum.FORM,
 			CategoryTypeEnum.LAYOUT,
 			CategoryTypeEnum.DATA
 		];
-		return [
+		else categoryTypes = [
 			CategoryTypeEnum.FORM,
 			CategoryTypeEnum.LAYOUT,
 			CategoryTypeEnum.ADVANCED,
@@ -173,6 +175,8 @@ var instance = class ComponentUtils {
 			CategoryTypeEnum.KIT,
 			CategoryTypeEnum.PROCESS
 		];
+		if (_gct.store.context.txnPageMode === ContextTxnPageModeEnum.CREATE) return categoryTypes.filter((categoryType) => categoryType !== CategoryTypeEnum.ADVANCED);
+		return categoryTypes;
 	}
 	/**
 	* 根据分类类型返回当前上下文下允许使用的组件 key 列表

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

@@ -1,5 +1,5 @@
 import { Ref, App } from 'vue';
-import { PanelEnum } from '@gct-paas/core';
+import { PanelEnum, ContextTxnPageModeEnum } from '@gct-paas/core';
 import { PermissionResponse } from '@gct-paas/api/apaas';
 export type { PageInfo } from '../design-state';
 export { pageInfo } from '../design-state';
@@ -50,7 +50,7 @@ export declare function loadDetailPageInfo(app: App): Promise<void>;
 /**
  * @param mode 切换模式
  */
-export declare function toggleTxnPageInfo(mode: 'create' | 'detail'): Promise<void>;
+export declare function toggleTxnPageInfo(mode: ContextTxnPageModeEnum): Promise<void>;
 /**
  * 初始化界面占用信息
  */

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

@@ -10,7 +10,7 @@ import { useCacheHistory } from "../../develop/useCacheHistory.mjs";
 import { useToolkit } from "../layout/useToolkit.mjs";
 import { useDesigner } from "../useDesigner.mjs";
 import { isEmpty, isNil } from "lodash-es";
-import { ButtonSize, ButtonStyle, ContextSceneEnum, FormComponents, KitPkgUtil, PanelEnum, Platform, t } from "@gct-paas/core";
+import { ButtonSize, ButtonStyle, ContextSceneEnum, ContextTxnPageModeEnum, FormComponents, KitPkgUtil, PanelEnum, Platform, t } from "@gct-paas/core";
 import { computed, createVNode, ref } from "vue";
 import { ExclamationCircleOutlined } from "@ant-design/icons-vue";
 import { Modal } from "ant-design-vue";
@@ -117,6 +117,7 @@ async function loadPageInfo(app) {
 * @returns
 */
 async function loadTxnPageInfo(app) {
+	await _gct.store.setContext({ txnPageMode: ContextTxnPageModeEnum.CREATE });
 	const { initToolkitWidgets } = useToolkit();
 	const { setPageJson, loadPageDesignHistoryList, emitCache, pageJson, setPluginConfigs, savePageJsonSnapshot } = useDesigner();
 	const { historyUtils } = useCacheHistory();
@@ -149,6 +150,7 @@ async function loadTxnPageInfo(app) {
 	} else {
 		const pageInfoRes = await _api.apaas.transaction.getInfo({ id: _gct.store.context.pid });
 		pageInfo.value = pageInfoRes;
+		pageInfo.value.default = Boolean(pageInfoRes.defaulted ?? false);
 		pageInfo.value._designerJson = pageInfoRes.designerJson;
 		pageInfo.value.txnPageMode = "create";
 	}
@@ -290,8 +292,9 @@ async function loadDetailPageInfo(app) {
 * @param mode 切换模式
 */
 async function toggleTxnPageInfo(mode) {
+	await _gct.store.setContext({ txnPageMode: mode });
 	const { setTxnPageJson, pageJson } = useDesigner();
-	if (mode === "create") {
+	if (mode === ContextTxnPageModeEnum.CREATE) {
 		pageInfo.value.detailDesignerJson = JSON.stringify(pageJson);
 		pageInfo.value.txnPageMode = mode;
 		setTxnPageJson({ ...JSON.parse(pageInfo.value._designerJson) });

package/es/schema/common-config/common-field-editor-config.mjs

@@ -3,7 +3,7 @@ import { useScope } from "../../hooks/design-view/layout/useScope.mjs";
 import { useDesigner } from "../../hooks/design-view/useDesigner.mjs";
 import "../../hooks/index.mjs";
 import { has } from "lodash-es";
-import { BindCmpStyleEnum, BindCmpStyleTypeEnum, ContextSceneEnum, EntityModelTypeEnum, FIELD_TYPE, FormComponents, MaterialEnum, Platform, PropGroup, TreeHelper } from "@gct-paas/core";
+import { BindCmpStyleEnum, BindCmpStyleTypeEnum, ContextSceneEnum, ContextTxnPageModeEnum, EntityModelTypeEnum, FIELD_TYPE, FormComponents, MaterialEnum, Platform, PropGroup, TreeHelper } from "@gct-paas/core";
 import { isFormFieldType } from "@gct-paas/schema";
 //#region src/schema/common-config/common-field-editor-config.ts
 /** 字段名称和显示标题config */
@@ -62,7 +62,7 @@ var getInputAttrEditor = (needFieldAttrs) => {
 			}
 		},
 		hidden(widget) {
-			return widget.props.field === "operating_state_" || widget.props.bindFieldKey || widget.materialType === MaterialEnum.DescriptionsFormField || widget.props.fieldReadonly || _gct.store.context.scene === ContextSceneEnum.DETAIL;
+			return widget.props.field === "operating_state_" || widget.props.bindFieldKey || widget.materialType === MaterialEnum.DescriptionsFormField || widget.props.fieldReadonly || _gct.store.context.scene === ContextSceneEnum.DETAIL || _gct.store.context.txnPageMode === ContextTxnPageModeEnum.DETAIL;
 		}
 	}];
 };

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, ContextSceneEnum, Platform, PropGroup, StyleGroup } from "@gct-paas/core";
+import { BuiltinType, ContextSceneEnum, ContextTxnPageModeEnum, 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 || _gct.store.context.scene === ContextSceneEnum.DETAIL;
+			return widget.props.isSubTableModal || _gct.store.context.scene === ContextSceneEnum.DETAIL || _gct.store.context.txnPageMode === ContextTxnPageModeEnum.DETAIL;
 		}
 	}
 ];
@@ -166,7 +166,7 @@ var eventList = [{
 }];
 var runCallback = () => {};
 var beforeCreate = (widget) => {
-	if (_gct.store.context.scene === ContextSceneEnum.DETAIL) widget.props.hasFooter = false;
+	if (_gct.store.context.scene === ContextSceneEnum.DETAIL || _gct.store.context.txnPageMode === ContextTxnPageModeEnum.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.22",
+  "version": "6.0.0-dev.24",
   "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": "6.0.0-dev.22",
-    "@gct-paas/core-web": "6.0.0-dev.22",
-    "@gct-paas/scss": "6.0.0-dev.22",
-    "@gct-paas/schema": "6.0.0-dev.22"
+    "@gct-paas/core": "6.0.0-dev.24",
+    "@gct-paas/scss": "6.0.0-dev.24",
+    "@gct-paas/schema": "6.0.0-dev.24",
+    "@gct-paas/core-web": "6.0.0-dev.24"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",
@@ -64,10 +64,10 @@
   "peerDependencies": {
     "@gct-paas/api": "^6.0.0-dev.9",
     "vue": ">=3",
-    "@gct-paas/core": "6.0.0-dev.22",
-    "@gct-paas/core-web": "6.0.0-dev.22",
-    "@gct-paas/schema": "6.0.0-dev.22",
-    "@gct-paas/scss": "6.0.0-dev.22"
+    "@gct-paas/core": "6.0.0-dev.24",
+    "@gct-paas/core-web": "6.0.0-dev.24",
+    "@gct-paas/schema": "6.0.0-dev.24",
+    "@gct-paas/scss": "6.0.0-dev.24"
   },
   "scripts": {
     "dev": "cross-env NODE_ENV=development vite build --watch --config vite.dev.config.ts",