@tmagic/editor 1.4.5 → 1.4.6

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.4.5",
+  "version": "1.4.6",
   "name": "@tmagic/editor",
   "type": "module",
   "sideEffects": [
@@ -50,18 +50,8 @@
     "lodash-es": "^4.17.21",
     "moveable": "^0.53.0",
     "serialize-javascript": "^6.0.0",
-    "@tmagic/dep": "1.4.5",
-    "@tmagic/table": "1.4.5"
-  },
-  "peerDependencies": {
-    "monaco-editor": "^0.48.0",
-    "vue": "^3.4.27",
-    "@tmagic/design": "1.4.5",
-    "@tmagic/form": "1.4.5",
-    "@tmagic/schema": "1.4.5",
-    "@tmagic/stage": "1.4.5",
-    "@tmagic/utils": "1.4.5",
-    "@tmagic/core": "1.4.5"
+    "@tmagic/dep": "1.4.6",
+    "@tmagic/table": "1.4.6"
   },
   "devDependencies": {
     "@types/events": "^3.0.0",
@@ -75,10 +65,25 @@
     "sass": "^1.77.0",
     "tsc-alias": "^1.8.5",
     "type-fest": "^4.10.3",
-    "typescript": "^5.4.2",
     "vite": "^5.2.11",
     "vue-tsc": "^2.0.16"
   },
