@gct-paas/design 6.0.0-dev.27 → 6.0.0-dev.29

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/dist/loader.esm.min.js +2 -2
  2. package/es/hooks/design-view/design-state.d.ts +1 -0
  3. package/es/hooks/design-view/page/usePage.d.ts +1 -1
  4. package/es/hooks/design-view/page/usePage.mjs +7 -8
  5. package/es/hooks/design-view/useDesigner.d.ts +1 -0
  6. package/package.json +9 -9
package/es/hooks/design-view/design-state.d.ts CHANGED
@@ -1171,6 +1171,7 @@ export declare const pageJson: {
1171
1171
  unitType?: "px" | "%" | undefined;
1172
1172
  pageWidth?: number | undefined;
1173
1173
  independentDetailPage?: boolean | undefined;
1174
+ detailPageCustom?: boolean | undefined;
1174
1175
  };
1175
1176
  pageVars: {
1176
1177
  id: string;
package/es/hooks/design-view/page/usePage.d.ts CHANGED
@@ -52,7 +52,7 @@ export declare function loadDetailPageInfo(app: App): Promise<void>;
52
52
  */
53
53
  export declare function toggleTxnPageInfo(mode: ContextTxnPageModeEnum): Promise<void>;
54
54
  /**
55
- * 初始化界面占用信息
55
+ * 初始化界面占用信息，目前针对详情和事务，补充2个锁了type，分别是detail_page和transaction_module
56
56
  */
57
57
  declare function initLockState(type?: string): void;
58
58
  /**
package/es/hooks/design-view/page/usePage.mjs CHANGED
@@ -10,7 +10,7 @@ import { useCacheHistory } from "../../develop/useCacheHistory.mjs";
10
10
  import { useToolkit } from "../layout/useToolkit.mjs";
11
11
  import { useDesigner } from "../useDesigner.mjs";
12
12
  import { isEmpty, isNil } from "lodash-es";
13
- import { ButtonSize, ButtonStyle, ContextSceneEnum, ContextTxnPageModeEnum, FormComponents, KitPkgUtil, PanelEnum, Platform, t } from "@gct-paas/core";
13
+ import { ButtonSize, ButtonStyle, ContextTxnPageModeEnum, FormComponents, KitPkgUtil, PanelEnum, Platform, t } from "@gct-paas/core";
14
14
  import { computed, createVNode, ref } from "vue";
15
15
  import { ExclamationCircleOutlined } from "@ant-design/icons-vue";
16
16
  import { Modal } from "ant-design-vue";
@@ -181,7 +181,7 @@ async function loadTxnPageInfo(app) {
181
181
  setTxnPageJson({
182
182
  ..._json,
183
183
  id: pageInfo.value.id
184
- }, false);
184
+ }, true);
185
185
  } else {
186
186
  emitCache();
187
187
  setTxnPageJson({
@@ -193,7 +193,7 @@ async function loadTxnPageInfo(app) {
193
193
  paddingBottom: "16",
194
194
  paddingLeft: "16"
195
195
  }
196
- }, false);
196
+ }, true);
197
197
  }
198
198
  if (!pageJson.widgets.some((item) => item.type === FormComponents.BottomButtonContainer)) {
199
199
  const bottomBtnWidget = createWidgetByType(FormComponents.BottomButtonContainer);
@@ -210,7 +210,7 @@ async function loadTxnPageInfo(app) {
210
210
  initToolkitWidgets();
211
211
  loadPageDesignHistoryList();
212
212
  pagePermissions.value = await _api.apaas.permission.getList({ relationId: _gct.store.context.pid }) || [];
213
- if (!pid.startsWith("___new___")) initLockState();
213
+ if (!pid.startsWith("___new___")) initLockState("transaction_module");
214
214
  savePageJsonSnapshot();
215
215
  }
216
216
  /**
@@ -295,7 +295,7 @@ async function toggleTxnPageInfo(mode) {
295
295
  if (mode === ContextTxnPageModeEnum.CREATE) {
296
296
  pageInfo.value.detailDesignerJson = JSON.stringify(pageJson);
297
297
  pageInfo.value.txnPageMode = mode;
298
- setTxnPageJson({ ...JSON.parse(pageInfo.value._designerJson) });
298
+ setTxnPageJson({ ...JSON.parse(pageInfo.value._designerJson) }, true);
299
299
  } else {
300
300
  pageInfo.value._designerJson = JSON.stringify(pageJson);
301
301
  pageInfo.value.txnPageMode = mode;
@@ -308,14 +308,13 @@ async function toggleTxnPageInfo(mode) {
308
308
  paddingBottom: "16",
309
309
  paddingLeft: "16"
310
310
  }
311
- } });
311
+ } }, false);
312
312
  }
313
313
  }
314
314
  /**
315
- * 初始化界面占用信息
315
+ * 初始化界面占用信息，目前针对详情和事务，补充2个锁了type，分别是detail_page和transaction_module
316
316
  */
317
317
  function initLockState(type) {
318
- if (_gct.store.context.scene === ContextSceneEnum.TXN) return;
319
318
  const { setLockInfo, initOccupy, loadOccupyInfo } = useUserOccupy();
320
319
  const initData = {
321
320
  id: _gct.store.context.pid || "",
package/es/hooks/design-view/useDesigner.d.ts CHANGED
@@ -1072,6 +1072,7 @@ export declare function useDesigner(): {
1072
1072
  unitType?: "px" | "%" | undefined;
1073
1073
  pageWidth?: number | undefined;
1074
1074
  independentDetailPage?: boolean | undefined;
1075
+ detailPageCustom?: boolean | undefined;
1075
1076
  };
1076
1077
  pageVars: {
1077
1078
  id: string;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@gct-paas/design",
3
- "version": "6.0.0-dev.27",
3
+ "version": "6.0.0-dev.29",
4
4
  "type": "module",
5
5
  "description": "paas 平台设计界面底包",
6
6
  "loader": "dist/loader.esm.min.js",
@@ -51,10 +51,10 @@
51
51
  "react-dnd-html5-backend": "^16.0.1",
52
52
  "vue": "^3.5.30",
53
53
  "vue3-dnd": "^2.1.0",
54
- "@gct-paas/core": "6.0.0-dev.27",
55
- "@gct-paas/scss": "6.0.0-dev.27",
56
- "@gct-paas/core-web": "6.0.0-dev.27",
57
- "@gct-paas/schema": "6.0.0-dev.27"
54
+ "@gct-paas/core": "6.0.0-dev.29",
55
+ "@gct-paas/schema": "6.0.0-dev.29",
56
+ "@gct-paas/core-web": "6.0.0-dev.29",
57
+ "@gct-paas/scss": "6.0.0-dev.29"
58
58
  },
59
59
  "devDependencies": {
60
60
  "@types/babel__core": "^7.20.5",
@@ -64,10 +64,10 @@
64
64
  "peerDependencies": {
65
65
  "@gct-paas/api": "^6.0.0-dev.10",
66
66
  "vue": ">=3",
67
- "@gct-paas/core": "6.0.0-dev.27",
68
- "@gct-paas/core-web": "6.0.0-dev.27",
69
- "@gct-paas/scss": "6.0.0-dev.27",
70
- "@gct-paas/schema": "6.0.0-dev.27"
67
+ "@gct-paas/core": "6.0.0-dev.29",
68
+ "@gct-paas/core-web": "6.0.0-dev.29",
69
+ "@gct-paas/scss": "6.0.0-dev.29",
70
+ "@gct-paas/schema": "6.0.0-dev.29"
71
71
  },
72
72
  "scripts": {
73
73
  "dev": "cross-env NODE_ENV=development vite build --watch --config vite.dev.config.ts",