@gct-paas/design 6.0.0-dev.2 → 6.0.0-dev.4

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/components/useUserOccupy.mjs +2 -1
  3. package/es/hooks/design-view/designer/useDesignSave.mjs +4 -2
  4. package/es/hooks/design-view/page/usePage.d.ts +1 -1
  5. package/es/hooks/design-view/page/usePage.mjs +7 -5
  6. package/package.json +11 -11
package/es/hooks/design-view/components/useUserOccupy.mjs CHANGED
@@ -138,8 +138,9 @@ function _useUserOccupy() {
138
138
  async function lock() {
139
139
  if (occupyInfo.value.occupyId) return;
140
140
  if (lockInfo.value.id) return;
141
+ const sthText = i18nKeyMap[params.type] || "sys.page";
141
142
  Modal.confirm({
142
- title: t("sys.sureToLockSth", { sth: t(i18nKeyMap[params.type]) }),
143
+ title: t("sys.sureToLockSth", { sth: t(sthText) }),
143
144
  icon: createVNode(ExclamationCircleOutlined),
144
145
  okText: t("sys.ok"),
145
146
  cancelText: t("sys.cancel"),
package/es/hooks/design-view/designer/useDesignSave.mjs CHANGED
@@ -289,11 +289,13 @@ function useDesignSave() {
289
289
  pageInfo.value._designerJson = JSON.stringify(_designerJson);
290
290
  await _api.apaas.detailPage.putUpdateDesignerJsonId({ id: pageId }, {
291
291
  designerJson: JSON.stringify(_designerJson),
292
- runtimeJson: JSON.stringify(runtimeJson),
292
+ description: pageInfo.value.description,
293
293
  key: pageInfo.value.key,
294
294
  name: pageInfo.value.name,
295
- description: pageInfo.value.description
295
+ logId: (pageDesignHistoryList.value[0] ?? {}).id,
296
+ runtimeJson: JSON.stringify(runtimeJson)
296
297
  });
298
+ savePageJsonSnapshot();
297
299
  if (showSuccess) _gct.message.success(flag ? "sys.saveSuccess" : "sys.recoverSuccess");
298
300
  cancelOccupy();
299
301
  noMore.value = false;
package/es/hooks/design-view/page/usePage.d.ts CHANGED
@@ -54,7 +54,7 @@ export declare function toggleTxnPageInfo(mode: 'create' | 'detail'): Promise<vo
54
54
  /**
55
55
  * 初始化界面占用信息
56
56
  */
57
- declare function initLockState(): void;
57
+ declare function initLockState(type?: string): void;
58
58
  /**
59
59
  * 更新页面锁定状态
60
60
  * @param {boolean} value
package/es/hooks/design-view/page/usePage.mjs CHANGED
@@ -279,7 +279,7 @@ async function loadDetailPageInfo(app) {
279
279
  initToolkitWidgets();
280
280
  loadPageDesignHistoryList();
281
281
  pagePermissions.value = await _api.apaas.permission.getList({ relationId: _gct.store.context.pid }) || [];
282
- if (!pid.startsWith("___new___")) initLockState();
282
+ if (!pid.startsWith("___new___")) initLockState("detail_page");
283
283
  pageJson.pageConfig.title = pageJson.pageConfig.title || "详情";
284
284
  pageJson.pageConfig.unitType = "%";
285
285
  pageJson.pageConfig.pageWidth = 80;
@@ -312,13 +312,15 @@ async function toggleTxnPageInfo(mode) {
312
312
  /**
313
313
  * 初始化界面占用信息
314
314
  */
315
- function initLockState() {
316
- if (_gct.store.context.scene === ContextSceneEnum.TXN || _gct.store.context.scene === ContextSceneEnum.DETAIL) return;
315
+ function initLockState(type) {
316
+ if (_gct.store.context.scene === ContextSceneEnum.TXN) return;
317
317
  const { setLockInfo, initOccupy, loadOccupyInfo } = useUserOccupy();
318
- initOccupy({
318
+ const initData = {
319
319
  id: _gct.store.context.pid || "",
320
320
  type: (platform.value === Platform.WEB ? PageTypeEnum.WEB : platform.value === Platform.PAD ? PageTypeEnum.PAD : PageTypeEnum.MOBILE).toString()
321
- });
321
+ };
322
+ if (type) initData.type = type;
323
+ initOccupy(initData);
322
324
  loadOccupyInfo();
323
325
  setLockInfo({
324
326
  id: pageInfo.value?.lockUserId,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@gct-paas/design",
3
- "version": "6.0.0-dev.2",
3
+ "version": "6.0.0-dev.4",
4
4
  "type": "module",
5
5
  "description": "paas 平台设计界面底包",
6
6
  "loader": "dist/loader.esm.min.js",
@@ -34,7 +34,7 @@
34
34
  "@ant-design/icons-vue": "^7.0.1",
35
35
  "@babel/core": "^7.29.0",
36
36
  "@babel/standalone": "^7.29.2",
37
- "@gct-paas/api": "^6.0.0-dev.2",
37
+ "@gct-paas/api": "^6.0.0-dev.4",
38
38
  "@jsplumb/browser-ui": "^6.2.10",
39
39
  "@vueuse/core": "^14.1.0",
40
40
  "ant-design-vue": "npm:@gct-paas/ant-design-vue@3.2.21",
@@ -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-web": "6.0.0-dev.2",
55
- "@gct-paas/core": "6.0.0-dev.2",
56
- "@gct-paas/schema": "6.0.0-dev.2",
57
- "@gct-paas/scss": "6.0.0-dev.2"
54
+ "@gct-paas/core-web": "6.0.0-dev.4",
55
+ "@gct-paas/scss": "6.0.0-dev.4",
56
+ "@gct-paas/schema": "6.0.0-dev.4",
57
+ "@gct-paas/core": "6.0.0-dev.4"
58
58
  },
59
59
  "devDependencies": {
60
60
  "@types/babel__core": "^7.20.5",
@@ -62,12 +62,12 @@
62
62
  "@types/estraverse": "^5.1.7"
63
63
  },
64
64
  "peerDependencies": {
65
- "@gct-paas/api": "^6.0.0-dev.2",
65
+ "@gct-paas/api": "^6.0.0-dev.4",
66
66
  "vue": ">=3",
67
- "@gct-paas/core": "6.0.0-dev.2",
68
- "@gct-paas/core-web": "6.0.0-dev.2",
69
- "@gct-paas/scss": "6.0.0-dev.2",
70
- "@gct-paas/schema": "6.0.0-dev.2"
67
+ "@gct-paas/core-web": "6.0.0-dev.4",
68
+ "@gct-paas/scss": "6.0.0-dev.4",
69
+ "@gct-paas/core": "6.0.0-dev.4",
70
+ "@gct-paas/schema": "6.0.0-dev.4"
71
71
  },
72
72
  "scripts": {
73
73
  "dev": "cross-env NODE_ENV=development vite build --watch --config vite.dev.config.ts",