+  "peerDependencies": {
+    "monaco-editor": "^0.48.0",
+    "vue": "^3.4.27",
+    "typescript": "*",
+    "@tmagic/form": "1.4.6",
+    "@tmagic/schema": "1.4.6",
+    "@tmagic/design": "1.4.6",
+    "@tmagic/core": "1.4.6",
+    "@tmagic/utils": "1.4.6",
+    "@tmagic/stage": "1.4.6"
+  },
+  "peerDependenciesMeta": {
+    "typescript": {
+      "optional": true
+    }
+  },
   "scripts": {
     "build": "npm run build:type && vite build",
     "build:type": "npm run clear:type && vue-tsc --declaration --emitDeclarationOnly --project tsconfig.build.json && tsc-alias -p tsconfig.build.json",

package/src/editorProps.ts

@@ -70,8 +70,12 @@ export interface EditorProps {
   codeOptions?: { [key: string]: any };
   /** 禁用鼠标左键按下时就开始拖拽，需要先选中再可以拖拽 */
   disabledDragStart?: boolean;
-  /** 自定义依赖收集器，复制组件时会将关联依赖一并复制 */
+  /** 自定义依赖收集器，复制组件时会将关联组件一并复制 */
   collectorOptions?: CustomTargetOptions;
+  /** 自定义依赖收集器，复制组件时会将关联代码块一并复制 */
+  collectorOptionsForCode?: CustomTargetOptions;
+  /** 自定义依赖收集器，复制组件时会将关联数据源一并复制 */
+  collectorOptionsForDataSource?: CustomTargetOptions;
   /** 标尺配置 */
   guidesOptions?: Partial<GuidesOptions>;
   /** 禁止多选 */

package/src/hooks/use-code-block-edit.ts

@@ -67,8 +67,6 @@ export const useCodeBlockEdit = (codeBlockService?: CodeBlockService) => {
 
     await codeBlockService?.setCodeDslById(codeId.value, values);
 
-    tMagicMessage.success('代码块保存成功');
-
     codeBlockEditor.value?.hide();
   };
 

package/src/hooks/use-stage.ts

@@ -24,7 +24,7 @@ export const useStage = (stageOptions: StageOptions) => {
   const stage = new StageCore({
     render: stageOptions.render,
     runtimeUrl: stageOptions.runtimeUrl,
-    zoom: zoom.value,
+    zoom: stageOptions.zoom ?? zoom.value,
     autoScrollIntoView: stageOptions.autoScrollIntoView,
     isContainer: stageOptions.isContainer,
     containerHighlightClassName: stageOptions.containerHighlightClassName,

package/src/index.ts

@@ -82,6 +82,7 @@ export { default as LayoutContainer } from './components/SplitView.vue';
 export { default as SplitView } from './components/SplitView.vue';
 export { default as Resizer } from './components/Resizer.vue';
 export { default as CodeBlockEditor } from './components/CodeBlockEditor.vue';
+export { default as FloatingBox } from './components/FloatingBox.vue';
 export { default as PageFragmentSelect } from './fields/PageFragmentSelect.vue';
 
 const defaultInstallOpt: InstallOptions = {

package/src/initService.ts

@@ -7,7 +7,7 @@ import {
   createDataSourceCondTarget,
   createDataSourceMethodTarget,
   createDataSourceTarget,
-  createRelatedCompTarget,
+  createRelatedTargetForCopy,
   DepTargetType,
   Target,
 } from '@tmagic/dep';
@@ -412,7 +412,17 @@ export const initServiceEvents = (
 
   // 初始化复制组件相关的依赖收集器
   if (props.collectorOptions && !depService.hasTarget(DepTargetType.RELATED_COMP_WHEN_COPY)) {
-    depService.addTarget(createRelatedCompTarget(props.collectorOptions));
+    depService.addTarget(createRelatedTargetForCopy(props.collectorOptions, DepTargetType.RELATED_COMP_WHEN_COPY));
+  }
+  if (props.collectorOptionsForCode && !depService.hasTarget(DepTargetType.RELATED_CODE_WHEN_COPY)) {
+    depService.addTarget(
+      createRelatedTargetForCopy(props.collectorOptionsForCode, DepTargetType.RELATED_CODE_WHEN_COPY),
+    );
+  }
+  if (props.collectorOptionsForDataSource && !depService.hasTarget(DepTargetType.RELATED_DS_WHEN_COPY)) {
+    depService.addTarget(
+      createRelatedTargetForCopy(props.collectorOptionsForDataSource, DepTargetType.RELATED_DS_WHEN_COPY),
+    );
   }
 
   onBeforeUnmount(() => {

package/src/services/codeBlock.ts

@@ -17,21 +17,26 @@
  */
 
 import { reactive } from 'vue';
-import { keys, pick } from 'lodash-es';
+import { cloneDeep, get, keys, pick } from 'lodash-es';
 import type { Writable } from 'type-fest';
 
+import { DepTargetType } from '@tmagic/dep';
 import type { ColumnConfig } from '@tmagic/form';
-import type { CodeBlockContent, CodeBlockDSL, Id } from '@tmagic/schema';
+import type { CodeBlockContent, CodeBlockDSL, Id, MNode } from '@tmagic/schema';
 
+import depService from '@editor/services/dep';
+import editorService from '@editor/services/editor';
+import storageService, { Protocol } from '@editor/services/storage';
 import type { AsyncHookPlugin, CodeState } from '@editor/type';
 import { CODE_DRAFT_STORAGE_KEY } from '@editor/type';
 import { getConfig } from '@editor/utils/config';
+import { COPY_CODE_STORAGE_KEY } from '@editor/utils/editor';
 
 import BaseService from './BaseService';
 
 const canUsePluginMethods = {
   async: ['setCodeDslById', 'setEditStatus', 'setCombineIds', 'setUndeleteableList', 'deleteCodeDslByIds'] as const,
-  sync: [],
+  sync: ['setCodeDslByIdSync'],
 };
 
 type AsyncMethodName = Writable<(typeof canUsePluginMethods)['async']>;
@@ -46,7 +51,10 @@ class CodeBlock extends BaseService {
   });
 
   constructor() {
-    super(canUsePluginMethods.async.map((methodName) => ({ name: methodName, isAsync: true })));
+    super([
+      ...canUsePluginMethods.async.map((methodName) => ({ name: methodName, isAsync: true })),
+      ...canUsePluginMethods.sync.map((methodName) => ({ name: methodName, isAsync: false })),
+    ]);
   }
 
   /**
@@ -88,20 +96,32 @@ class CodeBlock extends BaseService {
    * @returns {void}
    */
   public async setCodeDslById(id: Id, codeConfig: Partial<CodeBlockContent>): Promise<void> {
+    this.setCodeDslByIdSync(id, codeConfig, true);
+  }
+
+  /**
+   * 为了兼容历史原因
+   * 设置代码块ID和代码内容到源dsl
+   * @param {Id} id 代码块id
+   * @param {CodeBlockContent} codeConfig 代码块内容配置信息
+   * @param {boolean} force 是否强制写入，默认true
+   * @returns {void}
+   */
+  public setCodeDslByIdSync(id: Id, codeConfig: Partial<CodeBlockContent>, force = true): void {
     const codeDsl = this.getCodeDsl();
 
     if (!codeDsl) {
       throw new Error('dsl中没有codeBlocks');
     }
+    if (codeDsl[id] && !force) return;
 
-    const codeConfigProcessed = codeConfig;
-    if (codeConfig.content) {
+    const codeConfigProcessed = cloneDeep(codeConfig);
+    if (codeConfigProcessed.content) {
       // 在保存的时候转换代码内容
       const parseDSL = getConfig('parseDSL');
-      if (typeof codeConfig.content === 'string') {
-        codeConfig.content = parseDSL<(...args: any[]) => any>(codeConfig.content);
+      if (typeof codeConfigProcessed.content === 'string') {
+        codeConfigProcessed.content = parseDSL<(...args: any[]) => any>(codeConfigProcessed.content);
       }
-      codeConfigProcessed.content = codeConfig.content;
     }
 
     const existContent = codeDsl[id] || {};
@@ -233,6 +253,54 @@ class CodeBlock extends BaseService {
     return await this.getUniqueId();
   }
 
+  /**
+   * 复制时会带上组件关联的代码块
+   * @param config 组件节点配置
+   * @returns
+   */
+  public copyWithRelated(config: MNode | MNode[]): void {
+    const copyNodes: MNode[] = Array.isArray(config) ? config : [config];
+    // 关联的代码块也一并复制
+    depService.clearByType(DepTargetType.RELATED_CODE_WHEN_COPY);
+    depService.collect(copyNodes, true, DepTargetType.RELATED_CODE_WHEN_COPY);
+    const customTarget = depService.getTarget(
+      DepTargetType.RELATED_CODE_WHEN_COPY,
+      DepTargetType.RELATED_CODE_WHEN_COPY,
+    );
+    const copyData: CodeBlockDSL = {};
+    if (customTarget) {
+      Object.keys(customTarget.deps).forEach((nodeId: Id) => {
+        const node = editorService.getNodeById(nodeId);
+        if (!node) return;
+        customTarget!.deps[nodeId].keys.forEach((key) => {
+          const relateCodeId = get(node, key);
+          const isExist = Object.keys(copyData).find((codeId: Id) => codeId === relateCodeId);
+          if (!isExist) {
+            const relateCode = this.getCodeContentById(relateCodeId);
+            if (relateCode) {
+              copyData[relateCodeId] = relateCode;
+            }
+          }
+        });
+      });
+    }
+    storageService.setItem(COPY_CODE_STORAGE_KEY, copyData, {
+      protocol: Protocol.OBJECT,
+    });
+  }
+
+  /**
+   * 粘贴代码块
+   * @returns
+   */
+  public paste() {
+    const codeDsl: CodeBlockDSL = storageService.getItem(COPY_CODE_STORAGE_KEY);
+    Object.keys(codeDsl).forEach((codeId: Id) => {
+      // 不覆盖同样id的代码块
+      this.setCodeDslByIdSync(codeId, codeDsl[codeId], false);
+    });
+  }
+
   public resetState() {
     this.state.codeDsl = null;
     this.state.editable = true;

package/src/services/dataSource.ts

@@ -1,14 +1,19 @@
 import { reactive } from 'vue';
-import { cloneDeep } from 'lodash-es';
+import { cloneDeep, get } from 'lodash-es';
 import { Writable } from 'type-fest';
 
 import type { EventOption } from '@tmagic/core';
+import { DepTargetType } from '@tmagic/dep';
 import type { FormConfig } from '@tmagic/form';
-import type { DataSourceSchema } from '@tmagic/schema';
+import type { DataSourceSchema, Id, MNode } from '@tmagic/schema';
 import { guid, toLine } from '@tmagic/utils';
 
+import depService from '@editor/services/dep';
+import editorService from '@editor/services/editor';
+import storageService, { Protocol } from '@editor/services/storage';
 import type { DatasourceTypeOption, SyncHookPlugin } from '@editor/type';
 import { getFormConfig, getFormValue } from '@editor/utils/data-source';
+import { COPY_DS_STORAGE_KEY } from '@editor/utils/editor';
 
 import BaseService from './BaseService';
 
@@ -102,7 +107,7 @@ class DataSource extends BaseService {
   public add(config: DataSourceSchema) {
     const newConfig = {
       ...config,
-      id: this.createId(),
+      id: config.id && !this.getDataSourceById(config.id) ? config.id : this.createId(),
     };
 
     this.get('dataSources').push(newConfig);
@@ -116,7 +121,6 @@ class DataSource extends BaseService {
     const dataSources = this.get('dataSources');
 
     const index = dataSources.findIndex((ds) => ds.id === config.id);
-
     dataSources[index] = cloneDeep(config);
 
     this.emit('update', config);
@@ -153,6 +157,51 @@ class DataSource extends BaseService {
   public usePlugin(options: SyncHookPlugin<SyncMethodName, DataSource>): void {
     super.usePlugin(options);
   }
+
+  /**
+   * 复制时会带上组件关联的数据源
+   * @param config 组件节点配置
+   * @returns
+   */
+  public copyWithRelated(config: MNode | MNode[]): void {
+    const copyNodes: MNode[] = Array.isArray(config) ? config : [config];
+    depService.clearByType(DepTargetType.RELATED_DS_WHEN_COPY);
+    depService.collect(copyNodes, true, DepTargetType.RELATED_DS_WHEN_COPY);
+    const customTarget = depService.getTarget(DepTargetType.RELATED_DS_WHEN_COPY, DepTargetType.RELATED_DS_WHEN_COPY);
+    const copyData: DataSourceSchema[] = [];
+    if (customTarget) {
+      Object.keys(customTarget.deps).forEach((nodeId: Id) => {
+        const node = editorService.getNodeById(nodeId);
+        if (!node) return;
+        customTarget!.deps[nodeId].keys.forEach((key) => {
+          const [relateDsId] = get(node, key);
+          const isExist = copyData.find((dsItem) => dsItem.id === relateDsId);
+          if (!isExist) {
+            const relateDs = this.getDataSourceById(relateDsId);
+            if (relateDs) {
+              copyData.push(relateDs);
+            }
+          }
+        });
+      });
+    }
+    storageService.setItem(COPY_DS_STORAGE_KEY, copyData, {
+      protocol: Protocol.OBJECT,
+    });
+  }
+  /**
+   * 粘贴数据源
+   * @returns
+   */
+  public paste() {
+    const dataSource: DataSourceSchema[] = storageService.getItem(COPY_DS_STORAGE_KEY);
+    dataSource.forEach((item: DataSourceSchema) => {
+      // 不覆盖同样id的数据源
+      if (!this.getDataSourceById(item.id)) {
+        this.add(item);
+      }
+    });
+  }
 }
 
 export type DataSourceService = DataSource;

package/src/services/props.ts

@@ -23,7 +23,7 @@ import { Writable } from 'type-fest';
 import { DepTargetType } from '@tmagic/dep';
 import type { FormConfig } from '@tmagic/form';
 import type { Id, MComponent, MNode } from '@tmagic/schema';
-import { getValueByKeyPath, guid, setValueByKeyPath, toLine } from '@tmagic/utils';
+import { getNodePath, getValueByKeyPath, guid, setValueByKeyPath, toLine } from '@tmagic/utils';
 
 import depService from '@editor/services/dep';
 import editorService from '@editor/services/editor';
@@ -199,13 +199,14 @@ class Props extends BaseService {
   public replaceRelateId(originConfigs: MNode[], targetConfigs: MNode[]) {
     const relateIdMap = this.getRelateIdMap();
     if (Object.keys(relateIdMap).length === 0) return;
-
+    depService.clearByType(DepTargetType.RELATED_COMP_WHEN_COPY);
+    depService.collect(originConfigs, true, DepTargetType.RELATED_COMP_WHEN_COPY);
     const target = depService.getTarget(DepTargetType.RELATED_COMP_WHEN_COPY, DepTargetType.RELATED_COMP_WHEN_COPY);
     if (!target) return;
-
     originConfigs.forEach((config: MNode) => {
       const newId = relateIdMap[config.id];
-      const targetConfig = targetConfigs.find((targetConfig) => targetConfig.id === newId);
+      const path = getNodePath(newId, targetConfigs);
+      const targetConfig = path[path.length - 1];
 
       if (!targetConfig) return;
 
@@ -213,9 +214,13 @@ class Props extends BaseService {
         const relateOriginId = getValueByKeyPath(fullKey, config);
         const relateTargetId = relateIdMap[relateOriginId];
         if (!relateTargetId) return;
-
         setValueByKeyPath(fullKey, relateTargetId, targetConfig);
       });
+
+      // 递归items
+      if (config.items && Array.isArray(config.items)) {
+        this.replaceRelateId(config.items, targetConfigs);
+      }
     });
   }
 

package/src/services/stageOverlay.ts

@@ -90,6 +90,7 @@ class StageOverlay extends BaseService {
   public createStage(stageOptions: StageOptions = {}) {
     return useStage({
       ...stageOptions,
+      zoom: 1,
       runtimeUrl: '',
       autoScrollIntoView: false,
       render: async (stage: StageCore) => {

package/src/type.ts

@@ -150,6 +150,7 @@ export interface StageOptions {
   renderType?: RenderType;
   guidesOptions?: Partial<GuidesOptions>;
   disabledMultiSelect?: boolean;
+  zoom?: number;
 }
 
 export interface StoreState {

package/src/utils/editor.ts

@@ -25,6 +25,8 @@ import { calcValueByFontsize, getNodePath, isNumber, isPage, isPageFragment, isP
 
 import { Layout } from '@editor/type';
 export const COPY_STORAGE_KEY = '$MagicEditorCopyData';
+export const COPY_CODE_STORAGE_KEY = '$MagicEditorCopyCode';
+export const COPY_DS_STORAGE_KEY = '$MagicEditorCopyDataSource';
 
 /**
  * 获取所有页面配置

package/types/editorProps.d.ts

@@ -60,8 +60,12 @@ export interface EditorProps {
     };
     /** 禁用鼠标左键按下时就开始拖拽，需要先选中再可以拖拽 */
     disabledDragStart?: boolean;
-    /** 自定义依赖收集器，复制组件时会将关联依赖一并复制 */
+    /** 自定义依赖收集器，复制组件时会将关联组件一并复制 */
     collectorOptions?: CustomTargetOptions;
+    /** 自定义依赖收集器，复制组件时会将关联代码块一并复制 */
+    collectorOptionsForCode?: CustomTargetOptions;
+    /** 自定义依赖收集器，复制组件时会将关联数据源一并复制 */
+    collectorOptionsForDataSource?: CustomTargetOptions;
     /** 标尺配置 */
     guidesOptions?: Partial<GuidesOptions>;
     /** 禁止多选 */

package/types/index.d.ts

@@ -43,6 +43,7 @@ export { default as LayoutContainer } from './components/SplitView.vue';
 export { default as SplitView } from './components/SplitView.vue';
 export { default as Resizer } from './components/Resizer.vue';
 export { default as CodeBlockEditor } from './components/CodeBlockEditor.vue';
+export { default as FloatingBox } from './components/FloatingBox.vue';
 export { default as PageFragmentSelect } from './fields/PageFragmentSelect.vue';
 declare const _default: {
     install: (app: App, opt?: Partial<InstallOptions>) => void;

package/types/layouts/PropsPanel.vue.d.ts

@@ -5,14 +5,6 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<__
     extendState?: ((state: FormState) => Record<string, any> | Promise<Record<string, any>>) | undefined;
 }>, {
     configForm: import("vue").Ref<import("vue").CreateComponentPublicInstance<Readonly<import("vue").ExtractPropTypes<{
-        labelWidth: {
-            type: import("vue").PropType<string>;
-            default: string;
-        };
-        disabled: {
-            type: import("vue").PropType<boolean>;
-            default: boolean;
-        };
         size: {
             type: import("vue").PropType<"default" | "small" | "large">;
         };
@@ -23,11 +15,19 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<__
             type: import("vue").PropType<string>;
             default: string;
         };
+        disabled: {
+            type: import("vue").PropType<boolean>;
+            default: boolean;
+        };
         config: {
             type: import("vue").PropType<import("@tmagic/form").FormConfig>;
             required: true;
             default: () => never[];
         };
+        labelWidth: {
+            type: import("vue").PropType<string>;
+            default: string;
+        };
         initValues: {
             type: import("vue").PropType<Record<string, any>>;
             required: true;
@@ -83,14 +83,6 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<__
         "field-input": (...args: any[]) => void;
         "field-change": (...args: any[]) => void;
     }, import("vue").VNodeProps & import("vue").AllowedComponentProps & import("vue").ComponentCustomProps & Readonly<import("vue").ExtractPropTypes<{
-        labelWidth: {
-            type: import("vue").PropType<string>;
-            default: string;
-        };
-        disabled: {
-            type: import("vue").PropType<boolean>;
-            default: boolean;
-        };
         size: {
             type: import("vue").PropType<"default" | "small" | "large">;
         };
@@ -101,11 +93,19 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<__
             type: import("vue").PropType<string>;
             default: string;
         };
+        disabled: {
+            type: import("vue").PropType<boolean>;
+            default: boolean;
+        };
         config: {
             type: import("vue").PropType<import("@tmagic/form").FormConfig>;
             required: true;
             default: () => never[];
         };
+        labelWidth: {
+            type: import("vue").PropType<string>;
+            default: string;
+        };
         initValues: {
             type: import("vue").PropType<Record<string, any>>;
             required: true;
@@ -168,14 +168,6 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<__
         M: {};
         Defaults: {};
     }, Readonly<import("vue").ExtractPropTypes<{
-        labelWidth: {
-            type: import("vue").PropType<string>;
-            default: string;
-        };
-        disabled: {
-            type: import("vue").PropType<boolean>;
-            default: boolean;
-        };
         size: {
             type: import("vue").PropType<"default" | "small" | "large">;
         };
@@ -186,11 +178,19 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<__
             type: import("vue").PropType<string>;
             default: string;
         };
+        disabled: {
+            type: import("vue").PropType<boolean>;
+            default: boolean;
+        };
         config: {
             type: import("vue").PropType<import("@tmagic/form").FormConfig>;
             required: true;
             default: () => never[];
         };
+        labelWidth: {
+            type: import("vue").PropType<string>;
+            default: string;
+        };
         initValues: {
             type: import("vue").PropType<Record<string, any>>;
             required: true;

package/types/layouts/sidebar/code-block/CodeBlockList.vue.d.ts

@@ -10,8 +10,8 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<__
 }, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<__VLS_TypePropsToOption<{
     customError?: ((id: Id, errorType: CodeDeleteErrorType) => any) | undefined;
 }>>> & {
-    onEdit?: ((id: string) => any) | undefined;
     onRemove?: ((id: string) => any) | undefined;
+    onEdit?: ((id: string) => any) | undefined;
 }, {}, {}>, Readonly<CodeBlockListSlots> & CodeBlockListSlots>;
 export default _default;
 type __VLS_WithTemplateSlots<T, S> = T & {

package/types/layouts/sidebar/data-source/DataSourceList.vue.d.ts

@@ -5,8 +5,8 @@ declare const _default: __VLS_WithTemplateSlots<import("vue").DefineComponent<{}
     remove: (id: string) => void;
     edit: (id: string) => void;
 }, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{}>> & {
-    onEdit?: ((id: string) => any) | undefined;
     onRemove?: ((id: string) => any) | undefined;
+    onEdit?: ((id: string) => any) | undefined;
 }, {}, {}>, Readonly<DataSourceListSlots> & DataSourceListSlots>;
 export default _default;
 type __VLS_WithTemplateSlots<T, S> = T & {

package/types/services/codeBlock.d.ts

@@ -1,11 +1,11 @@
 import type { Writable } from 'type-fest';
 import type { ColumnConfig } from '@tmagic/form';
-import type { CodeBlockContent, CodeBlockDSL, Id } from '@tmagic/schema';
+import type { CodeBlockContent, CodeBlockDSL, Id, MNode } from '@tmagic/schema';
 import type { AsyncHookPlugin } from '../type';
 import BaseService from './BaseService';
 declare const canUsePluginMethods: {
     async: readonly ["setCodeDslById", "setEditStatus", "setCombineIds", "setUndeleteableList", "deleteCodeDslByIds"];
-    sync: never[];
+    sync: string[];
 };
 type AsyncMethodName = Writable<(typeof canUsePluginMethods)['async']>;
 declare class CodeBlock extends BaseService {
@@ -37,6 +37,15 @@ declare class CodeBlock extends BaseService {
      * @returns {void}
      */
     setCodeDslById(id: Id, codeConfig: Partial<CodeBlockContent>): Promise<void>;
+    /**
+     * 为了兼容历史原因
+     * 设置代码块ID和代码内容到源dsl
+     * @param {Id} id 代码块id
+     * @param {CodeBlockContent} codeConfig 代码块内容配置信息
+     * @param {boolean} force 是否强制写入，默认true
+     * @returns {void}
+     */
+    setCodeDslByIdSync(id: Id, codeConfig: Partial<CodeBlockContent>, force?: boolean): void;
     /**
      * 根据代码块id数组获取代码dsl
      * @param {string[]} ids 代码块id数组
@@ -100,6 +109,17 @@ declare class CodeBlock extends BaseService {
      * @returns {Id} 代码块唯一id
      */
     getUniqueId(): Promise<string>;
+    /**
+     * 复制时会带上组件关联的代码块
+     * @param config 组件节点配置
+     * @returns
+     */
+    copyWithRelated(config: MNode | MNode[]): void;
+    /**
+     * 粘贴代码块
+     * @returns
+     */
+    paste(): void;
     resetState(): void;
     destroy(): void;
     usePlugin(options: AsyncHookPlugin<AsyncMethodName, CodeBlock>): void;

package/types/services/dataSource.d.ts

@@ -1,7 +1,7 @@
 import { Writable } from 'type-fest';
 import type { EventOption } from '@tmagic/core';
 import type { FormConfig } from '@tmagic/form';
-import type { DataSourceSchema } from '@tmagic/schema';
+import type { DataSourceSchema, MNode } from '@tmagic/schema';
 import type { DatasourceTypeOption, SyncHookPlugin } from '../type';
 import BaseService from './BaseService';
 interface State {
@@ -50,6 +50,17 @@ declare class DataSource extends BaseService {
     resetState(): void;
     destroy(): void;
     usePlugin(options: SyncHookPlugin<SyncMethodName, DataSource>): void;
+    /**
+     * 复制时会带上组件关联的数据源
+     * @param config 组件节点配置
+     * @returns
+     */
+    copyWithRelated(config: MNode | MNode[]): void;
+    /**
+     * 粘贴数据源
+     * @returns
+     */
+    paste(): void;
 }
 export type DataSourceService = DataSource;
 declare const _default: DataSource;

package/types/type.d.ts

@@ -117,6 +117,7 @@ export interface StageOptions {
     renderType?: RenderType;
     guidesOptions?: Partial<GuidesOptions>;
     disabledMultiSelect?: boolean;
+    zoom?: number;
 }
 export interface StoreState {
     root: MApp | null;

package/types/utils/editor.d.ts

@@ -3,6 +3,8 @@ import { NodeType } from '@tmagic/schema';
 import type StageCore from '@tmagic/stage';
 import { Layout } from '../type';
 export declare const COPY_STORAGE_KEY = "$MagicEditorCopyData";
+export declare const COPY_CODE_STORAGE_KEY = "$MagicEditorCopyCode";
+export declare const COPY_DS_STORAGE_KEY = "$MagicEditorCopyDataSource";
 /**
  * 获取所有页面配置
  * @param root DSL跟节点