@gct-paas/design 0.1.6-dev.9 → 6.0.0-dev.2

package/es/components/field-transfer/components/field-transfer-modal.vue.mjs

@@ -1,7 +1,7 @@
 import _plugin_vue_export_helper_default from "../../../_virtual/_plugin-vue_export-helper.mjs";
 import field_transfer_modal_vue_vue_type_script_setup_true_name_field_transfer_modal_lang_default from "./field-transfer-modal.vue_vue_type_script_setup_true_name_field-transfer-modal_lang.mjs";
-import './field-transfer-modal.vue_vue_type_style_index_0_scoped_711e6992_lang.css';/* empty css                                                                           */
+import './field-transfer-modal.vue_vue_type_style_index_0_scoped_2f34388d_lang.css';/* empty css                                                                           */
 //#region src/components/field-transfer/components/field-transfer-modal.vue
-var field_transfer_modal_default = /* @__PURE__ */ _plugin_vue_export_helper_default(field_transfer_modal_vue_vue_type_script_setup_true_name_field_transfer_modal_lang_default, [["__scopeId", "data-v-711e6992"]]);
+var field_transfer_modal_default = /* @__PURE__ */ _plugin_vue_export_helper_default(field_transfer_modal_vue_vue_type_script_setup_true_name_field_transfer_modal_lang_default, [["__scopeId", "data-v-2f34388d"]]);
 //#endregion
 export { field_transfer_modal_default as default };

package/es/components/field-transfer/components/field-transfer-modal.vue_vue_type_style_index_0_scoped_2f34388d_lang.css

@@ -0,0 +1,8 @@
+.field-transfer-container[data-v-2f34388d] {
+  position: relative;
+  width: 100%;
+  height: 100%;
+}
+.field-transfer-container .field-cascader[data-v-2f34388d] {
+  margin-bottom: 8px;
+}

package/es/components/index.d.ts

@@ -6,10 +6,6 @@ export default _default;
 export * from './design';
 export * from './material';
 export * from './panel';
-export { DesignSaveTip } from './design-save-tip/design-save-tip';
-export { DesignStepCheck } from './design-step-check/design-step-check';
-export { DesignViewLayout } from './design-view-layout/design-view-layout';
 export * from './field-transfer';
-export { ModalNameEditor } from './modal-name-editor/modal-name-editor';
 export * from './user-occupy';
 export * from './multi-field';

package/es/components/index.mjs

@@ -8,14 +8,9 @@ import "./material/material-content/material-content.mjs";
 import "./material/index.mjs";
 import "./panel/panel-content/panel-content.mjs";
 import "./panel/index.mjs";
-import "./design-save-tip/design-save-tip.mjs";
-import "./design-step-check/design-step-check.mjs";
-import "./modal-name-editor/modal-name-editor.mjs";
-import "./design-view-layout/design-view-layout.mjs";
 import "./field-transfer/components/Cascader/FieldCascader.mjs";
 import "./field-transfer/useFieldTransfer.mjs";
 import "./field-transfer/index.mjs";
-import "./user-occupy/useUserOccupy.mjs";
 import "./user-occupy/user-lock.vue.mjs";
 import "./user-occupy/user-occupy.vue.mjs";
 import "./user-occupy/index.mjs";

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/components/multi-field/multi-field-display.vue.mjs

@@ -1,7 +1,7 @@
 import _plugin_vue_export_helper_default from "../../_virtual/_plugin-vue_export-helper.mjs";
 import multi_field_display_vue_vue_type_script_setup_true_lang_default from "./multi-field-display.vue_vue_type_script_setup_true_lang.mjs";
-import './multi-field-display.vue_vue_type_style_index_0_scoped_802ade7b_lang.css';/* empty css                                                                          */
+import './multi-field-display.vue_vue_type_style_index_0_scoped_83390705_lang.css';/* empty css                                                                          */
 //#region src/components/multi-field/multi-field-display.vue
