@tmagic/editor 1.5.24 → 1.6.0-beta.1

package/LICENSE

@@ -1,6 +1,6 @@
 Tencent is pleased to support the open source community by making TMagicEditor available. 
 
-Copyright (C) 2023 THL A29 Limited, a Tencent company.  All rights reserved. 
+Copyright (C) 2025 Tencent.  All rights reserved. 
 
 TMagicEditor is licensed under the Apache License Version 2.0 except for the third-party components listed below.
 

package/dist/tmagic-editor.js

@@ -15766,7 +15766,7 @@ const defaultEditorProps = {
   eventMethodList: () => ({}),
   datasourceValues: () => ({}),
   datasourceConfigs: () => ({}),
-  canSelect: (el) => Boolean(getIdFromEl()(el)),
+  canSelect: (el) => Boolean(getIdFromEl()(el) && !el.dataset.tmagicPageFragmentContainerId),
   isContainer: (el) => el.classList.contains("magic-ui-container"),
   codeOptions: () => ({}),
   customContentMenu: (menus) => menus
@@ -16062,8 +16062,8 @@ const initServiceEvents = (props, emit, { editorService, codeBlockService, dataS
     });
     if (value) {
       depService.clearIdleTasks();
+      await (typeof Worker === "undefined" ? collectIdle(value.items, true) : depService.collectByWorker(value));
       const dsl = cloneDeep(toRaw(value));
-      await (typeof Worker === "undefined" ? collectIdle(dsl.items, true) : depService.collectByWorker(dsl));
       if (dsl.dataSources && dsl.dataSourceDeps && app?.dataSourceManager) {
         for (const node2 of getNodes(getDepNodeIds(dsl.dataSourceDeps), dsl.items)) {
           updateNode(app.dataSourceManager.compiledNode(node2), dsl);
@@ -16371,7 +16371,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     datasourceValues: {},
     datasourceConfigs: {},
     datasourceEventMethodList: {},
-    moveableOptions: { type: [Object, Function] },
+    moveableOptions: { type: [Function, Object] },
     defaultSelected: {},
     containerHighlightClassName: {},
     containerHighlightDuration: {},

package/dist/tmagic-editor.umd.cjs

@@ -20559,7 +20559,7 @@
     eventMethodList: () => ({}),
     datasourceValues: () => ({}),
     datasourceConfigs: () => ({}),
-    canSelect: (el) => Boolean(utils.getIdFromEl()(el)),
+    canSelect: (el) => Boolean(utils.getIdFromEl()(el) && !el.dataset.tmagicPageFragmentContainerId),
     isContainer: (el) => el.classList.contains("magic-ui-container"),
     codeOptions: () => ({}),
     customContentMenu: (menus) => menus
@@ -20855,8 +20855,8 @@
       });
       if (value) {
         depService.clearIdleTasks();
+        await (typeof Worker === "undefined" ? collectIdle(value.items, true) : depService.collectByWorker(value));
         const dsl = cloneDeep(vue.toRaw(value));
-        await (typeof Worker === "undefined" ? collectIdle(dsl.items, true) : depService.collectByWorker(dsl));
         if (dsl.dataSources && dsl.dataSourceDeps && app?.dataSourceManager) {
           for (const node2 of utils.getNodes(utils.getDepNodeIds(dsl.dataSourceDeps), dsl.items)) {
             core.updateNode(app.dataSourceManager.compiledNode(node2), dsl);
@@ -21164,7 +21164,7 @@
       datasourceValues: {},
       datasourceConfigs: {},
       datasourceEventMethodList: {},
-      moveableOptions: { type: [Object, Function] },
+      moveableOptions: { type: [Function, Object] },
       defaultSelected: {},
       containerHighlightClassName: {},
       containerHighlightDuration: {},

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.5.24",
+  "version": "1.6.0-beta.1",
   "name": "@tmagic/editor",
   "type": "module",
   "sideEffects": [
@@ -58,11 +58,11 @@
     "moveable": "^0.53.0",
     "serialize-javascript": "^6.0.2",
     "sortablejs": "^1.15.6",
-    "@tmagic/form": "1.5.24",
-    "@tmagic/stage": "1.5.24",
-    "@tmagic/utils": "1.5.24",
-    "@tmagic/design": "1.5.24",
-    "@tmagic/table": "1.5.24"
+    "@tmagic/design": "1.6.0-beta.1",
+    "@tmagic/form": "1.6.0-beta.1",
+    "@tmagic/table": "1.6.0-beta.1",
+    "@tmagic/utils": "1.6.0-beta.1",
+    "@tmagic/stage": "1.6.0-beta.1"
   },
   "devDependencies": {
     "@types/events": "^3.0.3",
@@ -76,7 +76,7 @@
     "monaco-editor": "^0.48.0",
     "typescript": "^5.8.3",
     "vue": "^3.5.17",
-    "@tmagic/core": "1.5.24"
+    "@tmagic/core": "1.6.0-beta.1"
   },
   "peerDependenciesMeta": {
     "typescript": {

package/src/editorProps.ts

@@ -3,9 +3,8 @@ import type { FormConfig, FormState } from '@tmagic/form';
 import StageCore, {
   CONTAINER_HIGHLIGHT_CLASS_NAME,
   ContainerHighlightType,
-  type CustomizeMoveableOptionsCallbackConfig,
+  type CustomizeMoveableOptions,
   type GuidesOptions,
-  type MoveableOptions,
   RenderType,
   type UpdateDragEl,
 } from '@tmagic/stage';
@@ -56,7 +55,7 @@ export interface EditorProps {
   datasourceConfigs?: Record<string, FormConfig>;
   datasourceEventMethodList?: Record<string, { events: EventOption[]; methods: EventOption[] }>;
   /** 画布中组件选中框的移动范围 */
-  moveableOptions?: MoveableOptions | ((config?: CustomizeMoveableOptionsCallbackConfig) => MoveableOptions);
+  moveableOptions?: CustomizeMoveableOptions;
   /** 编辑器初始化时默认选中的组件ID */
   defaultSelected?: Id;
   /** 拖入画布中容器时，识别到容器后给容器根dom加上的class */
@@ -127,7 +126,7 @@ export const defaultEditorProps = {
   eventMethodList: () => ({}),
   datasourceValues: () => ({}),
   datasourceConfigs: () => ({}),
-  canSelect: (el: HTMLElement) => Boolean(getIdFromEl()(el)),
+  canSelect: (el: HTMLElement) => Boolean(getIdFromEl()(el) && !el.dataset.tmagicPageFragmentContainerId),
   isContainer: (el: HTMLElement) => el.classList.contains('magic-ui-container'),
   codeOptions: () => ({}),
   customContentMenu: (menus: (MenuButton | MenuComponent)[]) => menus,

package/src/hooks/index.ts

@@ -1,7 +1,7 @@
 /*
  * Tencent is pleased to support the open source community by making TMagicEditor available.
  *
- * Copyright (C) 2023 THL A29 Limited, a Tencent company.  All rights reserved.
+ * Copyright (C) 2025 Tencent.  All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/src/index.ts

@@ -1,7 +1,7 @@
 /*
  * Tencent is pleased to support the open source community by making TMagicEditor available.
  *
- * Copyright (C) 2023 THL A29 Limited, a Tencent company.  All rights reserved.
+ * Copyright (C) 2025 Tencent.  All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/src/initService.ts

@@ -388,10 +388,9 @@ export const initServiceEvents = (
     if (value) {
       depService.clearIdleTasks();
 
-      const dsl = cloneDeep(toRaw(value));
-
-      await (typeof Worker === 'undefined' ? collectIdle(dsl.items, true) : depService.collectByWorker(dsl));
+      await (typeof Worker === 'undefined' ? collectIdle(value.items, true) : depService.collectByWorker(value));
 
+      const dsl = cloneDeep(toRaw(value));
       if (dsl.dataSources && dsl.dataSourceDeps && app?.dataSourceManager) {
         for (const node of getNodes(getDepNodeIds(dsl.dataSourceDeps), dsl.items)) {
           updateNode(app.dataSourceManager.compiledNode(node), dsl);

package/src/services/BaseService.ts

@@ -2,7 +2,7 @@
 /*
  * Tencent is pleased to support the open source community by making TMagicEditor available.
  *
- * Copyright (C) 2023 THL A29 Limited, a Tencent company.  All rights reserved.
+ * Copyright (C) 2025 Tencent.  All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/src/services/codeBlock.ts

@@ -1,7 +1,7 @@
 /*
  * Tencent is pleased to support the open source community by making TMagicEditor available.
  *
- * Copyright (C) 2023 THL A29 Limited, a Tencent company.  All rights reserved.
+ * Copyright (C) 2025 Tencent.  All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/src/services/componentList.ts

@@ -1,7 +1,7 @@
 /*
  * Tencent is pleased to support the open source community by making TMagicEditor available.
  *
- * Copyright (C) 2023 THL A29 Limited, a Tencent company.  All rights reserved.
+ * Copyright (C) 2025 Tencent.  All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/src/services/dep.ts

@@ -1,7 +1,7 @@
 /*
  * Tencent is pleased to support the open source community by making TMagicEditor available.
  *
- * Copyright (C) 2023 THL A29 Limited, a Tencent company.  All rights reserved.
+ * Copyright (C) 2025 Tencent.  All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/src/services/editor.ts

@@ -1,7 +1,7 @@
 /*
  * Tencent is pleased to support the open source community by making TMagicEditor available.
  *
- * Copyright (C) 2023 THL A29 Limited, a Tencent company.  All rights reserved.
+ * Copyright (C) 2025 Tencent.  All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/src/services/events.ts

@@ -1,7 +1,7 @@
 /*
  * Tencent is pleased to support the open source community by making TMagicEditor available.
  *
- * Copyright (C) 2023 THL A29 Limited, a Tencent company.  All rights reserved.
+ * Copyright (C) 2025 Tencent.  All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/src/services/history.ts

@@ -1,7 +1,7 @@
 /*
  * Tencent is pleased to support the open source community by making TMagicEditor available.
  *
- * Copyright (C) 2023 THL A29 Limited, a Tencent company.  All rights reserved.
+ * Copyright (C) 2025 Tencent.  All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/src/services/props.ts

@@ -1,7 +1,7 @@
 /*
  * Tencent is pleased to support the open source community by making TMagicEditor available.
  *
- * Copyright (C) 2023 THL A29 Limited, a Tencent company.  All rights reserved.
+ * Copyright (C) 2025 Tencent.  All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/src/services/ui.ts

@@ -1,7 +1,7 @@
 /*
  * Tencent is pleased to support the open source community by making TMagicEditor available.
  *
- * Copyright (C) 2023 THL A29 Limited, a Tencent company.  All rights reserved.
+ * Copyright (C) 2025 Tencent.  All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/src/type.ts

@@ -1,7 +1,7 @@
 /*
  * Tencent is pleased to support the open source community by making TMagicEditor available.
  *
- * Copyright (C) 2023 THL A29 Limited, a Tencent company.  All rights reserved.
+ * Copyright (C) 2025 Tencent.  All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,9 +26,8 @@ import type { FormConfig, TableColumnConfig } from '@tmagic/form';
 import type StageCore from '@tmagic/stage';
 import type {
   ContainerHighlightType,
-  CustomizeMoveableOptionsCallbackConfig,
+  CustomizeMoveableOptions,
   GuidesOptions,
-  MoveableOptions,
   RenderType,
   UpdateDragEl,
 } from '@tmagic/stage';
@@ -157,7 +156,7 @@ export interface StageOptions {
   containerHighlightType?: ContainerHighlightType;
   disabledDragStart?: boolean;
   render?: (stage: StageCore) => HTMLDivElement | void | Promise<HTMLDivElement | void>;
-  moveableOptions?: MoveableOptions | ((config?: CustomizeMoveableOptionsCallbackConfig) => MoveableOptions);
+  moveableOptions?: CustomizeMoveableOptions;
   canSelect?: (el: HTMLElement) => boolean | Promise<boolean>;
   isContainer?: (el: HTMLElement) => boolean | Promise<boolean>;
   updateDragEl?: UpdateDragEl;

package/src/utils/config.ts

@@ -1,7 +1,7 @@
 /*
  * Tencent is pleased to support the open source community by making TMagicEditor available.
  *
- * Copyright (C) 2023 THL A29 Limited, a Tencent company.  All rights reserved.
+ * Copyright (C) 2025 Tencent.  All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/src/utils/editor.ts

@@ -1,7 +1,7 @@
 /*
  * Tencent is pleased to support the open source community by making TMagicEditor available.
  *
- * Copyright (C) 2023 THL A29 Limited, a Tencent company.  All rights reserved.
+ * Copyright (C) 2025 Tencent.  All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/src/utils/index.ts

@@ -1,7 +1,7 @@
 /*
  * Tencent is pleased to support the open source community by making TMagicEditor available.
  *
- * Copyright (C) 2023 THL A29 Limited, a Tencent company.  All rights reserved.
+ * Copyright (C) 2025 Tencent.  All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/src/utils/logger.ts

@@ -1,7 +1,7 @@
 /*
  * Tencent is pleased to support the open source community by making TMagicEditor available.
  *
- * Copyright (C) 2023 THL A29 Limited, a Tencent company.  All rights reserved.
+ * Copyright (C) 2025 Tencent.  All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/src/utils/props.ts

@@ -2,7 +2,7 @@
 /*
  * Tencent is pleased to support the open source community by making TMagicEditor available.
  *
- * Copyright (C) 2023 THL A29 Limited, a Tencent company.  All rights reserved.
+ * Copyright (C) 2025 Tencent.  All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/src/utils/undo-redo.ts

@@ -1,7 +1,7 @@
 /*
  * Tencent is pleased to support the open source community by making TMagicEditor available.
  *
- * Copyright (C) 2023 THL A29 Limited, a Tencent company.  All rights reserved.
+ * Copyright (C) 2025 Tencent.  All rights reserved.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

package/types/index.d.ts

@@ -12,7 +12,7 @@ import * as _tmagic_core from '@tmagic/core';
 import { CodeBlockDSL, Id, CodeBlockContent, MNode, TargetOptions, DataSourceSchema, EventOption, Target, DepExtendedData, DepTargetType, MApp, DepData, MContainer, MPage, MPageFragment, NodeType, DataSchema, DataSourceFieldType, DisplayCond } from '@tmagic/core';
 export { DepTargetType } from '@tmagic/core';
 import * as StageCore from '@tmagic/stage';
-import StageCore__default, { ContainerHighlightType, MoveableOptions, CustomizeMoveableOptionsCallbackConfig, UpdateDragEl, RenderType, GuidesOptions } from '@tmagic/stage';
+import StageCore__default, { ContainerHighlightType, CustomizeMoveableOptions, UpdateDragEl, RenderType, GuidesOptions } from '@tmagic/stage';
 export * from '@tmagic/stage';
 export { default as StageCore } from '@tmagic/stage';
 import * as monaco from 'monaco-editor';
@@ -925,7 +925,7 @@ interface StageOptions {
     containerHighlightType?: ContainerHighlightType;
     disabledDragStart?: boolean;
     render?: (stage: StageCore__default) => HTMLDivElement | void | Promise<HTMLDivElement | void>;
-    moveableOptions?: MoveableOptions | ((config?: CustomizeMoveableOptionsCallbackConfig) => MoveableOptions);
+    moveableOptions?: CustomizeMoveableOptions;
     canSelect?: (el: HTMLElement) => boolean | Promise<boolean>;
     isContainer?: (el: HTMLElement) => boolean | Promise<boolean>;
     updateDragEl?: UpdateDragEl;
@@ -1751,7 +1751,7 @@ interface EditorProps {
         methods: EventOption[];
     }>;
     /** 画布中组件选中框的移动范围 */
-    moveableOptions?: MoveableOptions | ((config?: CustomizeMoveableOptionsCallbackConfig) => MoveableOptions);
+    moveableOptions?: CustomizeMoveableOptions;
     /** 编辑器初始化时默认选中的组件ID */
     defaultSelected?: Id;
     /** 拖入画布中容器时，识别到容器后给容器根dom加上的class */