@gct-paas/design 0.1.6-dev.21 → 0.1.6-dev.22

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

@@ -4,20 +4,19 @@ import { platform } from "../../../utils/design-view/index.mjs";
 import { DesignPluginPgkUtil } from "../../../utils/design-plugin-pkg-util/design-plugin-pkg-util.mjs";
 import { createWidgetByType } from "../../../utils/schema/index.mjs";
 import "../../../utils/index.mjs";
-import "../design-state.mjs";
+import { pageInfo } from "../design-state.mjs";
 import { useCacheHistory } from "../../develop/useCacheHistory.mjs";
 import { useToolkit } from "../layout/useToolkit.mjs";
 import { useDesigner } from "../useDesigner.mjs";
 import { useUserOccupy } from "../../../components/user-occupy/useUserOccupy.mjs";
 import "../../../components/index.mjs";
 import { isEmpty, isNil } from "lodash-es";
-import { FormComponents, KitPkgUtil, PanelEnum, Platform, t } from "@gct-paas/core";
+import { ButtonSize, ButtonStyle, 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";
 //#region src/hooks/design-view/page/usePage.ts
 var newKeyTag = "___new___";
-var pageInfo = ref({});
 var pagePermissions = ref([]);
 var { setLockInfo, initOccupy, loadOccupyInfo } = useUserOccupy();
 var unlockAvailable = computed(() => {
@@ -113,9 +112,132 @@ async function loadPageInfo(app) {
 	loadPageDesignHistoryList();
 	pagePermissions.value = await _api.apaas.permission.getList({ relationId: _gct.store.context.pid }) || [];
 	if (!pid.startsWith("___new___")) initLockState();
+	pageJson.pageConfig.title = "新建页";
 	savePageJsonSnapshot();
 }
 /**
+* 加载页面信息
+* @returns
+*/
+async function loadTxnPageInfo(app) {
+	const { initToolkitWidgets } = useToolkit();
+	const { setPageJson, loadPageDesignHistoryList, emitCache, pageJson, setPluginConfigs, savePageJsonSnapshot } = useDesigner();
+	const { historyUtils } = useCacheHistory();
+	platform.value = _gct.store.context.platform || Platform.WEB;
+	const baseid = _gct.store.context.baseid || "";
+	const pid = _gct.store.context.pid || "";
+	if (baseid) {
+		const res = await _api.apaas.transaction.getGetVersionById({ id: baseid });
+		pageInfo.value = {
+			id: newKeyTag,
+			name: res.name,
+			key: res.key,
+			modelKey: res.modelKey,
+			designerJson: "",
+			_designerJson: "",
+			detailDesignerJson: "",
+			txnPageMode: "create",
+			baseId: baseid
+		};
+	} else if (pid.startsWith("___new___")) pageInfo.value = {
+		id: newKeyTag,
+		name: "",
+		key: pid.replace(`${newKeyTag}:`, ""),
+		designerJson: "",
+		_designerJson: "",
+		detailDesignerJson: "",
+		txnPageMode: "create"
+	};
+	else {
+		const pageInfoRes = await _api.apaas.transaction.getInfo({ id: _gct.store.context.pid });
+		pageInfo.value = pageInfoRes;
+		pageInfo.value._designerJson = pageInfoRes.designerJson;
+		pageInfo.value.txnPageMode = "create";
+	}
+	const all = [];
+	if (_gct.store.appInfo.suiteKey) all.push(KitPkgUtil.loadDesign(_gct.store.appInfo.suiteKey).then((module) => {
+		if (module) module.setupApp(app);
+	}));
+	const _configs = [];
+	all.push(DesignPluginPgkUtil.loadDesignPlugin(app, platform.value, _gct.store.appInfo.suiteKey ? [_gct.store.appInfo.suiteKey] : void 0).then(([configs]) => {
+		_configs.push(...configs);
+		setPluginConfigs(configs);
+	}));
+	await Promise.all(all);
+	if (!historyUtils.isHistoryInfoExist(_gct.store.context.pid)) historyUtils.init({ historyId: _gct.store.context.pid ?? "" });
+	if (pageInfo.value.designerJson && !isNil(pageInfo.value.designerJson) && !isEmpty(pageInfo.value.designerJson)) {
+		const _json = JSON.parse(pageInfo.value.designerJson);
+		if (_json && _json.plugins) {
+			const items = _json.plugins.filter((item) => {
+				return _configs.findIndex((config) => config.key === item.key) === -1;
+			});
+			await DesignPluginPgkUtil.loadDesignDeletedPlugins(platform.value, items);
+		}
+		if (!_json.pageConfig) _json.pageConfig = {
+			title: "",
+			i18n: {},
+			hasFooter: false
+		};
+		setPageJson({
+			..._json,
+			id: pageInfo.value.id
+		}, true);
+	} else {
+		emitCache();
+		setPageJson({
+			newDesigner: true,
+			style: {
+				paddingAll: "",
+				paddingTop: "",
+				paddingRight: "16",
+				paddingBottom: "16",
+				paddingLeft: "16"
+			}
+		}, true);
+	}
+	if (!pageJson.widgets.some((item) => item.type === FormComponents.BottomButtonContainer)) {
+		const bottomBtnWidget = createWidgetByType(FormComponents.BottomButtonContainer);
+		[FormComponents.TxnCancelButton, FormComponents.TxnConfirmButton].forEach((e) => {
+			const data = createWidgetByType(e);
+			data.props.parentWidgetId = bottomBtnWidget.id;
+			data.props.buttonStyle = ButtonStyle.ORDINARY;
+			data.props.size = ButtonSize.DEFAULT;
+			data.props.noDelete = true;
+			bottomBtnWidget.children?.push(data);
+		});
+		pageJson.widgets.push(bottomBtnWidget);
+	}
+	initToolkitWidgets();
+	loadPageDesignHistoryList();
+	pagePermissions.value = await _api.apaas.permission.getList({ relationId: _gct.store.context.pid }) || [];
+	if (!pid.startsWith("___new___")) initLockState();
+	savePageJsonSnapshot();
+}
+/**
+* @param mode 切换模式
+*/
+async function toggleTxnPageInfo(mode) {
+	const { setTxnPageJson, pageJson } = useDesigner();
+	if (mode === "create") {
+		pageInfo.value.detailDesignerJson = JSON.stringify(pageJson);
+		pageInfo.value.txnPageMode = mode;
+		setTxnPageJson({ ...JSON.parse(pageInfo.value._designerJson) });
+	} else {
+		pageInfo.value._designerJson = JSON.stringify(pageJson);
+		pageInfo.value.txnPageMode = mode;
+		setTxnPageJson({ ...pageInfo.value.detailDesignerJson ? JSON.parse(pageInfo.value.detailDesignerJson) : {
+			newDesigner: true,
+			style: {
+				paddingAll: "",
+				paddingTop: "",
+				paddingRight: "16",
+				paddingBottom: "16",
+				paddingLeft: "16"
+			}
+		} });
+	}
+}
+/**
 * 初始化界面占用信息
 */
 function initLockState() {
@@ -166,4 +288,4 @@ function usePage() {
 	};
 }
 //#endregion
-export { currentPanel, loadPageInfo, lockPage, newKeyTag, pageInfo, pagePermissions, togglePanel, unlockAvailable, usePage };
+export { currentPanel, loadPageInfo, loadTxnPageInfo, lockPage, newKeyTag, pagePermissions, togglePanel, toggleTxnPageInfo, unlockAvailable, usePage };

package/es/hooks/design-view/useDesigner.d.ts

@@ -1091,8 +1091,9 @@ export declare function useDesigner(): {
     methodMap: import('vue').Ref<import('@gct-paas/schema').ExportMethod, import('@gct-paas/schema').ExportMethod>;
     checkWidgetMove: () => boolean;
     handleAddDrag: (newIndex: number, childrenList: LowCodeWidget.BasicSchema[], scope: SCOPE, formID?: string) => void;
-    setPageJson: (json: PageJson) => Promise<void>;
-    save: (flag?: boolean, showSuccess?: boolean) => Promise<boolean>;
+    setPageJson: (json: PageJson, hasFooter?: boolean) => Promise<void>;
+    setTxnPageJson: (json: PageJson, hasFooter?: boolean) => Promise<void>;
+    save: (flag?: boolean, showSuccess?: boolean, isTxn?: boolean) => Promise<boolean>;
     savePageJsonSnapshot: (json?: PageJson) => void;
     emitCache: () => void;
     undoOrRestore: (content: string) => void;

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

@@ -1,7 +1,7 @@
 import { platform } from "../../utils/design-view/index.mjs";
 import { initMethodMap } from "../../utils/transform-js/transform-js.mjs";
 import "../../utils/index.mjs";
-import { methodMap, pageJson } from "./design-state.mjs";
+import { defaultPageJson, methodMap, pageJson } from "./design-state.mjs";
 import { useDesignModal } from "./designer/useDesignModal.mjs";
 import { useDesignPreview } from "./designer/useDesignPreview.mjs";
 import { useWidgetRegistry } from "./widget/useWidgetRegistry.mjs";
@@ -38,14 +38,22 @@ function useDesigner() {
 	/**
 	* 设置设计器的 pageJSON
 	*/
-	async function setPageJson(json) {
-		pageJson.pageConfig.hasFooter = platform.value === Platform.MOBILE || platform.value === Platform.PAD;
+	async function setPageJson(json, hasFooter = false) {
+		pageJson.pageConfig.hasFooter = hasFooter || platform.value === Platform.MOBILE || platform.value === Platform.PAD;
 		Object.assign(pageJson, json);
 		initMethodMap(pageJson.js).then((map) => {
 			methodMap.value = map;
 		});
 		cache.emitCache();
 	}
+	async function setTxnPageJson(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;
+		});
+		cache.emitCache();
+	}
 	/** 检查是否可以拖拽进入的方法，比如某些组件不能拖到某些组件内 */
 	function checkWidgetMove() {
 		return true;
@@ -66,6 +74,7 @@ function useDesigner() {
 		checkWidgetMove,
 		handleAddDrag,
 		setPageJson,
+		setTxnPageJson,
 		save: saveHook.save,
 		savePageJsonSnapshot: saveHook.savePageJsonSnapshot,
 		emitCache: cache.emitCache,

package/es/index.mjs

@@ -39,7 +39,7 @@ import { FieldOverrideUtil, setupOverride } from "./schema/field/index.mjs";
 import { BaseSearch, getSearchOptions } from "./schema/search/BaseSearch.mjs";
 import { BaseDate } from "./schema/search/BaseDate.mjs";
 import "./schema/index.mjs";
-import { isModified, loading, methodMap, modalDesignId, modalDesignState, modalInfo, noMore, pageDesignHistoryList, pageJson, pageJsonSnapshot, pageNo, pluginConfigs, regRoot, subTableModalId, subTableModalState, transformPageJson, wfNodesModalId, wfNodesModalState, widgetInfo, workflowModalId, workflowModalState } from "./hooks/design-view/design-state.mjs";
+import { isModified, loading, methodMap, modalDesignId, modalDesignState, modalInfo, noMore, pageDesignHistoryList, pageInfo, pageJson, pageJsonSnapshot, pageNo, pluginConfigs, regRoot, subTableModalId, subTableModalState, transformPageJson, wfNodesModalId, wfNodesModalState, widgetInfo, workflowModalId, workflowModalState } from "./hooks/design-view/design-state.mjs";
 import { useScope } from "./hooks/design-view/layout/useScope.mjs";
 import { useGlobal } from "./hooks/design-view/global/useGlobal.mjs";
 import { useDesignModal } from "./hooks/design-view/designer/useDesignModal.mjs";
@@ -47,7 +47,7 @@ import { useDesignPreview } from "./hooks/design-view/designer/useDesignPreview.
 import { useCacheHistory, useCacheHistoryInner } from "./hooks/develop/useCacheHistory.mjs";
 import { useWidgetRegistry } from "./hooks/design-view/widget/useWidgetRegistry.mjs";
 import { useToolkit } from "./hooks/design-view/layout/useToolkit.mjs";
-import { currentPanel, loadPageInfo, lockPage, newKeyTag, pageInfo, pagePermissions, togglePanel, unlockAvailable, usePage } from "./hooks/design-view/page/usePage.mjs";
+import { currentPanel, loadPageInfo, loadTxnPageInfo, lockPage, newKeyTag, pagePermissions, togglePanel, toggleTxnPageInfo, unlockAvailable, usePage } from "./hooks/design-view/page/usePage.mjs";
 import { useWidgetQuery } from "./hooks/design-view/widget/useWidgetQuery.mjs";
 import { useSelectedWidget } from "./hooks/design-view/widget/useSelectedWidget.mjs";
 import { useDesignCache } from "./hooks/design-view/designer/useDesignCache.mjs";
@@ -105,4 +105,4 @@ function onInit() {
 }
 onInit();
 //#endregion
-export { BaseDate, BaseSearch, CategoryEnum, ControllerType, DesignContainerNode, DesignContent, DesignEditorNode, DesignEditorNodeProvider, DesignEditorType, DesignItemActionTag, DesignItemAttribute, DesignItemPreview, DesignNode, DesignNodePrefix, DesignNodeType, DesignPluginPgkUtil, DesignViewController, DesignViewHooks, DesignViewPrefix, DesignerRegister, FieldCascader_default as FieldCascader, FieldOverrideUtil, FieldSchema, InsertNodeMode, MaterialContent, MaterialGroup, MaterialRegister, MenuClickEvent, multi_field_display_default as MultiFieldDisplay, NodeBaseProvider, NodeRegister, NotMask, PageTypeEnum, PanelContent, PropsEditorRegister, SCREditorUtils, user_lock_default as UserLock, user_occupy_default as UserOccupy, asyncIdentify, baseBtnEditor, baseBtnProp, basicAttrsUtils, basicFieldEditor, beginDrag, BTN_TYPE_COLOR as btnTypeColor, buildRunJs, buildRuntimeJson, buttonEditor, buttonProps, buttonStyleEditor, changeCmpData, commonStyle, createWidgetByType, createWidgetProvider, createdSearchField, currentPanel, customMenu, deptFilter, designCreateAppVue, designInterceptors, designRegister, designSetupApp, destroyOccupyTimer, deviceEvent, displayEditor, displayProps, explainEditor, findAllChildrenTypes, fixedAlignEditor, flatten, formItemProps, formulaFilter, getAutofillEditor, getBindCmpTypeEditor, getInputAttrEditor, getSearchOptions, hiddenButtonProps, initFieldWidgetRuntime, initMethodMap, isCanCrop, isModified, loadPageInfo, loadPageOccupyInfo, loading, lockPage, methodMap, modal_exports as modalCfg, modalDesignId, modalDesignState, modalInfo, multiFieldEditor, newKeyTag, noMore, nodeContainerProps, nodeEditorProps, nodeProps, notNeedPxStyle, occupyPage, onWidgetInfoInit, openFormulaEditorByDesign, pageDesignHistoryList, pageInfo, pageJson, pageJsonSnapshot, pageNo, pageOccupyInfo, pagePermissions, permissionEditor, placeholderEditor, platform, pluginConfigs, PRESET_COLOR as presetColor, propEditorProps, propsToStyle, regRoot, regexEditor, rgba2hex, schemaToStyle, setupOverride, shadeColor, styleEditorProps, subTableModalId, subTableModalState, submitInHideEditor, togglePanel, transformField2Component, transformPageJson, unlockAvailable, uploadDraggerEditor, useAsyncFieldConfig, useAsyncFileAttrs, useAsyncOperateField, useCacheHistory, useCacheHistoryInner, useDesignCache, useDesignHistory, useDesignModal, useDesignPreview, useDesignSave, useDesignViewController, useDesignViewStore, useDesigner, useDesignerController, useFieldTransfer, useGlobal, useModelField, usePage, usePageOccupy, usePropEditor, useScope, useSelectedWidget, useStyle, useStyleEditor, useToolkit, useUserOccupy, useWidget, useWidgetQuery, useWidgetRegistry, validatorEditor, wfNodesModalId, wfNodesModalState, widgetInfo, widgetProps, widgetWrapperProps, workflowModalId, workflowModalState };
+export { BaseDate, BaseSearch, CategoryEnum, ControllerType, DesignContainerNode, DesignContent, DesignEditorNode, DesignEditorNodeProvider, DesignEditorType, DesignItemActionTag, DesignItemAttribute, DesignItemPreview, DesignNode, DesignNodePrefix, DesignNodeType, DesignPluginPgkUtil, DesignViewController, DesignViewHooks, DesignViewPrefix, DesignerRegister, FieldCascader_default as FieldCascader, FieldOverrideUtil, FieldSchema, InsertNodeMode, MaterialContent, MaterialGroup, MaterialRegister, MenuClickEvent, multi_field_display_default as MultiFieldDisplay, NodeBaseProvider, NodeRegister, NotMask, PageTypeEnum, PanelContent, PropsEditorRegister, SCREditorUtils, user_lock_default as UserLock, user_occupy_default as UserOccupy, asyncIdentify, baseBtnEditor, baseBtnProp, basicAttrsUtils, basicFieldEditor, beginDrag, BTN_TYPE_COLOR as btnTypeColor, buildRunJs, buildRuntimeJson, buttonEditor, buttonProps, buttonStyleEditor, changeCmpData, commonStyle, createWidgetByType, createWidgetProvider, createdSearchField, currentPanel, customMenu, deptFilter, designCreateAppVue, designInterceptors, designRegister, designSetupApp, destroyOccupyTimer, deviceEvent, displayEditor, displayProps, explainEditor, findAllChildrenTypes, fixedAlignEditor, flatten, formItemProps, formulaFilter, getAutofillEditor, getBindCmpTypeEditor, getInputAttrEditor, getSearchOptions, hiddenButtonProps, initFieldWidgetRuntime, initMethodMap, isCanCrop, isModified, loadPageInfo, loadPageOccupyInfo, loadTxnPageInfo, loading, lockPage, methodMap, modal_exports as modalCfg, modalDesignId, modalDesignState, modalInfo, multiFieldEditor, newKeyTag, noMore, nodeContainerProps, nodeEditorProps, nodeProps, notNeedPxStyle, occupyPage, onWidgetInfoInit, openFormulaEditorByDesign, pageDesignHistoryList, pageInfo, pageJson, pageJsonSnapshot, pageNo, pageOccupyInfo, pagePermissions, permissionEditor, placeholderEditor, platform, pluginConfigs, PRESET_COLOR as presetColor, propEditorProps, propsToStyle, regRoot, regexEditor, rgba2hex, schemaToStyle, setupOverride, shadeColor, styleEditorProps, subTableModalId, subTableModalState, submitInHideEditor, togglePanel, toggleTxnPageInfo, transformField2Component, transformPageJson, unlockAvailable, uploadDraggerEditor, useAsyncFieldConfig, useAsyncFileAttrs, useAsyncOperateField, useCacheHistory, useCacheHistoryInner, useDesignCache, useDesignHistory, useDesignModal, useDesignPreview, useDesignSave, useDesignViewController, useDesignViewStore, useDesigner, useDesignerController, useFieldTransfer, useGlobal, useModelField, usePage, usePageOccupy, usePropEditor, useScope, useSelectedWidget, useStyle, useStyleEditor, useToolkit, useUserOccupy, useWidget, useWidgetQuery, useWidgetRegistry, validatorEditor, wfNodesModalId, wfNodesModalState, widgetInfo, widgetProps, widgetWrapperProps, workflowModalId, workflowModalState };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gct-paas/design",
-  "version": "0.1.6-dev.21",
+  "version": "0.1.6-dev.22",
   "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.21",
-    "@gct-paas/core-web": "0.1.6-dev.21",
-    "@gct-paas/schema": "0.1.6-dev.21",
-    "@gct-paas/scss": "0.1.6-dev.21"
+    "@gct-paas/core": "0.1.6-dev.22",
+    "@gct-paas/core-web": "0.1.6-dev.22",
+    "@gct-paas/schema": "0.1.6-dev.22",
+    "@gct-paas/scss": "0.1.6-dev.22"
   },
   "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.21",
-    "@gct-paas/core": "0.1.6-dev.21",
-    "@gct-paas/schema": "0.1.6-dev.21",
-    "@gct-paas/scss": "0.1.6-dev.21"
+    "@gct-paas/core": "0.1.6-dev.22",
+    "@gct-paas/schema": "0.1.6-dev.22",
+    "@gct-paas/core-web": "0.1.6-dev.22",
+    "@gct-paas/scss": "0.1.6-dev.22"
   },
   "scripts": {
     "dev": "cross-env NODE_ENV=development vite build --watch --config vite.dev.config.ts",