-var multi_field_display_default = /* @__PURE__ */ _plugin_vue_export_helper_default(multi_field_display_vue_vue_type_script_setup_true_lang_default, [["__scopeId", "data-v-802ade7b"]]);
+var multi_field_display_default = /* @__PURE__ */ _plugin_vue_export_helper_default(multi_field_display_vue_vue_type_script_setup_true_lang_default, [["__scopeId", "data-v-83390705"]]);
 //#endregion
 export { multi_field_display_default as default };

package/es/components/multi-field/multi-field-display.vue_vue_type_script_setup_true_lang.mjs

@@ -4,7 +4,7 @@ import { Fragment, computed, createCommentVNode, createElementBlock, createVNode
 //#region src/components/multi-field/multi-field-display.vue?vue&type=script&setup=true&lang.ts
 var _hoisted_1 = {
 	key: 0,
-	class: "flex tag-area"
+	class: "flex tag-area items-center"
 };
 var multi_field_display_vue_vue_type_script_setup_true_lang_default = /* @__PURE__ */ defineComponent({
 	__name: "multi-field-display",

package/es/components/multi-field/{multi-field-display.vue_vue_type_style_index_0_scoped_802ade7b_lang.css → multi-field-display.vue_vue_type_style_index_0_scoped_83390705_lang.css}

@@ -1,4 +1,4 @@
-.tag-area[data-v-802ade7b] {
+.tag-area[data-v-83390705] {
   flex-wrap: nowrap;
   width: auto;
 }

package/es/components/user-occupy/index.d.ts

@@ -1,4 +1,3 @@
 import { default as UserLock } from './user-lock.vue';
 import { default as UserOccupy } from './user-occupy.vue';
 export { UserLock, UserOccupy };
-export { useUserOccupy } from './useUserOccupy';

package/es/components/user-occupy/index.mjs

@@ -1,3 +1,2 @@
-import "./useUserOccupy.mjs";
 import "./user-lock.vue.mjs";
 import "./user-occupy.vue.mjs";

package/es/components/user-occupy/user-lock.vue.mjs

@@ -1,7 +1,7 @@
 import _plugin_vue_export_helper_default from "../../_virtual/_plugin-vue_export-helper.mjs";
 import user_lock_vue_vue_type_script_setup_true_lang_default from "./user-lock.vue_vue_type_script_setup_true_lang.mjs";
-import './user-lock.vue_vue_type_style_index_0_scoped_b40d46ff_lang.css';/* empty css                                                                */
+import './user-lock.vue_vue_type_style_index_0_scoped_143659f6_lang.css';/* empty css                                                                */
 //#region src/components/user-occupy/user-lock.vue
-var user_lock_default = /* @__PURE__ */ _plugin_vue_export_helper_default(user_lock_vue_vue_type_script_setup_true_lang_default, [["__scopeId", "data-v-b40d46ff"]]);
+var user_lock_default = /* @__PURE__ */ _plugin_vue_export_helper_default(user_lock_vue_vue_type_script_setup_true_lang_default, [["__scopeId", "data-v-143659f6"]]);
 //#endregion
 export { user_lock_default as default };

package/es/components/user-occupy/user-lock.vue_vue_type_script_setup_true_lang.mjs

@@ -1,4 +1,5 @@
-import { useUserOccupy } from "./useUserOccupy.mjs";
+import { useUserOccupy } from "../../hooks/design-view/components/useUserOccupy.mjs";
+import "../../hooks/index.mjs";
 import { t } from "@gct-paas/core";
 import { Fragment, createCommentVNode, createElementBlock, createElementVNode, defineComponent, normalizeClass, openBlock, toDisplayString, unref } from "vue";
 //#region src/components/user-occupy/user-lock.vue?vue&type=script&setup=true&lang.ts

package/es/components/user-occupy/user-lock.vue_vue_type_style_index_0_scoped_143659f6_lang.css

@@ -0,0 +1,29 @@
+.user-lock[data-v-143659f6] {
+  color: rgba(255, 255, 255, 0.72);
+  cursor: pointer;
+}
+.user-lock .user-lock-info[data-v-143659f6] {
+  padding-right: 4px;
+  color: rgba(255, 255, 255, 0.72);
+}
+.user-lock .iconfont[data-v-143659f6] {
+  color: rgba(255, 255, 255, 0.72);
+  margin-right: 6px;
+  margin-left: 6px;
+}
+.user-lock[data-v-143659f6]:hover {
+  color: #ffffff;
+}
+.user-lock:hover .iconfont[data-v-143659f6],
+.user-lock:hover .user-lock-info[data-v-143659f6] {
+  color: #ffffff;
+}
+.user-lock.locked[data-v-143659f6] {
+  color: #ff8c4b;
+}
+.user-lock.locked .iconfont[data-v-143659f6] {
+  color: #ff8c4b;
+}
+.user-lock.locked .user-lock-info[data-v-143659f6] {
+  color: #ffffff;
+}

package/es/components/user-occupy/user-occupy.vue.mjs

@@ -1,7 +1,7 @@
 import _plugin_vue_export_helper_default from "../../_virtual/_plugin-vue_export-helper.mjs";
 import user_occupy_vue_vue_type_script_setup_true_lang_default from "./user-occupy.vue_vue_type_script_setup_true_lang.mjs";
-import './user-occupy.vue_vue_type_style_index_0_scoped_9b136922_lang.css';/* empty css                                                                  */
+import './user-occupy.vue_vue_type_style_index_0_scoped_1234af11_lang.css';/* empty css                                                                  */
 //#region src/components/user-occupy/user-occupy.vue
-var user_occupy_default = /* @__PURE__ */ _plugin_vue_export_helper_default(user_occupy_vue_vue_type_script_setup_true_lang_default, [["__scopeId", "data-v-9b136922"]]);
+var user_occupy_default = /* @__PURE__ */ _plugin_vue_export_helper_default(user_occupy_vue_vue_type_script_setup_true_lang_default, [["__scopeId", "data-v-1234af11"]]);
 //#endregion
 export { user_occupy_default as default };

package/es/components/user-occupy/user-occupy.vue_vue_type_script_setup_true_lang.mjs

@@ -1,4 +1,5 @@
-import { useUserOccupy } from "./useUserOccupy.mjs";
+import { useUserOccupy } from "../../hooks/design-view/components/useUserOccupy.mjs";
+import "../../hooks/index.mjs";
 import { t } from "@gct-paas/core";
 import { computed, createCommentVNode, createElementBlock, createElementVNode, createTextVNode, createVNode, defineComponent, openBlock, resolveComponent, toDisplayString, unref } from "vue";
 //#region src/components/user-occupy/user-occupy.vue?vue&type=script&setup=true&lang.ts

package/es/components/user-occupy/{user-occupy.vue_vue_type_style_index_0_scoped_9b136922_lang.css → user-occupy.vue_vue_type_style_index_0_scoped_1234af11_lang.css}

@@ -1,25 +1,25 @@
-.gct-svg-icon[data-v-9b136922] {
+.gct-svg-icon[data-v-1234af11] {
   margin-right: 8px;
   font-size: 16px;
 }
-.user-occupy[data-v-9b136922] {
+.user-occupy[data-v-1234af11] {
   color: #fff;
   display: flex;
   align-items: center;
   line-height: 1em;
   font-size: 12px;
 }
-.user-occupy__username[data-v-9b136922] {
+.user-occupy__username[data-v-1234af11] {
   color: var(--ant-primary-color);
   display: inline-block;
   white-space: nowrap;
   overflow: hidden;
   vertical-align: bottom;
 }
-.user-occupy .iconfont[data-v-9b136922] {
+.user-occupy .gct-assets-svg-icon[data-v-1234af11] {
   margin-right: 6px;
 }
-.designer-stage .user-occupy[data-v-9b136922],
-.so-toolbar .user-occupy[data-v-9b136922] {
+.designer-stage .user-occupy[data-v-1234af11],
+.so-toolbar .user-occupy[data-v-1234af11] {
   color: #5c616a;
 }

package/es/constant/index.d.ts

@@ -228,3 +228,8 @@ export declare enum DesignItemActionTag {
      */
     SELECT_PARENT = "select-parent"
 }
+export declare const newKeyTag = "___new___";
+/**
+ * occupy 的 mqtt 唯一实例的 key 标识
+ */
+export declare const OCCUPY_MQTT_KEY = "occupy_mqtt_key";

package/es/constant/index.mjs

@@ -237,5 +237,10 @@ var DesignItemActionTag = /* @__PURE__ */ function(DesignItemActionTag) {
 	DesignItemActionTag["SELECT_PARENT"] = "select-parent";
 	return DesignItemActionTag;
 }({});
+var newKeyTag = "___new___";
+/**
+* occupy 的 mqtt 唯一实例的 key 标识
+*/
+var OCCUPY_MQTT_KEY = "occupy_mqtt_key";
 //#endregion
-export { ControllerType, DesignItemActionTag, DesignItemAttribute, DesignNodePrefix, DesignNodeType, DesignViewPrefix, InsertNodeMode, MaterialGroup };
+export { ControllerType, DesignItemActionTag, DesignItemAttribute, DesignNodePrefix, DesignNodeType, DesignViewPrefix, InsertNodeMode, MaterialGroup, OCCUPY_MQTT_KEY, newKeyTag };

package/es/constant/page-designer.d.ts

@@ -1,23 +1,9 @@
-import { FormDesignEnum, PrintTypeEnum } from '@gct-paas/core';
+import { FormDesignEnum, PrintTypeEnum, ProcessTypeEnum, ScriptTypeEnum, ModelTypeEnum } from '@gct-paas/core';
 export declare enum MenuClickEvent {
     NEW = "new",
     EDIT = "edit",
     DELETE = "delete"
 }
-export declare enum ModelTypeEnum {
-    /** 实体模型 */
-    ENTITY = "entity_module",
-    /** 枚举 */
-    ENUM = "enum_module",
-    /** 虚拟 */
-    VIRTUAL = 5,
-    /** 视图 */
-    VIEW = "view_model_module",
-    /** SQL */
-    SQL = 7,
-    /** 数据 */
-    DATA = "data_model"
-}
 export declare enum PageTypeEnum {
     /** WEB */
     WEB = "web_module",
@@ -28,37 +14,24 @@ export declare enum PageTypeEnum {
     /** 统计 */
     STATISTICS = 8
 }
-export declare enum ScriptTypeEnum {
-    /** 公共方法 */
-    GLOBAL_METHOD = "global_method_module",
-    /** 脚本 */
-    DEFAULT = "script_module",
-    /** 编排 */
-    ORCHESTRATION = "so_module"
-}
-export declare enum ProcessTypeEnum {
-    /** 业务流 */
-    /** 审批流 */
-    APPROVAL = "approval_process_module"
-}
 export declare const CategoryEnum: {
-    ONLINE_FORM: FormDesignEnum.ONLINE_FORM;
-    EDHR: FormDesignEnum.EDHR;
-    LABEL: PrintTypeEnum.LABEL;
-    RECEIPT: PrintTypeEnum.RECEIPT;
+    GLOBAL_METHOD: ScriptTypeEnum.GLOBAL_METHOD;
+    DEFAULT: ScriptTypeEnum.DEFAULT;
+    ORCHESTRATION: ScriptTypeEnum.ORCHESTRATION;
     ENTITY: ModelTypeEnum.ENTITY;
     ENUM: ModelTypeEnum.ENUM;
     VIRTUAL: ModelTypeEnum.VIRTUAL;
     VIEW: ModelTypeEnum.VIEW;
     SQL: ModelTypeEnum.SQL;
     DATA: ModelTypeEnum.DATA;
+    ONLINE_FORM: FormDesignEnum.ONLINE_FORM;
+    EDHR: FormDesignEnum.EDHR;
+    LABEL: PrintTypeEnum.LABEL;
+    RECEIPT: PrintTypeEnum.RECEIPT;
+    APPROVAL: ProcessTypeEnum.APPROVAL;
     WEB: PageTypeEnum.WEB;
     MOBILE: PageTypeEnum.MOBILE;
     PAD: PageTypeEnum.PAD;
     STATISTICS: PageTypeEnum.STATISTICS;
-    GLOBAL_METHOD: ScriptTypeEnum.GLOBAL_METHOD;
-    DEFAULT: ScriptTypeEnum.DEFAULT;
-    ORCHESTRATION: ScriptTypeEnum.ORCHESTRATION;
-    APPROVAL: ProcessTypeEnum.APPROVAL;
 };
 export type CategoryType = ModelTypeEnum | PageTypeEnum | ScriptTypeEnum | PrintTypeEnum | ProcessTypeEnum;

package/es/constant/page-designer.mjs

@@ -1,4 +1,4 @@
-import { FormDesignEnum, PrintTypeEnum } from "@gct-paas/core";
+import { FormDesignEnum, ModelTypeEnum, PrintTypeEnum, ProcessTypeEnum, ScriptTypeEnum } from "@gct-paas/core";
 //#region src/constant/page-designer.ts
 var MenuClickEvent = /* @__PURE__ */ function(MenuClickEvent) {
 	MenuClickEvent["NEW"] = "new";
@@ -6,21 +6,6 @@ var MenuClickEvent = /* @__PURE__ */ function(MenuClickEvent) {
 	MenuClickEvent["DELETE"] = "delete";
 	return MenuClickEvent;
 }({});
-var ModelTypeEnum = /* @__PURE__ */ function(ModelTypeEnum) {
-	/** 实体模型 */
-	ModelTypeEnum["ENTITY"] = "entity_module";
-	/** 枚举 */
-	ModelTypeEnum["ENUM"] = "enum_module";
-	/** 虚拟 */
-	ModelTypeEnum[ModelTypeEnum["VIRTUAL"] = 5] = "VIRTUAL";
-	/** 视图 */
-	ModelTypeEnum["VIEW"] = "view_model_module";
-	/** SQL */
-	ModelTypeEnum[ModelTypeEnum["SQL"] = 7] = "SQL";
-	/** 数据 */
-	ModelTypeEnum["DATA"] = "data_model";
-	return ModelTypeEnum;
-}({});
 var PageTypeEnum = /* @__PURE__ */ function(PageTypeEnum) {
 	/** WEB */
 	PageTypeEnum["WEB"] = "web_module";
@@ -32,21 +17,6 @@ var PageTypeEnum = /* @__PURE__ */ function(PageTypeEnum) {
 	PageTypeEnum[PageTypeEnum["STATISTICS"] = 8] = "STATISTICS";
 	return PageTypeEnum;
 }({});
-var ScriptTypeEnum = /* @__PURE__ */ function(ScriptTypeEnum) {
-	/** 公共方法 */
-	ScriptTypeEnum["GLOBAL_METHOD"] = "global_method_module";
-	/** 脚本 */
-	ScriptTypeEnum["DEFAULT"] = "script_module";
-	/** 编排 */
-	ScriptTypeEnum["ORCHESTRATION"] = "so_module";
-	return ScriptTypeEnum;
-}({});
-var ProcessTypeEnum = /* @__PURE__ */ function(ProcessTypeEnum) {
-	/** 业务流 */
-	/** 审批流 */
-	ProcessTypeEnum["APPROVAL"] = "approval_process_module";
-	return ProcessTypeEnum;
-}({});
 var CategoryEnum = {
 	...ModelTypeEnum,
 	...PageTypeEnum,
@@ -56,4 +26,4 @@ var CategoryEnum = {
 	...FormDesignEnum
 };
 //#endregion
-export { CategoryEnum, MenuClickEvent, ModelTypeEnum, PageTypeEnum, ProcessTypeEnum, ScriptTypeEnum };
+export { CategoryEnum, MenuClickEvent, PageTypeEnum };

package/es/{components/user-occupy → hooks/design-view/components}/useUserOccupy.d.ts

@@ -1,11 +1,10 @@
 import { PageOccupyResponse } from '@gct-paas/api/apaas';
-import { DebouncedFunc } from 'lodash-es';
 import { getGetPageOccupyMsgQuery } from '@gct-paas/api/apaas/apis/designer-lock.service';
 interface IUserLockInfo {
     id?: string;
     name?: string;
 }
-export declare function useUserOccupy(): {
+declare function _useUserOccupy(): {
     initOccupy: (data: getGetPageOccupyMsgQuery) => void;
     loadOccupyInfo: () => Promise<void>;
     occupyInfo: import('vue').Ref<{
@@ -21,7 +20,7 @@ export declare function useUserOccupy(): {
         occupyName?: string | undefined;
         querySpanNum?: number | undefined;
     }>;
-    occupy: DebouncedFunc<() => Promise<void>>;
+    occupy: () => Promise<void> | undefined;
     cancelOccupy: () => Promise<void>;
     setLockInfo: (data: IUserLockInfo) => void;
     lockInfo: import('vue').Ref<{
@@ -35,4 +34,5 @@ export declare function useUserOccupy(): {
     lock: () => Promise<void>;
     unlock: () => Promise<void>;
 };
+export declare const useUserOccupy: typeof _useUserOccupy;
 export {};

package/es/{components/user-occupy → hooks/design-view/components}/useUserOccupy.mjs

@@ -1,23 +1,22 @@
-import { PageTypeEnum, ScriptTypeEnum } from "../../constant/page-designer.mjs";
-import "../../constant/index.mjs";
-import "../../hooks/design-view/page/usePage.mjs";
-import "../../hooks/index.mjs";
-import { OCCUPY_MQTT_KEY } from "./occupy.const.mjs";
+import { PageTypeEnum } from "../../../constant/page-designer.mjs";
+import { OCCUPY_MQTT_KEY } from "../../../constant/index.mjs";
+import { pageInfo } from "../design-state.mjs";
 import { throttle } from "lodash-es";
-import { t } from "@gct-paas/core";
+import { ScriptTypeEnum, t } from "@gct-paas/core";
 import { computed, createVNode, ref } from "vue";
 import { ExclamationCircleOutlined } from "@ant-design/icons-vue";
+import { createSharedComposable } from "@vueuse/core";
 import { Modal } from "ant-design-vue";
-//#region src/components/user-occupy/useUserOccupy.ts
+//#region src/hooks/design-view/components/useUserOccupy.ts
 var i18nKeyMap = {
 	[PageTypeEnum.WEB]: "sys.page",
 	[PageTypeEnum.MOBILE]: "sys.page",
 	[PageTypeEnum.PAD]: "sys.page",
 	[ScriptTypeEnum.DEFAULT]: "sys.script"
 };
-/** 参数 */
-var params = {};
-function useUserOccupy() {
+function _useUserOccupy() {
+	/** 参数 */
+	let params = {};
 	/** 占用信息 */
 	const occupyInfo = ref({});
 	/** 锁定信息 */
@@ -30,10 +29,19 @@ function useUserOccupy() {
 	});
 	const unlockAvailable = computed(() => {
 		const { userId, username } = _gct.store.userInfo;
-		return lockInfo.value.id === userId || username === "admin";
+		const lockUserId = lockInfo.value.id;
+		if (!lockUserId) return false;
+		return String(lockUserId) === String(userId) || username === "admin";
 	});
+	function applyLockInfo(data) {
+		lockInfo.value = data;
+		pageInfo.value.lockUserId = data.id || "";
+		pageInfo.value.lockUserName = data.name || "";
+	}
 	/** 查询占用定时器 */
 	let occupyTimer = null;
+	/** 节流 wait 是否已按真实 cacheNum 初始化 */
+	let _occupyThrottleInitialized = false;
 	async function _loadOccupyInfo() {
 		if (!params.id || !params.type || params.id.startsWith("___new___")) return;
 		const res = await _api.apaas.designerLock.getGetPageOccupyMsg(params);
@@ -41,6 +49,11 @@ function useUserOccupy() {
 		if (!data.querySpanNum) data.querySpanNum = 120;
 		if (!data.cacheNum) data.cacheNum = 500;
 		occupyInfo.value = data;
+		if (wait.value > 0 && !_occupyThrottleInitialized) {
+			_occupyThrottle.cancel();
+			_occupyThrottle = throttle(_occupy, wait.value, { trailing: false });
+			_occupyThrottleInitialized = true;
+		}
 		if (res?.occupyId) destoryOccupyTimer();
 		else if (!occupyTimer) occupyTimer = setInterval(() => {
 			_loadOccupyInfo();
@@ -67,17 +80,20 @@ function useUserOccupy() {
 				})
 			}
 		}).subscribe(CLEAN_CACHE, () => {
-			const currentUrl = window.location.href;
-			if (currentUrl.includes("?")) if (currentUrl.includes("reloadTime")) {
-				const arr = currentUrl.split("reloadTime=");
-				arr[1] = Date.now().toString();
-				window.location.href = arr.join("reloadTime=");
-			} else window.location.href = currentUrl + "&reloadTime=" + Date.now();
-			else window.location.href = currentUrl + "?reloadTime=" + Date.now();
+			const url = new URL(window.location.href);
+			url.searchParams.set("reloadTime", Date.now().toString());
+			window.location.href = url.toString();
 			location.reload();
 		});
 	}
 	function initOccupy(data) {
+		destoryOccupyTimer();
+		if (_gct.mqtt.has("occupy_mqtt_key")) _gct.mqtt.destroy(OCCUPY_MQTT_KEY);
+		occupyInfo.value = {};
+		lockInfo.value = {};
+		_occupyThrottle.cancel();
+		_occupyThrottle = throttle(_occupy, 0, { trailing: false });
+		_occupyThrottleInitialized = false;
 		params = data;
 		initMqttOccupy(params);
 	}
@@ -89,29 +105,32 @@ function useUserOccupy() {
 		if (lockInfo.value.id) return;
 		if (_gct.store.userInfo.userId !== occupyInfo.value.occupyId && occupyInfo.value.occupyId) return;
 		try {
-			await _api.apaas.designerLock.getGetPageOccupyMsg(params);
+			await _api.apaas.designerLock.postOccupyPage(params);
 		} catch (err) {
 			console.warn("【占用异常】", err);
 		} finally {
 			await _loadOccupyInfo();
 		}
 	}
+	let _occupyThrottle = throttle(_occupy, 0, { trailing: false });
 	/**
 	* 占用
 	*/
-	const occupy = throttle(_occupy, wait.value, { trailing: false });
+	function occupy() {
+		return _occupyThrottle();
+	}
 	/**
 	* 取消占用
 	*/
 	async function cancelOccupy() {
 		if (!params.id || !params.type) return;
 		if (lockInfo.value.id) return;
-		occupy.cancel();
+		_occupyThrottle.cancel();
 		await _api.apaas.designerLock.postCancelOccupyPage(params);
 		await _loadOccupyInfo();
 	}
 	function setLockInfo(data) {
-		lockInfo.value = data;
+		applyLockInfo(data);
 	}
 	/**
 	* 锁定
@@ -127,10 +146,10 @@ function useUserOccupy() {
 			async onOk() {
 				await _api.apaas.designerLock.postLockPage(params);
 				_gct.message.success(t("sys.operationSuccess"));
-				lockInfo.value = {
-					id: _gct.store.userInfo.userId,
+				applyLockInfo({
+					id: String(_gct.store.userInfo.userId),
 					name: _gct.store.userInfo.fullname
-				};
+				});
 			}
 		});
 	}
@@ -138,12 +157,13 @@ function useUserOccupy() {
 	* 解锁
 	*/
 	async function unlock() {
+		if (!unlockAvailable.value) return;
 		await _api.apaas.designerLock.postUnLockPage(params);
 		_gct.message.success(t("sys.operationSuccess"));
-		lockInfo.value = {
+		applyLockInfo({
 			id: "",
 			name: ""
-		};
+		});
 	}
 	return {
 		initOccupy,
@@ -158,5 +178,6 @@ function useUserOccupy() {
 		unlock
 	};
 }
+var useUserOccupy = createSharedComposable(_useUserOccupy);
 //#endregion
 export { useUserOccupy };