@tmagic/editor 1.8.0-manmanyu.9 → 1.8.0

package/types/index.d.ts

@@ -1,14 +1,15 @@
-import formPlugin, { CascaderOption, ChangeRecord, CodeSelectColConfig, CodeSelectConfig, CondOpSelectConfig, ContainerChangeEventData, DataSourceFieldSelectConfig, DataSourceFieldsConfig, DataSourceInputConfig, DataSourceMethodSelectConfig, DataSourceMethodsConfig, DataSourceMocksConfig, DataSourceSelect, DisplayCondsConfig, EventSelectConfig, FieldProps, FormConfig, FormInstallOptions, FormState, FormValue, KeyValueConfig, MForm, PageFragmentSelectConfig, TabPaneConfig, TableColumnConfig, TypeFunction } from "@tmagic/form";
+import formPlugin, { CascaderOption, ChangeRecord, CodeSelectColConfig, CodeSelectConfig, CondOpSelectConfig, ContainerChangeEventData, DataSourceFieldSelectConfig, DataSourceFieldsConfig, DataSourceInputConfig, DataSourceMethodSelectConfig, DataSourceMethodsConfig, DataSourceMocksConfig, DataSourceSelect, DisplayCondsConfig, EventSelectConfig, FieldProps, FormConfig, FormContext, FormInstallOptions, FormValue, KeyValueConfig, MForm, PageFragmentSelectConfig, TabPaneConfig, TableColumnConfig, TypeFunction } from "@tmagic/form";
 import tablePlugin from "@tmagic/table";
 import StageCore, { CanDropIn, ContainerHighlightType, CustomizeMoveableOptions, GuidesOptions, RenderType, UpdateDragEl, default as StageCore$1 } from "@tmagic/stage";
-import designPlugin, { ButtonProps, DesignPluginOptions } from "@tmagic/design";
+import designPlugin, { ButtonProps, DesignPluginOptions, FieldSize } from "@tmagic/design";
 import Gesto, { OnDrag, OnDrag as OnDrag$1 } from "gesto";
 import { CodeBlockContent, CodeBlockDSL, DataSchema, DataSourceFieldType, DataSourceSchema, DepData, DepExtendedData, DepTargetType, DepTargetType as DepTargetType$1, DisplayCond, EventOption, Id, MApp, MContainer, MNode, MPage, MPageFragment, NodeType, Target, TargetOptions } from "@tmagic/core";
-import { App, AppContext, Component, ComputedRef, Ref, ShallowRef } from "vue";
-import EventEmitter, { EventEmitter as EventEmitter$1 } from "events";
+import { App, AppContext, CSSProperties, Component, ComputedRef, Ref, ShallowRef } from "vue";
+import EventEmitter$1, { EventEmitter } from "events";
 import * as Monaco from "monaco-editor";
 import Sortable, { Options, SortableEvent } from "sortablejs";
 import { PascalCasedProperties, Writable } from "type-fest";
+import { HeadlessFieldOptions, TypeMatchValidateContext, TypeMatchValidator } from "@tmagic/form/headless";
 import { FormItemConfig } from "@tmagic/form-schema";
 import { StyleSchema } from "@tmagic/schema";
 export * from "@tmagic/form";
@@ -16,7 +17,6 @@ export * from "@tmagic/table";
 export * from "@tmagic/stage";
 export * from "@tmagic/design";
 export * from "@tmagic/utils";
-
 //#region temp/packages/editor/src/services/BaseService.d.ts
 /**
  * 对Class进行扩展
@@ -47,7 +47,7 @@ export * from "@tmagic/utils";
  * 调用时的参数会透传到before方法的参数中, 然后before的return 会作为原方法的参数和after的参数，after第一个参数则是原方法的return值;
  * 如需终止后续方法调用可以return new Error();
  */
-declare class BaseService extends EventEmitter$1 {
+declare class BaseService extends EventEmitter {
   private pluginOptionsList;
   private taskList;
   private doingTask;
@@ -108,12 +108,7 @@ declare class CodeBlock extends BaseService {
    * @param options.doNotPushHistory 是否不写入历史记录（默认 false）
    * @returns {void}
    */
-  setCodeDslById(id: Id, codeConfig: Partial<CodeBlockContent>, {
-    changeRecords,
-    doNotPushHistory,
-    historyDescription,
-    historySource
-  }?: HistoryOpOptionsWithChangeRecords): Promise<void>;
+  setCodeDslById(id: Id, codeConfig: Partial<CodeBlockContent>, { changeRecords, doNotPushHistory, historyDescription, historySource }?: HistoryOpOptionsWithChangeRecords): Promise<void>;
   /**
    * 为了兼容历史原因
    * 设置代码块ID和代码内容到源dsl
@@ -126,12 +121,7 @@ declare class CodeBlock extends BaseService {
    * @param options.historyDescription 入栈时附带的人类可读描述，用于历史面板展示
    * @returns {void}
    */
-  setCodeDslByIdSync(id: Id, codeConfig: Partial<CodeBlockContent>, force?: boolean, {
-    changeRecords,
-    doNotPushHistory,
-    historyDescription,
-    historySource
-  }?: HistoryOpOptionsWithChangeRecords): void;
+  setCodeDslByIdSync(id: Id, codeConfig: Partial<CodeBlockContent>, force?: boolean, { changeRecords, doNotPushHistory, historyDescription, historySource }?: HistoryOpOptionsWithChangeRecords): void;
   /**
    * 根据代码块id数组获取代码dsl
    * @param {string[]} ids 代码块id数组
@@ -189,11 +179,7 @@ declare class CodeBlock extends BaseService {
    * @param options 可选配置
    * @param options.doNotPushHistory 是否不写入历史记录（默认 false）
    */
-  deleteCodeDslByIds(codeIds: Id[], {
-    doNotPushHistory,
-    historyDescription,
-    historySource
-  }?: HistoryOpOptions): Promise<void>;
+  deleteCodeDslByIds(codeIds: Id[], { doNotPushHistory, historyDescription, historySource }?: HistoryOpOptions): Promise<void>;
   /**
    * 下列 *AndGetHistoryId 方法与对应的写入方法行为完全一致，
    * 返回值在 {@link DslOpWithHistoryIdsResult} 中同时包含原操作结果与本次写入的历史 uuid 列表，
@@ -302,7 +288,7 @@ declare class CodeBlock extends BaseService {
   private applyHistoryStep;
 }
 type CodeBlockService = CodeBlock;
-declare const _default$38: CodeBlock;
+declare const _default$40: CodeBlock;
 //#endregion
 //#region temp/packages/editor/src/services/componentList.d.ts
 declare class ComponentList extends BaseService {
@@ -317,6 +303,7 @@ declare class ComponentList extends BaseService {
   destroy(): void;
 }
 type ComponentListService = ComponentList;
+declare const _default$41: ComponentList;
 //#endregion
 //#region temp/packages/editor/src/services/dataSource.d.ts
 interface State$2 {
@@ -360,11 +347,7 @@ declare class DataSource extends BaseService {
    * @param options.doNotPushHistory 是否不写入历史记录（默认 false）
    * @param options.historyDescription 入栈时附带的人类可读描述，用于历史面板展示
    */
-  add(config: DataSourceSchema, {
-    doNotPushHistory,
-    historyDescription,
-    historySource
-  }?: HistoryOpOptions): {
+  add(config: DataSourceSchema, { doNotPushHistory, historyDescription, historySource }?: HistoryOpOptions): {
     id: string;
     type: string;
     title?: string;
@@ -383,12 +366,7 @@ declare class DataSource extends BaseService {
    * @param data.doNotPushHistory 是否不写入历史记录（默认 false）
    * @param data.historyDescription 入栈时附带的人类可读描述，用于历史面板展示
    */
-  update(config: DataSourceSchema, {
-    changeRecords,
-    doNotPushHistory,
-    historyDescription,
-    historySource
-  }?: HistoryOpOptionsWithChangeRecords): DataSourceSchema;
+  update(config: DataSourceSchema, { changeRecords, doNotPushHistory, historyDescription, historySource }?: HistoryOpOptionsWithChangeRecords): DataSourceSchema;
   /**
    * 删除数据源
    * @param id 数据源 id
@@ -396,11 +374,7 @@ declare class DataSource extends BaseService {
    * @param options.doNotPushHistory 是否不写入历史记录（默认 false）
    * @param options.historyDescription 入栈时附带的人类可读描述，用于历史面板展示
    */
-  remove(id: string, {
-    doNotPushHistory,
-    historyDescription,
-    historySource
-  }?: HistoryOpOptions): void;
+  remove(id: string, { doNotPushHistory, historyDescription, historySource }?: HistoryOpOptions): void;
   /**
    * 下列 *AndGetHistoryId 方法与对应的 add / update / remove 行为完全一致，
    * 返回值在 {@link DslOpWithHistoryIdsResult} 中同时包含原操作结果与本次写入历史栈的 uuid 列表（{@link DataSourceStepValue.uuid}），
@@ -500,7 +474,10 @@ declare class DataSource extends BaseService {
   private applyHistoryStep;
 }
 type DataSourceService = DataSource;
-declare const _default$39: DataSource;
+declare const _default$42: DataSource;
+//#endregion
+//#region temp/packages/editor/src/utils/dep/worker.d.ts
+type DepsData = Record<string, Record<Id, DepData>>;
 //#endregion
 //#region temp/packages/editor/src/services/dep.d.ts
 interface DepEvents {
@@ -517,8 +494,12 @@ type StateKey = keyof State$1;
 declare class Dep extends BaseService {
   private state;
   private idleTask;
+  private collectWorker;
   private watcher;
   private waitingWorker?;
+  private resolveWaitingWorker?;
+  private workerGeneration;
+  private activeBatches;
   constructor();
   set<K extends StateKey, T extends State$1[K]>(name: K, value: T): void;
   get<K extends StateKey>(name: K): State$1[K];
@@ -532,8 +513,16 @@ declare class Dep extends BaseService {
   removeTarget(id: Id, type?: string): void;
   clearTargets(): void;
   collect(nodes: MNode[], depExtendedData?: DepExtendedData, deep?: boolean, type?: DepTargetType$1): void;
-  collectIdle(nodes: MNode[], depExtendedData?: DepExtendedData, deep?: boolean, type?: DepTargetType$1): Promise<void>;
-  collectByWorker(dsl: MApp): Promise<Record<string, Record<string, DepData>>>;
+  /**
+   * 空闲收集依赖
+   *
+   * 遍历匹配是整个收集过程中最耗时的部分（要深度遍历节点树并对每个属性做 target 匹配），
+   * 节点/数据源多时在主线程执行会长时间卡死页面，因此优先交给 worker 执行，主线程只负责把结果写回 target。
+   * 自定义 target 的 isTarget 是无法跨线程传递的闭包函数（没有 descriptor），仍走主线程空闲队列；
+   * worker 不可用（如 SSR）或执行失败时也会回退到主线程空闲队列。
+   */
+  collectIdle(nodes: MNode[], depExtendedData?: DepExtendedData, deep?: boolean, type?: DepTargetType$1): Promise<boolean>;
+  collectByWorker(dsl: MApp): Promise<DepsData>;
   collectNode(node: MNode, target: Target, depExtendedData?: DepExtendedData, deep?: boolean): void;
   clear(nodes?: MNode[]): void;
   clearByType(type: DepTargetType$1, nodes?: MNode[]): void;
@@ -550,25 +539,55 @@ declare class Dep extends BaseService {
    * 按 pageId 匹配，可清掉页面内已被删除节点的残留依赖
    */
   private removePageDep;
+  /**
+   * 把遍历匹配交给 worker，结果回来后按 target 分片写回主线程
+   */
+  private collectByCollectWorker;
+  /**
+   * 用 worker 的收集结果替换 target 上这批节点的依赖
+   */
+  private enqueueApplyTask;
+  private enqueueTasks;
   private enqueueTask;
+  private beginBatchTask;
+  private onBatchTaskDone;
+  private settleBatchDs;
+  private finishBatch;
+  /**
+   * idleTask 被清空时，在途批次的任务不会再执行，必须主动结算，
+   * 否则对应的 collectIdle Promise 永远不会 resolve（collecting 卡在 true、once 监听器泄漏）。
+   * 收集被中断（通常紧跟一次全量重新收集），因此不再 emit collected/ds-collected，仅结算 Promise。
+   */
+  private abortActiveBatches;
+  private updateCollectingState;
 }
 type DepService = Dep;
-declare const _default$41: Dep;
+declare const _default$44: Dep;
 //#endregion
 //#region temp/packages/editor/src/services/editor.d.ts
 declare class Editor extends BaseService {
   state: StoreState;
   private selectionBeforeOp;
+  /**
+   * 操作前的节点校验错误快照，与 selectionBeforeOp 同时在 captureSelectionBeforeOp 中捕获，
+   * 供 pushOpHistory 写入 step.extra.invalidNodeIdsBefore，用于撤销时还原到「操作前」的错误状态。
+   */
+  private invalidNodeIdsBeforeOp;
   /**
    * 最近一次 pushOpHistory 写入的历史记录 uuid。
    * 供 *AndGetHistoryId 系列方法在调用普通操作后取回本次产生的历史记录 id；
    * 普通操作不会读取它，调用前由 *AndGetHistoryId 重置为 null。
    */
   private lastPushedHistoryId;
+  /**
+   * 上一次 doAdd 的插入记忆：nodeId 为插入的节点，selectedId 为当时的选中节点。
+   * 仅在选中节点未变化时复用（连续 add / doNotSelect / 批量粘贴），选中变化后自动失效，无需手动清理。
+   */
+  private lastAdded;
   constructor();
   /**
    * 设置当前指点节点配置
-   * @param name 'root' | 'page' | 'parent' | 'node' | 'highlightNode' | 'nodes' | 'stage' | 'modifiedNodeIds' | 'pageLength' | 'pageFragmentLength
+   * @param name 'root' | 'page' | 'parent' | 'node' | 'highlightNode' | 'nodes' | 'stage' | 'modifiedNodeIds' | 'invalidNodeIds' | 'pageLength' | 'pageFragmentLength
    * @param value MNode
    * @param options.historySource 设置 root 时，本次变更写入历史记录的「操作来源」（仅 name === 'root' 时生效）
    */
@@ -577,7 +596,7 @@ declare class Editor extends BaseService {
   }): void;
   /**
    * 获取当前指点节点配置
-   * @param name  'root' | 'page' | 'parent' | 'node' | 'highlightNode' | 'nodes' | 'stage' | 'modifiedNodeIds' | 'pageLength' | 'pageFragmentLength'
+   * @param name  'root' | 'page' | 'parent' | 'node' | 'highlightNode' | 'nodes' | 'stage' | 'modifiedNodeIds' | 'invalidNodeIds' | 'pageLength' | 'pageFragmentLength'
    * @returns MNode
    */
   get<K extends StoreStateKey>(name: K): StoreState[K];
@@ -633,28 +652,16 @@ declare class Editor extends BaseService {
    */
   multiSelect(ids: Id[]): void;
   selectRoot(): void;
-  doAdd(node: MNode, parent: MContainer): Promise<MNode>;
+  doAdd(node: MNode, parent: MContainer, _options?: DslOpOptions): Promise<MNode>;
   /**
    * 向指点容器添加组件节点
    * @param addConfig 将要添加的组件节点配置
    * @param parent 要添加到的容器组件节点配置，如果不设置，默认为当前选中的组件的父节点
-   * @param options 可选配置
-   * @param options.doNotSelect 添加后是否不更新当前选中节点（默认 false，添加后会选中新增的节点）
-   * @param options.doNotSwitchPage 添加后是否不切换当前页面（默认 false；新增页面 / 跨页新增时为 true 会跳过会引发页面切换的选中操作）
-   * @param options.doNotPushHistory 是否不写入历史记录（默认 false）
+   * @param options 可选配置，见 {@link DslOpOptions}
    * @returns 添加后的节点
    */
-  add(addNode: AddMNode | MNode[], parent?: MContainer | null, {
-    doNotSelect,
-    doNotSwitchPage,
-    doNotPushHistory,
-    historyDescription,
-    historySource
-  }?: DslOpOptions): Promise<MNode | MNode[]>;
-  doRemove(node: MNode, {
-    doNotSelect,
-    doNotSwitchPage
-  }?: DslOpOptions): Promise<void>;
+  add(addNode: AddMNode | MNode[], parent?: MContainer | null, options?: DslOpOptions): Promise<MNode | MNode[]>;
+  doRemove(node: MNode, { doNotSelect, doNotSwitchPage }?: DslOpOptions): Promise<void>;
   /**
    * 删除组件
    * @param {Object} node 要删除的节点或节点集合
@@ -663,20 +670,8 @@ declare class Editor extends BaseService {
    * @param options.doNotSwitchPage 删除后是否不切换当前页面（默认 false；删除页面 / 页面片段时为 true 会跳过自动切换到首个剩余页面）
    * @param options.doNotPushHistory 是否不写入历史记录（默认 false）
    */
-  remove(nodeOrNodeList: MNode | MNode[], {
-    doNotSelect,
-    doNotSwitchPage,
-    doNotPushHistory,
-    historyDescription,
-    historySource
-  }?: DslOpOptions): Promise<void>;
-  doUpdate(config: MNode, {
-    changeRecords,
-    historySource
-  }?: {
-    changeRecords?: ChangeRecord[];
-    historySource?: HistoryOpSource;
-  }): Promise<{
+  remove(nodeOrNodeList: MNode | MNode[], options?: DslOpOptions): Promise<void>;
+  doUpdate(config: MNode, data?: UpdateOptions): Promise<{
     newNode: MNode;
     oldNode: MNode;
     changeRecords?: ChangeRecord[];
@@ -685,20 +680,10 @@ declare class Editor extends BaseService {
    * 更新节点
    * update后会触发依赖收集，收集完后会掉stage.update方法
    * @param config 新的节点配置，配置中需要有id信息
-   * @param data 额外数据
-   * @param data.changeRecords 单节点 form 端变更记录（多节点场景下被忽略，使用 changeRecordList）
-   * @param data.changeRecordList 多节点 form 端变更记录列表，按 config 数组同序对应每个节点；优先级高于 changeRecords
-   * @param data.doNotPushHistory 是否不写入历史记录（默认 false）
-   * @param data.historyDescription 入栈时附带的人类可读描述，用于历史面板展示（不影响 undo/redo 行为）
+   * @param data 额外数据，见 {@link UpdateOptions}
    * @returns 更新后的节点配置
    */
-  update(config: MNode | MNode[], data?: {
-    changeRecords?: ChangeRecord[];
-    changeRecordList?: ChangeRecord[][];
-    doNotPushHistory?: boolean;
-    historyDescription?: string;
-    historySource?: HistoryOpSource;
-  }): Promise<MNode | MNode[]>;
+  update(config: MNode | MNode[], data?: UpdateOptions): Promise<MNode | MNode[]>;
   /**
    * 将id为id1的组件移动到id为id2的组件位置上，例如：[1,2,3,4] -> sort(1,3) -> [2,1,3,4]
    * @param id1 组件ID
@@ -709,11 +694,7 @@ declare class Editor extends BaseService {
    * @param options.doNotPushHistory 是否不写入历史记录（默认 false）
    * @returns void
    */
-  sort(id1: Id, id2: Id, {
-    doNotSelect,
-    doNotPushHistory,
-    historySource
-  }?: DslOpOptions): Promise<void>;
+  sort(id1: Id, id2: Id, { doNotSelect, doNotPushHistory, historySource }?: DslOpOptions): Promise<void>;
   /**
    * 将组件节点配置存储到localStorage中
    * @param config 组件节点配置
@@ -736,13 +717,7 @@ declare class Editor extends BaseService {
    * @param options.doNotPushHistory 是否不写入历史记录（默认 false）
    * @returns 添加后的组件节点配置
    */
-  paste(position?: PastePosition, collectorOptions?: TargetOptions, {
-    doNotSelect,
-    doNotSwitchPage,
-    doNotPushHistory,
-    historyDescription,
-    historySource
-  }?: DslOpOptions): Promise<MNode | MNode[] | void>;
+  paste(position?: PastePosition, collectorOptions?: TargetOptions, { doNotSelect, doNotSwitchPage, doNotPushHistory, historyDescription, historySource }?: DslOpOptions): Promise<MNode | MNode[] | void>;
   doPaste(config: MNode[], position?: PastePosition): Promise<MNode[]>;
   doAlignCenter(config: MNode): Promise<MNode>;
   /**
@@ -754,23 +729,14 @@ declare class Editor extends BaseService {
    * @param options.doNotPushHistory 是否不写入历史记录（默认 false）
    * @returns 当前组件节点配置
    */
-  alignCenter(config: MNode | MNode[], {
-    doNotSelect,
-    doNotPushHistory,
-    historyDescription,
-    historySource
-  }?: DslOpOptions): Promise<MNode | MNode[]>;
+  alignCenter(config: MNode | MNode[], { doNotSelect, doNotPushHistory, historyDescription, historySource }?: DslOpOptions): Promise<MNode | MNode[]>;
   /**
    * 移动当前选中节点位置
    * @param offset 偏移量
    * @param options 可选配置
    * @param options.doNotPushHistory 是否不写入历史记录（默认 false）
    */
-  moveLayer(offset: number | LayerOffset, {
-    doNotPushHistory,
-    historyDescription,
-    historySource
-  }?: DslOpOptions): Promise<void>;
+  moveLayer(offset: number | LayerOffset, { doNotPushHistory, historyDescription, historySource }?: DslOpOptions): Promise<void>;
   /**
    * 移动一个或多个节点到指定容器中。
    *
@@ -785,18 +751,8 @@ declare class Editor extends BaseService {
    * @param options.doNotSwitchPage 移动后是否不切换当前页面（默认 false；目标容器位于其它页面时为 true 会跳过自动选中以避免页面切换）
    * @param options.doNotPushHistory 是否不写入历史记录（默认 false）
    */
-  moveToContainer(config: MNode | MNode[], targetId: Id, {
-    doNotSelect,
-    doNotSwitchPage,
-    doNotPushHistory,
-    historyDescription,
-    historySource
-  }?: DslOpOptions): Promise<MNode | MNode[]>;
-  dragTo(config: MNode | MNode[], targetParent: MContainer, targetIndex: number, {
-    doNotPushHistory,
-    historyDescription,
-    historySource
-  }?: DslOpOptions): Promise<void>;
+  moveToContainer(config: MNode | MNode[], targetId: Id, { doNotSelect, doNotSwitchPage, doNotPushHistory, historyDescription, historySource }?: DslOpOptions): Promise<MNode | MNode[]>;
+  dragTo(config: MNode | MNode[], targetParent: MContainer, targetIndex: number, { doNotPushHistory, historyDescription, historySource }?: DslOpOptions): Promise<void>;
   /**
    * 下列 *AndGetHistoryId 方法与对应的普通操作（add / remove / update ...）行为完全一致，
    * 返回值在 {@link DslOpWithHistoryIdsResult} 中同时包含原操作结果与本次写入历史栈的 uuid 列表（{@link StepValue.uuid}），
@@ -809,13 +765,7 @@ declare class Editor extends BaseService {
   /** 等价于 {@link remove}，并额外返回本次写入历史记录的 uuid 列表（未入栈时 historyIds 为 `[]`）。 */
   removeAndGetHistoryId(nodeOrNodeList: MNode | MNode[], options?: DslOpOptions): Promise<DslOpWithHistoryIdsResult<void>>;
   /** 等价于 {@link update}，并额外返回本次写入历史记录的 uuid 列表（未入栈时 historyIds 为 `[]`）。 */
-  updateAndGetHistoryId(config: MNode | MNode[], data?: {
-    changeRecords?: ChangeRecord[];
-    changeRecordList?: ChangeRecord[][];
-    doNotPushHistory?: boolean;
-    historyDescription?: string;
-    historySource?: HistoryOpSource;
-  }): Promise<DslOpWithHistoryIdsResult<MNode | MNode[]>>;
+  updateAndGetHistoryId(config: MNode | MNode[], data?: UpdateOptions): Promise<DslOpWithHistoryIdsResult<MNode | MNode[]>>;
   /** 等价于 {@link moveLayer}，并额外返回本次写入历史记录的 uuid 列表（未入栈时 historyIds 为 `[]`）。 */
   moveLayerAndGetHistoryId(offset: number | LayerOffset, options?: DslOpOptions): Promise<DslOpWithHistoryIdsResult<void>>;
   /** 等价于 {@link moveToContainer}，并额外返回本次写入历史记录的 uuid 列表（未入栈时 historyIds 为 `[]`）。 */
@@ -867,19 +817,52 @@ declare class Editor extends BaseService {
    * @returns 实际移动到的最终游标位置
    */
   gotoPageStep(targetCursor: number): Promise<number>;
-  move(left: number, top: number, {
-    doNotPushHistory,
-    historyDescription,
-    historySource
-  }?: DslOpOptions): Promise<void>;
+  move(left: number, top: number, { doNotPushHistory, historyDescription, historySource }?: DslOpOptions): Promise<void>;
   resetState(): void;
   destroy(): void;
   resetModifiedNodeId(): void;
+  /**
+   * 记录（或覆盖）某个节点在指定来源（属性表单 / 样式表单）上的校验错误信息。
+   * @param id 节点 id
+   * @param source 错误来源：'props'（属性表单）| 'style'（样式表单）
+   * @param message 错误文案（可能是包含 <br> 的 HTML）
+   */
+  setInvalidNode(id: Id, source: NodeInvalidSource, message: string): void;
+  /**
+   * 删除节点的校验错误记录。
+   * @param id 节点 id
+   * @param source 指定来源则仅删除该来源；不传则删除该节点全部来源的错误
+   */
+  deleteInvalidNode(id: Id, source?: NodeInvalidSource): void;
+  /** 获取当前存在校验错误的节点错误 Map（key 为节点 id） */
+  getInvalidNodeIds(): Map<Id, NodeInvalidInfo>;
+  /** 获取指定节点的校验错误信息 */
+  getInvalidNodeInfo(id: Id): NodeInvalidInfo | undefined;
+  /** 清空全部校验错误记录 */
+  resetInvalidNodeId(): void;
   usePlugin(options: AsyncHookPlugin<AsyncMethodName, Editor>): void;
   on<Name extends keyof EditorEvents, Param extends EditorEvents[Name]>(eventName: Name, listener: (...args: Param) => void | Promise<void>): this;
   once<Name extends keyof EditorEvents, Param extends EditorEvents[Name]>(eventName: Name, listener: (...args: Param) => void | Promise<void>): this;
   emit<Name extends keyof EditorEvents, Param extends EditorEvents[Name]>(eventName: Name, ...args: Param): boolean;
+  /**
+   * 应用一次属性面板提交携带的校验错误信息（在写入历史记录之前调用，使历史快照与本次变更对齐）。
+   * - invalidInfo 为空（调用方未携带）：认为本次更新对应的节点已无校验错误，清除其全部来源的错误；
+   * - error 非空则记录错误，为空则清除对应来源的错误。
+   */
+  private applyInvalidInfo;
+  /** 删除被移除节点（含其子树）的校验错误记录，避免残留误报 */
+  private removeInvalidNodesBySubtree;
+  /** 清理不在当前 DSL 中的失效节点错误记录（用于整体替换 root 后） */
+  private pruneInvalidNodeIds;
   private addModifiedNodeId;
+  /**
+   * 获取指定节点所属的页面 / 页面片：
+   * - 普通节点返回其所在的 page；
+   * - 节点本身就是 page / pageFragment 时返回它自己；
+   * - 找不到时返回 null。
+   * 供 `change` 事件携带「变更节点对应的 page」（而非编辑器当前选中页）。
+   */
+  private getPageOfNode;
   private captureSelectionBeforeOp;
   /**
    * 比较「上一次 root」与「新 root」的页面 / 页面片，按页面粒度把整体替换拆成历史记录：
@@ -903,10 +886,12 @@ declare class Editor extends BaseService {
   /**
    * 应用历史操作（撤销 / 重做）
    *
-   * 所有 DSL 修改都走 `editor.add / remove / update`，并通过 `doNotPushHistory` 阻止再次入栈、
-   * `doNotSelect / doNotSwitchPage` 让选区由方法末尾的统一逻辑兜底。
+   * 删除 / 更新类修改走 `editor.remove / update`，并通过 `doNotPushHistory` 阻止再次入栈、
+   * `doNotSelect / doNotSwitchPage` 让选区由方法末尾的统一逻辑兜底；
+   * 「重新插回节点」（撤销 remove / 重做 add）需按 step 记录的 parentId / index 精确还原，
+   * 不走 this.add，由手工 splice + stage.add 完成后补发等价的 add / change 事件（见 emitHistoryInsertEvents）。
    *
-   * 注意：这些公开方法会发出 add / remove / update 事件，业务侧若需要区分"用户操作"与"撤销重做触发"，
+   * 注意：这些路径都会发出 add / remove / update / change 事件，业务侧若需要区分"用户操作"与"撤销重做触发"，
    * 请监听 `history-change` 事件配合判断。
    *
    * @param step 操作记录
@@ -914,9 +899,14 @@ declare class Editor extends BaseService {
    */
   private applyHistoryOp;
   private selectedConfigExceptionHandler;
+  /**
+   * 撤销 remove / 重做 add 通过手工 splice 按 step 记录的 parentId / index 精确还原节点（不走 this.add，原因见调用处注释），
+   * 这里补齐与 this.add 等价的 add / change 事件，保证撤销/重做路径的事件行为与正向操作一致。
+   */
+  private emitHistoryInsertEvents;
 }
 type EditorService = Editor;
-declare const _default$42: Editor;
+declare const _default$45: Editor;
 //#endregion
 //#region temp/packages/editor/src/services/events.d.ts
 declare const canUsePluginMethods$6: {
@@ -929,22 +919,27 @@ declare class Events extends BaseService {
   constructor();
   setEvents(events: Record<string, EventOption[]>): void;
   setEvent(type: string, events: EventOption[]): void;
-  getEvent(type: string): EventOption[];
+  getEvent(type: string, _data?: {
+    node?: MNode | null;
+  }): EventOption[];
   setMethods(methods: Record<string, EventOption[]>): void;
   setMethod(type: string, method: EventOption[]): void;
-  getMethod(type: string, _targetId: Id): EventOption[];
+  getMethod(type: string, _data?: {
+    node?: MNode | null;
+    targetId?: Id;
+  }): EventOption[];
   resetState(): void;
   destroy(): void;
   usePlugin(options: AsyncHookPlugin<AsyncMethodName$3, Events> & SyncHookPlugin<SyncMethodName$4, Events>): void;
 }
 type EventsService = Events;
-declare const _default$43: Events;
+declare const _default$46: Events;
 //#endregion
 //#region temp/packages/editor/src/utils/undo-redo.d.ts
 /**
  * UndoRedo 栈的可序列化快照，用于持久化（如写入 IndexedDB）后再还原。
  */
-interface SerializedUndoRedo<T = any> {
+export interface SerializedUndoRedo<T = any> {
   /** 栈内全部元素（按时间正序，索引 0 为最早一步）。 */
   elementList: T[];
   /** 游标位置（已应用步骤数量）。 */
@@ -952,7 +947,7 @@ interface SerializedUndoRedo<T = any> {
   /** 栈容量上限。 */
   listMaxSize: number;
 }
-declare class UndoRedo<T = any> {
+export declare class UndoRedo<T = any> {
   /**
    * 由 {@link UndoRedo.serialize} 产出的快照重建一个 UndoRedo 实例。
    * 游标会被夹紧到 [0, length] 区间，避免脏数据导致越界。
@@ -1155,6 +1150,22 @@ declare class History extends BaseService {
    * @param id       目标栈 id；缺省表示标记全部类型 / 全部栈
    */
   markSaved(stepType: HistoryStepType, id?: Id): void;
+  /**
+   * 派发「页面 / 页面片结构变更」事件（`page-structure-change`）。
+   *
+   * 常规 `editorService.add` / `remove` 页面节点不会写入 `page` 历史栈（见 editor.add / remove 中
+   * 对 isPageOrFragment 的分支），因此不会产生任何 historyService 事件。该方法用于在这些
+   * 场景（以及 setRoot 整体替换 DSL 增删页面）下，向外统一通知页面结构的增删变化，供业务方感知。
+   *
+   * 一次操作涉及多个页面时，调用方应把本次增删的页面**合并为一个 change 一次性传入**，
+   * 使一次操作只派发一个事件；`add` / `remove` 分别为本次新增与删除的页面列表（其一可为空数组）。
+   *
+   * @param change 本次结构变更：{ add: 新增的页面列表, remove: 删除的页面列表 }
+   */
+  notifyPageStructureChange(change: {
+    add: (MPage | MPageFragment)[];
+    remove: (MPage | MPageFragment)[];
+  }): void;
   /**
    * 把当前内存中的全部历史栈（页面 / 代码块 / 数据源 / 扩展类型）序列化后写入本地 IndexedDB。
    *
@@ -1254,7 +1265,7 @@ declare class History extends BaseService {
   private resolveDbName;
 }
 type HistoryService = History;
-declare const _default$44: History;
+declare const _default$47: History;
 //#endregion
 //#region temp/packages/editor/src/services/keybinding.d.ts
 declare class Keybinding extends BaseService {
@@ -1293,6 +1304,7 @@ declare class Keybinding extends BaseService {
   private getKeyconKeys;
 }
 type KeybindingService = Keybinding;
+declare const _default$48: Keybinding;
 //#endregion
 //#region temp/packages/editor/src/services/props.d.ts
 declare const canUsePluginMethods$4: {
@@ -1334,10 +1346,7 @@ declare class Props extends BaseService {
    * @param type 组件类型
    * @returns 组件初始值
    */
-  getPropsValue(componentType: string, {
-    inputEvent,
-    ...defaultValue
-  }?: Record<string, any>): Promise<any>;
+  getPropsValue(componentType: string, { inputEvent, ...defaultValue }?: Record<string, any>): Promise<any>;
   hasPropsValue(type: string): boolean;
   createId(type: string | number): string;
   /**
@@ -1392,7 +1401,7 @@ declare class Props extends BaseService {
   private setRelateId;
 }
 type PropsService = Props;
-declare const _default$46: Props;
+declare const _default$50: Props;
 //#endregion
 //#region temp/packages/editor/src/services/stageOverlay.d.ts
 declare const canUsePluginMethods$3: {
@@ -1419,7 +1428,7 @@ declare class StageOverlay extends BaseService {
   private updateSelectStatus;
 }
 type StageOverlayService = StageOverlay;
-declare const _default$47: StageOverlay;
+declare const _default$51: StageOverlay;
 //#endregion
 //#region temp/packages/editor/src/services/storage.d.ts
 interface Options$1 {
@@ -1482,7 +1491,7 @@ declare class WebStorage extends BaseService {
   private getValueAndProtocol;
 }
 type StorageService = WebStorage;
-declare const _default$48: WebStorage;
+declare const _default$52: WebStorage;
 //#endregion
 //#region temp/packages/editor/src/services/ui.d.ts
 declare const canUsePluginMethods$1: {
@@ -1502,10 +1511,10 @@ declare class Ui extends BaseService {
   private setStageRect;
 }
 type UiService = Ui;
-declare const _default$49: Ui;
+declare const _default$53: Ui;
 //#endregion
 //#region temp/packages/editor/src/type.d.ts
-type EditorSlots = FrameworkSlots & WorkspaceSlots & SidebarSlots & PropsPanelSlots & {
+export type EditorSlots = FrameworkSlots & WorkspaceSlots & SidebarSlots & PropsPanelSlots & {
   workspace(props: {
     editorService: EditorService;
   }): any;
@@ -1513,7 +1522,7 @@ type EditorSlots = FrameworkSlots & WorkspaceSlots & SidebarSlots & PropsPanelSl
     editorService: EditorService;
   }): any;
 };
-interface FrameworkSlots {
+export interface FrameworkSlots {
   header(props: {}): any;
   nav(props: {}): any;
   'content-before'(props: {}): any;
@@ -1523,7 +1532,7 @@ interface FrameworkSlots {
   empty(props: {}): any;
   workspace(props: {}): any;
   'props-panel'(props: {}): any;
-  'footer'(props: {}): any;
+  footer(props: {}): any;
   'page-bar'(props: {}): any;
   'page-bar-add-button'(props: {}): any;
   'page-bar-title'(props: {
@@ -1536,19 +1545,19 @@ interface FrameworkSlots {
     list: (MPage | MPageFragment)[];
   }): any;
 }
-interface ScrollViewerSlots {
+export interface ScrollViewerSlots {
   before(props: {}): any;
   content(props: {}): any;
   default(props: {}): any;
 }
-interface StageSlots extends ScrollViewerSlots {
+export interface StageSlots extends ScrollViewerSlots {
   'stage-top'(props: {}): any;
 }
-interface WorkspaceSlots extends StageSlots {
+export interface WorkspaceSlots extends StageSlots {
   stage(props: {}): any;
   'workspace-content'(props: {}): any;
 }
-interface ComponentListPanelSlots {
+export interface ComponentListPanelSlots {
   'component-list-panel-header'(props: {}): any;
   'component-list'(props: {
     componentGroupList: ComponentGroup[];
@@ -1557,23 +1566,23 @@ interface ComponentListPanelSlots {
     component: ComponentItem;
   }): any;
 }
-interface CodeBlockListPanelSlots extends CodeBlockListSlots {
+export interface CodeBlockListPanelSlots extends CodeBlockListSlots {
   'code-block-panel-search'(props: {}): any;
   'code-block-panel-header'(props: {}): any;
 }
-interface CodeBlockListSlots {
+export interface CodeBlockListSlots {
   'code-block-panel-tool'(props: {
     id: Id;
     data: any;
   }): any;
 }
-interface DataSourceListSlots {
+export interface DataSourceListSlots {
   'data-source-panel-tool'(props: {
     data: any;
   }): any;
   'data-source-panel-search'(props: {}): any;
 }
-interface LayerNodeSlots {
+export interface LayerNodeSlots {
   'layer-node-content'(props: {
     data: MNode;
   }): any;
@@ -1584,16 +1593,17 @@ interface LayerNodeSlots {
     data: MNode;
   }): any;
 }
-interface LayerPanelSlots extends LayerNodeSlots {
+export interface LayerPanelSlots extends LayerNodeSlots {
   'layer-panel-header'(props: {}): any;
 }
-interface PropsPanelSlots {
+export interface PropsPanelSlots {
   'props-panel-header'(props: {}): any;
 }
-type SidebarSlots = LayerPanelSlots & CodeBlockListPanelSlots & ComponentListPanelSlots & DataSourceListSlots;
-type BeforeAdd = (config: MNode, parent: MContainer) => Promise<MNode> | MNode;
-type GetConfig = (config: FormConfig) => Promise<FormConfig> | FormConfig;
-interface EditorInstallOptions {
+export type SidebarSlots = LayerPanelSlots & CodeBlockListPanelSlots & ComponentListPanelSlots & DataSourceListSlots;
+export type BeforeAdd = (config: MNode, parent: MContainer) => Promise<MNode> | MNode;
+export type GetConfig = (config: FormConfig) => Promise<FormConfig> | FormConfig;
+export interface EditorInstallOptions {
+  flat?: boolean;
   parseDSL: <T = any>(dsl: string) => T;
   customCreateMonacoEditor: (monaco: typeof import('monaco-editor'), codeEditorEl: HTMLElement, options: Monaco.editor.IStandaloneEditorConstructionOptions & {
     editorCustomType?: string;
@@ -1603,7 +1613,7 @@ interface EditorInstallOptions {
   }) => Promise<Monaco.editor.IStandaloneDiffEditor> | Monaco.editor.IStandaloneDiffEditor;
   [key: string]: any;
 }
-interface Services {
+export interface Services {
   editorService: EditorService;
   historyService: HistoryService;
   storageService: StorageService;
@@ -1617,12 +1627,25 @@ interface Services {
   keybindingService: KeybindingService;
   stageOverlayService: StageOverlayService;
 }
-interface StageOptions {
+declare module '@tmagic/form-schema' {
+  interface FormContext {
+    /** 编辑器服务集合（由 Editor / FormPanel provide） */
+    services?: Services;
+    /** 当前画布 Stage 实例（由 Editor / FormPanel provide） */
+    stage?: any;
+  }
+}
+export interface StageOptions {
   runtimeUrl?: string;
   autoScrollIntoView?: boolean;
   containerHighlightClassName?: string;
   containerHighlightDuration?: number;
   containerHighlightType?: ContainerHighlightType;
+  /**
+   * 是否仅在新增组件（从组件列表拖入新组件）时才启用识别容器，
+   * 开启后在画布中拖动已有组件不会识别容器，默认 false
+   */
+  containerHighlightAddOnly?: boolean;
   disabledDragStart?: boolean;
   render?: (stage: StageCore$1) => HTMLDivElement | void | Promise<HTMLDivElement | void>;
   moveableOptions?: CustomizeMoveableOptions;
@@ -1655,7 +1678,21 @@ interface StageOptions {
   /** 画布双击前的钩子函数，返回 false 则阻止默认的双击行为 */
   beforeDblclick?: (event: MouseEvent) => Promise<boolean | void> | boolean | void;
 }
-interface StoreState {
+/**
+ * 节点校验错误信息，按来源（属性表单 / 样式表单）分别保存错误文案。
+ * 属性表单与样式表单是两个独立的 FormPanel，均指向同一节点，故以来源为键，
+ * 避免某个面板校验通过时误清另一个面板记录的错误。
+ * 节点视为存在错误当且仅当任一来源存在非空文本。
+ */
+export interface NodeInvalidInfo {
+  /** 属性表单校验错误文案（可能为包含 <br> 的 HTML） */
+  props?: string;
+  /** 样式表单校验错误文案（可能为包含 <br> 的 HTML） */
+  style?: string;
+}
+/** 节点校验错误来源 */
+export type NodeInvalidSource = keyof NodeInvalidInfo;
+export interface StoreState {
   root: MApp | null;
   page: MPage | MPageFragment | null;
   parent: MContainer | null;
@@ -1665,14 +1702,16 @@ interface StoreState {
   stage: StageCore$1 | null;
   stageLoading: boolean;
   modifiedNodeIds: Map<Id, Id>;
+  /** 校验失败的节点错误信息，按节点 id 存储，供组件树标记与保存拦截读取 */
+  invalidNodeIds: Map<Id, NodeInvalidInfo>;
   pageLength: number;
   pageFragmentLength: number;
   disabledMultiSelect: boolean;
   /** 是否始终启用多选模式（无需按住 Ctrl/Meta） */
   alwaysMultiSelect: boolean;
 }
-type StoreStateKey = keyof StoreState;
-interface PropsState {
+export type StoreStateKey = keyof StoreState;
+export interface PropsState {
   propsConfigMap: Record<string, FormConfig>;
   propsValueMap: Record<string, Partial<MNode>>;
   relateIdMap: Record<Id, Id>;
@@ -1681,7 +1720,7 @@ interface PropsState {
   /** 禁用代码块 */
   disabledCodeBlock: boolean;
 }
-interface StageOverlayState {
+export interface StageOverlayState {
   wrapDiv: HTMLDivElement;
   sourceEl: HTMLElement | null;
   contentEl: HTMLElement | null;
@@ -1691,29 +1730,29 @@ interface StageOverlayState {
   wrapHeight: number;
   stageOverlayVisible: boolean;
 }
-interface ComponentGroupState {
+export interface ComponentGroupState {
   list: ComponentGroup[];
 }
-declare enum ColumnLayout {
+export declare enum ColumnLayout {
   LEFT = "left",
   CENTER = "center",
   RIGHT = "right"
 }
-interface SetColumnWidth {
+export interface SetColumnWidth {
   [ColumnLayout.LEFT]?: number;
   [ColumnLayout.CENTER]?: number | 'auto';
   [ColumnLayout.RIGHT]?: number;
 }
-interface GetColumnWidth {
+export interface GetColumnWidth {
   [ColumnLayout.LEFT]: number;
   [ColumnLayout.CENTER]: number;
   [ColumnLayout.RIGHT]: number;
 }
-interface StageRect {
+export interface StageRect {
   width: number | string;
   height: number | string;
 }
-interface UiState {
+export interface UiState {
   /** 当前点击画布是否触发选中，true: 不触发，false: 触发，默认为false */
   uiSelectMode: boolean;
   /** 是否显示整个配置源码， true: 显示， false: 不显示，默认为false */
@@ -1731,6 +1770,12 @@ interface UiState {
   stageRect: StageRect;
   /** 编辑器列布局每一列的宽度，分为左中右三列 */
   columnWidth: GetColumnWidth;
+  /** 编辑器列布局左侧列最小宽度 */
+  minLeftColumnWidth: number;
+  /** 编辑器列布局中间列最小宽度 */
+  minCenterColumnWidth: number;
+  /** 编辑器列布局右侧列最小宽度 */
+  minRightColumnWidth: number;
   /** 是否显示画布参考线，true: 显示，false: 不显示，默认为true */
   showGuides: boolean;
   /** 画布上是否存在参考线 */
@@ -1762,19 +1807,19 @@ interface UiState {
     height: number;
   };
 }
-interface EditorNodeInfo {
+export interface EditorNodeInfo {
   node: MNode | null;
   parent: MContainer | null;
   page: MPage | MPageFragment | null;
   path: MNode[];
 }
-interface AddMNode {
+export interface AddMNode {
   type: string;
   name?: string;
   inputEvent?: DragEvent;
   [key: string]: any;
 }
-interface PastePosition {
+export interface PastePosition {
   left?: number;
   top?: number;
   /**
@@ -1789,7 +1834,7 @@ interface PastePosition {
 /**
  * 菜单按钮
  */
-interface MenuButton {
+export interface MenuButton {
   /**
    * 按钮类型
    * button: 只有文字不带边框的按钮
@@ -1821,7 +1866,7 @@ interface MenuButton {
     type?: string;
   };
 }
-interface MenuComponent {
+export interface MenuComponent {
   type: 'component';
   /** Vue3组件 */
   component: any;
@@ -1849,9 +1894,9 @@ interface MenuComponent {
  * 'scale-to-fit': 缩放以适应
  * 'history-list': 历史记录面板（按 页面 / 数据源 / 代码块 三个 tab 展示，相邻同目标修改自动合并）
  */
-type MenuItem = '/' | 'delete' | 'undo' | 'redo' | 'zoom' | 'zoom-in' | 'zoom-out' | 'guides' | 'rule' | 'scale-to-original' | 'scale-to-fit' | 'history-list' | MenuButton | MenuComponent | string;
+export type MenuItem = '/' | 'delete' | 'undo' | 'redo' | 'zoom' | 'zoom-in' | 'zoom-out' | 'guides' | 'rule' | 'scale-to-original' | 'scale-to-fit' | 'history-list' | MenuButton | MenuComponent | string;
 /** 工具栏 */
-interface MenuBarData {
+export interface MenuBarData {
   /** 顶部工具栏左边项 */
   [ColumnLayout.LEFT]?: MenuItem[];
   /** 顶部工具栏中间项 */
@@ -1859,7 +1904,7 @@ interface MenuBarData {
   /** 顶部工具栏右边项 */
   [ColumnLayout.RIGHT]?: MenuItem[];
 }
-interface SideComponent extends MenuComponent {
+export interface SideComponent extends MenuComponent {
   /** 显示文案 */
   text: string;
   /** tab样式 */
@@ -1874,7 +1919,9 @@ interface SideComponent extends MenuComponent {
   beforeClick?: (config: SideComponent) => boolean | Promise<boolean>;
   /** 组件扩展参数 */
   boxComponentConfig?: {
-    /** Vue3组件 */component?: any; /** 传入组件的props对象 */
+    /** Vue3组件 */
+    component?: any;
+    /** 传入组件的props对象 */
     props?: Record<string, any>;
   };
 }
@@ -1886,7 +1933,7 @@ interface SideComponent extends MenuComponent {
  * 独立的 tab 来展示与回滚。内置的「页面 / 数据源 / 代码块」三个 tab 之后
  * 会依次追加这些扩展 tab。
  */
-interface HistoryListExtraTab {
+export interface HistoryListExtraTab {
   /** tab 唯一标识，作为 TMagicTabs 的 name */
   name: string;
   /** tab 显示文案，支持传入函数以展示动态内容（如记录数量） */
@@ -1904,12 +1951,12 @@ interface HistoryListExtraTab {
  * - data-source: 数据源，按 `type`(base/http/...) 从 dataSourceService 获取数据源表单配置
  * - code-block: 数据源代码块，使用内置的代码块表单配置
  */
-type CompareCategory = 'node' | 'data-source' | 'code-block' | string;
+export type CompareCategory = 'node' | 'data-source' | 'code-block' | string;
 /**
  * 自定义 `loadConfig` 时回传的上下文，聚合了组件当前的对比入参，
  * 方便调用方在外部按需拼装 FormConfig。
  */
-interface CompareFormLoadConfigContext {
+export interface CompareFormLoadConfigContext {
   /** 对比类型，见 CompareCategory */
   category: string;
   /** 节点 / 数据源类型 */
@@ -1926,8 +1973,47 @@ interface CompareFormLoadConfigContext {
  * 自定义 FormConfig 加载逻辑。传入后将接管内置的按 `category` 取配置逻辑，
  * 可通过 `ctx.defaultLoadConfig()` 复用默认结果再做二次加工。
  */
-type CompareFormLoadConfig = (ctx: CompareFormLoadConfigContext) => FormConfig | Promise<FormConfig>;
-declare enum SideItemKey {
+export type CompareFormLoadConfig = (ctx: CompareFormLoadConfigContext) => FormConfig | Promise<FormConfig>;
+/**
+ * CompareForm / ViewForm 共用的基础 props。
+ * 两者都基于同一套「按 category 加载 FormConfig + 注入 services/stage」的逻辑（见 useCompareForm），
+ * 差异仅在于是否做新旧值对比。这里抽出公共字段避免重复定义。
+ */
+export interface CompareFormBaseProps {
+  /** 当前值（对比场景下为修改后的值） */
+  value: Partial<MNode> | Partial<DataSourceSchema> | Partial<CodeBlockContent> | Record<string, any>;
+  /**
+   * 类型说明：
+   * - `category` 为 `node` 时，`type` 为节点组件的类型，例如 'text'、'button'、'page'、'container' 等
+   * - `category` 为 `data-source` 时，`type` 为数据源类型，例如 'base'、'http'
+   * - `category` 为 `code-block` 时，`type` 可不传
+   */
+  type?: string;
+  /** 表单配置类别，决定从哪里取 FormConfig */
+  category?: CompareCategory;
+  /** 数据源代码块场景下的数据源类型（base/http），用于代码块表单中"执行时机"展示 */
+  dataSourceType?: string;
+  labelWidth?: string;
+  /**
+   * 外层容器高度。设置后表单内容超出时会在组件内部出现滚动条，
+   * 避免 dialog / 面板使用方需要自行处理滚动。可传任意 CSS 长度，例如 `60vh` / `400px` / `100%`。
+   */
+  height?: string;
+  /**
+   * 表单内组件的尺寸（透传给 MForm 的 `size`），可选 'large' | 'default' | 'small'。
+   * 缺省时使用 MForm 内置默认尺寸。
+   */
+  size?: FieldSize;
+  /**
+   * 自定义 FormConfig 加载逻辑。传入后将接管内置的按 `category`(node/data-source/code-block)
+   * 取配置逻辑，调用方可根据业务自行返回（或异步返回）表单配置。可通过
+   * `ctx.defaultLoadConfig()` 复用默认结果再做二次加工。
+   */
+  loadConfig?: CompareFormLoadConfig;
+  /** 编辑器服务集合，由调用方传入（不再通过 inject('services') 获取）。 */
+  services?: Services;
+}
+export declare enum SideItemKey {
   COMPONENT_LIST = "component-list",
   LAYER = "layer",
   CODE_BLOCK = "code-block",
@@ -1938,9 +2024,9 @@ declare enum SideItemKey {
  * layer: 已选组件树
  * code-block: 代码块
  */
-type SideItem = `${SideItemKey}` | SideComponent;
+export type SideItem = `${SideItemKey}` | SideComponent;
 /** 工具栏 */
-interface SideBarData {
+export interface SideBarData {
   /** 容器类型 */
   type: 'tabs';
   /** 默认激活的内容 */
@@ -1948,7 +2034,7 @@ interface SideBarData {
   /** panel列表 */
   items: SideItem[];
 }
-interface ComponentItem {
+export interface ComponentItem {
   /** 显示文案 */
   text: string;
   /** 详情，用于tooltip */
@@ -1962,43 +2048,48 @@ interface ComponentItem {
     [key: string]: any;
   };
 }
-interface ComponentGroup {
+export interface ComponentGroup {
   /** 显示文案 */
   title: string;
   /** 组内列表 */
   items: ComponentItem[];
 }
-declare enum LayerOffset {
+export declare enum LayerOffset {
   TOP = "top",
   BOTTOM = "bottom"
 }
 /** 容器布局 */
-declare enum Layout {
+export declare enum Layout {
   FLEX = "flex",
   FIXED = "fixed",
   RELATIVE = "relative",
   ABSOLUTE = "absolute"
 }
-declare enum Keys {
+export declare enum Keys {
   ESCAPE = "Space"
 }
-interface ScrollViewerEvent {
+export interface ScrollViewerEvent {
   scrollLeft: number;
   scrollTop: number;
   scrollHeight: number;
   scrollWidth: number;
 }
-type CodeState = {
-  /** 代码块DSL数据源 */codeDsl: CodeBlockDSL | null; /** 代码块是否可编辑 */
-  editable: boolean; /** list模式下左侧展示的代码列表 */
-  combineIds: string[]; /** 为业务逻辑预留的不可删除的代码块列表，由业务逻辑维护（如代码块上线后不可删除） */
+export type CodeState = {
+  /** 代码块DSL数据源 */
+  codeDsl: CodeBlockDSL | null;
+  /** 代码块是否可编辑 */
+  editable: boolean;
+  /** list模式下左侧展示的代码列表 */
+  combineIds: string[];
+  /** 为业务逻辑预留的不可删除的代码块列表，由业务逻辑维护（如代码块上线后不可删除） */
   undeletableList: Id[];
   paramsColConfig?: TableColumnConfig;
 };
-type CodeRelation = {
-  /** 组件id:[代码id1，代码id2] */[compId: Id]: Id[];
+export type CodeRelation = {
+  /** 组件id:[代码id1，代码id2] */
+  [compId: Id]: Id[];
 };
-interface CodeDslItem {
+export interface CodeDslItem {
   /** 代码块id */
   id: Id;
   /** 代码块名称 */
@@ -2010,24 +2101,24 @@ interface CodeDslItem {
   /** 代码块对应绑定的组件信息 */
   combineInfo?: CombineInfo[];
 }
-interface CombineInfo {
+export interface CombineInfo {
   /** 组件id */
   compId: Id;
   /** 组件名称 */
   compName: string;
 }
-interface ListState {
+export interface ListState {
   /** 代码块列表 */
   codeList: CodeDslItem[];
 }
-declare enum CodeDeleteErrorType {
+export declare enum CodeDeleteErrorType {
   /** 代码块存在于不可删除列表中 */
   UNDELETEABLE = "undeleteable",
   /** 代码块存在绑定关系 */
   BIND = "bind"
 }
-declare const CODE_DRAFT_STORAGE_KEY = "magicCodeDraft";
-interface CodeParamStatement {
+export declare const CODE_DRAFT_STORAGE_KEY = "magicCodeDraft";
+export interface CodeParamStatement {
   /** 参数名称 */
   name: string;
   /** 参数类型 */
@@ -2040,7 +2131,7 @@ interface CodeParamStatement {
  * - `initial`：页面「未修改的初始状态」基线（设置 root 时生成），作为页面栈 index 0 的固定底线 step。
  *   该 step 不可被撤销/回滚（cursor 不会低于它），仅用于历史面板底部的初始行展示。
  */
-type HistoryOpType = 'add' | 'remove' | 'update' | 'initial';
+export type HistoryOpType = 'add' | 'remove' | 'update' | 'initial';
 /**
  * 历史记录的「操作途径」——标记本次变更由哪条交互入口触发，仅用于历史面板展示 / 业务埋点，
  * 不影响 undo/redo 行为。缺省（未传）时 UI 视为「未知」。
@@ -2061,9 +2152,9 @@ type HistoryOpType = 'add' | 'remove' | 'update' | 'initial';
  *
  * 通过 `(string & {})` 允许业务侧扩展自定义途径字符串，同时保留内置值的自动补全。
  */
-type HistoryOpSource = 'initial' | 'stage' | 'tree' | 'component-panel' | 'props' | 'code' | 'root-code' | 'stage-contextmenu' | 'tree-contextmenu' | 'toolbar' | 'shortcut' | 'rollback' | 'api' | 'ai' | 'sync' | 'unknown' | (string & {});
+export type HistoryOpSource = 'initial' | 'stage' | 'tree' | 'component-panel' | 'props' | 'code' | 'root-code' | 'stage-contextmenu' | 'tree-contextmenu' | 'toolbar' | 'shortcut' | 'rollback' | 'api' | 'ai' | 'sync' | 'unknown' | (string & {});
 /** *AndGetHistoryId 系列方法返回值：原操作结果 + 本次写入历史记录的 uuid 列表（未入栈时为 `[]`）。 */
-type DslOpWithHistoryIdsResult<T> = {
+export type DslOpWithHistoryIdsResult<T> = {
   result: T;
   historyIds: string[];
 };
@@ -2078,7 +2169,7 @@ type DslOpWithHistoryIdsResult<T> = {
  *
  * 泛型 `T` 为变化内容的快照类型：页面节点为 `MNode`，代码块为 `CodeBlockContent`，数据源为 `DataSourceSchema`。
  */
-interface StepDiffItem<T = unknown> {
+export interface StepDiffItem<T = unknown> {
   /** 变更后的内容快照。`opType` 为 `add` / `update` 时有，`remove` 时无。 */
   newSchema?: T;
   /** 变更前的内容快照。`opType` 为 `remove` / `update` 时有，`add` 时无。 */
@@ -2098,7 +2189,7 @@ interface StepDiffItem<T = unknown> {
  *
  * 泛型 `T` 为 `diff` 中变化内容的快照类型（页面节点 `MNode` / 代码块 `CodeBlockContent` / 数据源 `DataSourceSchema`）。
  */
-interface BaseStepValue<T = unknown, U extends Record<string, any> = {}> {
+export interface BaseStepValue<T = unknown, U extends Record<string, any> = {}> {
   /**
    * 历史记录唯一标识（uuid）。入栈时自动写入（若调用方未指定），
    * 用于精确定位 / 引用某一条历史记录（如 revert、埋点、跨端同步等）。
@@ -2155,37 +2246,41 @@ interface BaseStepValue<T = unknown, U extends Record<string, any> = {}> {
  * 历史记录的扩展上下文（{@link BaseStepValue.extra}）。
  * 内置字段供 `page` 类型在撤销 / 重做时恢复选区与受影响节点；扩展类型可自由附加其它键。
  */
-interface StepExtra {
+export interface StepExtra {
   /** 操作前选中的节点 ID，用于撤销后恢复选择状态（page 类型） */
   selectedBefore?: Id[];
   /** 操作后选中的节点 ID，用于重做后恢复选择状态（page 类型） */
   selectedAfter?: Id[];
   /** 本次操作涉及的节点 id 集合（page 类型） */
   modifiedNodeIds?: Map<Id, Id>;
+  /** 操作前的节点校验错误快照，撤销后还原（使撤销一个「校验失败」的改动后错误消失） */
+  invalidNodeIdsBefore?: Map<Id, NodeInvalidInfo>;
+  /** 操作后的节点校验错误快照，重做后还原（使重做后错误恢复） */
+  invalidNodeIdsAfter?: Map<Id, NodeInvalidInfo>;
   [key: string]: any;
 }
 /**
  * 页面节点历史记录条目（`diff` 内容为 {@link MNode}）。结构已与代码块 / 数据源统一收敛到
  * {@link BaseStepValue}：关联 id 见 `data.id`，选区等上下文见 `extra`。
  */
-type StepValue = BaseStepValue<MNode, StepExtra>;
+export type StepValue = BaseStepValue<MNode, StepExtra>;
 /**
  * 代码块历史记录条目（`diff` 内容为 {@link CodeBlockContent}），按 `data.id`（codeBlock.id）
  * 分组保存到 historyState.steps.codeBlock。结构与 {@link StepValue} / {@link DataSourceStepValue}
  * 一致，仅 `diff` 快照类型不同。
  */
-type CodeBlockStepValue = BaseStepValue<CodeBlockContent>;
+export type CodeBlockStepValue = BaseStepValue<CodeBlockContent>;
 /**
  * 数据源历史记录条目（`diff` 内容为 {@link DataSourceSchema}），按 `data.id`（dataSource.id）
  * 分组保存到 historyState.steps.dataSource。结构与 {@link StepValue} / {@link CodeBlockStepValue}
  * 一致，仅 `diff` 快照类型不同。
  */
-type DataSourceStepValue = BaseStepValue<DataSourceSchema>;
+export type DataSourceStepValue = BaseStepValue<DataSourceSchema>;
 /**
  * 历史记录类型标识：内置 `page` / `codeBlock` / `dataSource`，并允许业务扩展自定义类型。
  * `(string & {})` 保留对内置字面量的智能提示，同时不限制扩展取值。
  */
-type HistoryStepType = 'page' | 'codeBlock' | 'dataSource' | (string & {});
+export type HistoryStepType = 'page' | 'codeBlock' | 'dataSource' | (string & {});
 /**
  * 全部历史栈的统一容器，按「类型 -> id -> UndoRedo 栈」两级分组。
  *
@@ -2197,14 +2292,14 @@ type HistoryStepType = 'page' | 'codeBlock' | 'dataSource' | (string & {});
  * 所有类型（含扩展类型）一视同仁：均按 id 独立分栈、独立 undo/redo，且都可通过
  * {@link HistoryService.setMarker} 在 index 0 种入 `initial` 基线（撤销 / 回滚不会越过该基线）。
  */
-interface HistorySteps {
+export interface HistorySteps {
   page: Record<Id, UndoRedo<StepValue>>;
   codeBlock: Record<Id, UndoRedo<CodeBlockStepValue>>;
   dataSource: Record<Id, UndoRedo<DataSourceStepValue>>;
   /** 扩展历史类型：按 id 分组的 UndoRedo 栈。 */
   [stepType: string]: Record<Id, UndoRedo<any>>;
 }
-interface HistoryState {
+export interface HistoryState {
   /**
    * 全部历史栈的统一容器（页面 / 代码块 / 数据源 / 扩展类型），见 {@link HistorySteps}。
    * 各类型互不影响，支持按 id 独立 undo/redo；是否可撤销 / 重做改用 {@link HistoryService.canUndo} /
@@ -2223,7 +2318,7 @@ interface HistoryState {
  * 历史记录的可持久化快照。由 historyService.saveToIndexedDB 写入 IndexedDB，
  * 再由 historyService.restoreFromIndexedDB 读出并重建各 UndoRedo 栈。
  */
-interface PersistedHistoryState {
+export interface PersistedHistoryState {
   /** 快照结构版本号，便于后续兼容升级。 */
   version: number;
   /**
@@ -2240,7 +2335,7 @@ interface PersistedHistoryState {
   savedAt: number;
 }
 /** historyService 持久化相关 API 的可选配置。 */
-interface HistoryPersistOptions {
+export interface HistoryPersistOptions {
   /** IndexedDB 数据库名，默认 `tmagic-editor`（最终库名会拼上当前 DSL app id）。 */
   dbName?: string;
   /** objectStore 名，默认 `history`。 */
@@ -2257,7 +2352,7 @@ interface HistoryPersistOptions {
 /**
  * 历史面板用：当前页面的一条历史步骤（包含位置和是否已应用）。
  */
-interface HistoryStepEntry<T> {
+export interface HistoryStepEntry<T> {
   /** 步骤内容 */
   step: T;
   /** 在所属栈中的索引（0 为最早） */
@@ -2280,7 +2375,7 @@ interface HistoryStepEntry<T> {
  * - 数据源：`HistoryGroup<DataSourceStepValue>`，`kind: 'data-source'`，`id` 为 dataSource.id；
  * - 代码块：`HistoryGroup<CodeBlockStepValue>`，`kind: 'code-block'`，`id` 为 codeBlock.id。
  */
-interface HistoryGroup<T extends BaseStepValue = BaseStepValue> {
+export interface HistoryGroup<T extends BaseStepValue = BaseStepValue> {
   /** 历史类型标识：page / code-block / data-source（扩展类型同理）。 */
   kind: string;
   /** 所属栈 id（page 为 pageId，代码块 / 数据源为对应资源 id）。 */
@@ -2306,7 +2401,7 @@ interface HistoryGroup<T extends BaseStepValue = BaseStepValue> {
   /** 是否为当前所在的分组（包含栈中最近一次已应用步骤的那一组）。 */
   isCurrent?: boolean;
 }
-declare enum KeyBindingCommand {
+export declare enum KeyBindingCommand {
   /** 复制 */
   COPY_NODE = "tmagic-system-copy-node",
   /** 粘贴 */
@@ -2346,12 +2441,12 @@ declare enum KeyBindingCommand {
   /** 切换组件 */
   SWITCH_NODE = "tmagic-system-switch-node"
 }
-interface KeyBindingItem {
+export interface KeyBindingItem {
   command: KeyBindingCommand | string;
   keybinding?: string | string[];
   when: [string, 'keyup' | 'keydown'][];
 }
-interface KeyBindingCacheItem {
+export interface KeyBindingCacheItem {
   type: string;
   command: KeyBindingCommand | string;
   keybinding?: string | string[];
@@ -2359,14 +2454,14 @@ interface KeyBindingCacheItem {
   bound: boolean;
 }
 /** 可新增的数据源类型选项 */
-interface DatasourceTypeOption {
+export interface DatasourceTypeOption {
   /** 数据源类型 */
   type: string;
   /** 数据源名称 */
   text: string;
 }
 /** 组件树节点状态 */
-interface LayerNodeStatus {
+export interface LayerNodeStatus {
   /** 显隐 */
   visible: boolean;
   /** 展开子节点 */
@@ -2377,22 +2472,28 @@ interface LayerNodeStatus {
   draggable: boolean;
 }
 /** 拖拽类型 */
-declare enum DragType {
+export declare enum DragType {
   /** 从组件列表拖到画布 */
   COMPONENT_LIST = "component-list",
   /** 拖动组件树节点 */
   LAYER_TREE = "layer-tree"
 }
-interface TreeNodeData {
+export interface TreeNodeData {
   id: Id;
   name?: string;
   items?: TreeNodeData[];
   [key: string]: any;
 }
 /** 判断组件树节点是否可展开（即是否要展示为拥有子节点的形态）的函数 */
-type IsExpandableFunction = (_data: TreeNodeData, _nodeStatusMap: Map<Id, LayerNodeStatus>) => boolean;
+export type IsExpandableFunction = (_data: TreeNodeData, _nodeStatusMap: Map<Id, LayerNodeStatus>) => boolean;
 /** canDropIn 的调用场景 */
-type CanDropInScene = /** 在"已选组件"面板的组件树中拖动节点 */'layer' /** 在画布上拖动已有组件（被拖动组件本身已经存在于画布中，sourceIds 包含其 id） */ | 'stage-drag' /** 从组件列表拖入新组件到画布（被拖入的组件尚不存在，sourceIds 为空数组） */ | 'stage-add';
+export type CanDropInScene =
+/** 在"已选组件"面板的组件树中拖动节点 */
+'layer' |
+/** 在画布上拖动已有组件（被拖动组件本身已经存在于画布中，sourceIds 包含其 id） */
+'stage-drag' |
+/** 从组件列表拖入新组件到画布（被拖入的组件尚不存在，sourceIds 为空数组） */
+'stage-add';
 /**
  * 判断当前正在拖动的源节点是否可以拖入目标节点内部的函数
  * @param _sourceIds 当前正在拖动的源节点 id 列表
@@ -2410,40 +2511,53 @@ type CanDropInScene = /** 在"已选组件"面板的组件树中拖动节点 */'
  *     （例如把命中的"卡片外壳"节点重定向到其内层"卡片内容"容器节点）
  *   - 其他（`true` / `void` / `undefined`）：按原 targetId 正常拖入
  */
-type CanDropInFunction = (_sourceIds: Id[], _targetId: Id, _scene: CanDropInScene) => Id | boolean | void;
-type AsyncBeforeHook<Value extends Array<string>, C extends Record<Value[number], (...args: any) => any>> = { [K in Value[number]]?: (...args: Parameters<C[K]>) => Promise<Parameters<C[K]>> | Parameters<C[K]> };
-type AsyncAfterHook<Value extends Array<string>, C extends Record<Value[number], (...args: any) => any>> = { [K in Value[number]]?: (result: Awaited<ReturnType<C[K]>>, ...args: Parameters<C[K]>) => ReturnType<C[K]> | Awaited<ReturnType<C[K]>> };
-type SyncBeforeHook<Value extends Array<string>, C extends Record<Value[number], (...args: any) => any>> = { [K in Value[number]]?: (...args: Parameters<C[K]>) => Parameters<C[K]> };
-type SyncAfterHook<Value extends Array<string>, C extends Record<Value[number], (...args: any) => any>> = { [K in Value[number]]?: (result: ReturnType<C[K]>, ...args: Parameters<C[K]>) => ReturnType<C[K]> };
-type AddPrefixToObject<T, P extends string> = { [K in keyof T as K extends string ? `${P}${K}` : never]: T[K] };
-type AsyncHookPlugin<T extends Array<string>, C extends Record<T[number], (...args: any) => any>> = AddPrefixToObject<PascalCasedProperties<AsyncBeforeHook<T, C>>, 'before'> & AddPrefixToObject<PascalCasedProperties<AsyncAfterHook<T, C>>, 'after'>;
-type SyncHookPlugin<T extends Array<string>, C extends Record<T[number], (...args: any) => any>> = AddPrefixToObject<PascalCasedProperties<SyncBeforeHook<T, C>>, 'before'> & AddPrefixToObject<PascalCasedProperties<SyncAfterHook<T, C>>, 'after'>;
-interface EventBusEvent {
+export type CanDropInFunction = (_sourceIds: Id[], _targetId: Id, _scene: CanDropInScene) => Id | boolean | void;
+export type AsyncBeforeHook<Value extends Array<string>, C extends Record<Value[number], (...args: any) => any>> = { [K in Value[number]]?: (...args: Parameters<C[K]>) => Promise<Parameters<C[K]>> | Parameters<C[K]>; };
+export type AsyncAfterHook<Value extends Array<string>, C extends Record<Value[number], (...args: any) => any>> = { [K in Value[number]]?: (result: Awaited<ReturnType<C[K]>>, ...args: Parameters<C[K]>) => ReturnType<C[K]> | Awaited<ReturnType<C[K]>>; };
+export type SyncBeforeHook<Value extends Array<string>, C extends Record<Value[number], (...args: any) => any>> = { [K in Value[number]]?: (...args: Parameters<C[K]>) => Parameters<C[K]>; };
+export type SyncAfterHook<Value extends Array<string>, C extends Record<Value[number], (...args: any) => any>> = { [K in Value[number]]?: (result: ReturnType<C[K]>, ...args: Parameters<C[K]>) => ReturnType<C[K]>; };
+export type AddPrefixToObject<T, P extends string> = { [K in keyof T as K extends string ? `${P}${K}` : never]: T[K]; };
+export type AsyncHookPlugin<T extends Array<string>, C extends Record<T[number], (...args: any) => any>> = AddPrefixToObject<PascalCasedProperties<AsyncBeforeHook<T, C>>, 'before'> & AddPrefixToObject<PascalCasedProperties<AsyncAfterHook<T, C>>, 'after'>;
+export type SyncHookPlugin<T extends Array<string>, C extends Record<T[number], (...args: any) => any>> = AddPrefixToObject<PascalCasedProperties<SyncBeforeHook<T, C>>, 'before'> & AddPrefixToObject<PascalCasedProperties<SyncAfterHook<T, C>>, 'after'>;
+export interface EventBusEvent {
   'edit-data-source': [id: string];
   'edit-data-source-method': [id: string, methodName: string];
   'edit-data-source-field': [id: string, fieldPath: string[]];
   'remove-data-source': [id: string];
   'edit-code': [id: string];
 }
-interface EventBus extends EventEmitter {
+export interface EventBus extends EventEmitter$1 {
   on<Name extends keyof EventBusEvent, Param extends EventBusEvent[Name]>(eventName: Name, listener: (...args: Param) => void): this;
   emit<Name extends keyof EventBusEvent, Param extends EventBusEvent[Name]>(eventName: Name, ...args: Param): boolean;
 }
-type PropsFormConfigFunction = (data: {
+export type PropsFormConfigFunction = (data: {
   editorService: EditorService;
 }) => FormConfig;
-type PropsFormValueFunction = (data: {
+export type PropsFormValueFunction = (data: {
   editorService: EditorService;
 }) => Partial<MNode>;
-type PartSortableOptions = Omit<Options, 'onStart' | 'onUpdate'>;
-interface PageBarSortOptions extends PartSortableOptions {
+export type PartSortableOptions = Omit<Options, 'onStart' | 'onUpdate'>;
+export interface PageBarSortOptions extends PartSortableOptions {
   /** 在onUpdate之后调用 */
   afterUpdate?: (event: SortableEvent, sortable: Sortable) => void | Promise<void>;
   /** 在onStart之前调用 */
   beforeStart?: (event: SortableEvent, sortable: Sortable) => void | Promise<void>;
 }
-type CustomContentMenuFunction = (menus: (MenuButton | MenuComponent)[], type: 'layer' | 'data-source' | 'viewer' | 'code-block') => (MenuButton | MenuComponent)[];
-interface EditorEvents {
+/**
+ * 右键菜单当前目标（侧栏树节点等）。
+ * 数据源 / 代码块面板通过 `customContentMenu` 的 `getTarget` 暴露，业务在 handler 内自行读取。
+ */
+export interface ContentMenuTarget {
+  /** 目标 ID */
+  id: string;
+  /** 原始节点数据（树节点等） */
+  data?: TreeNodeData;
+}
+export type ContentMenuType = 'layer' | 'data-source' | 'viewer' | 'code-block';
+export type CustomContentMenuFunction = (menus: (MenuButton | MenuComponent)[], type: ContentMenuType,
+/** 读取当前右键目标；数据源 / 代码块面板会传入，图层 / 画布一般不需要 */
+getTarget?: () => ContentMenuTarget | null) => (MenuButton | MenuComponent)[];
+export interface EditorEvents {
   'root-change': [value: StoreState['root'], preValue?: StoreState['root'], options?: {
     historySource?: HistoryOpSource;
   }];
@@ -2462,8 +2576,69 @@ interface EditorEvents {
     targetParent: MContainer;
   }];
   'history-change': [data: MPage | MPageFragment];
+  /**
+   * DSL 发生变更后统一触发，免去分别监听 add / remove / update / move-layer / drag-to。
+   * 回调参数为 {@link EditorChangeEvent}，按 `type` 区分操作类型并携带各自的操作内容（payload）
+   * 以及变更所在的当前 page（可能为 null）。撤销 / 重做内部同样会经由
+   * add / remove / update 触发本事件；如需区分「用户操作」与「撤销重做」请配合 `history-change`。
+   */
+  change: [event: EditorChangeEvent];
+  /** 节点校验错误状态发生变化时触发，携带当前完整的错误 Map（供非响应式消费方订阅） */
+  'invalid-node-change': [invalidNodeIds: Map<Id, NodeInvalidInfo>];
+}
+/** `change` 事件中单个变更项：变更的 node 及其所属的 page（可能为 null）。 */
+export interface EditorChangeItem {
+  node: MNode;
+  page: StoreState['page'];
 }
-interface HistoryEvents {
+/** `update` 类型变更项：node 为前后快照及 form 端变更记录，page 为其所属页面。 */
+export interface EditorUpdateChangeItem {
+  node: {
+    newNode: MNode;
+    oldNode: MNode;
+    changeRecords?: ChangeRecord[];
+  };
+  page: StoreState['page'];
+}
+/** {@link EditorEvents.change} 各操作类型共有的历史相关字段。 */
+export interface EditorChangeEventHistoryMeta {
+  /**
+   * 本次变更的「历史来源」（调用 DSL 操作时传入的 {@link HistoryOpOptions.historySource}，
+   * 撤销 / 重做时则为被应用 step 上记录的 `source`），未携带时为 undefined。
+   */
+  historySource?: HistoryOpSource;
+  /**
+   * 本次操作是否未写入历史记录（即调用时传入的 {@link HistoryOpOptions.doNotPushHistory}，缺省为 false）；
+   * 撤销 / 重做路径补发的事件恒为 true（撤销/重做本身不再入栈）。
+   */
+  doNotPushHistory?: boolean;
+}
+/**
+ * {@link EditorEvents.change} 的回调参数：以 `type` 区分操作类型，并携带对应的操作内容。
+ * `data` 为本次变更的节点列表，每项包含 node 及其所属的 page（可能为 null）；
+ * `move-layer` 额外带层级偏移 `offset`，`drag-to` 额外带目标位置 `targetIndex` / `targetParent`；
+ * 历史相关字段（historySource / doNotPushHistory）见 {@link EditorChangeEventHistoryMeta}。
+ */
+export type EditorChangeEvent = ({
+  type: 'add';
+  data: EditorChangeItem[];
+} & EditorChangeEventHistoryMeta) | ({
+  type: 'remove';
+  data: EditorChangeItem[];
+} & EditorChangeEventHistoryMeta) | ({
+  type: 'update';
+  data: EditorUpdateChangeItem[];
+} & EditorChangeEventHistoryMeta) | ({
+  type: 'move-layer';
+  data: EditorChangeItem[];
+  offset: number | LayerOffset;
+} & EditorChangeEventHistoryMeta) | ({
+  type: 'drag-to';
+  data: EditorChangeItem[];
+  targetIndex: number;
+  targetParent: MContainer;
+} & EditorChangeEventHistoryMeta);
+export interface HistoryEvents {
   change: [state: BaseStepValue | StepValue | CodeBlockStepValue | DataSourceStepValue, stepType: HistoryStepType, id: Id];
   'code-block-history-change': [id: Id, state: CodeBlockStepValue];
   'data-source-history-change': [id: Id, state: DataSourceStepValue];
@@ -2482,19 +2657,28 @@ interface HistoryEvents {
     marker: StepValue;
     stepType: HistoryStepType;
   }];
+  /**
+   * 页面 / 页面片结构变更（新增 / 删除）时派发，见 {@link HistoryService.notifyPageStructureChange}。
+   * 一次操作（add / remove / setRoot 整体替换）涉及多个页面时合并为**一个**事件；
+   * `add` / `remove` 分别为本次新增与删除的页面列表（其一可为空数组）。
+   */
+  'page-structure-change': [change: {
+    add: (MPage | MPageFragment)[];
+    remove: (MPage | MPageFragment)[];
+  }];
 }
-declare const canUsePluginMethods: {
+export declare const canUsePluginMethods: {
   async: readonly ["getLayout", "highlight", "select", "multiSelect", "doAdd", "add", "doRemove", "remove", "doUpdate", "update", "sort", "copy", "paste", "doPaste", "doAlignCenter", "alignCenter", "moveLayer", "moveToContainer", "dragTo", "undo", "redo", "move"];
   sync: never[];
 };
-type AsyncMethodName = Writable<(typeof canUsePluginMethods)['async']>;
+export type AsyncMethodName = Writable<(typeof canUsePluginMethods)['async']>;
 /**
  * 历史记录写入相关的通用配置（codeBlock / dataSource / editor 共用）
  * - doNotPushHistory: 操作完成后是否不要将本次操作压入历史栈（撤销/重做记录），默认 false
  * - historyDescription: 入栈时附带的人类可读描述，用于历史面板展示；不影响 undo/redo 行为，缺省时面板会自动生成描述
  * - historySource: 操作途径，取值见 {@link HistoryOpSource}（画布 / 树面板 / 组件面板 / 配置面板 / 源码编辑器 / 右键菜单 / 工具栏 / 快捷键 / 回滚 / 接口 等），用于历史面板展示与埋点；不影响 undo/redo 行为
  */
-interface HistoryOpOptions {
+export interface HistoryOpOptions {
   doNotPushHistory?: boolean;
   historyDescription?: string;
   historySource?: HistoryOpSource;
@@ -2503,7 +2687,7 @@ interface HistoryOpOptions {
  * 在 HistoryOpOptions 基础上携带 form 端 propPath/value 变更记录，
  * 用于历史记录的精细化撤销/重做（按 propPath 局部 patch）。
  */
-interface HistoryOpOptionsWithChangeRecords extends HistoryOpOptions {
+export interface HistoryOpOptionsWithChangeRecords extends HistoryOpOptions {
   changeRecords?: ChangeRecord[];
 }
 /**
@@ -2511,12 +2695,36 @@ interface HistoryOpOptionsWithChangeRecords extends HistoryOpOptions {
  * - doNotSelect: 操作后是否不要自动触发选中（不调用 this.select / this.multiSelect / stage.select / stage.multiSelect）
  * - doNotSwitchPage: 操作若会引发当前页面切换（如新增 / 删除 / 跨页移动），是否跳过这次切换
  */
-interface DslOpOptions extends HistoryOpOptions {
+export interface DslOpOptions extends HistoryOpOptions {
   doNotSelect?: boolean;
   doNotSwitchPage?: boolean;
 }
+/**
+ * {@link EditorService.update} / {@link EditorService.doUpdate} 的额外数据
+ * - changeRecords: 单节点 form 端变更记录（多节点场景下被忽略，使用 changeRecordList）
+ * - changeRecordList: 多节点 form 端变更记录列表，按 config 数组同序对应每个节点；优先级高于 changeRecords
+ * - replace: 为 true 时跳过 mergeWith / toggleFixedPosition / setChildrenLayout，直接用传入配置整节点替换
+ * - invalidInfo: 属性面板提交时携带的校验错误信息，在写入历史记录之前落库
+ */
+export interface UpdateOptions extends HistoryOpOptionsWithChangeRecords {
+  changeRecordList?: ChangeRecord[][];
+  /**
+   * 为 true 时不做深合并等变换，直接用传入配置整节点替换现有节点。
+   * 适用于源码编辑、历史整节点快照回放等「完整 DSL」场景；默认 false（局部属性更新走 merge）。
+   */
+  replace?: boolean;
+  /**
+   * 属性面板提交时携带的校验错误信息，在写入历史记录之前落库，
+   * 使历史快照与本次变更对齐，从而 undo/redo 能正确还原错误标记。
+   */
+  invalidInfo?: {
+    id: Id;
+    source: NodeInvalidSource;
+    error?: string;
+  };
+}
 /** 差异对话框的入参 */
-interface DiffDialogPayload {
+export interface DiffDialogPayload {
   /** 表单类别 */
   category?: CompareCategory;
   /** 节点类型 / 数据源类型 */
@@ -2533,12 +2741,20 @@ interface DiffDialogPayload {
   targetLabel?: string;
   /** 用于标题展示的目标 id */
   id?: string | number;
+  /**
+   * 指定打开时的初始对比模式：
+   * - before：该步骤修改前 vs 修改后
+   * - current：该步骤修改后 vs 当前最新值
+   * 不传时按是否存在「修改后的值」/「当前值」自动推断。
+   * 若指定的模式当前不可用（对应数据缺失），将回退到自动推断结果。
+   */
+  mode?: 'before' | 'current';
 }
 /**
  * 一组「描述 + 可操作性」的判定函数集合。页面 / 数据源 / 代码块及业务自定义历史
  * 各自实现一份，作为整体注入，避免把 describe* / isStep* 拆成多个独立 props 反复透传。
  */
-interface HistoryRowDescriptor<T extends BaseStepValue = BaseStepValue> {
+export interface HistoryRowDescriptor<T extends BaseStepValue = BaseStepValue> {
   /**
    * 组级描述文案生成器，接收一个 group，返回展示文本。
    * 不传时回退到对组内最后一步调用 {@link describeStep}（适用于不做相邻合并、每组恒为单步的历史，如数据源/代码块）。
@@ -2556,7 +2772,7 @@ interface HistoryRowDescriptor<T extends BaseStepValue = BaseStepValue> {
  * 把原先散落在 Bucket / BucketTab 上的 title / prefix / describe* / isStep* / showInitial / gotoEnabled
  * 收敛成一个对象作为单一 prop 传递，调用方一次配齐、组件内部按需读取。
  */
-interface HistoryBucketConfig<T extends BaseStepValue = BaseStepValue> extends HistoryRowDescriptor<T> {
+export interface HistoryBucketConfig<T extends BaseStepValue = BaseStepValue> extends HistoryRowDescriptor<T> {
   /** bucket 头部标题，例如 "数据源" / "代码块"。 */
   title: string;
   /** 子项 key 的命名空间前缀（`ds` 数据源 / `cb` 代码块 / 业务自定义如 `mod`）。 */
@@ -2565,8 +2781,10 @@ interface HistoryBucketConfig<T extends BaseStepValue = BaseStepValue> extends H
   showInitial?: boolean;
   /** 是否支持「跳转到该记录」(goto)，默认 true。 */
   gotoEnabled?: boolean;
+  /** 是否展示顶部「清空」按钮，默认 true。无需提供清空能力的自定义历史可传 false。 */
+  showClear?: boolean;
 }
-interface UseHistoryRevertOptions {
+export interface UseHistoryRevertOptions {
   /**
    * 父级应用上下文，用于让动态挂载的「差异确认弹窗」继承全局组件 / 指令 / provide / 插件
    * （Element Plus、@tmagic/form 字段组件等）。未显式传入时，会自动取调用方所在组件的 appContext
@@ -2574,17 +2792,18 @@ interface UseHistoryRevertOptions {
    */
   appContext?: AppContext | null;
   /**
-   * 透传给差异确认弹窗的 `extendState`（即 Editor 的 `extendFormState`），
-   * 使对比表单中依赖业务上下文的 `display` / `disabled` 等 filterFunction 正常工作。
+   * 内置页面 / 数据源 / 代码块的差异 / 回滚确认弹窗默认宽度（透传给 TMagicDialog 的 `width`），
+   * 如 `'1200px'` / `'80%'`。缺省时使用弹窗内置默认宽度（900px）。
+   * 业务自有历史（`viewDiff` / `confirmAndRevert`）可在调用时通过各自入参的 `width` 单独覆盖。
    */
-  extendState?: (_state: FormState) => Record<string, any> | Promise<Record<string, any>>;
+  dialogWidth?: string;
 }
 /**
  * 业务自有历史（如管理台「模块」）做差异对比时所需的额外渲染入参。
  * 内置的页面 / 数据源 / 代码块按 `category` 自动取表单配置，无需传这些；
  * 业务自有类别可通过 `loadConfig` 注入自定义表单配置加载逻辑。
  */
-interface CustomDiffFormOptions {
+export interface CustomDiffFormOptions {
   /**
    * 自定义差异表单配置加载逻辑（如「模块」按 c_type 重建表单配置），
    * 透传给弹窗内部的 CompareForm；缺省时按 `category` 走内置加载。
@@ -2592,13 +2811,23 @@ interface CustomDiffFormOptions {
   loadConfig?: CompareFormLoadConfig;
   /** 需要走 self diff 的字段类型（如模块的 mod-cond）。 */
   selfDiffFieldTypes?: string[];
+  /**
+   * 差异 / 确认回滚弹窗宽度（透传给 HistoryDiffDialog 的 TMagicDialog `width`），
+   * 如 `'1200px'` / `'80%'`。缺省时使用弹窗内置默认宽度（900px）。
+   */
+  width?: string;
+  /**
+   * 差异 / 确认回滚弹窗内 form 表单的尺寸（透传给 CompareForm 的 `size`），
+   * 可选 `'large' | 'default' | 'small'`，缺省时使用表单内置默认尺寸。
+   */
+  size?: FieldSize;
 }
 /**
  * 业务自有历史复用「单步回滚」交互（{@link useHistoryRevert} 的 `confirmAndRevert`）的入参。
  * 与内置页面 / 数据源 / 代码块回滚共用「目标校验 → 差异/二次确认弹窗 → 反向回滚」流程，
  * 业务方只需提供：差异弹窗入参（可选）、表单配置加载（可选）、实际回滚执行函数。
  */
-interface ConfirmAndRevertOptions<T = unknown> extends CustomDiffFormOptions {
+export interface ConfirmAndRevertOptions<T = unknown> extends CustomDiffFormOptions {
   /**
    * 差异确认弹窗入参；可对比的步骤（单实体 update）传入后弹差异确认弹窗，
    * 传 null / 省略则退化为普通二次确认框（add / remove / 不可对比）。
@@ -2611,7 +2840,7 @@ interface ConfirmAndRevertOptions<T = unknown> extends CustomDiffFormOptions {
 }
 //#endregion
 //#region temp/packages/editor/src/hooks/use-code-block-edit.d.ts
-declare const useCodeBlockEdit: (codeBlockService: Services["codeBlockService"]) => {
+export declare const useCodeBlockEdit: (codeBlockService: Services["codeBlockService"]) => {
   codeId: import("@vue/reactivity").Ref<string | undefined, string | undefined>;
   codeConfig: import("@vue/reactivity").Ref<(Omit<CodeBlockContent, "content"> & {
     content: string;
@@ -2672,16 +2901,35 @@ declare const useCodeBlockEdit: (codeBlockService: Services["codeBlockService"])
   }, {}, {}, {}, {}> | null>>;
   createCodeBlock: () => Promise<void>;
   editCode: (id: string) => Promise<void>;
-  deleteCode: (key: string, {
-    historySource
-  }?: {
+  deleteCode: (key: string, { historySource }?: {
     historySource?: HistoryOpSource;
   }) => Promise<void>;
   submitCodeBlockHandler: (values: CodeBlockContent, eventData?: ContainerChangeEventData) => Promise<void>;
 };
 //#endregion
+//#region temp/packages/editor/src/hooks/use-compare-form.d.ts
+export interface UseCompareFormReturn {
+  config: Ref<FormConfig>;
+  currentValues: ComputedRef<FormValue>;
+  wrapperStyle: ComputedRef<Record<string, string> | undefined>;
+  formContext: ComputedRef<FormContext>;
+  loadConfig: () => Promise<void>;
+  formRef: Readonly<Ref<InstanceType<typeof MForm> | null>>;
+  normalizeCodeBlockValue: (v: Partial<CodeBlockContent> | Record<string, any> | undefined) => Record<string, any>;
+}
+/**
+ * CompareForm / ViewForm 共用逻辑：
+ * - 按 `category`(node / data-source / code-block) 加载 FormConfig（支持自定义 `loadConfig`）；
+ * - 代码块 `content` 归一化为字符串；
+ * - 外层容器固定高度 + 内部滚动的 `wrapperStyle`；
+ * - 将 services / stage 作为 form context 传给 MForm，保证 filterFunction 上下文一致。
+ *
+ * 两个组件的差异仅在于是否做新旧值对比，这部分逻辑保留在各自组件中。
+ */
+export declare const useCompareForm: (props: CompareFormBaseProps) => UseCompareFormReturn;
+//#endregion
 //#region temp/packages/editor/src/hooks/use-stage.d.ts
-declare const useStage: (stageOptions: StageOptions) => StageCore$1;
+export declare const useStage: (stageOptions: StageOptions) => StageCore$1;
 //#endregion
 //#region temp/packages/editor/src/hooks/use-float-box.d.ts
 interface State {
@@ -2689,7 +2937,7 @@ interface State {
   top: number;
   left: number;
 }
-declare const useFloatBox: (slideKeys: ComputedRef<string[]>) => {
+export declare const useFloatBox: (slideKeys: ComputedRef<string[]>) => {
   dragstartHandler: (e: DragEvent) => void;
   dragendHandler: (key: string, e: DragEvent) => void;
   floatBoxStates: import("@vue/reactivity").Ref<{
@@ -2701,7 +2949,7 @@ declare const useFloatBox: (slideKeys: ComputedRef<string[]>) => {
 };
 //#endregion
 //#region temp/packages/editor/src/hooks/use-window-rect.d.ts
-declare const useWindowRect: () => {
+export declare const useWindowRect: () => {
   rect: {
     width: number;
     height: number;
@@ -2709,23 +2957,23 @@ declare const useWindowRect: () => {
 };
 //#endregion
 //#region temp/packages/editor/src/hooks/use-editor-content-height.d.ts
-declare const useEditorContentHeight: () => {
+export declare const useEditorContentHeight: () => {
   height: import("@vue/reactivity").Ref<number, number>;
 };
 //#endregion
 //#region temp/packages/editor/src/hooks/use-filter.d.ts
-declare const useFilter: (nodeData: Ref<TreeNodeData[]>, nodeStatusMap: Ref<Map<Id, LayerNodeStatus> | undefined>, filterNodeMethod: (value: string, data: MNode) => boolean) => {
+export declare const useFilter: (nodeData: Ref<TreeNodeData[]>, nodeStatusMap: Ref<Map<Id, LayerNodeStatus> | undefined>, filterNodeMethod: (value: string, data: MNode) => boolean) => {
   filterText: Ref<string, string>;
   filterTextChangeHandler(text: string | string[]): void;
 };
 //#endregion
 //#region temp/packages/editor/src/hooks/use-getso.d.ts
-declare const useGetSo: (target: ShallowRef<HTMLElement | null>, emit: (evt: "change", e: OnDrag$1<Gesto>) => void) => {
+export declare const useGetSo: (target: ShallowRef<HTMLElement | null>, emit: (evt: "change", e: OnDrag$1<Gesto>) => void) => {
   isDragging: import("@vue/reactivity").Ref<boolean, boolean>;
 };
 //#endregion
 //#region temp/packages/editor/src/hooks/use-next-float-box-position.d.ts
-declare const useNextFloatBoxPosition: (uiService: Services["uiService"], parent?: Ref<HTMLDivElement | null>) => {
+export declare const useNextFloatBoxPosition: (uiService: Services["uiService"], parent?: Ref<HTMLDivElement | null>) => {
   boxPosition: Ref<{
     left: number;
     top: number;
@@ -2740,7 +2988,7 @@ declare const useNextFloatBoxPosition: (uiService: Services["uiService"], parent
 };
 //#endregion
 //#region temp/packages/editor/src/hooks/use-node-status.d.ts
-declare const useNodeStatus: (nodeData: ComputedRef<TreeNodeData[]>) => {
+export declare const useNodeStatus: (nodeData: ComputedRef<TreeNodeData[]>) => {
   nodeStatusMap: import("@vue/reactivity").Ref<Map<Id, {
     visible: boolean;
     expand: boolean;
@@ -2755,39 +3003,45 @@ declare const useNodeStatus: (nodeData: ComputedRef<TreeNodeData[]>) => {
 };
 //#endregion
 //#region temp/packages/editor/src/hooks/use-services.d.ts
-declare const useServices: () => Services;
+export declare const useServices: () => Services;
 //#endregion
 //#region temp/packages/editor/src/utils/config.d.ts
+declare const isGlobalFlat: import("@vue/reactivity").Ref<boolean, boolean>;
 declare const setEditorConfig: (option: EditorInstallOptions) => void;
 declare const getEditorConfig: <K extends keyof EditorInstallOptions>(key: K) => EditorInstallOptions[K];
 //#endregion
 //#region temp/packages/editor/src/utils/props.d.ts
-declare const arrayOptions: {
+export declare const arrayOptions: {
   text: string;
   value: string;
 }[];
-declare const eqOptions: {
+export declare const eqOptions: {
   text: string;
   value: string;
 }[];
-declare const numberOptions: {
+export declare const numberOptions: {
   text: string;
   value: string;
 }[];
-declare const styleTabConfig: TabPaneConfig;
-declare const eventTabConfig: TabPaneConfig;
-declare const advancedTabConfig: TabPaneConfig;
-declare const displayTabConfig: TabPaneConfig<DisplayCondsConfig>;
+export declare const booleanOptions: {
+  text: string;
+  value: string;
+}[];
+/** 按字段类型返回条件运算符选项（UI 与 typeMatch 校验共用） */
+export declare const getCondOpOptionsByFieldType: (type: string) => {
+  text: string;
+  value: string;
+}[];
+export declare const styleTabConfig: TabPaneConfig;
+export declare const eventTabConfig: TabPaneConfig;
+export declare const advancedTabConfig: TabPaneConfig;
+export declare const displayTabConfig: TabPaneConfig<DisplayCondsConfig>;
 /**
  * 统一为组件属性表单加上事件、高级、样式配置
  * @param config 组件属性配置
  * @returns Object
  */
-declare const fillConfig: (config?: FormConfig, {
-  labelWidth,
-  disabledDataSource,
-  disabledCodeBlock
-}?: {
+export declare const fillConfig: (config?: FormConfig, { labelWidth, disabledDataSource, disabledCodeBlock }?: {
   labelWidth?: string;
   disabledDataSource?: boolean;
   disabledCodeBlock?: boolean;
@@ -2804,7 +3058,7 @@ declare const fillConfig: (config?: FormConfig, {
  * 通过参数控制两端的细微差异（是否启用必填校验 / vs-code onChange 校验 / dataSource 相关字段显示规则等），
  * 避免两边同步两份相同的 schema 而造成漂移。
  */
-interface GetCodeBlockFormConfigOptions {
+export interface GetCodeBlockFormConfigOptions {
   /**
    * 自定义 `params` 表格的"参数类型"列配置。优先级高于内置默认值；
    * 通常由 `codeBlockService.getParamsColConfig()` 注入业务侧的扩展。
@@ -2834,60 +3088,60 @@ interface GetCodeBlockFormConfigOptions {
  * 生成代码块表单配置。返回的是普通对象数组，可直接传给 `<MForm :config>`；
  * 如需响应式的 props 变化（如切换 dataSourceType），调用方在 `computed` 中再次调用本函数即可。
  */
-declare const getCodeBlockFormConfig: (options?: GetCodeBlockFormConfigOptions) => FormConfig;
+export declare const getCodeBlockFormConfig: (options?: GetCodeBlockFormConfigOptions) => FormConfig;
 //#endregion
 //#region temp/packages/editor/src/utils/logger.d.ts
-declare const log: (...args: any[]) => void;
-declare const info: (...args: any[]) => void;
-declare const warn: (...args: any[]) => void;
-declare const debug: (...args: any[]) => void;
-declare const error: (...args: any[]) => void;
+export declare const log: (...args: any[]) => void;
+export declare const info: (...args: any[]) => void;
+export declare const warn: (...args: any[]) => void;
+export declare const debug: (...args: any[]) => void;
+export declare const error: (...args: any[]) => void;
 //#endregion
 //#region temp/packages/editor/src/utils/editor.d.ts
-declare const COPY_STORAGE_KEY = "$MagicEditorCopyData";
-declare const COPY_CODE_STORAGE_KEY = "$MagicEditorCopyCode";
-declare const COPY_DS_STORAGE_KEY = "$MagicEditorCopyDataSource";
+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跟节点
  * @returns 所有页面配置
  */
-declare const getPageList: (root?: MApp | null) => MPage[];
-declare const getPageFragmentList: (root?: MApp | null) => MPageFragment[];
+export declare const getPageList: (root?: MApp | null) => MPage[];
+export declare const getPageFragmentList: (root?: MApp | null) => MPageFragment[];
 /**
  * 获取所有页面名称
  * @param pages 所有页面配置
  * @returns 所有页面名称
  */
-declare const getPageNameList: (pages: (MPage | MPageFragment)[]) => string[];
+export declare const getPageNameList: (pages: (MPage | MPageFragment)[]) => string[];
 /**
  * 新增页面时，生成页面名称
  * @param {Object} pageNameList 所有页面名称
  * @returns {string}
  */
-declare const generatePageName: (pageNameList: string[], type: NodeType.PAGE | NodeType.PAGE_FRAGMENT) => string;
+export declare const generatePageName: (pageNameList: string[], type: NodeType.PAGE | NodeType.PAGE_FRAGMENT) => string;
 /**
  * 新增页面时，生成页面名称
  * @param {Object} app 所有页面配置
  * @returns {string}
  */
-declare const generatePageNameByApp: (app: MApp, type: NodeType.PAGE | NodeType.PAGE_FRAGMENT) => string;
-declare const getNodeIndex: (id: Id, parent: MContainer | MApp) => number;
-declare const getRelativeStyle: (style?: Record<string, any>) => Record<string, any>;
-declare const getInitPositionStyle: (style: Record<string, any> | undefined, layout: Layout) => Record<string, any>;
-declare const setChildrenLayout: (node: MContainer, layout: Layout) => MContainer;
-declare const setLayout: (node: MNode, layout: Layout) => import("@tmagic/schema").MComponent | undefined;
-declare const change2Fixed: (node: MNode, path: MNode[]) => {
+export declare const generatePageNameByApp: (app: MApp, type: NodeType.PAGE | NodeType.PAGE_FRAGMENT) => string;
+export declare const getNodeIndex: (id: Id, parent: MContainer | MApp) => number;
+export declare const getRelativeStyle: (style?: Record<string, any>) => Record<string, any>;
+export declare const getInitPositionStyle: (style: Record<string, any> | undefined, layout: Layout) => Record<string, any>;
+export declare const setChildrenLayout: (node: MContainer, layout: Layout) => MContainer;
+export declare const setLayout: (node: MNode, layout: Layout) => import("@tmagic/schema").MComponent | undefined;
+export declare const change2Fixed: (node: MNode, path: MNode[]) => {
   [key: string]: any;
 };
-declare const Fixed2Other: (node: MNode, path: MNode[], getLayout: (parent: MNode, node?: MNode) => Promise<Layout>) => Promise<Record<string, any>>;
-declare const getGuideLineFromCache: (key: string) => number[];
-declare const fixNodeLeft: (config: MNode, parent: MContainer, doc?: Document) => any;
-declare const fixNodePosition: (config: MNode, parent: MContainer, stage: StageCore$1 | null) => import("@tmagic/schema").StyleSchema | undefined;
-declare const serializeConfig: (config: any) => string;
-declare const moveItemsInContainer: (sourceIndices: number[], parent: MContainer, targetIndex: number) => void;
-declare const isIncludeDataSource: (node: MNode, oldNode: MNode) => boolean;
-declare const buildChangeRecords: (value: any, basePath: string) => {
+export declare const Fixed2Other: (node: MNode, path: MNode[], getLayout: (parent: MNode, node?: MNode) => Promise<Layout>) => Promise<Record<string, any>>;
+export declare const getGuideLineFromCache: (key: string) => number[];
+export declare const fixNodeLeft: (config: MNode, parent: MContainer, doc?: Document) => any;
+export declare const fixNodePosition: (config: MNode, parent: MContainer, stage: StageCore$1 | null) => import("@tmagic/schema").StyleSchema | undefined;
+export declare const serializeConfig: (config: any) => string;
+export declare const moveItemsInContainer: (sourceIndices: number[], parent: MContainer, targetIndex: number) => void;
+export declare const isIncludeDataSource: (node: MNode, oldNode: MNode) => boolean;
+export declare const buildChangeRecords: (value: any, basePath: string) => {
   propPath: string;
   value: any;
 }[];
@@ -2898,7 +3152,7 @@ declare const buildChangeRecords: (value: any, basePath: string) => {
  * @param rootId 根节点ID，用于排除根节点被选中
  * @returns 选中节点的完整信息（node、parent、page）
  */
-declare const resolveSelectedNode: (config: MNode | Id, getNodeInfoFn: (id: Id) => EditorNodeInfo, rootId?: Id) => EditorNodeInfo;
+export declare const resolveSelectedNode: (config: MNode | Id, getNodeInfoFn: (id: Id) => EditorNodeInfo, rootId?: Id) => EditorNodeInfo;
 /**
  * 处理节点在 fixed 定位与其他定位之间的切换
  * 当节点从非 fixed 变为 fixed 时，根据节点路径累加偏移量；反之则还原偏移量
@@ -2908,7 +3162,7 @@ declare const resolveSelectedNode: (config: MNode | Id, getNodeInfoFn: (id: Id)
  * @param getLayoutFn 获取父节点布局方式的回调函数
  * @returns 处理后的节点配置（深拷贝）
  */
-declare const toggleFixedPosition: (dist: MNode, src: MNode, path: MNode[], getLayoutFn: (parent: MNode, node?: MNode | null) => Promise<Layout>) => Promise<MNode>;
+export declare const toggleFixedPosition: (dist: MNode, src: MNode, path: MNode[], getLayoutFn: (parent: MNode, node?: MNode | null) => Promise<Layout>) => Promise<MNode>;
 /**
  * 根据键盘移动的偏移量计算节点的新样式
  * 仅对 absolute 或 fixed 定位的节点生效；优先修改 top/left，若未设置则修改 bottom/right
@@ -2917,7 +3171,7 @@ declare const toggleFixedPosition: (dist: MNode, src: MNode, path: MNode[], getL
  * @param top 垂直方向偏移量（正值向下，负值向上）
  * @returns 计算后的新样式对象，若节点不支持移动则返回 null
  */
-declare const calcMoveStyle: (style: Record<string, any>, left: number, top: number) => Record<string, any> | null;
+export declare const calcMoveStyle: (style: Record<string, any>, left: number, top: number) => Record<string, any> | null;
 /**
  * 计算节点水平居中对齐后的样式
  * 流式布局（relative）下不做处理；优先通过 DOM 元素实际宽度计算，回退到配置中的 width 值
@@ -2927,7 +3181,7 @@ declare const calcMoveStyle: (style: Record<string, any>, left: number, top: num
  * @param doc 画布 document 对象，用于获取 DOM 元素实际宽度
  * @returns 计算后的新样式对象，若不支持居中则返回 null
  */
-declare const calcAlignCenterStyle: (node: MNode, parent: MContainer, layout: Layout, doc?: Document) => Record<string, any> | null;
+export declare const calcAlignCenterStyle: (node: MNode, parent: MContainer, layout: Layout, doc?: Document) => Record<string, any> | null;
 /**
  * 计算图层移动后的目标索引
  * 流式布局与绝对定位布局的移动方向相反：流式布局中"上移"对应索引减小，绝对定位中"上移"对应索引增大
@@ -2937,22 +3191,22 @@ declare const calcAlignCenterStyle: (node: MNode, parent: MContainer, layout: La
  * @param isRelative 是否为流式布局
  * @returns 目标索引位置
  */
-declare const calcLayerTargetIndex: (currentIndex: number, offset: number | LayerOffset, brothersLength: number, isRelative: boolean) => number;
+export declare const calcLayerTargetIndex: (currentIndex: number, offset: number | LayerOffset, brothersLength: number, isRelative: boolean) => number;
 /**
  * 节点配置合并策略：用于 mergeWith 的自定义回调
  * - undefined 且 source 拥有该 key 时返回空字符串
  * - 原来是数组而新值是对象时，使用新值
  * - 新值是数组时，直接替换而非逐元素合并
  */
-declare const editorNodeMergeCustomizer: (objValue: any, srcValue: any, key: string, _object: any, source: any) => object | "" | undefined;
+export declare const editorNodeMergeCustomizer: (objValue: any, srcValue: any, key: string, _object: any, source: any) => object | "" | undefined;
 /**
  * 收集复制节点关联的依赖节点，将关联节点追加到 copyNodes 数组中
  * @param copyNodes 待复制的节点列表（会被就地修改）
  * @param collectorOptions 依赖收集器配置
  * @param getNodeById 根据 ID 获取节点的回调函数
  */
-declare const collectRelatedNodes: (copyNodes: MNode[], collectorOptions: TargetOptions, getNodeById: (id: Id) => MNode | null) => void;
-interface DragClassification {
+export declare const collectRelatedNodes: (copyNodes: MNode[], collectorOptions: TargetOptions, getNodeById: (id: Id) => MNode | null) => void;
+export interface DragClassification {
   sameParentIndices: number[];
   crossParentConfigs: {
     config: MNode;
@@ -2968,12 +3222,12 @@ interface DragClassification {
  * @param getNodeInfo 获取节点信息的回调
  * @returns 分类结果，包含同容器索引列表和跨容器节点列表
  */
-declare const classifyDragSources: (configs: MNode[], targetParent: MContainer, getNodeInfo: (id: Id, raw?: boolean) => EditorNodeInfo) => DragClassification;
+export declare const classifyDragSources: (configs: MNode[], targetParent: MContainer, getNodeInfo: (id: Id, raw?: boolean) => EditorNodeInfo) => DragClassification;
 /**
  * 给「回滚」生成的新 step 用的简短描述生成器。
  * 与 UI 层 `describePageStep` 同义，但避免 service 反向依赖 layouts/，故放在此工具函数中。
  */
-declare const describeStepForRevert: (step: StepValue) => string;
+export declare const describeStepForRevert: (step: StepValue) => string;
 //#endregion
 //#region temp/packages/editor/src/utils/operator.d.ts
 /**
@@ -2982,32 +3236,44 @@ declare const describeStepForRevert: (step: StepValue) => string;
  * @param config 待粘贴的元素配置(复制时保存的那份配置)
  * @returns
  */
-declare const beforePaste: (position: PastePosition, config: MNode[], doc?: Document) => MNode[];
+export declare const beforePaste: (position: PastePosition, config: MNode[], doc?: Document) => MNode[];
 /**
  * 将元素粘贴到容器内时，将相对于画布坐标转换为相对于容器的坐标
  * @param position PastePosition 粘贴时相对于画布的坐标
  * @param id 元素id
  * @returns PastePosition 转换后的坐标
  */
-declare const getPositionInContainer: (position: PastePosition | undefined, id: Id, doc?: Document) => {
+export declare const getPositionInContainer: (position: PastePosition | undefined, id: Id, doc?: Document) => {
   left: number;
   top: number;
 };
-declare const getAddParent: (node: MNode) => MContainer | null | undefined;
-declare const getDefaultConfig: (addNode: AddMNode, parentNode: MContainer) => Promise<any>;
+export declare const getAddParent: (node: MNode) => MContainer | null | undefined;
+export declare const getDefaultConfig: (addNode: AddMNode, parentNode: MContainer) => Promise<any>;
 //#endregion
 //#region temp/packages/editor/src/utils/data-source/index.d.ts
-declare const getFormConfig: (type: string, configs: Record<string, FormConfig>) => FormConfig;
-declare const getFormValue: (type: string, values: Partial<DataSourceSchema>) => Partial<DataSourceSchema>;
-declare const getDisplayField: (dataSources: DataSourceSchema[], key: string) => {
+export declare const getFormConfig: (type: string, configs: Record<string, FormConfig>) => FormConfig;
+export declare const getFormValue: (type: string, values: Partial<DataSourceSchema>) => Partial<DataSourceSchema>;
+export declare const getDisplayField: (dataSources: DataSourceSchema[], key: string) => {
   value: string;
   type: "var" | "text";
 }[];
-declare const getCascaderOptionsFromFields: (fields?: DataSchema[], dataSourceFieldType?: DataSourceFieldType[]) => CascaderOption[];
-declare const getFieldType: (ds: DataSourceSchema | undefined, fieldNames: string[]) => string;
+export declare const getCascaderOptionsFromFields: (fields?: DataSchema[], dataSourceFieldType?: DataSourceFieldType[]) => CascaderOption[];
+/**
+ * 按字段名路径下钻 DataSchema。
+ * @param skipNumberIndices 为 true 时跳过数字段（模板路径中的数组下标，如 arr[0].x）
+ */
+export declare const resolveFieldByPath: (fields: DataSchema[] | undefined, fieldNames: string[], options?: {
+  skipNumberIndices?: boolean;
+}) => {
+  ok: boolean;
+  field?: DataSchema;
+  fields: DataSchema[];
+  failedName?: string;
+};
+export declare const getFieldType: (ds: DataSourceSchema | undefined, fieldNames: string[]) => "" | DataSourceFieldType;
 //#endregion
 //#region temp/packages/editor/src/utils/dep/idle-task.d.ts
-interface IdleTaskEvents {
+export interface IdleTaskEvents {
   finish: [];
   'hight-level-finish': [];
   'update-task-length': [{
@@ -3015,7 +3281,7 @@ interface IdleTaskEvents {
     hightLevelLength: number;
   }];
 }
-declare class IdleTask<T = any> extends EventEmitter$1 {
+export declare class IdleTask<T = any> extends EventEmitter {
   private taskList;
   private hightLevelTaskList;
   private taskHandle;
@@ -3026,6 +3292,17 @@ declare class IdleTask<T = any> extends EventEmitter$1 {
   once<Name extends keyof IdleTaskEvents, Param extends IdleTaskEvents[Name]>(eventName: Name, listener: (...args: Param) => void | Promise<void>): this;
   emit<Name extends keyof IdleTaskEvents, Param extends IdleTaskEvents[Name]>(eventName: Name, ...args: Param): boolean;
   private runTaskQueue;
+  /**
+   * 执行一批任务，队列被清空时提前结束
+   */
+  private runTaskBatch;
+  /**
+   * 单个任务失败不能中断整个队列，否则后续任务永远不会被执行，
+   * 依赖收集会停在半路（收集中状态与剩余任务数都不再变化）
+   */
+  private runTask;
+  private finishRun;
+  private getTaskLength;
 }
 //#endregion
 //#region temp/packages/editor/src/utils/scroll-viewer.d.ts
@@ -3038,7 +3315,7 @@ interface ScrollViewerOptions {
     height: number;
   };
 }
-declare class ScrollViewer extends EventEmitter$1 {
+export declare class ScrollViewer extends EventEmitter {
   private container;
   private target;
   private zoom;
@@ -3055,10 +3332,7 @@ declare class ScrollViewer extends EventEmitter$1 {
   constructor(options: ScrollViewerOptions);
   destroy(): void;
   setZoom(zoom: number): void;
-  scrollTo({
-    left,
-    top
-  }: {
+  scrollTo({ left, top }: {
     left?: number;
     top?: number;
   }): void;
@@ -3069,9 +3343,9 @@ declare class ScrollViewer extends EventEmitter$1 {
 }
 //#endregion
 //#region temp/packages/editor/src/utils/tree.d.ts
-declare const updateStatus: (nodeStatusMap: Map<Id, LayerNodeStatus>, id: Id, status: Partial<LayerNodeStatus>) => void;
+export declare const updateStatus: (nodeStatusMap: Map<Id, LayerNodeStatus>, id: Id, status: Partial<LayerNodeStatus>) => void;
 /** 默认的组件树节点是否可展开的判断函数：当节点的子项中至少存在一个可见节点时认为可展开 */
-declare const defaultIsExpandable: IsExpandableFunction;
+export declare const defaultIsExpandable: IsExpandableFunction;
 //#endregion
 //#region temp/packages/editor/src/utils/indexed-db.d.ts
 /**
@@ -3079,20 +3353,20 @@ declare const defaultIsExpandable: IsExpandableFunction;
  * 仅用于浏览器环境；在不支持 IndexedDB 的环境（如 SSR / 部分测试环境）下会 reject。
  */
 /** 是否处于支持 IndexedDB 的环境。 */
-declare const isIndexedDBSupported: () => boolean;
+export declare const isIndexedDBSupported: () => boolean;
 /**
  * 打开（必要时升级）数据库，确保目标 objectStore 存在后返回连接。
  *
  * 由于 objectStore 只能在 `onupgradeneeded` 内创建，这里先以当前版本打开，
  * 若发现 store 不存在则关闭连接、以更高版本重开来按需创建，兼容动态 storeName。
  */
-declare const openIndexedDB: (dbName: string, storeName: string) => Promise<IDBDatabase>;
+export declare const openIndexedDB: (dbName: string, storeName: string) => Promise<IDBDatabase>;
 /** 写入（覆盖）一条记录。value 通过结构化克隆存储，支持 Map / Set 等结构。 */
-declare const idbSet: (dbName: string, storeName: string, key: IDBValidKey, value: unknown) => Promise<void>;
+export declare const idbSet: (dbName: string, storeName: string, key: IDBValidKey, value: unknown) => Promise<void>;
 /** 读取一条记录，不存在时返回 undefined。 */
-declare const idbGet: <T = unknown>(dbName: string, storeName: string, key: IDBValidKey) => Promise<T | undefined>;
+export declare const idbGet: <T = unknown>(dbName: string, storeName: string, key: IDBValidKey) => Promise<T | undefined>;
 /** 删除一条记录。 */
-declare const idbDelete: (dbName: string, storeName: string, key: IDBValidKey) => Promise<void>;
+export declare const idbDelete: (dbName: string, storeName: string, key: IDBValidKey) => Promise<void>;
 //#endregion
 //#region temp/packages/editor/src/utils/history.d.ts
 /**
@@ -3104,15 +3378,11 @@ declare const idbDelete: (dbName: string, storeName: string, key: IDBValidKey) =
  * @param diff 单条变更 diff（缺省视为空）
  * @param getLabel 从快照取展示名
  */
-declare const describeRevertStep: <T extends object>(id: Id, {
-  oldSchema,
-  newSchema,
-  changeRecords
-}: StepDiffItem<T> | undefined, getLabel: (schema: T) => string | undefined) => string;
+export declare const describeRevertStep: <T extends object>(id: Id, { oldSchema, newSchema, changeRecords }: StepDiffItem<T> | undefined, getLabel: (schema: T) => string | undefined) => string;
 /**
  * 根据 old/new 是否为 null 推断 opType（与 push 时的约定一致）。
  */
-declare const detectStackOpType: (oldVal: unknown, newVal: unknown) => "add" | "remove" | "update";
+export declare const detectStackOpType: (oldVal: unknown, newVal: unknown) => "add" | "remove" | "update";
 /**
  * 构造一条代码块 / 数据源「按 id 分栈」的历史记录：两者除 payload 字段命名外完全一致。
  *
@@ -3121,13 +3391,14 @@ declare const detectStackOpType: (oldVal: unknown, newVal: unknown) => "add" | "
  * - 仅负责构造 step 并返回，入栈与事件 emit 由统一的 history.push(stepType, step, id) 处理。
  * - 不直接驱动业务 service，调用方负责实际写回。
  */
-declare const createStackStep: <T, S extends BaseStepValue<T>>(id: Id, payload: Omit<BaseStepValue<T>, "uuid" | "data" | "opType" | "diff" | "timestamp" | "saved"> & {
+export declare const createStackStep: <T, S extends BaseStepValue<T>>(id: Id, payload: Omit<BaseStepValue<T>, "uuid" | "data" | "opType" | "diff" | "timestamp" | "saved"> & {
   oldValue: T | null;
   newValue: T | null;
-  changeRecords?: ChangeRecord[]; /** 展示名（缺省时从快照 name / title 推断）。 */
+  changeRecords?: ChangeRecord[];
+  /** 展示名（缺省时从快照 name / title 推断）。 */
   name?: string;
 }) => S | null;
-declare const markStackSaved: <S extends {
+export declare const markStackSaved: <S extends {
   saved?: boolean;
 }>(undoRedo?: UndoRedo<S>) => void;
 /**
@@ -3138,16 +3409,16 @@ declare const markStackSaved: <S extends {
  *
  * 各类型行为完全一致，仅 `kind` 与 step 快照类型不同，统一由本方法处理。
  */
-declare const mergeSteps: <T extends BaseStepValue>(kind: string, id: Id, list: T[], cursor: number) => HistoryGroup<T>[];
+export declare const mergeSteps: <T extends BaseStepValue>(kind: string, id: Id, list: T[], cursor: number) => HistoryGroup<T>[];
 /**
  * 解析 step 中的"目标 id"用于合并：
  * - 单实体 update：取唯一一项 diff 的快照 id；快照无 id 时（如 CodeBlockContent）回退到 `step.data.id`
  *   （即资源 id），使代码块 / 数据源同样能按资源合并相邻 update；
  * - 其它情形（多实体 update / add / remove）：返回 undefined，表示不参与合并。
  */
-declare const detectTargetId: (step: BaseStepValue) => Id | undefined;
+export declare const detectTargetId: (step: BaseStepValue) => Id | undefined;
 /** 解析 step 中的目标可读名（用于 UI 展示）。 */
-declare const detectTargetName: (step: BaseStepValue) => string | undefined;
+export declare const detectTargetName: (step: BaseStepValue) => string | undefined;
 /**
  * 把 `Record<Id, UndoRedo>` 整体序列化为 `Record<Id, SerializedUndoRedo>`。
  *
@@ -3156,7 +3427,7 @@ declare const detectTargetName: (step: BaseStepValue) => string | undefined;
  * 这样既能写入函数，又避免序列化整份快照的开销；读取时再由 {@link parseStacksStepDiff} 还原 diff。
  * 不含 `diff` 的元素（如通用栈）原样透传。
  */
-declare const serializeStacks: <T extends {
+export declare const serializeStacks: <T extends {
   diff?: unknown;
 }>(stacks: Record<Id, UndoRedo<T>>) => Record<Id, SerializedUndoRedo<T>>;
 /**
@@ -3166,38 +3437,97 @@ declare const serializeStacks: <T extends {
  * 与 {@link serializeStacks} 相反：当传入 `parse`（parseDSL）时，把每条 step 中以字符串形式存储的 `diff`
  * 解析回真实对象（含函数）；不含 `diff` 的元素（如通用栈）原样透传。
  */
-declare const deserializeStacks: <T extends {
+export declare const deserializeStacks: <T extends {
   saved?: boolean;
 }>(stacks?: Record<Id, ReturnType<UndoRedo<T>["serialize"]>>, parse?: (serialized: string) => unknown) => Record<Id, UndoRedo<T>>;
 /**
  * 按 id 从「按 id 分栈」的记录表（代码块 / 数据源）中获取（或创建）对应的 UndoRedo 栈。
  */
-declare const getOrCreateStack: <T>(stacks: Record<Id, UndoRedo<T>>, id: Id) => UndoRedo<T>;
+export declare const getOrCreateStack: <T>(stacks: Record<Id, UndoRedo<T>>, id: Id) => UndoRedo<T>;
 /**
  * 撤销下限：当栈 index 0 是 `opType: 'initial'` 的基线 step 时为 1（基线不可被撤销），否则为 0。
  * 适用于所有历史类型（page / codeBlock / dataSource / 扩展），把 cursor 钉在基线之上，
  * 保证 undo / canUndo / goto 都不会越过初始基线。
  */
-declare const undoFloor: (undoRedo: UndoRedo<any>) => number;
+export declare const undoFloor: (undoRedo: UndoRedo<any>) => number;
 /** 将单次 push 产生的 history uuid（或 null）转为 *AndGetHistoryId 返回用的 uuid 列表。 */
-declare const getLastPushedHistoryIds: (historyId: string | null) => string[];
+export declare const getLastPushedHistoryIds: (historyId: string | null) => string[];
 //#endregion
 //#region temp/packages/editor/src/utils/const.d.ts
 /** 当uiService.get('uiSelectMode')为true,点击组件（包括任何形式，组件树/画布）时触发的事件名 */
-declare const UI_SELECT_MODE_EVENT_NAME = "ui-select";
-declare const LEFT_COLUMN_WIDTH_STORAGE_KEY = "$MagicEditorLeftColumnWidthData";
-declare const RIGHT_COLUMN_WIDTH_STORAGE_KEY = "$MagicEditorRightColumnWidthData";
-declare const PROPS_PANEL_WIDTH_STORAGE_KEY = "$MagicEditorPropsPanelWidthData";
-declare const DEFAULT_LEFT_COLUMN_WIDTH = 310;
-declare const DEFAULT_RIGHT_COLUMN_WIDTH = 480;
-declare const MIN_LEFT_COLUMN_WIDTH = 238;
-declare const MIN_CENTER_COLUMN_WIDTH = 400;
-declare const MIN_RIGHT_COLUMN_WIDTH = 300;
-declare const H_GUIDE_LINE_STORAGE_KEY = "$MagicStageHorizontalGuidelinesData";
-declare const V_GUIDE_LINE_STORAGE_KEY = "$MagicStageVerticalGuidelinesData";
+export declare const UI_SELECT_MODE_EVENT_NAME = "ui-select";
+export declare const LEFT_COLUMN_WIDTH_STORAGE_KEY = "$MagicEditorLeftColumnWidthData";
+export declare const RIGHT_COLUMN_WIDTH_STORAGE_KEY = "$MagicEditorRightColumnWidthData";
+export declare const PROPS_PANEL_WIDTH_STORAGE_KEY = "$MagicEditorPropsPanelWidthData";
+export declare const DEFAULT_LEFT_COLUMN_WIDTH = 345;
+export declare const DEFAULT_RIGHT_COLUMN_WIDTH = 480;
+export declare const MIN_LEFT_COLUMN_WIDTH = 345;
+export declare const MIN_CENTER_COLUMN_WIDTH = 400;
+export declare const MIN_RIGHT_COLUMN_WIDTH = 300;
+export declare const H_GUIDE_LINE_STORAGE_KEY = "$MagicStageHorizontalGuidelinesData";
+export declare const V_GUIDE_LINE_STORAGE_KEY = "$MagicStageVerticalGuidelinesData";
+//#endregion
+//#region temp/packages/editor/src/utils/type-match-rules.d.ts
+export declare const ALL_COND_OPS: Set<string>;
+export type ValidateDataSourceFieldSelectOptions = {
+  /**
+   * 覆盖「非数据源字段路径」时的校验。
+   * 不传则按 fieldConfig 走内置 typeMatch（与表单项自身 typeMatch 行为一致）。
+   */
+  validatePlainValue?: (value: any, context: TypeMatchValidateContext) => string | undefined | Promise<string | undefined>;
+};
+/**
+ * data-source-field-select 的 typeMatch 校验逻辑，可供自定义 rules.validator 复用。
+ */
+export declare const validateDataSourceFieldSelect: (value: any, context: TypeMatchValidateContext, options?: ValidateDataSourceFieldSelectOptions) => string | undefined | Promise<string | undefined>;
+export declare const editorTypeMatchRules: Record<string, TypeMatchValidator>;
+//#endregion
+//#region temp/packages/editor/src/utils/event.d.ts
+export declare const EVENT_NAME_VALUE_SEPARATOR = ".";
+export type EventNameSelectOption = {
+  text: string;
+  value: string;
+};
+export type EventNameOption = EventOption | CascaderOption | EventNameSelectOption;
+/** 与 EventSelect 中 checkStrictly 一致：component 为 false，其余为 true */
+export declare const isEventNameCheckStrictly: (src?: string) => boolean;
+/** 将动作 method 值规范为与 collectEventNameOptionValues 一致的字符串（cascader 无 valueSeparator 时存数组） */
+export declare const normalizeCompActionValue: (value: unknown) => string;
+/**
+ * 组装事件名称下拉/级联 options，与 EventSelect 默认 eventNameConfig.options 逻辑一致。
+ */
+export declare const getEventNameOptions: (src: string | undefined, formValue?: Record<string, any>) => EventNameOption[];
+/** 将 select / cascader options 展平为最终写入 name 的字符串集合（cascader 用 `.` 拼接） */
+export declare const collectEventNameOptionValues: (options: EventNameOption[], checkStrictly: boolean, prefix?: any[], result?: Set<string>) => Set<string>;
+/**
+ * 解析 event-select 允许的 name 集合。
+ * 自定义 eventNameConfig.options 时返回 null（跳过枚举校验）。
+ */
+export declare const getEventNameAllowedValues: (config?: {
+  src?: string;
+  eventNameConfig?: {
+    options?: unknown;
+  };
+}, formValue?: Record<string, any>) => Set<string> | null;
+/**
+ * 组装联动组件动作下拉/级联 options，与 EventSelect 默认 compActionConfig.options 逻辑一致。
+ */
+export declare const getCompActionOptions: (toId?: Id) => EventNameOption[];
+/**
+ * 解析 event-select 联动组件动作允许的 method 集合。
+ * 自定义 compActionConfig.options 时返回 null（跳过枚举校验）。
+ */
+export declare const getCompActionAllowedValues: (config?: {
+  src?: string;
+  compActionConfig?: {
+    options?: unknown;
+  };
+}, model?: {
+  to?: Id;
+}) => Set<string> | null;
 //#endregion
 //#region temp/packages/editor/src/utils/monaco-editor.d.ts
-declare const _default$45: () => Promise<typeof import("monaco-editor")>;
+declare const _default$49: () => Promise<typeof import("monaco-editor")>;
 //#endregion
 //#region temp/packages/form/src/schema.d.ts
 interface ChangeRecord$1 {
@@ -3228,14 +3558,8 @@ interface FormSlots {
 //#endregion
 //#region temp/packages/editor/src/editorProps.d.ts
 interface EditorProps {
-  /**
-   * 主题名称：对应 `packages/editor/src/theme/themes/<theme>/index.scss` 的目录名。
-   *
-   * 设置后会在编辑器根元素上追加 `m-editor--<theme>` 修饰类，配合按需引入
-   * `@tmagic/editor/dist/themes/<theme>.css` 即可启用主题样式。
-   *
-   * 例如：`<MEditor theme="magic-admin" />` + `import '@tmagic/editor/dist/themes/magic-admin.css'`。
-   */
+  /** 是否是大屏模拟器容器，大屏容器时，左侧属性面板会扩展为两列（正常3列），颜色表单不扩展两列等 */
+  isLargeStageContainer?: boolean;
   theme?: string;
   /** 页面初始值 */
   modelValue?: MApp;
@@ -3286,6 +3610,11 @@ interface EditorProps {
   containerHighlightDuration?: number;
   /** 拖入画布中容器时，识别容器的操作类型 */
   containerHighlightType?: ContainerHighlightType;
+  /**
+   * 是否仅在新增组件（从组件列表拖入新组件）时才启用识别容器，
+   * 开启后在画布中拖动已有组件不会识别容器，默认 false
+   */
+  containerHighlightAddOnly?: boolean;
   /** 画布大小 */
   stageRect?: StageRect;
   /** monaco editor 的配置 */
@@ -3309,6 +3638,11 @@ interface EditorProps {
   disabledFlashTip?: boolean;
   /** 禁用双击在浮层中单独编辑选中组件 */
   disabledStageOverlay?: boolean;
+  /**
+   * 是否启用「属性配置表单校验」联动能力：开启后属性/样式表单校验失败时仍更新节点，
+   * 并把错误信息集中记录到 editorService，用于组件树标红提示与保存拦截；默认 false（关闭）。
+   */
+  enablePropsFormValidate?: boolean;
   /** 禁用属性配置面板右下角显示源码的按钮 */
   disabledShowSrc?: boolean;
   /** 禁用数据源 */
@@ -3345,7 +3679,6 @@ interface EditorProps {
   beforeDblclick?: (event: MouseEvent) => Promise<boolean | void> | boolean | void;
   /** 组件树节点双击前的钩子函数，返回 false 则阻止默认的双击行为 */
   beforeLayerNodeDblclick?: (event: MouseEvent, data: TreeNodeData) => Promise<boolean | void> | boolean | void;
-  extendFormState?: (state: FormState) => Record<string, any> | Promise<Record<string, any>>;
   /** 历史记录面板的自定义扩展 tab，追加在内置的页面/数据源/代码块 tab 之后 */
   historyListExtraTabs?: HistoryListExtraTab[];
   /** 页面顺序拖拽配置参数 */
@@ -3368,11 +3701,10 @@ declare const __VLS_base$12: import("@vue/runtime-core").DefineComponent<EditorP
       readonly disabledShowSrc?: boolean | undefined;
       readonly labelWidth?: string | undefined;
       readonly codeValueKey?: string | undefined;
-      readonly labelPosition?: string | undefined;
-      readonly extendState?: ((_state: import("@tmagic/form-schema").FormState) => Record<string, any> | Promise<Record<string, any>>) | undefined;
+      readonly labelPosition?: "top" | "left" | "right" | undefined;
+      readonly onSubmit?: ((values: any, eventData?: ContainerChangeEventData$1 | undefined, error?: any) => any) | undefined;
       readonly onMounted?: ((internalInstance: any) => any) | undefined;
       readonly onUnmounted?: (() => any) | undefined;
-      readonly onSubmit?: ((values: any, eventData?: ContainerChangeEventData$1 | undefined) => any) | undefined;
       readonly "onSubmit-error"?: ((e: any) => any) | undefined;
       readonly "onForm-error"?: ((e: any) => any) | undefined;
     } & import("@vue/runtime-core").VNodeProps & import("@vue/runtime-core").AllowedComponentProps & import("@vue/runtime-core").ComponentCustomProps;
@@ -3386,7 +3718,7 @@ declare const __VLS_base$12: import("@vue/runtime-core").DefineComponent<EditorP
     $root: import("@vue/runtime-core").ComponentPublicInstance | null;
     $parent: import("@vue/runtime-core").ComponentPublicInstance | null;
     $host: Element | null;
-    $emit: ((event: "mounted", internalInstance: any) => void) & ((event: "unmounted") => void) & ((event: "submit", values: any, eventData?: ContainerChangeEventData$1 | undefined) => void) & ((event: "submit-error", e: any) => void) & ((event: "form-error", e: any) => void);
+    $emit: ((event: "submit", values: any, eventData?: ContainerChangeEventData$1 | undefined, error?: any) => void) & ((event: "mounted", internalInstance: any) => void) & ((event: "unmounted") => void) & ((event: "submit-error", e: any) => void) & ((event: "form-error", e: any) => void);
     $el: any;
     $options: import("@vue/runtime-core").ComponentOptionsBase<Readonly<{
       config: import("@tmagic/form-schema").FormConfig;
@@ -3394,12 +3726,11 @@ declare const __VLS_base$12: import("@vue/runtime-core").DefineComponent<EditorP
       disabledShowSrc?: boolean;
       labelWidth?: string;
       codeValueKey?: string;
-      labelPosition?: string;
-      extendState?: (_state: import("@tmagic/form-schema").FormState) => Record<string, any> | Promise<Record<string, any>>;
+      labelPosition?: "top" | "left" | "right";
     }> & Readonly<{
+      onSubmit?: ((values: any, eventData?: ContainerChangeEventData$1 | undefined, error?: any) => any) | undefined;
       onMounted?: ((internalInstance: any) => any) | undefined;
       onUnmounted?: (() => any) | undefined;
-      onSubmit?: ((values: any, eventData?: ContainerChangeEventData$1 | undefined) => any) | undefined;
       "onSubmit-error"?: ((e: any) => any) | undefined;
       "onForm-error"?: ((e: any) => any) | undefined;
     }>, {
@@ -3413,16 +3744,19 @@ declare const __VLS_base$12: import("@vue/runtime-core").DefineComponent<EditorP
           readonly isCompare?: boolean | undefined;
           readonly parentValues?: Record<string, any> | undefined;
           readonly labelWidth?: string | undefined;
+          readonly typeMatchValid?: boolean | undefined;
+          readonly validateOnInit?: boolean | undefined;
           readonly disabled?: boolean | undefined;
           readonly height?: string | undefined;
           readonly stepActive?: string | number | undefined;
           readonly size?: "small" | "default" | "large" | undefined;
           readonly inline?: boolean | undefined;
-          readonly labelPosition?: string | undefined;
+          readonly labelPosition?: "top" | "left" | "right" | undefined;
           readonly keyProp?: string | undefined;
           readonly popperClass?: string | undefined;
           readonly preventSubmitDefault?: boolean | undefined;
-          readonly extendState?: ((_state: import("@tmagic/form-schema").FormState) => Record<string, any> | Promise<Record<string, any>>) | undefined;
+          readonly useFieldTextInError?: boolean | undefined;
+          readonly context?: import("@tmagic/form-schema").FormContext | undefined;
           readonly showDiff?: ((_data: {
             curValue: any;
             lastValue: any;
@@ -3455,16 +3789,19 @@ declare const __VLS_base$12: import("@vue/runtime-core").DefineComponent<EditorP
           isCompare?: boolean;
           parentValues?: Record<string, any>;
           labelWidth?: string;
+          typeMatchValid?: boolean;
+          validateOnInit?: boolean;
           disabled?: boolean;
           height?: string;
           stepActive?: string | number;
           size?: "small" | "default" | "large";
           inline?: boolean;
-          labelPosition?: string;
+          labelPosition?: "top" | "left" | "right";
           keyProp?: string;
           popperClass?: string;
           preventSubmitDefault?: boolean;
-          extendState?: (_state: import("@tmagic/form-schema").FormState) => Record<string, any> | Promise<Record<string, any>>;
+          useFieldTextInError?: boolean;
+          context?: import("@tmagic/form-schema").FormContext;
           showDiff?: (_data: {
             curValue: any;
             lastValue: any;
@@ -3487,6 +3824,7 @@ declare const __VLS_base$12: import("@vue/runtime-core").DefineComponent<EditorP
           changeHandler: (v: import("@tmagic/form-schema").FormValue, eventData: ContainerChangeEventData$1) => void;
           resetForm: () => void;
           submitForm: (native?: boolean) => Promise<any>;
+          validate: () => Promise<string>;
           getTextByName: (name: string, config?: import("@tmagic/form-schema").FormConfig) => string | undefined;
         }, {}, {}, {}, import("@vue/runtime-core").ComponentOptionsMixin, import("@vue/runtime-core").ComponentOptionsMixin, {
           error: (...args: any[]) => void;
@@ -3498,7 +3836,7 @@ declare const __VLS_base$12: import("@vue/runtime-core").DefineComponent<EditorP
           disabled: boolean;
           labelWidth: string;
           inline: boolean;
-          labelPosition: string;
+          labelPosition: "top" | "left" | "right";
           config: import("@tmagic/form-schema").FormConfig;
           height: string;
           initValues: Record<string, any>;
@@ -3506,7 +3844,9 @@ declare const __VLS_base$12: import("@vue/runtime-core").DefineComponent<EditorP
           isCompare: boolean;
           keyProp: string;
           parentValues: Record<string, any>;
+          useFieldTextInError: boolean;
           stepActive: string | number;
+          validateOnInit: boolean;
         }, {}, string, {}, import("@vue/runtime-core").GlobalComponents, import("@vue/runtime-core").GlobalDirectives, string, import("@vue/runtime-core").ComponentProvideOptions> & {
           beforeCreate?: (() => void) | (() => void)[];
           created?: (() => void) | (() => void)[];
@@ -3531,7 +3871,7 @@ declare const __VLS_base$12: import("@vue/runtime-core").DefineComponent<EditorP
         disabled: boolean;
         labelWidth: string;
         inline: boolean;
-        labelPosition: string;
+        labelPosition: "top" | "left" | "right";
         config: import("@tmagic/form-schema").FormConfig;
         height: string;
         initValues: Record<string, any>;
@@ -3539,7 +3879,9 @@ declare const __VLS_base$12: import("@vue/runtime-core").DefineComponent<EditorP
         isCompare: boolean;
         keyProp: string;
         parentValues: Record<string, any>;
+        useFieldTextInError: boolean;
         stepActive: string | number;
+        validateOnInit: boolean;
       }> & Omit<Readonly<{
         config: import("@tmagic/form-schema").FormConfig;
         initValues: Record<string, any>;
@@ -3547,16 +3889,19 @@ declare const __VLS_base$12: import("@vue/runtime-core").DefineComponent<EditorP
         isCompare?: boolean;
         parentValues?: Record<string, any>;
         labelWidth?: string;
+        typeMatchValid?: boolean;
+        validateOnInit?: boolean;
         disabled?: boolean;
         height?: string;
         stepActive?: string | number;
         size?: "small" | "default" | "large";
         inline?: boolean;
-        labelPosition?: string;
+        labelPosition?: "top" | "left" | "right";
         keyProp?: string;
         popperClass?: string;
         preventSubmitDefault?: boolean;
-        extendState?: (_state: import("@tmagic/form-schema").FormState) => Record<string, any> | Promise<Record<string, any>>;
+        useFieldTextInError?: boolean;
+        context?: import("@tmagic/form-schema").FormContext;
         showDiff?: (_data: {
           curValue: any;
           lastValue: any;
@@ -3570,7 +3915,7 @@ declare const __VLS_base$12: import("@vue/runtime-core").DefineComponent<EditorP
         "onField-input"?: ((...args: any[]) => any) | undefined;
         "onField-change"?: ((...args: any[]) => any) | undefined;
         "onUpdate:stepActive"?: ((...args: any[]) => any) | undefined;
-      }>, "values" | "changeHandler" | "initialized" | "lastValuesProcessed" | "formState" | "changeRecords" | "resetForm" | "submitForm" | "getTextByName" | ("disabled" | "labelWidth" | "inline" | "labelPosition" | "config" | "height" | "initValues" | "lastValues" | "isCompare" | "keyProp" | "parentValues" | "stepActive")> & {
+      }>, "values" | "changeHandler" | "validate" | "lastValuesProcessed" | "submitForm" | "changeRecords" | "initialized" | "formState" | "resetForm" | "getTextByName" | ("disabled" | "labelWidth" | "inline" | "labelPosition" | "config" | "height" | "initValues" | "lastValues" | "isCompare" | "keyProp" | "parentValues" | "useFieldTextInError" | "stepActive" | "validateOnInit")> & {
         values: import("@tmagic/form-schema").FormValue;
         lastValuesProcessed: import("@tmagic/form-schema").FormValue;
         formState: import("@tmagic/form-schema").FormState;
@@ -3579,15 +3924,16 @@ declare const __VLS_base$12: import("@vue/runtime-core").DefineComponent<EditorP
         changeHandler: (v: import("@tmagic/form-schema").FormValue, eventData: ContainerChangeEventData$1) => void;
         resetForm: () => void;
         submitForm: (native?: boolean) => Promise<any>;
+        validate: () => Promise<string>;
         getTextByName: (name: string, config?: import("@tmagic/form-schema").FormConfig) => string | undefined;
       } & {} & import("@vue/runtime-core").ComponentCustomProperties & {} & {
         $slots: FormSlots;
       }) | null>>;
       submit: (v: import("@tmagic/form-schema").FormValue, eventData: ContainerChangeEventData$1) => Promise<void>;
     }, {}, {}, {}, import("@vue/runtime-core").ComponentOptionsMixin, import("@vue/runtime-core").ComponentOptionsMixin, {
+      submit: (values: any, eventData?: ContainerChangeEventData$1 | undefined, error?: any) => any;
       mounted: (internalInstance: any) => any;
       unmounted: () => any;
-      submit: (values: any, eventData?: ContainerChangeEventData$1 | undefined) => any;
       "submit-error": (e: any) => any;
       "form-error": (e: any) => any;
     }, string, {}, {}, string, {}, import("@vue/runtime-core").GlobalComponents, import("@vue/runtime-core").GlobalDirectives, string, import("@vue/runtime-core").ComponentProvideOptions> & {
@@ -3616,12 +3962,11 @@ declare const __VLS_base$12: import("@vue/runtime-core").DefineComponent<EditorP
     disabledShowSrc?: boolean;
     labelWidth?: string;
     codeValueKey?: string;
-    labelPosition?: string;
-    extendState?: (_state: import("@tmagic/form-schema").FormState) => Record<string, any> | Promise<Record<string, any>>;
+    labelPosition?: "top" | "left" | "right";
   }> & Readonly<{
+    onSubmit?: ((values: any, eventData?: ContainerChangeEventData$1 | undefined, error?: any) => any) | undefined;
     onMounted?: ((internalInstance: any) => any) | undefined;
     onUnmounted?: (() => any) | undefined;
-    onSubmit?: ((values: any, eventData?: ContainerChangeEventData$1 | undefined) => any) | undefined;
     "onSubmit-error"?: ((e: any) => any) | undefined;
     "onForm-error"?: ((e: any) => any) | undefined;
   }>, "submit" | "configForm"> & {
@@ -3635,16 +3980,19 @@ declare const __VLS_base$12: import("@vue/runtime-core").DefineComponent<EditorP
         readonly isCompare?: boolean | undefined;
         readonly parentValues?: Record<string, any> | undefined;
         readonly labelWidth?: string | undefined;
+        readonly typeMatchValid?: boolean | undefined;
+        readonly validateOnInit?: boolean | undefined;
         readonly disabled?: boolean | undefined;
         readonly height?: string | undefined;
         readonly stepActive?: string | number | undefined;
         readonly size?: "small" | "default" | "large" | undefined;
         readonly inline?: boolean | undefined;
-        readonly labelPosition?: string | undefined;
+        readonly labelPosition?: "top" | "left" | "right" | undefined;
         readonly keyProp?: string | undefined;
         readonly popperClass?: string | undefined;
         readonly preventSubmitDefault?: boolean | undefined;
-        readonly extendState?: ((_state: import("@tmagic/form-schema").FormState) => Record<string, any> | Promise<Record<string, any>>) | undefined;
+        readonly useFieldTextInError?: boolean | undefined;
+        readonly context?: import("@tmagic/form-schema").FormContext | undefined;
         readonly showDiff?: ((_data: {
           curValue: any;
           lastValue: any;
@@ -3677,16 +4025,19 @@ declare const __VLS_base$12: import("@vue/runtime-core").DefineComponent<EditorP
         isCompare?: boolean;
         parentValues?: Record<string, any>;
         labelWidth?: string;
+        typeMatchValid?: boolean;
+        validateOnInit?: boolean;
         disabled?: boolean;
         height?: string;
         stepActive?: string | number;
         size?: "small" | "default" | "large";
         inline?: boolean;
-        labelPosition?: string;
+        labelPosition?: "top" | "left" | "right";
         keyProp?: string;
         popperClass?: string;
         preventSubmitDefault?: boolean;
-        extendState?: (_state: import("@tmagic/form-schema").FormState) => Record<string, any> | Promise<Record<string, any>>;
+        useFieldTextInError?: boolean;
+        context?: import("@tmagic/form-schema").FormContext;
         showDiff?: (_data: {
           curValue: any;
           lastValue: any;
@@ -3709,6 +4060,7 @@ declare const __VLS_base$12: import("@vue/runtime-core").DefineComponent<EditorP
         changeHandler: (v: import("@tmagic/form-schema").FormValue, eventData: ContainerChangeEventData$1) => void;
         resetForm: () => void;
         submitForm: (native?: boolean) => Promise<any>;
+        validate: () => Promise<string>;
         getTextByName: (name: string, config?: import("@tmagic/form-schema").FormConfig) => string | undefined;
       }, {}, {}, {}, import("@vue/runtime-core").ComponentOptionsMixin, import("@vue/runtime-core").ComponentOptionsMixin, {
         error: (...args: any[]) => void;
@@ -3720,7 +4072,7 @@ declare const __VLS_base$12: import("@vue/runtime-core").DefineComponent<EditorP
         disabled: boolean;
         labelWidth: string;
         inline: boolean;
-        labelPosition: string;
+        labelPosition: "top" | "left" | "right";
         config: import("@tmagic/form-schema").FormConfig;
         height: string;
         initValues: Record<string, any>;
@@ -3728,7 +4080,9 @@ declare const __VLS_base$12: import("@vue/runtime-core").DefineComponent<EditorP
         isCompare: boolean;
         keyProp: string;
         parentValues: Record<string, any>;
+        useFieldTextInError: boolean;
         stepActive: string | number;
+        validateOnInit: boolean;
       }, {}, string, {}, import("@vue/runtime-core").GlobalComponents, import("@vue/runtime-core").GlobalDirectives, string, import("@vue/runtime-core").ComponentProvideOptions> & {
         beforeCreate?: (() => void) | (() => void)[];
         created?: (() => void) | (() => void)[];
@@ -3753,7 +4107,7 @@ declare const __VLS_base$12: import("@vue/runtime-core").DefineComponent<EditorP
       disabled: boolean;
       labelWidth: string;
       inline: boolean;
-      labelPosition: string;
+      labelPosition: "top" | "left" | "right";
       config: import("@tmagic/form-schema").FormConfig;
       height: string;
       initValues: Record<string, any>;
@@ -3761,7 +4115,9 @@ declare const __VLS_base$12: import("@vue/runtime-core").DefineComponent<EditorP
       isCompare: boolean;
       keyProp: string;
       parentValues: Record<string, any>;
+      useFieldTextInError: boolean;
       stepActive: string | number;
+      validateOnInit: boolean;
     }> & Omit<Readonly<{
       config: import("@tmagic/form-schema").FormConfig;
       initValues: Record<string, any>;
@@ -3769,16 +4125,19 @@ declare const __VLS_base$12: import("@vue/runtime-core").DefineComponent<EditorP
       isCompare?: boolean;
       parentValues?: Record<string, any>;
       labelWidth?: string;
+      typeMatchValid?: boolean;
+      validateOnInit?: boolean;
       disabled?: boolean;
       height?: string;
       stepActive?: string | number;
       size?: "small" | "default" | "large";
       inline?: boolean;
-      labelPosition?: string;
+      labelPosition?: "top" | "left" | "right";
       keyProp?: string;
       popperClass?: string;
       preventSubmitDefault?: boolean;
-      extendState?: (_state: import("@tmagic/form-schema").FormState) => Record<string, any> | Promise<Record<string, any>>;
+      useFieldTextInError?: boolean;
+      context?: import("@tmagic/form-schema").FormContext;
       showDiff?: (_data: {
         curValue: any;
         lastValue: any;
@@ -3792,7 +4151,7 @@ declare const __VLS_base$12: import("@vue/runtime-core").DefineComponent<EditorP
       "onField-input"?: ((...args: any[]) => any) | undefined;
       "onField-change"?: ((...args: any[]) => any) | undefined;
       "onUpdate:stepActive"?: ((...args: any[]) => any) | undefined;
-    }>, "values" | "changeHandler" | "initialized" | "lastValuesProcessed" | "formState" | "changeRecords" | "resetForm" | "submitForm" | "getTextByName" | ("disabled" | "labelWidth" | "inline" | "labelPosition" | "config" | "height" | "initValues" | "lastValues" | "isCompare" | "keyProp" | "parentValues" | "stepActive")> & {
+    }>, "values" | "changeHandler" | "validate" | "lastValuesProcessed" | "submitForm" | "changeRecords" | "initialized" | "formState" | "resetForm" | "getTextByName" | ("disabled" | "labelWidth" | "inline" | "labelPosition" | "config" | "height" | "initValues" | "lastValues" | "isCompare" | "keyProp" | "parentValues" | "useFieldTextInError" | "stepActive" | "validateOnInit")> & {
       values: import("@tmagic/form-schema").FormValue;
       lastValuesProcessed: import("@tmagic/form-schema").FormValue;
       formState: import("@tmagic/form-schema").FormState;
@@ -3801,6 +4160,7 @@ declare const __VLS_base$12: import("@vue/runtime-core").DefineComponent<EditorP
       changeHandler: (v: import("@tmagic/form-schema").FormValue, eventData: ContainerChangeEventData$1) => void;
       resetForm: () => void;
       submitForm: (native?: boolean) => Promise<any>;
+      validate: () => Promise<string>;
       getTextByName: (name: string, config?: import("@tmagic/form-schema").FormConfig) => string | undefined;
     } & {} & import("@vue/runtime-core").ComponentCustomProperties & {} & {
       $slots: FormSlots;
@@ -3826,11 +4186,10 @@ declare const __VLS_base$12: import("@vue/runtime-core").DefineComponent<EditorP
       readonly disabledShowSrc?: boolean | undefined;
       readonly labelWidth?: string | undefined;
       readonly codeValueKey?: string | undefined;
-      readonly labelPosition?: string | undefined;
-      readonly extendState?: ((_state: import("@tmagic/form-schema").FormState) => Record<string, any> | Promise<Record<string, any>>) | undefined;
+      readonly labelPosition?: "top" | "left" | "right" | undefined;
+      readonly onSubmit?: ((values: any, eventData?: ContainerChangeEventData$1 | undefined, error?: any) => any) | undefined;
       readonly onMounted?: ((internalInstance: any) => any) | undefined;
       readonly onUnmounted?: (() => any) | undefined;
-      readonly onSubmit?: ((values: any, eventData?: ContainerChangeEventData$1 | undefined) => any) | undefined;
       readonly "onSubmit-error"?: ((e: any) => any) | undefined;
       readonly "onForm-error"?: ((e: any) => any) | undefined;
     } & import("@vue/runtime-core").VNodeProps & import("@vue/runtime-core").AllowedComponentProps & import("@vue/runtime-core").ComponentCustomProps;
@@ -3844,7 +4203,7 @@ declare const __VLS_base$12: import("@vue/runtime-core").DefineComponent<EditorP
     $root: import("@vue/runtime-core").ComponentPublicInstance | null;
     $parent: import("@vue/runtime-core").ComponentPublicInstance | null;
     $host: Element | null;
-    $emit: ((event: "mounted", internalInstance: any) => void) & ((event: "unmounted") => void) & ((event: "submit", values: any, eventData?: ContainerChangeEventData$1 | undefined) => void) & ((event: "submit-error", e: any) => void) & ((event: "form-error", e: any) => void);
+    $emit: ((event: "submit", values: any, eventData?: ContainerChangeEventData$1 | undefined, error?: any) => void) & ((event: "mounted", internalInstance: any) => void) & ((event: "unmounted") => void) & ((event: "submit-error", e: any) => void) & ((event: "form-error", e: any) => void);
     $el: any;
     $options: import("@vue/runtime-core").ComponentOptionsBase<Readonly<{
       config: import("@tmagic/form-schema").FormConfig;
@@ -3852,12 +4211,11 @@ declare const __VLS_base$12: import("@vue/runtime-core").DefineComponent<EditorP
       disabledShowSrc?: boolean;
       labelWidth?: string;
       codeValueKey?: string;
-      labelPosition?: string;
-      extendState?: (_state: import("@tmagic/form-schema").FormState) => Record<string, any> | Promise<Record<string, any>>;
+      labelPosition?: "top" | "left" | "right";
     }> & Readonly<{
+      onSubmit?: ((values: any, eventData?: ContainerChangeEventData$1 | undefined, error?: any) => any) | undefined;
       onMounted?: ((internalInstance: any) => any) | undefined;
       onUnmounted?: (() => any) | undefined;
-      onSubmit?: ((values: any, eventData?: ContainerChangeEventData$1 | undefined) => any) | undefined;
       "onSubmit-error"?: ((e: any) => any) | undefined;
       "onForm-error"?: ((e: any) => any) | undefined;
     }>, {
@@ -3871,16 +4229,19 @@ declare const __VLS_base$12: import("@vue/runtime-core").DefineComponent<EditorP
           readonly isCompare?: boolean | undefined;
           readonly parentValues?: Record<string, any> | undefined;
           readonly labelWidth?: string | undefined;
+          readonly typeMatchValid?: boolean | undefined;
+          readonly validateOnInit?: boolean | undefined;
           readonly disabled?: boolean | undefined;
           readonly height?: string | undefined;
           readonly stepActive?: string | number | undefined;
           readonly size?: "small" | "default" | "large" | undefined;
           readonly inline?: boolean | undefined;
-          readonly labelPosition?: string | undefined;
+          readonly labelPosition?: "top" | "left" | "right" | undefined;
           readonly keyProp?: string | undefined;
           readonly popperClass?: string | undefined;
           readonly preventSubmitDefault?: boolean | undefined;
-          readonly extendState?: ((_state: import("@tmagic/form-schema").FormState) => Record<string, any> | Promise<Record<string, any>>) | undefined;
+          readonly useFieldTextInError?: boolean | undefined;
+          readonly context?: import("@tmagic/form-schema").FormContext | undefined;
           readonly showDiff?: ((_data: {
             curValue: any;
             lastValue: any;
@@ -3913,16 +4274,19 @@ declare const __VLS_base$12: import("@vue/runtime-core").DefineComponent<EditorP
           isCompare?: boolean;
           parentValues?: Record<string, any>;
           labelWidth?: string;
+          typeMatchValid?: boolean;
+          validateOnInit?: boolean;
           disabled?: boolean;
           height?: string;
           stepActive?: string | number;
           size?: "small" | "default" | "large";
           inline?: boolean;
-          labelPosition?: string;
+          labelPosition?: "top" | "left" | "right";
           keyProp?: string;
           popperClass?: string;
           preventSubmitDefault?: boolean;
-          extendState?: (_state: import("@tmagic/form-schema").FormState) => Record<string, any> | Promise<Record<string, any>>;
+          useFieldTextInError?: boolean;
+          context?: import("@tmagic/form-schema").FormContext;
           showDiff?: (_data: {
             curValue: any;
             lastValue: any;
@@ -3945,6 +4309,7 @@ declare const __VLS_base$12: import("@vue/runtime-core").DefineComponent<EditorP
           changeHandler: (v: import("@tmagic/form-schema").FormValue, eventData: ContainerChangeEventData$1) => void;
           resetForm: () => void;
           submitForm: (native?: boolean) => Promise<any>;
+          validate: () => Promise<string>;
           getTextByName: (name: string, config?: import("@tmagic/form-schema").FormConfig) => string | undefined;
         }, {}, {}, {}, import("@vue/runtime-core").ComponentOptionsMixin, import("@vue/runtime-core").ComponentOptionsMixin, {
           error: (...args: any[]) => void;
@@ -3956,7 +4321,7 @@ declare const __VLS_base$12: import("@vue/runtime-core").DefineComponent<EditorP
           disabled: boolean;
           labelWidth: string;
           inline: boolean;
-          labelPosition: string;
+          labelPosition: "top" | "left" | "right";
           config: import("@tmagic/form-schema").FormConfig;
           height: string;
           initValues: Record<string, any>;
@@ -3964,7 +4329,9 @@ declare const __VLS_base$12: import("@vue/runtime-core").DefineComponent<EditorP
           isCompare: boolean;
           keyProp: string;
           parentValues: Record<string, any>;
+          useFieldTextInError: boolean;
           stepActive: string | number;
+          validateOnInit: boolean;
         }, {}, string, {}, import("@vue/runtime-core").GlobalComponents, import("@vue/runtime-core").GlobalDirectives, string, import("@vue/runtime-core").ComponentProvideOptions> & {
           beforeCreate?: (() => void) | (() => void)[];
           created?: (() => void) | (() => void)[];
@@ -3989,7 +4356,7 @@ declare const __VLS_base$12: import("@vue/runtime-core").DefineComponent<EditorP
         disabled: boolean;
         labelWidth: string;
         inline: boolean;
-        labelPosition: string;
+        labelPosition: "top" | "left" | "right";
         config: import("@tmagic/form-schema").FormConfig;
         height: string;
         initValues: Record<string, any>;
@@ -3997,7 +4364,9 @@ declare const __VLS_base$12: import("@vue/runtime-core").DefineComponent<EditorP
         isCompare: boolean;
         keyProp: string;
         parentValues: Record<string, any>;
+        useFieldTextInError: boolean;
         stepActive: string | number;
+        validateOnInit: boolean;
       }> & Omit<Readonly<{
         config: import("@tmagic/form-schema").FormConfig;
         initValues: Record<string, any>;
@@ -4005,16 +4374,19 @@ declare const __VLS_base$12: import("@vue/runtime-core").DefineComponent<EditorP
         isCompare?: boolean;
         parentValues?: Record<string, any>;
         labelWidth?: string;
+        typeMatchValid?: boolean;
+        validateOnInit?: boolean;
         disabled?: boolean;
         height?: string;
         stepActive?: string | number;
         size?: "small" | "default" | "large";
         inline?: boolean;
-        labelPosition?: string;
+        labelPosition?: "top" | "left" | "right";
         keyProp?: string;
         popperClass?: string;
         preventSubmitDefault?: boolean;
-        extendState?: (_state: import("@tmagic/form-schema").FormState) => Record<string, any> | Promise<Record<string, any>>;
+        useFieldTextInError?: boolean;
+        context?: import("@tmagic/form-schema").FormContext;
         showDiff?: (_data: {
           curValue: any;
           lastValue: any;
@@ -4028,7 +4400,7 @@ declare const __VLS_base$12: import("@vue/runtime-core").DefineComponent<EditorP
         "onField-input"?: ((...args: any[]) => any) | undefined;
         "onField-change"?: ((...args: any[]) => any) | undefined;
         "onUpdate:stepActive"?: ((...args: any[]) => any) | undefined;
-      }>, "values" | "changeHandler" | "initialized" | "lastValuesProcessed" | "formState" | "changeRecords" | "resetForm" | "submitForm" | "getTextByName" | ("disabled" | "labelWidth" | "inline" | "labelPosition" | "config" | "height" | "initValues" | "lastValues" | "isCompare" | "keyProp" | "parentValues" | "stepActive")> & {
+      }>, "values" | "changeHandler" | "validate" | "lastValuesProcessed" | "submitForm" | "changeRecords" | "initialized" | "formState" | "resetForm" | "getTextByName" | ("disabled" | "labelWidth" | "inline" | "labelPosition" | "config" | "height" | "initValues" | "lastValues" | "isCompare" | "keyProp" | "parentValues" | "useFieldTextInError" | "stepActive" | "validateOnInit")> & {
         values: import("@tmagic/form-schema").FormValue;
         lastValuesProcessed: import("@tmagic/form-schema").FormValue;
         formState: import("@tmagic/form-schema").FormState;
@@ -4037,15 +4409,16 @@ declare const __VLS_base$12: import("@vue/runtime-core").DefineComponent<EditorP
         changeHandler: (v: import("@tmagic/form-schema").FormValue, eventData: ContainerChangeEventData$1) => void;
         resetForm: () => void;
         submitForm: (native?: boolean) => Promise<any>;
+        validate: () => Promise<string>;
         getTextByName: (name: string, config?: import("@tmagic/form-schema").FormConfig) => string | undefined;
       } & {} & import("@vue/runtime-core").ComponentCustomProperties & {} & {
         $slots: FormSlots;
       }) | null>>;
       submit: (v: import("@tmagic/form-schema").FormValue, eventData: ContainerChangeEventData$1) => Promise<void>;
     }, {}, {}, {}, import("@vue/runtime-core").ComponentOptionsMixin, import("@vue/runtime-core").ComponentOptionsMixin, {
+      submit: (values: any, eventData?: ContainerChangeEventData$1 | undefined, error?: any) => any;
       mounted: (internalInstance: any) => any;
       unmounted: () => any;
-      submit: (values: any, eventData?: ContainerChangeEventData$1 | undefined) => any;
       "submit-error": (e: any) => any;
       "form-error": (e: any) => any;
     }, string, {}, {}, string, {}, import("@vue/runtime-core").GlobalComponents, import("@vue/runtime-core").GlobalDirectives, string, import("@vue/runtime-core").ComponentProvideOptions> & {
@@ -4074,12 +4447,11 @@ declare const __VLS_base$12: import("@vue/runtime-core").DefineComponent<EditorP
     disabledShowSrc?: boolean;
     labelWidth?: string;
     codeValueKey?: string;
-    labelPosition?: string;
-    extendState?: (_state: import("@tmagic/form-schema").FormState) => Record<string, any> | Promise<Record<string, any>>;
+    labelPosition?: "top" | "left" | "right";
   }> & Readonly<{
+    onSubmit?: ((values: any, eventData?: ContainerChangeEventData$1 | undefined, error?: any) => any) | undefined;
     onMounted?: ((internalInstance: any) => any) | undefined;
     onUnmounted?: (() => any) | undefined;
-    onSubmit?: ((values: any, eventData?: ContainerChangeEventData$1 | undefined) => any) | undefined;
     "onSubmit-error"?: ((e: any) => any) | undefined;
     "onForm-error"?: ((e: any) => any) | undefined;
   }>, "submit" | "configForm"> & {
@@ -4093,16 +4465,19 @@ declare const __VLS_base$12: import("@vue/runtime-core").DefineComponent<EditorP
         readonly isCompare?: boolean | undefined;
         readonly parentValues?: Record<string, any> | undefined;
         readonly labelWidth?: string | undefined;
+        readonly typeMatchValid?: boolean | undefined;
+        readonly validateOnInit?: boolean | undefined;
         readonly disabled?: boolean | undefined;
         readonly height?: string | undefined;
         readonly stepActive?: string | number | undefined;
         readonly size?: "small" | "default" | "large" | undefined;
         readonly inline?: boolean | undefined;
-        readonly labelPosition?: string | undefined;
+        readonly labelPosition?: "top" | "left" | "right" | undefined;
         readonly keyProp?: string | undefined;
         readonly popperClass?: string | undefined;
         readonly preventSubmitDefault?: boolean | undefined;
-        readonly extendState?: ((_state: import("@tmagic/form-schema").FormState) => Record<string, any> | Promise<Record<string, any>>) | undefined;
+        readonly useFieldTextInError?: boolean | undefined;
+        readonly context?: import("@tmagic/form-schema").FormContext | undefined;
         readonly showDiff?: ((_data: {
           curValue: any;
           lastValue: any;
@@ -4135,16 +4510,19 @@ declare const __VLS_base$12: import("@vue/runtime-core").DefineComponent<EditorP
         isCompare?: boolean;
         parentValues?: Record<string, any>;
         labelWidth?: string;
+        typeMatchValid?: boolean;
+        validateOnInit?: boolean;
         disabled?: boolean;
         height?: string;
         stepActive?: string | number;
         size?: "small" | "default" | "large";
         inline?: boolean;
-        labelPosition?: string;
+        labelPosition?: "top" | "left" | "right";
         keyProp?: string;
         popperClass?: string;
         preventSubmitDefault?: boolean;
-        extendState?: (_state: import("@tmagic/form-schema").FormState) => Record<string, any> | Promise<Record<string, any>>;
+        useFieldTextInError?: boolean;
+        context?: import("@tmagic/form-schema").FormContext;
         showDiff?: (_data: {
           curValue: any;
           lastValue: any;
@@ -4167,6 +4545,7 @@ declare const __VLS_base$12: import("@vue/runtime-core").DefineComponent<EditorP
         changeHandler: (v: import("@tmagic/form-schema").FormValue, eventData: ContainerChangeEventData$1) => void;
         resetForm: () => void;
         submitForm: (native?: boolean) => Promise<any>;
+        validate: () => Promise<string>;
         getTextByName: (name: string, config?: import("@tmagic/form-schema").FormConfig) => string | undefined;
       }, {}, {}, {}, import("@vue/runtime-core").ComponentOptionsMixin, import("@vue/runtime-core").ComponentOptionsMixin, {
         error: (...args: any[]) => void;
@@ -4178,7 +4557,7 @@ declare const __VLS_base$12: import("@vue/runtime-core").DefineComponent<EditorP
         disabled: boolean;
         labelWidth: string;
         inline: boolean;
-        labelPosition: string;
+        labelPosition: "top" | "left" | "right";
         config: import("@tmagic/form-schema").FormConfig;
         height: string;
         initValues: Record<string, any>;
@@ -4186,7 +4565,9 @@ declare const __VLS_base$12: import("@vue/runtime-core").DefineComponent<EditorP
         isCompare: boolean;
         keyProp: string;
         parentValues: Record<string, any>;
+        useFieldTextInError: boolean;
         stepActive: string | number;
+        validateOnInit: boolean;
       }, {}, string, {}, import("@vue/runtime-core").GlobalComponents, import("@vue/runtime-core").GlobalDirectives, string, import("@vue/runtime-core").ComponentProvideOptions> & {
         beforeCreate?: (() => void) | (() => void)[];
         created?: (() => void) | (() => void)[];
@@ -4211,7 +4592,7 @@ declare const __VLS_base$12: import("@vue/runtime-core").DefineComponent<EditorP
       disabled: boolean;
       labelWidth: string;
       inline: boolean;
-      labelPosition: string;
+      labelPosition: "top" | "left" | "right";
       config: import("@tmagic/form-schema").FormConfig;
       height: string;
       initValues: Record<string, any>;
@@ -4219,7 +4600,9 @@ declare const __VLS_base$12: import("@vue/runtime-core").DefineComponent<EditorP
       isCompare: boolean;
       keyProp: string;
       parentValues: Record<string, any>;
+      useFieldTextInError: boolean;
       stepActive: string | number;
+      validateOnInit: boolean;
     }> & Omit<Readonly<{
       config: import("@tmagic/form-schema").FormConfig;
       initValues: Record<string, any>;
@@ -4227,16 +4610,19 @@ declare const __VLS_base$12: import("@vue/runtime-core").DefineComponent<EditorP
       isCompare?: boolean;
       parentValues?: Record<string, any>;
       labelWidth?: string;
+      typeMatchValid?: boolean;
+      validateOnInit?: boolean;
       disabled?: boolean;
       height?: string;
       stepActive?: string | number;
       size?: "small" | "default" | "large";
       inline?: boolean;
-      labelPosition?: string;
+      labelPosition?: "top" | "left" | "right";
       keyProp?: string;
       popperClass?: string;
       preventSubmitDefault?: boolean;
-      extendState?: (_state: import("@tmagic/form-schema").FormState) => Record<string, any> | Promise<Record<string, any>>;
+      useFieldTextInError?: boolean;
+      context?: import("@tmagic/form-schema").FormContext;
       showDiff?: (_data: {
         curValue: any;
         lastValue: any;
@@ -4250,7 +4636,7 @@ declare const __VLS_base$12: import("@vue/runtime-core").DefineComponent<EditorP
       "onField-input"?: ((...args: any[]) => any) | undefined;
       "onField-change"?: ((...args: any[]) => any) | undefined;
       "onUpdate:stepActive"?: ((...args: any[]) => any) | undefined;
-    }>, "values" | "changeHandler" | "initialized" | "lastValuesProcessed" | "formState" | "changeRecords" | "resetForm" | "submitForm" | "getTextByName" | ("disabled" | "labelWidth" | "inline" | "labelPosition" | "config" | "height" | "initValues" | "lastValues" | "isCompare" | "keyProp" | "parentValues" | "stepActive")> & {
+    }>, "values" | "changeHandler" | "validate" | "lastValuesProcessed" | "submitForm" | "changeRecords" | "initialized" | "formState" | "resetForm" | "getTextByName" | ("disabled" | "labelWidth" | "inline" | "labelPosition" | "config" | "height" | "initValues" | "lastValues" | "isCompare" | "keyProp" | "parentValues" | "useFieldTextInError" | "stepActive" | "validateOnInit")> & {
       values: import("@tmagic/form-schema").FormValue;
       lastValuesProcessed: import("@tmagic/form-schema").FormValue;
       formState: import("@tmagic/form-schema").FormState;
@@ -4259,6 +4645,7 @@ declare const __VLS_base$12: import("@vue/runtime-core").DefineComponent<EditorP
       changeHandler: (v: import("@tmagic/form-schema").FormValue, eventData: ContainerChangeEventData$1) => void;
       resetForm: () => void;
       submitForm: (native?: boolean) => Promise<any>;
+      validate: () => Promise<string>;
       getTextByName: (name: string, config?: import("@tmagic/form-schema").FormConfig) => string | undefined;
     } & {} & import("@vue/runtime-core").ComponentCustomProperties & {} & {
       $slots: FormSlots;
@@ -4304,10 +4691,11 @@ declare const __VLS_base$12: import("@vue/runtime-core").DefineComponent<EditorP
   datasourceConfigs: Record<string, import("@tmagic/form-schema").FormConfig>;
   containerHighlightDuration: number;
   containerHighlightType: import("@tmagic/stage").ContainerHighlightType;
+  containerHighlightAddOnly: boolean;
   canSelect: (el: HTMLElement) => boolean | Promise<boolean>;
 }, {}, {}, {}, string, import("@vue/runtime-core").ComponentProvideOptions, false, {}, any>;
-declare const __VLS_export$37: __VLS_WithSlots$12<typeof __VLS_base$12, __VLS_Slots$12>;
-declare const _default$34: typeof __VLS_export$37;
+declare const __VLS_export$39: __VLS_WithSlots$12<typeof __VLS_base$12, __VLS_Slots$12>;
+declare const _default$35: typeof __VLS_export$39;
 type __VLS_WithSlots$12<T, S> = T & {
   new (): {
     $slots: S;
@@ -4315,7 +4703,7 @@ type __VLS_WithSlots$12<T, S> = T & {
 };
 //#endregion
 //#region temp/packages/editor/src/layouts/CodeEditor.vue.d.ts
-type __VLS_Props$32 = {
+type __VLS_Props$34 = {
   initValues?: any;
   modifiedValues?: any;
   type?: 'diff';
@@ -4331,7 +4719,7 @@ type __VLS_Props$32 = {
   };
   editorCustomType?: string;
 };
-declare const __VLS_export$36: import("@vue/runtime-core").DefineComponent<__VLS_Props$32, {
+declare const __VLS_export$38: import("@vue/runtime-core").DefineComponent<__VLS_Props$34, {
   values: import("@vue/reactivity").Ref<string, string>;
   getEditor(): Monaco.editor.IStandaloneCodeEditor | Monaco.editor.IStandaloneDiffEditor | null;
   getVsEditor(): Monaco.editor.IStandaloneCodeEditor | null;
@@ -4342,7 +4730,7 @@ declare const __VLS_export$36: import("@vue/runtime-core").DefineComponent<__VLS
 }, {}, {}, {}, import("@vue/runtime-core").ComponentOptionsMixin, import("@vue/runtime-core").ComponentOptionsMixin, {
   save: (...args: any[]) => void;
   initd: (...args: any[]) => void;
-}, string, import("@vue/runtime-core").PublicProps, Readonly<__VLS_Props$32> & Readonly<{
+}, string, import("@vue/runtime-core").PublicProps, Readonly<__VLS_Props$34> & Readonly<{
   onSave?: ((...args: any[]) => any) | undefined;
   onInitd?: ((...args: any[]) => any) | undefined;
 }>, {
@@ -4353,13 +4741,13 @@ declare const __VLS_export$36: import("@vue/runtime-core").DefineComponent<__VLS
   autoSave: boolean;
   disabledFullScreen: boolean;
 }, {}, {}, {}, string, import("@vue/runtime-core").ComponentProvideOptions, false, {}, any>;
-declare const _default$33: typeof __VLS_export$36;
+declare const _default$34: typeof __VLS_export$38;
 //#endregion
 //#region temp/packages/editor/src/layouts/sidebar/ComponentListPanel.vue.d.ts
 type __VLS_Slots$11 = ComponentListPanelSlots;
 declare const __VLS_base$11: import("@vue/runtime-core").DefineComponent<{}, {}, {}, {}, {}, import("@vue/runtime-core").ComponentOptionsMixin, import("@vue/runtime-core").ComponentOptionsMixin, {}, string, import("@vue/runtime-core").PublicProps, Readonly<{}> & Readonly<{}>, {}, {}, {}, {}, string, import("@vue/runtime-core").ComponentProvideOptions, true, {}, any>;
-declare const __VLS_export$35: __VLS_WithSlots$11<typeof __VLS_base$11, __VLS_Slots$11>;
-declare const _default$6: typeof __VLS_export$35;
+declare const __VLS_export$37: __VLS_WithSlots$11<typeof __VLS_base$11, __VLS_Slots$11>;
+declare const _default$6: typeof __VLS_export$37;
 type __VLS_WithSlots$11<T, S> = T & {
   new (): {
     $slots: S;
@@ -4368,57 +4756,67 @@ type __VLS_WithSlots$11<T, S> = T & {
 //#endregion
 //#region temp/packages/editor/src/layouts/sidebar/layer/LayerPanel.vue.d.ts
 type __VLS_Slots$10 = LayerPanelSlots;
-type __VLS_Props$31 = {
+type __VLS_Props$33 = {
   layerContentMenu: (MenuButton | MenuComponent)[];
   indent?: number;
   nextLevelIndentIncrement?: number;
-  customContentMenu: CustomContentMenuFunction; /** 自定义判断组件树节点是否可展开（即是否要展示为拥有子节点的形态）的函数 */
-  isExpandable?: IsExpandableFunction; /** 自定义判断当前拖动节点是否可以拖入目标节点内部的函数，返回 false 则禁止拖入 */
-  canDropIn?: CanDropInFunction; /** 组件树节点双击前的钩子函数，返回 false 则阻止默认的双击行为 */
+  customContentMenu: CustomContentMenuFunction;
+  /** 自定义判断组件树节点是否可展开（即是否要展示为拥有子节点的形态）的函数 */
+  isExpandable?: IsExpandableFunction;
+  /** 自定义判断当前拖动节点是否可以拖入目标节点内部的函数，返回 false 则禁止拖入 */
+  canDropIn?: CanDropInFunction;
+  /** 组件树节点双击前的钩子函数，返回 false 则阻止默认的双击行为 */
   beforeNodeDblclick?: (_event: MouseEvent, _data: TreeNodeData) => Promise<boolean | void> | boolean | void;
 };
-declare const __VLS_base$10: import("@vue/runtime-core").DefineComponent<__VLS_Props$31, {}, {}, {}, {}, import("@vue/runtime-core").ComponentOptionsMixin, import("@vue/runtime-core").ComponentOptionsMixin, {
+declare const __VLS_base$10: import("@vue/runtime-core").DefineComponent<__VLS_Props$33, {}, {}, {}, {}, import("@vue/runtime-core").ComponentOptionsMixin, import("@vue/runtime-core").ComponentOptionsMixin, {
   "node-dblclick": (event: MouseEvent, data: TreeNodeData) => any;
-}, string, import("@vue/runtime-core").PublicProps, Readonly<__VLS_Props$31> & Readonly<{
+}, string, import("@vue/runtime-core").PublicProps, Readonly<__VLS_Props$33> & Readonly<{
   "onNode-dblclick"?: ((event: MouseEvent, data: TreeNodeData) => any) | undefined;
 }>, {}, {}, {}, {}, string, import("@vue/runtime-core").ComponentProvideOptions, false, {}, any>;
-declare const __VLS_export$34: __VLS_WithSlots$10<typeof __VLS_base$10, __VLS_Slots$10>;
-declare const _default$26: typeof __VLS_export$34;
+declare const __VLS_export$36: __VLS_WithSlots$10<typeof __VLS_base$10, __VLS_Slots$10>;
+declare const _default$27: typeof __VLS_export$36;
 type __VLS_WithSlots$10<T, S> = T & {
   new (): {
     $slots: S;
   };
 };
 //#endregion
+//#region temp/packages/editor/src/layouts/sidebar/layer/LayerNodeContent.vue.d.ts
+type __VLS_Props$32 = {
+  data: TreeNodeData;
+};
+declare const __VLS_export$35: import("@vue/runtime-core").DefineComponent<__VLS_Props$32, {}, {}, {}, {}, import("@vue/runtime-core").ComponentOptionsMixin, import("@vue/runtime-core").ComponentOptionsMixin, {}, string, import("@vue/runtime-core").PublicProps, Readonly<__VLS_Props$32> & Readonly<{}>, {}, {}, {}, {}, string, import("@vue/runtime-core").ComponentProvideOptions, false, {}, any>;
+declare const _default$26: typeof __VLS_export$35;
+//#endregion
 //#region temp/packages/editor/src/fields/CodeSelect.vue.d.ts
-type __VLS_Props$30 = FieldProps<CodeSelectConfig>;
-declare const __VLS_export$33: import("@vue/runtime-core").DefineComponent<__VLS_Props$30, {}, {}, {}, {}, import("@vue/runtime-core").ComponentOptionsMixin, import("@vue/runtime-core").ComponentOptionsMixin, {
+type __VLS_Props$31 = FieldProps<CodeSelectConfig>;
+declare const __VLS_export$34: import("@vue/runtime-core").DefineComponent<__VLS_Props$31, {}, {}, {}, {}, import("@vue/runtime-core").ComponentOptionsMixin, import("@vue/runtime-core").ComponentOptionsMixin, {
   change: (v: any, eventData: ContainerChangeEventData) => any;
-}, string, import("@vue/runtime-core").PublicProps, Readonly<__VLS_Props$30> & Readonly<{
+}, string, import("@vue/runtime-core").PublicProps, Readonly<__VLS_Props$31> & Readonly<{
   onChange?: ((v: any, eventData: ContainerChangeEventData) => any) | undefined;
 }>, {}, {}, {}, {}, string, import("@vue/runtime-core").ComponentProvideOptions, false, {}, any>;
-declare const _default$3: typeof __VLS_export$33;
+declare const _default$3: typeof __VLS_export$34;
 //#endregion
 //#region temp/packages/editor/src/fields/CodeSelectCol.vue.d.ts
-type __VLS_Props$29 = FieldProps<CodeSelectColConfig>;
-declare const __VLS_export$32: import("@vue/runtime-core").DefineComponent<__VLS_Props$29, {}, {}, {}, {}, import("@vue/runtime-core").ComponentOptionsMixin, import("@vue/runtime-core").ComponentOptionsMixin, {
+type __VLS_Props$30 = FieldProps<CodeSelectColConfig>;
+declare const __VLS_export$33: import("@vue/runtime-core").DefineComponent<__VLS_Props$30, {}, {}, {}, {}, import("@vue/runtime-core").ComponentOptionsMixin, import("@vue/runtime-core").ComponentOptionsMixin, {
   change: (v: any, eventData: ContainerChangeEventData) => any;
-}, string, import("@vue/runtime-core").PublicProps, Readonly<__VLS_Props$29> & Readonly<{
+}, string, import("@vue/runtime-core").PublicProps, Readonly<__VLS_Props$30> & Readonly<{
   onChange?: ((v: any, eventData: ContainerChangeEventData) => any) | undefined;
 }>, {
   disabled: boolean;
 }, {}, {}, {}, string, import("@vue/runtime-core").ComponentProvideOptions, false, {}, any>;
-declare const _default$4: typeof __VLS_export$32;
+declare const _default$4: typeof __VLS_export$33;
 //#endregion
 //#region temp/packages/editor/src/fields/DataSourceFields.vue.d.ts
-type __VLS_Props$28 = FieldProps<DataSourceFieldsConfig>;
+type __VLS_Props$29 = FieldProps<DataSourceFieldsConfig>;
 type __VLS_ModelProps$4 = {
   'width'?: number;
   'visible'?: boolean;
   'visible1'?: boolean;
 };
-type __VLS_PublicProps$4 = __VLS_Props$28 & __VLS_ModelProps$4;
-declare const __VLS_export$31: import("@vue/runtime-core").DefineComponent<__VLS_PublicProps$4, {}, {}, {}, {}, import("@vue/runtime-core").ComponentOptionsMixin, import("@vue/runtime-core").ComponentOptionsMixin, {
+type __VLS_PublicProps$4 = __VLS_Props$29 & __VLS_ModelProps$4;
+declare const __VLS_export$32: import("@vue/runtime-core").DefineComponent<__VLS_PublicProps$4, {}, {}, {}, {}, import("@vue/runtime-core").ComponentOptionsMixin, import("@vue/runtime-core").ComponentOptionsMixin, {
   change: (v: any, eventData?: ContainerChangeEventData | undefined) => any;
   "update:visible": (value: boolean) => any;
   "update:width": (value: number) => any;
@@ -4431,111 +4829,109 @@ declare const __VLS_export$31: import("@vue/runtime-core").DefineComponent<__VLS
 }>, {
   disabled: boolean;
 }, {}, {}, {}, string, import("@vue/runtime-core").ComponentProvideOptions, false, {}, any>;
-declare const _default$12: typeof __VLS_export$31;
+declare const _default$12: typeof __VLS_export$32;
 //#endregion
 //#region temp/packages/editor/src/fields/DataSourceMocks.vue.d.ts
-type __VLS_Props$27 = FieldProps<DataSourceMocksConfig>;
+type __VLS_Props$28 = FieldProps<DataSourceMocksConfig>;
 type __VLS_ModelProps$3 = {
   'width'?: number;
   'visible'?: boolean;
 };
-type __VLS_PublicProps$3 = __VLS_Props$27 & __VLS_ModelProps$3;
-declare const __VLS_export$30: import("@vue/runtime-core").DefineComponent<__VLS_PublicProps$3, {}, {}, {}, {}, import("@vue/runtime-core").ComponentOptionsMixin, import("@vue/runtime-core").ComponentOptionsMixin, {
-  change: (...args: any[]) => void;
-  "update:visible": (value: boolean) => void;
-  "update:width": (value: number) => void;
+type __VLS_PublicProps$3 = __VLS_Props$28 & __VLS_ModelProps$3;
+declare const __VLS_export$31: import("@vue/runtime-core").DefineComponent<__VLS_PublicProps$3, {}, {}, {}, {}, import("@vue/runtime-core").ComponentOptionsMixin, import("@vue/runtime-core").ComponentOptionsMixin, {
+  "update:visible": (value: boolean) => any;
+  "update:width": (value: number) => any;
 }, string, import("@vue/runtime-core").PublicProps, Readonly<__VLS_PublicProps$3> & Readonly<{
-  onChange?: ((...args: any[]) => any) | undefined;
   "onUpdate:visible"?: ((value: boolean) => any) | undefined;
   "onUpdate:width"?: ((value: number) => any) | undefined;
 }>, {
   disabled: boolean;
 }, {}, {}, {}, string, import("@vue/runtime-core").ComponentProvideOptions, false, {}, any>;
-declare const _default$16: typeof __VLS_export$30;
+declare const _default$16: typeof __VLS_export$31;
 //#endregion
 //#region temp/packages/editor/src/fields/DataSourceMethods.vue.d.ts
-type __VLS_Props$26 = FieldProps<DataSourceMethodsConfig>;
-declare const __VLS_export$29: import("@vue/runtime-core").DefineComponent<__VLS_Props$26, {}, {}, {}, {}, import("@vue/runtime-core").ComponentOptionsMixin, import("@vue/runtime-core").ComponentOptionsMixin, {
+type __VLS_Props$27 = FieldProps<DataSourceMethodsConfig>;
+declare const __VLS_export$30: import("@vue/runtime-core").DefineComponent<__VLS_Props$27, {}, {}, {}, {}, import("@vue/runtime-core").ComponentOptionsMixin, import("@vue/runtime-core").ComponentOptionsMixin, {
   change: (...args: any[]) => void;
-}, string, import("@vue/runtime-core").PublicProps, Readonly<__VLS_Props$26> & Readonly<{
+}, string, import("@vue/runtime-core").PublicProps, Readonly<__VLS_Props$27> & Readonly<{
   onChange?: ((...args: any[]) => any) | undefined;
 }>, {
   disabled: boolean;
 }, {}, {}, {}, string, import("@vue/runtime-core").ComponentProvideOptions, false, {}, any>;
-declare const _default$15: typeof __VLS_export$29;
+declare const _default$15: typeof __VLS_export$30;
 //#endregion
 //#region temp/packages/editor/src/fields/DataSourceInput.vue.d.ts
-type __VLS_Props$25 = FieldProps<DataSourceInputConfig>;
-declare const __VLS_export$28: import("@vue/runtime-core").DefineComponent<__VLS_Props$25, {}, {}, {}, {}, import("@vue/runtime-core").ComponentOptionsMixin, import("@vue/runtime-core").ComponentOptionsMixin, {
+type __VLS_Props$26 = FieldProps<DataSourceInputConfig>;
+declare const __VLS_export$29: import("@vue/runtime-core").DefineComponent<__VLS_Props$26, {}, {}, {}, {}, import("@vue/runtime-core").ComponentOptionsMixin, import("@vue/runtime-core").ComponentOptionsMixin, {
   change: (value: string) => any;
-}, string, import("@vue/runtime-core").PublicProps, Readonly<__VLS_Props$25> & Readonly<{
+}, string, import("@vue/runtime-core").PublicProps, Readonly<__VLS_Props$26> & Readonly<{
   onChange?: ((value: string) => any) | undefined;
 }>, {
   disabled: boolean;
 }, {}, {}, {}, string, import("@vue/runtime-core").ComponentProvideOptions, false, {}, any>;
-declare const _default$13: typeof __VLS_export$28;
+declare const _default$13: typeof __VLS_export$29;
 //#endregion
 //#region temp/packages/editor/src/fields/DataSourceSelect.vue.d.ts
-type __VLS_Props$24 = FieldProps<DataSourceSelect>;
-declare const __VLS_export$27: import("@vue/runtime-core").DefineComponent<__VLS_Props$24, {}, {}, {}, {}, import("@vue/runtime-core").ComponentOptionsMixin, import("@vue/runtime-core").ComponentOptionsMixin, {
+type __VLS_Props$25 = FieldProps<DataSourceSelect>;
+declare const __VLS_export$28: import("@vue/runtime-core").DefineComponent<__VLS_Props$25, {}, {}, {}, {}, import("@vue/runtime-core").ComponentOptionsMixin, import("@vue/runtime-core").ComponentOptionsMixin, {
   change: (...args: any[]) => void;
-}, string, import("@vue/runtime-core").PublicProps, Readonly<__VLS_Props$24> & Readonly<{
+}, string, import("@vue/runtime-core").PublicProps, Readonly<__VLS_Props$25> & Readonly<{
   onChange?: ((...args: any[]) => any) | undefined;
 }>, {
   disabled: boolean;
 }, {}, {}, {}, string, import("@vue/runtime-core").ComponentProvideOptions, false, {}, any>;
-declare const _default$17: typeof __VLS_export$27;
+declare const _default$17: typeof __VLS_export$28;
 //#endregion
 //#region temp/packages/editor/src/fields/DataSourceMethodSelect.vue.d.ts
-type __VLS_Props$23 = FieldProps<DataSourceMethodSelectConfig>;
-declare const __VLS_export$26: import("@vue/runtime-core").DefineComponent<__VLS_Props$23, {}, {}, {}, {}, import("@vue/runtime-core").ComponentOptionsMixin, import("@vue/runtime-core").ComponentOptionsMixin, {
+type __VLS_Props$24 = FieldProps<DataSourceMethodSelectConfig>;
+declare const __VLS_export$27: import("@vue/runtime-core").DefineComponent<__VLS_Props$24, {}, {}, {}, {}, import("@vue/runtime-core").ComponentOptionsMixin, import("@vue/runtime-core").ComponentOptionsMixin, {
   change: (...args: any[]) => void;
-}, string, import("@vue/runtime-core").PublicProps, Readonly<__VLS_Props$23> & Readonly<{
+}, string, import("@vue/runtime-core").PublicProps, Readonly<__VLS_Props$24> & Readonly<{
   onChange?: ((...args: any[]) => any) | undefined;
 }>, {
   disabled: boolean;
 }, {}, {}, {}, string, import("@vue/runtime-core").ComponentProvideOptions, false, {}, any>;
-declare const _default$14: typeof __VLS_export$26;
+declare const _default$14: typeof __VLS_export$27;
 //#endregion
 //#region temp/packages/editor/src/fields/DataSourceFieldSelect/Index.vue.d.ts
-type __VLS_Props$22 = FieldProps<DataSourceFieldSelectConfig>;
-declare const __VLS_export$25: import("@vue/runtime-core").DefineComponent<__VLS_Props$22, {}, {}, {}, {}, import("@vue/runtime-core").ComponentOptionsMixin, import("@vue/runtime-core").ComponentOptionsMixin, {
+type __VLS_Props$23 = FieldProps<DataSourceFieldSelectConfig>;
+declare const __VLS_export$26: import("@vue/runtime-core").DefineComponent<__VLS_Props$23, {}, {}, {}, {}, import("@vue/runtime-core").ComponentOptionsMixin, import("@vue/runtime-core").ComponentOptionsMixin, {
   change: (...args: any[]) => void;
-}, string, import("@vue/runtime-core").PublicProps, Readonly<__VLS_Props$22> & Readonly<{
+}, string, import("@vue/runtime-core").PublicProps, Readonly<__VLS_Props$23> & Readonly<{
   onChange?: ((...args: any[]) => any) | undefined;
 }>, {
   disabled: boolean;
 }, {}, {}, {}, string, import("@vue/runtime-core").ComponentProvideOptions, false, {}, any>;
-declare const _default$11: typeof __VLS_export$25;
+declare const _default$11: typeof __VLS_export$26;
 //#endregion
 //#region temp/packages/editor/src/fields/EventSelect.vue.d.ts
-type __VLS_Props$21 = FieldProps<EventSelectConfig>;
-declare const __VLS_export$24: import("@vue/runtime-core").DefineComponent<__VLS_Props$21, {}, {}, {}, {}, import("@vue/runtime-core").ComponentOptionsMixin, import("@vue/runtime-core").ComponentOptionsMixin, {
+type __VLS_Props$22 = FieldProps<EventSelectConfig>;
+declare const __VLS_export$25: import("@vue/runtime-core").DefineComponent<__VLS_Props$22, {}, {}, {}, {}, import("@vue/runtime-core").ComponentOptionsMixin, import("@vue/runtime-core").ComponentOptionsMixin, {
   change: (v: any, eventData?: ContainerChangeEventData | undefined) => any;
-}, string, import("@vue/runtime-core").PublicProps, Readonly<__VLS_Props$21> & Readonly<{
+}, string, import("@vue/runtime-core").PublicProps, Readonly<__VLS_Props$22> & Readonly<{
   onChange?: ((v: any, eventData?: ContainerChangeEventData | undefined) => any) | undefined;
 }>, {}, {}, {}, {}, string, import("@vue/runtime-core").ComponentProvideOptions, false, {}, any>;
-declare const _default$19: typeof __VLS_export$24;
+declare const _default$19: typeof __VLS_export$25;
 //#endregion
 //#region temp/packages/editor/src/fields/KeyValue.vue.d.ts
-type __VLS_Props$20 = FieldProps<KeyValueConfig>;
-declare const __VLS_export$23: import("@vue/runtime-core").DefineComponent<__VLS_Props$20, {}, {}, {}, {}, import("@vue/runtime-core").ComponentOptionsMixin, import("@vue/runtime-core").ComponentOptionsMixin, {
+type __VLS_Props$21 = FieldProps<KeyValueConfig>;
+declare const __VLS_export$24: import("@vue/runtime-core").DefineComponent<__VLS_Props$21, {}, {}, {}, {}, import("@vue/runtime-core").ComponentOptionsMixin, import("@vue/runtime-core").ComponentOptionsMixin, {
   change: (value: Record<string, any>) => any;
-}, string, import("@vue/runtime-core").PublicProps, Readonly<__VLS_Props$20> & Readonly<{
+}, string, import("@vue/runtime-core").PublicProps, Readonly<__VLS_Props$21> & Readonly<{
   onChange?: ((value: Record<string, any>) => any) | undefined;
 }>, {
   disabled: boolean;
 }, {}, {}, {}, string, import("@vue/runtime-core").ComponentProvideOptions, false, {}, any>;
-declare const _default$25: typeof __VLS_export$23;
+declare const _default$25: typeof __VLS_export$24;
 //#endregion
 //#region temp/packages/editor/src/layouts/sidebar/code-block/CodeBlockList.vue.d.ts
 type __VLS_Slots$9 = CodeBlockListSlots;
-type __VLS_Props$19 = {
+type __VLS_Props$20 = {
   indent?: number;
   nextLevelIndentIncrement?: number;
   customError?: (_id: Id, _errorType: CodeDeleteErrorType) => any;
 };
-declare const __VLS_base$9: import("@vue/runtime-core").DefineComponent<__VLS_Props$19, {
+declare const __VLS_base$9: import("@vue/runtime-core").DefineComponent<__VLS_Props$20, {
   nodeStatusMap: import("@vue/reactivity").Ref<Map<Id, {
     visible: boolean;
     expand: boolean;
@@ -4548,9 +4944,7 @@ declare const __VLS_base$9: import("@vue/runtime-core").DefineComponent<__VLS_Pr
     draggable: boolean;
   }> & Omit<Map<Id, LayerNodeStatus>, keyof Map<any, any>>)>;
   filter: (text: string | string[]) => void;
-  deleteCode: (id: string, {
-    historySource
-  }?: {
+  deleteCode: (id: string, { historySource }?: {
     historySource?: HistoryOpSource;
   }) => Promise<void>;
 }, {}, {}, {}, import("@vue/runtime-core").ComponentOptionsMixin, import("@vue/runtime-core").ComponentOptionsMixin, {
@@ -4559,15 +4953,15 @@ declare const __VLS_base$9: import("@vue/runtime-core").DefineComponent<__VLS_Pr
   }) => any;
   edit: (id: string) => any;
   "node-contextmenu": (event: MouseEvent, data: TreeNodeData) => any;
-}, string, import("@vue/runtime-core").PublicProps, Readonly<__VLS_Props$19> & Readonly<{
+}, string, import("@vue/runtime-core").PublicProps, Readonly<__VLS_Props$20> & Readonly<{
   onRemove?: ((id: string, args_1: {
     historySource?: HistoryOpSource;
   }) => any) | undefined;
   onEdit?: ((id: string) => any) | undefined;
   "onNode-contextmenu"?: ((event: MouseEvent, data: TreeNodeData) => any) | undefined;
 }>, {}, {}, {}, {}, string, import("@vue/runtime-core").ComponentProvideOptions, false, {}, any>;
-declare const __VLS_export$22: __VLS_WithSlots$9<typeof __VLS_base$9, __VLS_Slots$9>;
-declare const _default$1: typeof __VLS_export$22;
+declare const __VLS_export$23: __VLS_WithSlots$9<typeof __VLS_base$9, __VLS_Slots$9>;
+declare const _default$1: typeof __VLS_export$23;
 type __VLS_WithSlots$9<T, S> = T & {
   new (): {
     $slots: S;
@@ -4576,15 +4970,15 @@ type __VLS_WithSlots$9<T, S> = T & {
 //#endregion
 //#region temp/packages/editor/src/layouts/sidebar/code-block/CodeBlockListPanel.vue.d.ts
 type __VLS_Slots$8 = CodeBlockListPanelSlots;
-type __VLS_Props$18 = {
+type __VLS_Props$19 = {
   indent?: number;
   nextLevelIndentIncrement?: number;
   customError?: (_id: Id, _errorType: CodeDeleteErrorType) => any;
   customContentMenu: CustomContentMenuFunction;
 };
-declare const __VLS_base$8: import("@vue/runtime-core").DefineComponent<__VLS_Props$18, {}, {}, {}, {}, import("@vue/runtime-core").ComponentOptionsMixin, import("@vue/runtime-core").ComponentOptionsMixin, {}, string, import("@vue/runtime-core").PublicProps, Readonly<__VLS_Props$18> & Readonly<{}>, {}, {}, {}, {}, string, import("@vue/runtime-core").ComponentProvideOptions, false, {}, any>;
-declare const __VLS_export$21: __VLS_WithSlots$8<typeof __VLS_base$8, __VLS_Slots$8>;
-declare const _default$2: typeof __VLS_export$21;
+declare const __VLS_base$8: import("@vue/runtime-core").DefineComponent<__VLS_Props$19, {}, {}, {}, {}, import("@vue/runtime-core").ComponentOptionsMixin, import("@vue/runtime-core").ComponentOptionsMixin, {}, string, import("@vue/runtime-core").PublicProps, Readonly<__VLS_Props$19> & Readonly<{}>, {}, {}, {}, {}, string, import("@vue/runtime-core").ComponentProvideOptions, false, {}, any>;
+declare const __VLS_export$22: __VLS_WithSlots$8<typeof __VLS_base$8, __VLS_Slots$8>;
+declare const _default$2: typeof __VLS_export$22;
 type __VLS_WithSlots$8<T, S> = T & {
   new (): {
     $slots: S;
@@ -4592,19 +4986,21 @@ type __VLS_WithSlots$8<T, S> = T & {
 };
 //#endregion
 //#region temp/packages/editor/src/layouts/sidebar/data-source/DataSourceConfigPanel.vue.d.ts
-type __VLS_Props$17 = {
+type __VLS_Props$18 = {
   title?: string;
   values: any;
-  disabled: boolean; /** 打开后需要直接定位并打开的方法名，传入时默认激活「方法定义」tab */
-  editMethodName?: string; /** 打开后需要直接定位并打开的字段路径，传入时默认激活「数据定义」tab */
+  disabled: boolean;
+  /** 打开后需要直接定位并打开的方法名，传入时默认激活「方法定义」tab */
+  editMethodName?: string;
+  /** 打开后需要直接定位并打开的字段路径，传入时默认激活「数据定义」tab */
   editFieldPath?: string[];
 };
 type __VLS_ModelProps$2 = {
   'visible'?: boolean;
   'width'?: number;
 };
-type __VLS_PublicProps$2 = __VLS_Props$17 & __VLS_ModelProps$2;
-declare const __VLS_export$20: import("@vue/runtime-core").DefineComponent<__VLS_PublicProps$2, {
+type __VLS_PublicProps$2 = __VLS_Props$18 & __VLS_ModelProps$2;
+declare const __VLS_export$21: import("@vue/runtime-core").DefineComponent<__VLS_PublicProps$2, {
   show(): void;
   hide(): void;
 }, {}, {}, {}, import("@vue/runtime-core").ComponentOptionsMixin, import("@vue/runtime-core").ComponentOptionsMixin, {
@@ -4620,10 +5016,10 @@ declare const __VLS_export$20: import("@vue/runtime-core").DefineComponent<__VLS
   "onUpdate:visible"?: ((value: boolean) => any) | undefined;
   "onUpdate:width"?: ((value: number) => any) | undefined;
 }>, {}, {}, {}, {}, string, import("@vue/runtime-core").ComponentProvideOptions, false, {}, any>;
-declare const _default$10: typeof __VLS_export$20;
+declare const _default$10: typeof __VLS_export$21;
 //#endregion
 //#region temp/packages/editor/src/layouts/sidebar/data-source/DataSourceAddButton.vue.d.ts
-type __VLS_Props$16 = {
+type __VLS_Props$17 = {
   datasourceTypeList: {
     text: string;
     type: string;
@@ -4631,22 +5027,21 @@ type __VLS_Props$16 = {
   addButtonConfig?: ButtonProps;
   addButtonText?: string;
 };
-declare const __VLS_export$19: import("@vue/runtime-core").DefineComponent<__VLS_Props$16, {}, {}, {}, {}, import("@vue/runtime-core").ComponentOptionsMixin, import("@vue/runtime-core").ComponentOptionsMixin, {
+declare const __VLS_export$20: import("@vue/runtime-core").DefineComponent<__VLS_Props$17, {}, {}, {}, {}, import("@vue/runtime-core").ComponentOptionsMixin, import("@vue/runtime-core").ComponentOptionsMixin, {
   add: (type: string) => any;
-}, string, import("@vue/runtime-core").PublicProps, Readonly<__VLS_Props$16> & Readonly<{
+}, string, import("@vue/runtime-core").PublicProps, Readonly<__VLS_Props$17> & Readonly<{
   onAdd?: ((type: string) => any) | undefined;
 }>, {}, {}, {}, {}, string, import("@vue/runtime-core").ComponentProvideOptions, false, {}, any>;
-declare const _default$9: typeof __VLS_export$19;
+declare const _default$9: typeof __VLS_export$20;
 //#endregion
 //#region temp/packages/editor/src/layouts/props-panel/PropsPanel.vue.d.ts
 type __VLS_Slots$7 = PropsPanelSlots;
-type __VLS_Props$15 = {
+type __VLS_Props$16 = {
   disabledShowSrc?: boolean;
-  extendState?: (_state: FormState) => Record<string, any> | Promise<Record<string, any>>;
 };
-declare const __VLS_base$7: import("@vue/runtime-core").DefineComponent<__VLS_Props$15, {
-  getFormState(): FormState | undefined;
-  submit: (v: MNode, eventData?: ContainerChangeEventData) => Promise<void>;
+declare const __VLS_base$7: import("@vue/runtime-core").DefineComponent<__VLS_Props$16, {
+  getFormState(): import("@tmagic/form-schema").FormState | undefined;
+  submit: (v: MNode, eventData?: ContainerChangeEventData, error?: any, source?: NodeInvalidSource) => Promise<void>;
 }, {}, {}, {}, import("@vue/runtime-core").ComponentOptionsMixin, import("@vue/runtime-core").ComponentOptionsMixin, {
   mounted: (internalInstance: {
     $: import("@vue/runtime-core").ComponentInternalInstance;
@@ -4657,11 +5052,10 @@ declare const __VLS_base$7: import("@vue/runtime-core").DefineComponent<__VLS_Pr
       readonly disabledShowSrc?: boolean | undefined;
       readonly labelWidth?: string | undefined;
       readonly codeValueKey?: string | undefined;
-      readonly labelPosition?: string | undefined;
-      readonly extendState?: ((_state: FormState) => Record<string, any> | Promise<Record<string, any>>) | undefined;
+      readonly labelPosition?: "top" | "left" | "right" | undefined;
+      readonly onSubmit?: ((values: any, eventData?: ContainerChangeEventData | undefined, error?: any) => any) | undefined;
       readonly onMounted?: ((internalInstance: any) => any) | undefined;
       readonly onUnmounted?: (() => any) | undefined;
-      readonly onSubmit?: ((values: any, eventData?: ContainerChangeEventData | undefined) => any) | undefined;
       readonly "onSubmit-error"?: ((e: any) => any) | undefined;
       readonly "onForm-error"?: ((e: any) => any) | undefined;
     } & import("@vue/runtime-core").VNodeProps & import("@vue/runtime-core").AllowedComponentProps & import("@vue/runtime-core").ComponentCustomProps;
@@ -4675,7 +5069,7 @@ declare const __VLS_base$7: import("@vue/runtime-core").DefineComponent<__VLS_Pr
     $root: import("@vue/runtime-core").ComponentPublicInstance | null;
     $parent: import("@vue/runtime-core").ComponentPublicInstance | null;
     $host: Element | null;
-    $emit: ((event: "mounted", internalInstance: any) => void) & ((event: "unmounted") => void) & ((event: "submit", values: any, eventData?: ContainerChangeEventData | undefined) => void) & ((event: "submit-error", e: any) => void) & ((event: "form-error", e: any) => void);
+    $emit: ((event: "submit", values: any, eventData?: ContainerChangeEventData | undefined, error?: any) => void) & ((event: "mounted", internalInstance: any) => void) & ((event: "unmounted") => void) & ((event: "submit-error", e: any) => void) & ((event: "form-error", e: any) => void);
     $el: any;
     $options: import("@vue/runtime-core").ComponentOptionsBase<Readonly<{
       config: import("@tmagic/form-schema").FormConfig;
@@ -4683,12 +5077,11 @@ declare const __VLS_base$7: import("@vue/runtime-core").DefineComponent<__VLS_Pr
       disabledShowSrc?: boolean;
       labelWidth?: string;
       codeValueKey?: string;
-      labelPosition?: string;
-      extendState?: (_state: FormState) => Record<string, any> | Promise<Record<string, any>>;
+      labelPosition?: "top" | "left" | "right";
     }> & Readonly<{
+      onSubmit?: ((values: any, eventData?: ContainerChangeEventData | undefined, error?: any) => any) | undefined;
       onMounted?: ((internalInstance: any) => any) | undefined;
       onUnmounted?: (() => any) | undefined;
-      onSubmit?: ((values: any, eventData?: ContainerChangeEventData | undefined) => any) | undefined;
       "onSubmit-error"?: ((e: any) => any) | undefined;
       "onForm-error"?: ((e: any) => any) | undefined;
     }>, {
@@ -4702,16 +5095,19 @@ declare const __VLS_base$7: import("@vue/runtime-core").DefineComponent<__VLS_Pr
           readonly isCompare?: boolean | undefined;
           readonly parentValues?: Record<string, any> | undefined;
           readonly labelWidth?: string | undefined;
+          readonly typeMatchValid?: boolean | undefined;
+          readonly validateOnInit?: boolean | undefined;
           readonly disabled?: boolean | undefined;
           readonly height?: string | undefined;
           readonly stepActive?: string | number | undefined;
           readonly size?: "small" | "default" | "large" | undefined;
           readonly inline?: boolean | undefined;
-          readonly labelPosition?: string | undefined;
+          readonly labelPosition?: "top" | "left" | "right" | undefined;
           readonly keyProp?: string | undefined;
           readonly popperClass?: string | undefined;
           readonly preventSubmitDefault?: boolean | undefined;
-          readonly extendState?: ((_state: FormState) => Record<string, any> | Promise<Record<string, any>>) | undefined;
+          readonly useFieldTextInError?: boolean | undefined;
+          readonly context?: import("@tmagic/form-schema").FormContext | undefined;
           readonly showDiff?: ((_data: {
             curValue: any;
             lastValue: any;
@@ -4744,16 +5140,19 @@ declare const __VLS_base$7: import("@vue/runtime-core").DefineComponent<__VLS_Pr
           isCompare?: boolean;
           parentValues?: Record<string, any>;
           labelWidth?: string;
+          typeMatchValid?: boolean;
+          validateOnInit?: boolean;
           disabled?: boolean;
           height?: string;
           stepActive?: string | number;
           size?: "small" | "default" | "large";
           inline?: boolean;
-          labelPosition?: string;
+          labelPosition?: "top" | "left" | "right";
           keyProp?: string;
           popperClass?: string;
           preventSubmitDefault?: boolean;
-          extendState?: (_state: FormState) => Record<string, any> | Promise<Record<string, any>>;
+          useFieldTextInError?: boolean;
+          context?: import("@tmagic/form-schema").FormContext;
           showDiff?: (_data: {
             curValue: any;
             lastValue: any;
@@ -4770,12 +5169,13 @@ declare const __VLS_base$7: import("@vue/runtime-core").DefineComponent<__VLS_Pr
         }>, {
           values: import("@vue/reactivity").Ref<FormValue, FormValue>;
           lastValuesProcessed: import("@vue/reactivity").Ref<FormValue, FormValue>;
-          formState: FormState;
+          formState: import("@tmagic/form-schema").FormState;
           initialized: import("@vue/reactivity").Ref<boolean, boolean>;
           changeRecords: import("@vue/reactivity").ShallowRef<ChangeRecord$1[], ChangeRecord$1[]>;
           changeHandler: (v: FormValue, eventData: ContainerChangeEventData) => void;
           resetForm: () => void;
           submitForm: (native?: boolean) => Promise<any>;
+          validate: () => Promise<string>;
           getTextByName: (name: string, config?: import("@tmagic/form-schema").FormConfig) => string | undefined;
         }, {}, {}, {}, import("@vue/runtime-core").ComponentOptionsMixin, import("@vue/runtime-core").ComponentOptionsMixin, {
           error: (...args: any[]) => void;
@@ -4787,7 +5187,7 @@ declare const __VLS_base$7: import("@vue/runtime-core").DefineComponent<__VLS_Pr
           disabled: boolean;
           labelWidth: string;
           inline: boolean;
-          labelPosition: string;
+          labelPosition: "top" | "left" | "right";
           config: import("@tmagic/form-schema").FormConfig;
           height: string;
           initValues: Record<string, any>;
@@ -4795,7 +5195,9 @@ declare const __VLS_base$7: import("@vue/runtime-core").DefineComponent<__VLS_Pr
           isCompare: boolean;
           keyProp: string;
           parentValues: Record<string, any>;
+          useFieldTextInError: boolean;
           stepActive: string | number;
+          validateOnInit: boolean;
         }, {}, string, {}, import("@vue/runtime-core").GlobalComponents, import("@vue/runtime-core").GlobalDirectives, string, import("@vue/runtime-core").ComponentProvideOptions> & {
           beforeCreate?: (() => void) | (() => void)[];
           created?: (() => void) | (() => void)[];
@@ -4820,7 +5222,7 @@ declare const __VLS_base$7: import("@vue/runtime-core").DefineComponent<__VLS_Pr
         disabled: boolean;
         labelWidth: string;
         inline: boolean;
-        labelPosition: string;
+        labelPosition: "top" | "left" | "right";
         config: import("@tmagic/form-schema").FormConfig;
         height: string;
         initValues: Record<string, any>;
@@ -4828,7 +5230,9 @@ declare const __VLS_base$7: import("@vue/runtime-core").DefineComponent<__VLS_Pr
         isCompare: boolean;
         keyProp: string;
         parentValues: Record<string, any>;
+        useFieldTextInError: boolean;
         stepActive: string | number;
+        validateOnInit: boolean;
       }> & Omit<Readonly<{
         config: import("@tmagic/form-schema").FormConfig;
         initValues: Record<string, any>;
@@ -4836,16 +5240,19 @@ declare const __VLS_base$7: import("@vue/runtime-core").DefineComponent<__VLS_Pr
         isCompare?: boolean;
         parentValues?: Record<string, any>;
         labelWidth?: string;
+        typeMatchValid?: boolean;
+        validateOnInit?: boolean;
         disabled?: boolean;
         height?: string;
         stepActive?: string | number;
         size?: "small" | "default" | "large";
         inline?: boolean;
-        labelPosition?: string;
+        labelPosition?: "top" | "left" | "right";
         keyProp?: string;
         popperClass?: string;
         preventSubmitDefault?: boolean;
-        extendState?: (_state: FormState) => Record<string, any> | Promise<Record<string, any>>;
+        useFieldTextInError?: boolean;
+        context?: import("@tmagic/form-schema").FormContext;
         showDiff?: (_data: {
           curValue: any;
           lastValue: any;
@@ -4859,24 +5266,25 @@ declare const __VLS_base$7: import("@vue/runtime-core").DefineComponent<__VLS_Pr
         "onField-input"?: ((...args: any[]) => any) | undefined;
         "onField-change"?: ((...args: any[]) => any) | undefined;
         "onUpdate:stepActive"?: ((...args: any[]) => any) | undefined;
-      }>, "values" | "changeHandler" | "initialized" | "lastValuesProcessed" | "formState" | "changeRecords" | "resetForm" | "submitForm" | "getTextByName" | ("disabled" | "labelWidth" | "inline" | "labelPosition" | "config" | "height" | "initValues" | "lastValues" | "isCompare" | "keyProp" | "parentValues" | "stepActive")> & {
+      }>, "values" | "changeHandler" | "validate" | "lastValuesProcessed" | "submitForm" | "changeRecords" | "initialized" | "formState" | "resetForm" | "getTextByName" | ("disabled" | "labelWidth" | "inline" | "labelPosition" | "config" | "height" | "initValues" | "lastValues" | "isCompare" | "keyProp" | "parentValues" | "useFieldTextInError" | "stepActive" | "validateOnInit")> & {
         values: FormValue;
         lastValuesProcessed: FormValue;
-        formState: FormState;
+        formState: import("@tmagic/form-schema").FormState;
         initialized: boolean;
         changeRecords: ChangeRecord$1[];
         changeHandler: (v: FormValue, eventData: ContainerChangeEventData) => void;
         resetForm: () => void;
         submitForm: (native?: boolean) => Promise<any>;
+        validate: () => Promise<string>;
         getTextByName: (name: string, config?: import("@tmagic/form-schema").FormConfig) => string | undefined;
       } & {} & import("@vue/runtime-core").ComponentCustomProperties & {} & {
         $slots: FormSlots;
       }) | null>>;
       submit: (v: FormValue, eventData: ContainerChangeEventData) => Promise<void>;
     }, {}, {}, {}, import("@vue/runtime-core").ComponentOptionsMixin, import("@vue/runtime-core").ComponentOptionsMixin, {
+      submit: (values: any, eventData?: ContainerChangeEventData | undefined, error?: any) => any;
       mounted: (internalInstance: any) => any;
       unmounted: () => any;
-      submit: (values: any, eventData?: ContainerChangeEventData | undefined) => any;
       "submit-error": (e: any) => any;
       "form-error": (e: any) => any;
     }, string, {}, {}, string, {}, import("@vue/runtime-core").GlobalComponents, import("@vue/runtime-core").GlobalDirectives, string, import("@vue/runtime-core").ComponentProvideOptions> & {
@@ -4905,12 +5313,11 @@ declare const __VLS_base$7: import("@vue/runtime-core").DefineComponent<__VLS_Pr
     disabledShowSrc?: boolean;
     labelWidth?: string;
     codeValueKey?: string;
-    labelPosition?: string;
-    extendState?: (_state: FormState) => Record<string, any> | Promise<Record<string, any>>;
+    labelPosition?: "top" | "left" | "right";
   }> & Readonly<{
+    onSubmit?: ((values: any, eventData?: ContainerChangeEventData | undefined, error?: any) => any) | undefined;
     onMounted?: ((internalInstance: any) => any) | undefined;
     onUnmounted?: (() => any) | undefined;
-    onSubmit?: ((values: any, eventData?: ContainerChangeEventData | undefined) => any) | undefined;
     "onSubmit-error"?: ((e: any) => any) | undefined;
     "onForm-error"?: ((e: any) => any) | undefined;
   }>, "submit" | "configForm"> & {
@@ -4924,16 +5331,19 @@ declare const __VLS_base$7: import("@vue/runtime-core").DefineComponent<__VLS_Pr
         readonly isCompare?: boolean | undefined;
         readonly parentValues?: Record<string, any> | undefined;
         readonly labelWidth?: string | undefined;
+        readonly typeMatchValid?: boolean | undefined;
+        readonly validateOnInit?: boolean | undefined;
         readonly disabled?: boolean | undefined;
         readonly height?: string | undefined;
         readonly stepActive?: string | number | undefined;
         readonly size?: "small" | "default" | "large" | undefined;
         readonly inline?: boolean | undefined;
-        readonly labelPosition?: string | undefined;
+        readonly labelPosition?: "top" | "left" | "right" | undefined;
         readonly keyProp?: string | undefined;
         readonly popperClass?: string | undefined;
         readonly preventSubmitDefault?: boolean | undefined;
-        readonly extendState?: ((_state: FormState) => Record<string, any> | Promise<Record<string, any>>) | undefined;
+        readonly useFieldTextInError?: boolean | undefined;
+        readonly context?: import("@tmagic/form-schema").FormContext | undefined;
         readonly showDiff?: ((_data: {
           curValue: any;
           lastValue: any;
@@ -4966,16 +5376,19 @@ declare const __VLS_base$7: import("@vue/runtime-core").DefineComponent<__VLS_Pr
         isCompare?: boolean;
         parentValues?: Record<string, any>;
         labelWidth?: string;
+        typeMatchValid?: boolean;
+        validateOnInit?: boolean;
         disabled?: boolean;
         height?: string;
         stepActive?: string | number;
         size?: "small" | "default" | "large";
         inline?: boolean;
-        labelPosition?: string;
+        labelPosition?: "top" | "left" | "right";
         keyProp?: string;
         popperClass?: string;
         preventSubmitDefault?: boolean;
-        extendState?: (_state: FormState) => Record<string, any> | Promise<Record<string, any>>;
+        useFieldTextInError?: boolean;
+        context?: import("@tmagic/form-schema").FormContext;
         showDiff?: (_data: {
           curValue: any;
           lastValue: any;
@@ -4992,12 +5405,13 @@ declare const __VLS_base$7: import("@vue/runtime-core").DefineComponent<__VLS_Pr
       }>, {
         values: import("@vue/reactivity").Ref<FormValue, FormValue>;
         lastValuesProcessed: import("@vue/reactivity").Ref<FormValue, FormValue>;
-        formState: FormState;
+        formState: import("@tmagic/form-schema").FormState;
         initialized: import("@vue/reactivity").Ref<boolean, boolean>;
         changeRecords: import("@vue/reactivity").ShallowRef<ChangeRecord$1[], ChangeRecord$1[]>;
         changeHandler: (v: FormValue, eventData: ContainerChangeEventData) => void;
         resetForm: () => void;
         submitForm: (native?: boolean) => Promise<any>;
+        validate: () => Promise<string>;
         getTextByName: (name: string, config?: import("@tmagic/form-schema").FormConfig) => string | undefined;
       }, {}, {}, {}, import("@vue/runtime-core").ComponentOptionsMixin, import("@vue/runtime-core").ComponentOptionsMixin, {
         error: (...args: any[]) => void;
@@ -5009,7 +5423,7 @@ declare const __VLS_base$7: import("@vue/runtime-core").DefineComponent<__VLS_Pr
         disabled: boolean;
         labelWidth: string;
         inline: boolean;
-        labelPosition: string;
+        labelPosition: "top" | "left" | "right";
         config: import("@tmagic/form-schema").FormConfig;
         height: string;
         initValues: Record<string, any>;
@@ -5017,7 +5431,9 @@ declare const __VLS_base$7: import("@vue/runtime-core").DefineComponent<__VLS_Pr
         isCompare: boolean;
         keyProp: string;
         parentValues: Record<string, any>;
+        useFieldTextInError: boolean;
         stepActive: string | number;
+        validateOnInit: boolean;
       }, {}, string, {}, import("@vue/runtime-core").GlobalComponents, import("@vue/runtime-core").GlobalDirectives, string, import("@vue/runtime-core").ComponentProvideOptions> & {
         beforeCreate?: (() => void) | (() => void)[];
         created?: (() => void) | (() => void)[];
@@ -5042,7 +5458,7 @@ declare const __VLS_base$7: import("@vue/runtime-core").DefineComponent<__VLS_Pr
       disabled: boolean;
       labelWidth: string;
       inline: boolean;
-      labelPosition: string;
+      labelPosition: "top" | "left" | "right";
       config: import("@tmagic/form-schema").FormConfig;
       height: string;
       initValues: Record<string, any>;
@@ -5050,7 +5466,9 @@ declare const __VLS_base$7: import("@vue/runtime-core").DefineComponent<__VLS_Pr
       isCompare: boolean;
       keyProp: string;
       parentValues: Record<string, any>;
+      useFieldTextInError: boolean;
       stepActive: string | number;
+      validateOnInit: boolean;
     }> & Omit<Readonly<{
       config: import("@tmagic/form-schema").FormConfig;
       initValues: Record<string, any>;
@@ -5058,16 +5476,19 @@ declare const __VLS_base$7: import("@vue/runtime-core").DefineComponent<__VLS_Pr
       isCompare?: boolean;
       parentValues?: Record<string, any>;
       labelWidth?: string;
+      typeMatchValid?: boolean;
+      validateOnInit?: boolean;
       disabled?: boolean;
       height?: string;
       stepActive?: string | number;
       size?: "small" | "default" | "large";
       inline?: boolean;
-      labelPosition?: string;
+      labelPosition?: "top" | "left" | "right";
       keyProp?: string;
       popperClass?: string;
       preventSubmitDefault?: boolean;
-      extendState?: (_state: FormState) => Record<string, any> | Promise<Record<string, any>>;
+      useFieldTextInError?: boolean;
+      context?: import("@tmagic/form-schema").FormContext;
       showDiff?: (_data: {
         curValue: any;
         lastValue: any;
@@ -5081,15 +5502,16 @@ declare const __VLS_base$7: import("@vue/runtime-core").DefineComponent<__VLS_Pr
       "onField-input"?: ((...args: any[]) => any) | undefined;
       "onField-change"?: ((...args: any[]) => any) | undefined;
       "onUpdate:stepActive"?: ((...args: any[]) => any) | undefined;
-    }>, "values" | "changeHandler" | "initialized" | "lastValuesProcessed" | "formState" | "changeRecords" | "resetForm" | "submitForm" | "getTextByName" | ("disabled" | "labelWidth" | "inline" | "labelPosition" | "config" | "height" | "initValues" | "lastValues" | "isCompare" | "keyProp" | "parentValues" | "stepActive")> & {
+    }>, "values" | "changeHandler" | "validate" | "lastValuesProcessed" | "submitForm" | "changeRecords" | "initialized" | "formState" | "resetForm" | "getTextByName" | ("disabled" | "labelWidth" | "inline" | "labelPosition" | "config" | "height" | "initValues" | "lastValues" | "isCompare" | "keyProp" | "parentValues" | "useFieldTextInError" | "stepActive" | "validateOnInit")> & {
       values: FormValue;
       lastValuesProcessed: FormValue;
-      formState: FormState;
+      formState: import("@tmagic/form-schema").FormState;
       initialized: boolean;
       changeRecords: ChangeRecord$1[];
       changeHandler: (v: FormValue, eventData: ContainerChangeEventData) => void;
       resetForm: () => void;
       submitForm: (native?: boolean) => Promise<any>;
+      validate: () => Promise<string>;
       getTextByName: (name: string, config?: import("@tmagic/form-schema").FormConfig) => string | undefined;
     } & {} & import("@vue/runtime-core").ComponentCustomProperties & {} & {
       $slots: FormSlots;
@@ -5103,7 +5525,7 @@ declare const __VLS_base$7: import("@vue/runtime-core").DefineComponent<__VLS_Pr
   unmounted: () => any;
   "submit-error": (e: any) => any;
   "form-error": (e: any) => any;
-}, string, import("@vue/runtime-core").PublicProps, Readonly<__VLS_Props$15> & Readonly<{
+}, string, import("@vue/runtime-core").PublicProps, Readonly<__VLS_Props$16> & Readonly<{
   onMounted?: ((internalInstance: {
     $: import("@vue/runtime-core").ComponentInternalInstance;
     $data: {};
@@ -5113,11 +5535,10 @@ declare const __VLS_base$7: import("@vue/runtime-core").DefineComponent<__VLS_Pr
       readonly disabledShowSrc?: boolean | undefined;
       readonly labelWidth?: string | undefined;
       readonly codeValueKey?: string | undefined;
-      readonly labelPosition?: string | undefined;
-      readonly extendState?: ((_state: FormState) => Record<string, any> | Promise<Record<string, any>>) | undefined;
+      readonly labelPosition?: "top" | "left" | "right" | undefined;
+      readonly onSubmit?: ((values: any, eventData?: ContainerChangeEventData | undefined, error?: any) => any) | undefined;
       readonly onMounted?: ((internalInstance: any) => any) | undefined;
       readonly onUnmounted?: (() => any) | undefined;
-      readonly onSubmit?: ((values: any, eventData?: ContainerChangeEventData | undefined) => any) | undefined;
       readonly "onSubmit-error"?: ((e: any) => any) | undefined;
       readonly "onForm-error"?: ((e: any) => any) | undefined;
     } & import("@vue/runtime-core").VNodeProps & import("@vue/runtime-core").AllowedComponentProps & import("@vue/runtime-core").ComponentCustomProps;
@@ -5131,7 +5552,7 @@ declare const __VLS_base$7: import("@vue/runtime-core").DefineComponent<__VLS_Pr
     $root: import("@vue/runtime-core").ComponentPublicInstance | null;
     $parent: import("@vue/runtime-core").ComponentPublicInstance | null;
     $host: Element | null;
-    $emit: ((event: "mounted", internalInstance: any) => void) & ((event: "unmounted") => void) & ((event: "submit", values: any, eventData?: ContainerChangeEventData | undefined) => void) & ((event: "submit-error", e: any) => void) & ((event: "form-error", e: any) => void);
+    $emit: ((event: "submit", values: any, eventData?: ContainerChangeEventData | undefined, error?: any) => void) & ((event: "mounted", internalInstance: any) => void) & ((event: "unmounted") => void) & ((event: "submit-error", e: any) => void) & ((event: "form-error", e: any) => void);
     $el: any;
     $options: import("@vue/runtime-core").ComponentOptionsBase<Readonly<{
       config: import("@tmagic/form-schema").FormConfig;
@@ -5139,12 +5560,11 @@ declare const __VLS_base$7: import("@vue/runtime-core").DefineComponent<__VLS_Pr
       disabledShowSrc?: boolean;
       labelWidth?: string;
       codeValueKey?: string;
-      labelPosition?: string;
-      extendState?: (_state: FormState) => Record<string, any> | Promise<Record<string, any>>;
+      labelPosition?: "top" | "left" | "right";
     }> & Readonly<{
+      onSubmit?: ((values: any, eventData?: ContainerChangeEventData | undefined, error?: any) => any) | undefined;
       onMounted?: ((internalInstance: any) => any) | undefined;
       onUnmounted?: (() => any) | undefined;
-      onSubmit?: ((values: any, eventData?: ContainerChangeEventData | undefined) => any) | undefined;
       "onSubmit-error"?: ((e: any) => any) | undefined;
       "onForm-error"?: ((e: any) => any) | undefined;
     }>, {
@@ -5158,16 +5578,19 @@ declare const __VLS_base$7: import("@vue/runtime-core").DefineComponent<__VLS_Pr
           readonly isCompare?: boolean | undefined;
           readonly parentValues?: Record<string, any> | undefined;
           readonly labelWidth?: string | undefined;
+          readonly typeMatchValid?: boolean | undefined;
+          readonly validateOnInit?: boolean | undefined;
           readonly disabled?: boolean | undefined;
           readonly height?: string | undefined;
           readonly stepActive?: string | number | undefined;
           readonly size?: "small" | "default" | "large" | undefined;
           readonly inline?: boolean | undefined;
-          readonly labelPosition?: string | undefined;
+          readonly labelPosition?: "top" | "left" | "right" | undefined;
           readonly keyProp?: string | undefined;
           readonly popperClass?: string | undefined;
           readonly preventSubmitDefault?: boolean | undefined;
-          readonly extendState?: ((_state: FormState) => Record<string, any> | Promise<Record<string, any>>) | undefined;
+          readonly useFieldTextInError?: boolean | undefined;
+          readonly context?: import("@tmagic/form-schema").FormContext | undefined;
           readonly showDiff?: ((_data: {
             curValue: any;
             lastValue: any;
@@ -5200,16 +5623,19 @@ declare const __VLS_base$7: import("@vue/runtime-core").DefineComponent<__VLS_Pr
           isCompare?: boolean;
           parentValues?: Record<string, any>;
           labelWidth?: string;
+          typeMatchValid?: boolean;
+          validateOnInit?: boolean;
           disabled?: boolean;
           height?: string;
           stepActive?: string | number;
           size?: "small" | "default" | "large";
           inline?: boolean;
-          labelPosition?: string;
+          labelPosition?: "top" | "left" | "right";
           keyProp?: string;
           popperClass?: string;
           preventSubmitDefault?: boolean;
-          extendState?: (_state: FormState) => Record<string, any> | Promise<Record<string, any>>;
+          useFieldTextInError?: boolean;
+          context?: import("@tmagic/form-schema").FormContext;
           showDiff?: (_data: {
             curValue: any;
             lastValue: any;
@@ -5226,12 +5652,13 @@ declare const __VLS_base$7: import("@vue/runtime-core").DefineComponent<__VLS_Pr
         }>, {
           values: import("@vue/reactivity").Ref<FormValue, FormValue>;
           lastValuesProcessed: import("@vue/reactivity").Ref<FormValue, FormValue>;
-          formState: FormState;
+          formState: import("@tmagic/form-schema").FormState;
           initialized: import("@vue/reactivity").Ref<boolean, boolean>;
           changeRecords: import("@vue/reactivity").ShallowRef<ChangeRecord$1[], ChangeRecord$1[]>;
           changeHandler: (v: FormValue, eventData: ContainerChangeEventData) => void;
           resetForm: () => void;
           submitForm: (native?: boolean) => Promise<any>;
+          validate: () => Promise<string>;
           getTextByName: (name: string, config?: import("@tmagic/form-schema").FormConfig) => string | undefined;
         }, {}, {}, {}, import("@vue/runtime-core").ComponentOptionsMixin, import("@vue/runtime-core").ComponentOptionsMixin, {
           error: (...args: any[]) => void;
@@ -5243,7 +5670,7 @@ declare const __VLS_base$7: import("@vue/runtime-core").DefineComponent<__VLS_Pr
           disabled: boolean;
           labelWidth: string;
           inline: boolean;
-          labelPosition: string;
+          labelPosition: "top" | "left" | "right";
           config: import("@tmagic/form-schema").FormConfig;
           height: string;
           initValues: Record<string, any>;
@@ -5251,7 +5678,9 @@ declare const __VLS_base$7: import("@vue/runtime-core").DefineComponent<__VLS_Pr
           isCompare: boolean;
           keyProp: string;
           parentValues: Record<string, any>;
+          useFieldTextInError: boolean;
           stepActive: string | number;
+          validateOnInit: boolean;
         }, {}, string, {}, import("@vue/runtime-core").GlobalComponents, import("@vue/runtime-core").GlobalDirectives, string, import("@vue/runtime-core").ComponentProvideOptions> & {
           beforeCreate?: (() => void) | (() => void)[];
           created?: (() => void) | (() => void)[];
@@ -5276,7 +5705,7 @@ declare const __VLS_base$7: import("@vue/runtime-core").DefineComponent<__VLS_Pr
         disabled: boolean;
         labelWidth: string;
         inline: boolean;
-        labelPosition: string;
+        labelPosition: "top" | "left" | "right";
         config: import("@tmagic/form-schema").FormConfig;
         height: string;
         initValues: Record<string, any>;
@@ -5284,7 +5713,9 @@ declare const __VLS_base$7: import("@vue/runtime-core").DefineComponent<__VLS_Pr
         isCompare: boolean;
         keyProp: string;
         parentValues: Record<string, any>;
+        useFieldTextInError: boolean;
         stepActive: string | number;
+        validateOnInit: boolean;
       }> & Omit<Readonly<{
         config: import("@tmagic/form-schema").FormConfig;
         initValues: Record<string, any>;
@@ -5292,16 +5723,19 @@ declare const __VLS_base$7: import("@vue/runtime-core").DefineComponent<__VLS_Pr
         isCompare?: boolean;
         parentValues?: Record<string, any>;
         labelWidth?: string;
+        typeMatchValid?: boolean;
+        validateOnInit?: boolean;
         disabled?: boolean;
         height?: string;
         stepActive?: string | number;
         size?: "small" | "default" | "large";
         inline?: boolean;
-        labelPosition?: string;
+        labelPosition?: "top" | "left" | "right";
         keyProp?: string;
         popperClass?: string;
         preventSubmitDefault?: boolean;
-        extendState?: (_state: FormState) => Record<string, any> | Promise<Record<string, any>>;
+        useFieldTextInError?: boolean;
+        context?: import("@tmagic/form-schema").FormContext;
         showDiff?: (_data: {
           curValue: any;
           lastValue: any;
@@ -5315,24 +5749,25 @@ declare const __VLS_base$7: import("@vue/runtime-core").DefineComponent<__VLS_Pr
         "onField-input"?: ((...args: any[]) => any) | undefined;
         "onField-change"?: ((...args: any[]) => any) | undefined;
         "onUpdate:stepActive"?: ((...args: any[]) => any) | undefined;
-      }>, "values" | "changeHandler" | "initialized" | "lastValuesProcessed" | "formState" | "changeRecords" | "resetForm" | "submitForm" | "getTextByName" | ("disabled" | "labelWidth" | "inline" | "labelPosition" | "config" | "height" | "initValues" | "lastValues" | "isCompare" | "keyProp" | "parentValues" | "stepActive")> & {
+      }>, "values" | "changeHandler" | "validate" | "lastValuesProcessed" | "submitForm" | "changeRecords" | "initialized" | "formState" | "resetForm" | "getTextByName" | ("disabled" | "labelWidth" | "inline" | "labelPosition" | "config" | "height" | "initValues" | "lastValues" | "isCompare" | "keyProp" | "parentValues" | "useFieldTextInError" | "stepActive" | "validateOnInit")> & {
         values: FormValue;
         lastValuesProcessed: FormValue;
-        formState: FormState;
+        formState: import("@tmagic/form-schema").FormState;
         initialized: boolean;
         changeRecords: ChangeRecord$1[];
         changeHandler: (v: FormValue, eventData: ContainerChangeEventData) => void;
         resetForm: () => void;
         submitForm: (native?: boolean) => Promise<any>;
+        validate: () => Promise<string>;
         getTextByName: (name: string, config?: import("@tmagic/form-schema").FormConfig) => string | undefined;
       } & {} & import("@vue/runtime-core").ComponentCustomProperties & {} & {
         $slots: FormSlots;
       }) | null>>;
       submit: (v: FormValue, eventData: ContainerChangeEventData) => Promise<void>;
     }, {}, {}, {}, import("@vue/runtime-core").ComponentOptionsMixin, import("@vue/runtime-core").ComponentOptionsMixin, {
+      submit: (values: any, eventData?: ContainerChangeEventData | undefined, error?: any) => any;
       mounted: (internalInstance: any) => any;
       unmounted: () => any;
-      submit: (values: any, eventData?: ContainerChangeEventData | undefined) => any;
       "submit-error": (e: any) => any;
       "form-error": (e: any) => any;
     }, string, {}, {}, string, {}, import("@vue/runtime-core").GlobalComponents, import("@vue/runtime-core").GlobalDirectives, string, import("@vue/runtime-core").ComponentProvideOptions> & {
@@ -5361,12 +5796,11 @@ declare const __VLS_base$7: import("@vue/runtime-core").DefineComponent<__VLS_Pr
     disabledShowSrc?: boolean;
     labelWidth?: string;
     codeValueKey?: string;
-    labelPosition?: string;
-    extendState?: (_state: FormState) => Record<string, any> | Promise<Record<string, any>>;
+    labelPosition?: "top" | "left" | "right";
   }> & Readonly<{
+    onSubmit?: ((values: any, eventData?: ContainerChangeEventData | undefined, error?: any) => any) | undefined;
     onMounted?: ((internalInstance: any) => any) | undefined;
     onUnmounted?: (() => any) | undefined;
-    onSubmit?: ((values: any, eventData?: ContainerChangeEventData | undefined) => any) | undefined;
     "onSubmit-error"?: ((e: any) => any) | undefined;
     "onForm-error"?: ((e: any) => any) | undefined;
   }>, "submit" | "configForm"> & {
@@ -5380,16 +5814,19 @@ declare const __VLS_base$7: import("@vue/runtime-core").DefineComponent<__VLS_Pr
         readonly isCompare?: boolean | undefined;
         readonly parentValues?: Record<string, any> | undefined;
         readonly labelWidth?: string | undefined;
+        readonly typeMatchValid?: boolean | undefined;
+        readonly validateOnInit?: boolean | undefined;
         readonly disabled?: boolean | undefined;
         readonly height?: string | undefined;
         readonly stepActive?: string | number | undefined;
         readonly size?: "small" | "default" | "large" | undefined;
         readonly inline?: boolean | undefined;
-        readonly labelPosition?: string | undefined;
+        readonly labelPosition?: "top" | "left" | "right" | undefined;
         readonly keyProp?: string | undefined;
         readonly popperClass?: string | undefined;
         readonly preventSubmitDefault?: boolean | undefined;
-        readonly extendState?: ((_state: FormState) => Record<string, any> | Promise<Record<string, any>>) | undefined;
+        readonly useFieldTextInError?: boolean | undefined;
+        readonly context?: import("@tmagic/form-schema").FormContext | undefined;
         readonly showDiff?: ((_data: {
           curValue: any;
           lastValue: any;
@@ -5422,16 +5859,19 @@ declare const __VLS_base$7: import("@vue/runtime-core").DefineComponent<__VLS_Pr
         isCompare?: boolean;
         parentValues?: Record<string, any>;
         labelWidth?: string;
+        typeMatchValid?: boolean;
+        validateOnInit?: boolean;
         disabled?: boolean;
         height?: string;
         stepActive?: string | number;
         size?: "small" | "default" | "large";
         inline?: boolean;
-        labelPosition?: string;
+        labelPosition?: "top" | "left" | "right";
         keyProp?: string;
         popperClass?: string;
         preventSubmitDefault?: boolean;
-        extendState?: (_state: FormState) => Record<string, any> | Promise<Record<string, any>>;
+        useFieldTextInError?: boolean;
+        context?: import("@tmagic/form-schema").FormContext;
         showDiff?: (_data: {
           curValue: any;
           lastValue: any;
@@ -5448,12 +5888,13 @@ declare const __VLS_base$7: import("@vue/runtime-core").DefineComponent<__VLS_Pr
       }>, {
         values: import("@vue/reactivity").Ref<FormValue, FormValue>;
         lastValuesProcessed: import("@vue/reactivity").Ref<FormValue, FormValue>;
-        formState: FormState;
+        formState: import("@tmagic/form-schema").FormState;
         initialized: import("@vue/reactivity").Ref<boolean, boolean>;
         changeRecords: import("@vue/reactivity").ShallowRef<ChangeRecord$1[], ChangeRecord$1[]>;
         changeHandler: (v: FormValue, eventData: ContainerChangeEventData) => void;
         resetForm: () => void;
         submitForm: (native?: boolean) => Promise<any>;
+        validate: () => Promise<string>;
         getTextByName: (name: string, config?: import("@tmagic/form-schema").FormConfig) => string | undefined;
       }, {}, {}, {}, import("@vue/runtime-core").ComponentOptionsMixin, import("@vue/runtime-core").ComponentOptionsMixin, {
         error: (...args: any[]) => void;
@@ -5465,7 +5906,7 @@ declare const __VLS_base$7: import("@vue/runtime-core").DefineComponent<__VLS_Pr
         disabled: boolean;
         labelWidth: string;
         inline: boolean;
-        labelPosition: string;
+        labelPosition: "top" | "left" | "right";
         config: import("@tmagic/form-schema").FormConfig;
         height: string;
         initValues: Record<string, any>;
@@ -5473,7 +5914,9 @@ declare const __VLS_base$7: import("@vue/runtime-core").DefineComponent<__VLS_Pr
         isCompare: boolean;
         keyProp: string;
         parentValues: Record<string, any>;
+        useFieldTextInError: boolean;
         stepActive: string | number;
+        validateOnInit: boolean;
       }, {}, string, {}, import("@vue/runtime-core").GlobalComponents, import("@vue/runtime-core").GlobalDirectives, string, import("@vue/runtime-core").ComponentProvideOptions> & {
         beforeCreate?: (() => void) | (() => void)[];
         created?: (() => void) | (() => void)[];
@@ -5498,7 +5941,7 @@ declare const __VLS_base$7: import("@vue/runtime-core").DefineComponent<__VLS_Pr
       disabled: boolean;
       labelWidth: string;
       inline: boolean;
-      labelPosition: string;
+      labelPosition: "top" | "left" | "right";
       config: import("@tmagic/form-schema").FormConfig;
       height: string;
       initValues: Record<string, any>;
@@ -5506,7 +5949,9 @@ declare const __VLS_base$7: import("@vue/runtime-core").DefineComponent<__VLS_Pr
       isCompare: boolean;
       keyProp: string;
       parentValues: Record<string, any>;
+      useFieldTextInError: boolean;
       stepActive: string | number;
+      validateOnInit: boolean;
     }> & Omit<Readonly<{
       config: import("@tmagic/form-schema").FormConfig;
       initValues: Record<string, any>;
@@ -5514,16 +5959,19 @@ declare const __VLS_base$7: import("@vue/runtime-core").DefineComponent<__VLS_Pr
       isCompare?: boolean;
       parentValues?: Record<string, any>;
       labelWidth?: string;
+      typeMatchValid?: boolean;
+      validateOnInit?: boolean;
       disabled?: boolean;
       height?: string;
       stepActive?: string | number;
       size?: "small" | "default" | "large";
       inline?: boolean;
-      labelPosition?: string;
+      labelPosition?: "top" | "left" | "right";
       keyProp?: string;
       popperClass?: string;
       preventSubmitDefault?: boolean;
-      extendState?: (_state: FormState) => Record<string, any> | Promise<Record<string, any>>;
+      useFieldTextInError?: boolean;
+      context?: import("@tmagic/form-schema").FormContext;
       showDiff?: (_data: {
         curValue: any;
         lastValue: any;
@@ -5537,15 +5985,16 @@ declare const __VLS_base$7: import("@vue/runtime-core").DefineComponent<__VLS_Pr
       "onField-input"?: ((...args: any[]) => any) | undefined;
       "onField-change"?: ((...args: any[]) => any) | undefined;
       "onUpdate:stepActive"?: ((...args: any[]) => any) | undefined;
-    }>, "values" | "changeHandler" | "initialized" | "lastValuesProcessed" | "formState" | "changeRecords" | "resetForm" | "submitForm" | "getTextByName" | ("disabled" | "labelWidth" | "inline" | "labelPosition" | "config" | "height" | "initValues" | "lastValues" | "isCompare" | "keyProp" | "parentValues" | "stepActive")> & {
+    }>, "values" | "changeHandler" | "validate" | "lastValuesProcessed" | "submitForm" | "changeRecords" | "initialized" | "formState" | "resetForm" | "getTextByName" | ("disabled" | "labelWidth" | "inline" | "labelPosition" | "config" | "height" | "initValues" | "lastValues" | "isCompare" | "keyProp" | "parentValues" | "useFieldTextInError" | "stepActive" | "validateOnInit")> & {
       values: FormValue;
       lastValuesProcessed: FormValue;
-      formState: FormState;
+      formState: import("@tmagic/form-schema").FormState;
       initialized: boolean;
       changeRecords: ChangeRecord$1[];
       changeHandler: (v: FormValue, eventData: ContainerChangeEventData) => void;
       resetForm: () => void;
       submitForm: (native?: boolean) => Promise<any>;
+      validate: () => Promise<string>;
       getTextByName: (name: string, config?: import("@tmagic/form-schema").FormConfig) => string | undefined;
     } & {} & import("@vue/runtime-core").ComponentCustomProperties & {} & {
       $slots: FormSlots;
@@ -5560,8 +6009,8 @@ declare const __VLS_base$7: import("@vue/runtime-core").DefineComponent<__VLS_Pr
   "onSubmit-error"?: ((e: any) => any) | undefined;
   "onForm-error"?: ((e: any) => any) | undefined;
 }>, {}, {}, {}, {}, string, import("@vue/runtime-core").ComponentProvideOptions, false, {}, any>;
-declare const __VLS_export$18: __VLS_WithSlots$7<typeof __VLS_base$7, __VLS_Slots$7>;
-declare const _default$30: typeof __VLS_export$18;
+declare const __VLS_export$19: __VLS_WithSlots$7<typeof __VLS_base$7, __VLS_Slots$7>;
+declare const _default$31: typeof __VLS_export$19;
 type __VLS_WithSlots$7<T, S> = T & {
   new (): {
     $slots: S;
@@ -5572,16 +6021,15 @@ type __VLS_WithSlots$7<T, S> = T & {
 type __VLS_Slots$6 = {
   'props-form-panel-header'(_props: {}): any;
 };
-type __VLS_Props$14 = {
+type __VLS_Props$15 = {
   config: FormConfig;
   values: FormValue;
   disabledShowSrc?: boolean;
   labelWidth?: string;
   codeValueKey?: string;
-  labelPosition?: string;
-  extendState?: (_state: FormState) => Record<string, any> | Promise<Record<string, any>>;
+  labelPosition?: 'top' | 'left' | 'right';
 };
-declare const __VLS_base$6: import("@vue/runtime-core").DefineComponent<__VLS_Props$14, {
+declare const __VLS_base$6: import("@vue/runtime-core").DefineComponent<__VLS_Props$15, {
   configForm: Readonly<import("@vue/reactivity").ShallowRef<({
     $: import("@vue/runtime-core").ComponentInternalInstance;
     $data: {};
@@ -5592,16 +6040,19 @@ declare const __VLS_base$6: import("@vue/runtime-core").DefineComponent<__VLS_Pr
       readonly isCompare?: boolean | undefined;
       readonly parentValues?: Record<string, any> | undefined;
       readonly labelWidth?: string | undefined;
+      readonly typeMatchValid?: boolean | undefined;
+      readonly validateOnInit?: boolean | undefined;
       readonly disabled?: boolean | undefined;
       readonly height?: string | undefined;
       readonly stepActive?: string | number | undefined;
       readonly size?: "small" | "default" | "large" | undefined;
       readonly inline?: boolean | undefined;
-      readonly labelPosition?: string | undefined;
+      readonly labelPosition?: "top" | "left" | "right" | undefined;
       readonly keyProp?: string | undefined;
       readonly popperClass?: string | undefined;
       readonly preventSubmitDefault?: boolean | undefined;
-      readonly extendState?: ((_state: FormState) => Record<string, any> | Promise<Record<string, any>>) | undefined;
+      readonly useFieldTextInError?: boolean | undefined;
+      readonly context?: import("@tmagic/form-schema").FormContext | undefined;
       readonly showDiff?: ((_data: {
         curValue: any;
         lastValue: any;
@@ -5634,16 +6085,19 @@ declare const __VLS_base$6: import("@vue/runtime-core").DefineComponent<__VLS_Pr
       isCompare?: boolean;
       parentValues?: Record<string, any>;
       labelWidth?: string;
+      typeMatchValid?: boolean;
+      validateOnInit?: boolean;
       disabled?: boolean;
       height?: string;
       stepActive?: string | number;
       size?: "small" | "default" | "large";
       inline?: boolean;
-      labelPosition?: string;
+      labelPosition?: "top" | "left" | "right";
       keyProp?: string;
       popperClass?: string;
       preventSubmitDefault?: boolean;
-      extendState?: (_state: FormState) => Record<string, any> | Promise<Record<string, any>>;
+      useFieldTextInError?: boolean;
+      context?: import("@tmagic/form-schema").FormContext;
       showDiff?: (_data: {
         curValue: any;
         lastValue: any;
@@ -5660,12 +6114,13 @@ declare const __VLS_base$6: import("@vue/runtime-core").DefineComponent<__VLS_Pr
     }>, {
       values: import("@vue/reactivity").Ref<FormValue, FormValue>;
       lastValuesProcessed: import("@vue/reactivity").Ref<FormValue, FormValue>;
-      formState: FormState;
+      formState: import("@tmagic/form-schema").FormState;
       initialized: import("@vue/reactivity").Ref<boolean, boolean>;
       changeRecords: import("@vue/reactivity").ShallowRef<ChangeRecord$1[], ChangeRecord$1[]>;
       changeHandler: (v: FormValue, eventData: ContainerChangeEventData) => void;
       resetForm: () => void;
       submitForm: (native?: boolean) => Promise<any>;
+      validate: () => Promise<string>;
       getTextByName: (name: string, config?: FormConfig) => string | undefined;
     }, {}, {}, {}, import("@vue/runtime-core").ComponentOptionsMixin, import("@vue/runtime-core").ComponentOptionsMixin, {
       error: (...args: any[]) => void;
@@ -5677,7 +6132,7 @@ declare const __VLS_base$6: import("@vue/runtime-core").DefineComponent<__VLS_Pr
       disabled: boolean;
       labelWidth: string;
       inline: boolean;
-      labelPosition: string;
+      labelPosition: "top" | "left" | "right";
       config: FormConfig;
       height: string;
       initValues: Record<string, any>;
@@ -5685,7 +6140,9 @@ declare const __VLS_base$6: import("@vue/runtime-core").DefineComponent<__VLS_Pr
       isCompare: boolean;
       keyProp: string;
       parentValues: Record<string, any>;
+      useFieldTextInError: boolean;
       stepActive: string | number;
+      validateOnInit: boolean;
     }, {}, string, {}, import("@vue/runtime-core").GlobalComponents, import("@vue/runtime-core").GlobalDirectives, string, import("@vue/runtime-core").ComponentProvideOptions> & {
       beforeCreate?: (() => void) | (() => void)[];
       created?: (() => void) | (() => void)[];
@@ -5710,7 +6167,7 @@ declare const __VLS_base$6: import("@vue/runtime-core").DefineComponent<__VLS_Pr
     disabled: boolean;
     labelWidth: string;
     inline: boolean;
-    labelPosition: string;
+    labelPosition: "top" | "left" | "right";
     config: FormConfig;
     height: string;
     initValues: Record<string, any>;
@@ -5718,7 +6175,9 @@ declare const __VLS_base$6: import("@vue/runtime-core").DefineComponent<__VLS_Pr
     isCompare: boolean;
     keyProp: string;
     parentValues: Record<string, any>;
+    useFieldTextInError: boolean;
     stepActive: string | number;
+    validateOnInit: boolean;
   }> & Omit<Readonly<{
     config: FormConfig;
     initValues: Record<string, any>;
@@ -5726,16 +6185,19 @@ declare const __VLS_base$6: import("@vue/runtime-core").DefineComponent<__VLS_Pr
     isCompare?: boolean;
     parentValues?: Record<string, any>;
     labelWidth?: string;
+    typeMatchValid?: boolean;
+    validateOnInit?: boolean;
     disabled?: boolean;
     height?: string;
     stepActive?: string | number;
     size?: "small" | "default" | "large";
     inline?: boolean;
-    labelPosition?: string;
+    labelPosition?: "top" | "left" | "right";
     keyProp?: string;
     popperClass?: string;
     preventSubmitDefault?: boolean;
-    extendState?: (_state: FormState) => Record<string, any> | Promise<Record<string, any>>;
+    useFieldTextInError?: boolean;
+    context?: import("@tmagic/form-schema").FormContext;
     showDiff?: (_data: {
       curValue: any;
       lastValue: any;
@@ -5749,35 +6211,36 @@ declare const __VLS_base$6: import("@vue/runtime-core").DefineComponent<__VLS_Pr
     "onField-input"?: ((...args: any[]) => any) | undefined;
     "onField-change"?: ((...args: any[]) => any) | undefined;
     "onUpdate:stepActive"?: ((...args: any[]) => any) | undefined;
-  }>, "values" | "changeHandler" | "initialized" | "lastValuesProcessed" | "formState" | "changeRecords" | "resetForm" | "submitForm" | "getTextByName" | ("disabled" | "labelWidth" | "inline" | "labelPosition" | "config" | "height" | "initValues" | "lastValues" | "isCompare" | "keyProp" | "parentValues" | "stepActive")> & {
+  }>, "values" | "changeHandler" | "validate" | "lastValuesProcessed" | "submitForm" | "changeRecords" | "initialized" | "formState" | "resetForm" | "getTextByName" | ("disabled" | "labelWidth" | "inline" | "labelPosition" | "config" | "height" | "initValues" | "lastValues" | "isCompare" | "keyProp" | "parentValues" | "useFieldTextInError" | "stepActive" | "validateOnInit")> & {
     values: FormValue;
     lastValuesProcessed: FormValue;
-    formState: FormState;
+    formState: import("@tmagic/form-schema").FormState;
     initialized: boolean;
     changeRecords: ChangeRecord$1[];
     changeHandler: (v: FormValue, eventData: ContainerChangeEventData) => void;
     resetForm: () => void;
     submitForm: (native?: boolean) => Promise<any>;
+    validate: () => Promise<string>;
     getTextByName: (name: string, config?: FormConfig) => string | undefined;
   } & {} & import("@vue/runtime-core").ComponentCustomProperties & {} & {
     $slots: FormSlots;
   }) | null>>;
   submit: (v: FormValue, eventData: ContainerChangeEventData) => Promise<void>;
 }, {}, {}, {}, import("@vue/runtime-core").ComponentOptionsMixin, import("@vue/runtime-core").ComponentOptionsMixin, {
+  submit: (values: any, eventData?: ContainerChangeEventData | undefined, error?: any) => any;
   mounted: (internalInstance: any) => any;
   unmounted: () => any;
-  submit: (values: any, eventData?: ContainerChangeEventData | undefined) => any;
   "submit-error": (e: any) => any;
   "form-error": (e: any) => any;
-}, string, import("@vue/runtime-core").PublicProps, Readonly<__VLS_Props$14> & Readonly<{
+}, string, import("@vue/runtime-core").PublicProps, Readonly<__VLS_Props$15> & Readonly<{
+  onSubmit?: ((values: any, eventData?: ContainerChangeEventData | undefined, error?: any) => any) | undefined;
   onMounted?: ((internalInstance: any) => any) | undefined;
   onUnmounted?: (() => any) | undefined;
-  onSubmit?: ((values: any, eventData?: ContainerChangeEventData | undefined) => any) | undefined;
   "onSubmit-error"?: ((e: any) => any) | undefined;
   "onForm-error"?: ((e: any) => any) | undefined;
 }>, {}, {}, {}, {}, string, import("@vue/runtime-core").ComponentProvideOptions, false, {}, any>;
-declare const __VLS_export$17: __VLS_WithSlots$6<typeof __VLS_base$6, __VLS_Slots$6>;
-declare const _default$29: typeof __VLS_export$17;
+declare const __VLS_export$18: __VLS_WithSlots$6<typeof __VLS_base$6, __VLS_Slots$6>;
+declare const _default$30: typeof __VLS_export$18;
 type __VLS_WithSlots$6<T, S> = T & {
   new (): {
     $slots: S;
@@ -5785,20 +6248,20 @@ type __VLS_WithSlots$6<T, S> = T & {
 };
 //#endregion
 //#region temp/packages/editor/src/components/ToolButton.vue.d.ts
-type __VLS_Props$13 = {
+type __VLS_Props$14 = {
   data?: MenuButton | MenuComponent;
   eventType?: 'mousedown' | 'mouseup' | 'click';
 };
-declare const __VLS_export$16: import("@vue/runtime-core").DefineComponent<__VLS_Props$13, {
+declare const __VLS_export$17: import("@vue/runtime-core").DefineComponent<__VLS_Props$14, {
   getElRef: () => Readonly<import("@vue/reactivity").ShallowRef<HTMLDivElement | null>>;
-}, {}, {}, {}, import("@vue/runtime-core").ComponentOptionsMixin, import("@vue/runtime-core").ComponentOptionsMixin, {}, string, import("@vue/runtime-core").PublicProps, Readonly<__VLS_Props$13> & Readonly<{}>, {
+}, {}, {}, {}, import("@vue/runtime-core").ComponentOptionsMixin, import("@vue/runtime-core").ComponentOptionsMixin, {}, string, import("@vue/runtime-core").PublicProps, Readonly<__VLS_Props$14> & Readonly<{}>, {
   data: MenuButton | MenuComponent;
   eventType: "mousedown" | "mouseup" | "click";
 }, {}, {}, {}, string, import("@vue/runtime-core").ComponentProvideOptions, false, {}, any>;
-declare const _default$35: typeof __VLS_export$16;
+declare const _default$36: typeof __VLS_export$17;
 //#endregion
 //#region temp/packages/editor/src/components/ContentMenu.vue.d.ts
-type __VLS_Props$12 = {
+type __VLS_Props$13 = {
   menuData?: (MenuButton | MenuComponent)[];
   isSubMenu?: boolean;
   active?: string | number;
@@ -5808,7 +6271,7 @@ declare var __VLS_7$1: {};
 type __VLS_Slots$5 = {} & {
   title?: (props: typeof __VLS_7$1) => any;
 };
-declare const __VLS_base$5: import("@vue/runtime-core").DefineComponent<__VLS_Props$12, {
+declare const __VLS_base$5: import("@vue/runtime-core").DefineComponent<__VLS_Props$13, {
   menu: Readonly<import("@vue/reactivity").ShallowRef<HTMLDivElement | null>>;
   menuPosition: Ref<{
     left: number;
@@ -5834,7 +6297,7 @@ declare const __VLS_base$5: import("@vue/runtime-core").DefineComponent<__VLS_Pr
   mouseenter: () => any;
   show: () => any;
   hide: () => any;
-}, string, import("@vue/runtime-core").PublicProps, Readonly<__VLS_Props$12> & Readonly<{
+}, string, import("@vue/runtime-core").PublicProps, Readonly<__VLS_Props$13> & Readonly<{
   onMouseenter?: (() => any) | undefined;
   onShow?: (() => any) | undefined;
   onHide?: (() => any) | undefined;
@@ -5843,8 +6306,8 @@ declare const __VLS_base$5: import("@vue/runtime-core").DefineComponent<__VLS_Pr
   isSubMenu: boolean;
   autoHide: boolean;
 }, {}, {}, {}, string, import("@vue/runtime-core").ComponentProvideOptions, false, {}, any>;
-declare const __VLS_export$15: __VLS_WithSlots$5<typeof __VLS_base$5, __VLS_Slots$5>;
-declare const _default$8: typeof __VLS_export$15;
+declare const __VLS_export$16: __VLS_WithSlots$5<typeof __VLS_base$5, __VLS_Slots$5>;
+declare const _default$8: typeof __VLS_export$16;
 type __VLS_WithSlots$5<T, S> = T & {
   new (): {
     $slots: S;
@@ -5852,14 +6315,14 @@ type __VLS_WithSlots$5<T, S> = T & {
 };
 //#endregion
 //#region temp/packages/editor/src/components/Icon.vue.d.ts
-type __VLS_Props$11 = {
+type __VLS_Props$12 = {
   icon?: any;
 };
-declare const __VLS_export$14: import("@vue/runtime-core").DefineComponent<__VLS_Props$11, {}, {}, {}, {}, import("@vue/runtime-core").ComponentOptionsMixin, import("@vue/runtime-core").ComponentOptionsMixin, {}, string, import("@vue/runtime-core").PublicProps, Readonly<__VLS_Props$11> & Readonly<{}>, {}, {}, {}, {}, string, import("@vue/runtime-core").ComponentProvideOptions, false, {}, any>;
-declare const _default$24: typeof __VLS_export$14;
+declare const __VLS_export$15: import("@vue/runtime-core").DefineComponent<__VLS_Props$12, {}, {}, {}, {}, import("@vue/runtime-core").ComponentOptionsMixin, import("@vue/runtime-core").ComponentOptionsMixin, {}, string, import("@vue/runtime-core").PublicProps, Readonly<__VLS_Props$12> & Readonly<{}>, {}, {}, {}, {}, string, import("@vue/runtime-core").ComponentProvideOptions, false, {}, any>;
+declare const _default$24: typeof __VLS_export$15;
 //#endregion
 //#region temp/packages/editor/src/components/SplitView.vue.d.ts
-type __VLS_Props$10 = {
+type __VLS_Props$11 = {
   width?: number;
   left?: number;
   right?: number;
@@ -5878,13 +6341,13 @@ type __VLS_Slots$4 = {} & {
 } & {
   right?: (props: typeof __VLS_19) => any;
 };
-declare const __VLS_base$4: import("@vue/runtime-core").DefineComponent<__VLS_Props$10, {
+declare const __VLS_base$4: import("@vue/runtime-core").DefineComponent<__VLS_Props$11, {
   updateWidth(): void;
 }, {}, {}, {}, import("@vue/runtime-core").ComponentOptionsMixin, import("@vue/runtime-core").ComponentOptionsMixin, {
   change: (...args: any[]) => void;
   "update:left": (...args: any[]) => void;
   "update:right": (...args: any[]) => void;
-}, string, import("@vue/runtime-core").PublicProps, Readonly<__VLS_Props$10> & Readonly<{
+}, string, import("@vue/runtime-core").PublicProps, Readonly<__VLS_Props$11> & Readonly<{
   onChange?: ((...args: any[]) => any) | undefined;
   "onUpdate:left"?: ((...args: any[]) => any) | undefined;
   "onUpdate:right"?: ((...args: any[]) => any) | undefined;
@@ -5893,8 +6356,8 @@ declare const __VLS_base$4: import("@vue/runtime-core").DefineComponent<__VLS_Pr
   minRight: number;
   minCenter: number;
 }, {}, {}, {}, string, import("@vue/runtime-core").ComponentProvideOptions, false, {}, any>;
-declare const __VLS_export$13: __VLS_WithSlots$4<typeof __VLS_base$4, __VLS_Slots$4>;
-declare const _default$27: typeof __VLS_export$13;
+declare const __VLS_export$14: __VLS_WithSlots$4<typeof __VLS_base$4, __VLS_Slots$4>;
+declare const _default$28: typeof __VLS_export$14;
 type __VLS_WithSlots$4<T, S> = T & {
   new (): {
     $slots: S;
@@ -5911,8 +6374,8 @@ declare const __VLS_base$3: import("@vue/runtime-core").DefineComponent<{}, {},
 }, string, import("@vue/runtime-core").PublicProps, Readonly<{}> & Readonly<{
   onChange?: ((e: OnDrag$1<import("gesto").default>) => any) | undefined;
 }>, {}, {}, {}, {}, string, import("@vue/runtime-core").ComponentProvideOptions, true, {}, any>;
-declare const __VLS_export$12: __VLS_WithSlots$3<typeof __VLS_base$3, __VLS_Slots$3>;
-declare const _default$31: typeof __VLS_export$12;
+declare const __VLS_export$13: __VLS_WithSlots$3<typeof __VLS_base$3, __VLS_Slots$3>;
+declare const _default$32: typeof __VLS_export$13;
 type __VLS_WithSlots$3<T, S> = T & {
   new (): {
     $slots: S;
@@ -5920,7 +6383,7 @@ type __VLS_WithSlots$3<T, S> = T & {
 };
 //#endregion
 //#region temp/packages/editor/src/components/CodeBlockEditor.vue.d.ts
-type __VLS_Props$9 = {
+type __VLS_Props$10 = {
   content: Omit<CodeBlockContent, 'content'> & {
     content: string;
   };
@@ -5932,8 +6395,8 @@ type __VLS_ModelProps$1 = {
   'width'?: number;
   'visible'?: boolean;
 };
-type __VLS_PublicProps$1 = __VLS_Props$9 & __VLS_ModelProps$1;
-declare const __VLS_export$11: import("@vue/runtime-core").DefineComponent<__VLS_PublicProps$1, {
+type __VLS_PublicProps$1 = __VLS_Props$10 & __VLS_ModelProps$1;
+declare const __VLS_export$12: import("@vue/runtime-core").DefineComponent<__VLS_PublicProps$1, {
   show(): Promise<void>;
   hide(): Promise<void>;
 }, {}, {}, {}, import("@vue/runtime-core").ComponentOptionsMixin, import("@vue/runtime-core").ComponentOptionsMixin, {
@@ -5949,52 +6412,40 @@ declare const __VLS_export$11: import("@vue/runtime-core").DefineComponent<__VLS
   "onUpdate:visible"?: ((value: boolean) => any) | undefined;
   "onUpdate:width"?: ((value: number) => any) | undefined;
 }>, {}, {}, {}, {}, string, import("@vue/runtime-core").ComponentProvideOptions, false, {}, any>;
-declare const _default: typeof __VLS_export$11;
+declare const _default: typeof __VLS_export$12;
 //#endregion
 //#region temp/packages/editor/src/components/CompareForm.vue.d.ts
-type __VLS_Props$8 = {
-  /** 当前值（修改后的值） */value: Partial<MNode> | Partial<DataSourceSchema> | Partial<CodeBlockContent> | Record<string, any>; /** 用于对比的旧值（修改前的值） */
-  lastValue?: Partial<MNode> | Partial<DataSourceSchema> | Partial<CodeBlockContent> | Record<string, any>;
-  /**
-   * 类型说明：
-   * - `category` 为 `node` 时，`type` 为节点组件的类型，例如 'text'、'button'、'page'、'container' 等
-   * - `category` 为 `data-source` 时，`type` 为数据源类型，例如 'base'、'http'
-   * - `category` 为 `code-block` 时，`type` 可不传
-   */
-  type?: string; /** 表单配置类别，决定从哪里取 FormConfig */
-  category?: CompareCategory; /** 数据源代码块场景下的数据源类型（base/http），用于代码块表单中"执行时机"展示 */
-  dataSourceType?: string;
-  labelWidth?: string;
-  /**
-   * 外层容器高度。设置后表单内容超出时会在 CompareForm 内部出现滚动条，
-   * 避免 dialog / 面板使用方需要自行处理滚动。可传任意 CSS 长度，例如 `60vh` / `400px` / `100%`。
-   */
-  height?: string;
-  /**
-   * 用户自定义注入到 MForm.formState 的扩展字段，与 Editor 顶层的 `extendFormState`、
-   * PropsPanel 的 `extend-state` 语义一致。表单 item 的 `display` / `disabled` 等
-   * filterFunction 经常依赖这里注入的字段（如 stage、自定义业务上下文等），
-   * 因此在差异对比场景下也需要透传，避免出现 `formState.xxx is undefined` 的运行时错误。
-   */
-  extendState?: (_state: FormState) => Record<string, any> | Promise<Record<string, any>>;
-  /**
-   * 自定义 FormConfig 加载逻辑。传入后将接管内置的按 `category`(node/data-source/code-block)
-   * 取配置逻辑，调用方可根据业务自行返回（或异步返回）表单配置。可通过
-   * `ctx.defaultLoadConfig()` 复用默认结果再做二次加工。返回的 config 直接用于对比展示。
-   */
-  loadConfig?: CompareFormLoadConfig; /** 编辑器服务集合，由调用方传入（不再通过 inject('services') 获取）。 */
-  services: Services;
+type __VLS_Props$9 = CompareFormBaseProps & {
+  /** 用于对比的旧值（修改前的值） */
+  lastValue?: CompareFormBaseProps['value'];
+  /** 需要走 self diff 的字段类型（例如 mod-cond）。 */
+  selfDiffFieldTypes?: string[];
+};
+declare const __VLS_export$11: import("@vue/runtime-core").DefineComponent<__VLS_Props$9, {
+  form: ShallowRef<InstanceType<typeof MForm> | null>;
+  config: Ref<FormConfig>;
+  reload: () => Promise<void>;
+}, {}, {}, {}, import("@vue/runtime-core").ComponentOptionsMixin, import("@vue/runtime-core").ComponentOptionsMixin, {}, string, import("@vue/runtime-core").PublicProps, Readonly<__VLS_Props$9> & Readonly<{}>, {
+  labelWidth: string;
+  category: CompareCategory;
+}, {}, {}, {}, string, import("@vue/runtime-core").ComponentProvideOptions, false, {}, any>;
+declare const _default$5: typeof __VLS_export$11;
+//#endregion
+//#region temp/packages/editor/src/components/ViewForm.vue.d.ts
+type __VLS_Props$8 = CompareFormBaseProps & {
+  /** 是否禁用表单（默认只读展示）。 */
+  disabled?: boolean;
 };
 declare const __VLS_export$10: import("@vue/runtime-core").DefineComponent<__VLS_Props$8, {
   form: ShallowRef<InstanceType<typeof MForm> | null>;
   config: Ref<FormConfig>;
   reload: () => Promise<void>;
 }, {}, {}, {}, import("@vue/runtime-core").ComponentOptionsMixin, import("@vue/runtime-core").ComponentOptionsMixin, {}, string, import("@vue/runtime-core").PublicProps, Readonly<__VLS_Props$8> & Readonly<{}>, {
+  disabled: boolean;
   labelWidth: string;
-  services: Services;
   category: CompareCategory;
 }, {}, {}, {}, string, import("@vue/runtime-core").ComponentProvideOptions, false, {}, any>;
-declare const _default$5: typeof __VLS_export$10;
+declare const _default$39: typeof __VLS_export$10;
 //#endregion
 //#region temp/packages/editor/src/layouts/history-list/composables.d.ts
 /**
@@ -6020,7 +6471,7 @@ interface HistoryBucketGroup<T extends BaseStepValue = BaseStepValue> {
  * 通用二次确认弹窗：清空历史 / 无法差异对比的回滚等会改变状态的操作，先弹出确认框，
  * 用户点击「确定」返回 true，取消（confirm reject）时返回 false 并静默忽略。
  */
-declare const confirmHistoryAction: (message: string) => Promise<boolean>;
+export declare const confirmHistoryAction: (message: string) => Promise<boolean>;
 //#endregion
 //#region temp/packages/editor/src/layouts/history-list/Bucket.vue.d.ts
 declare const __VLS_export$9: <T extends BaseStepValue = BaseStepValue>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_PrettifyLocal$1<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_exposed?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
@@ -6029,9 +6480,12 @@ declare const __VLS_export$9: <T extends BaseStepValue = BaseStepValue>(__VLS_pr
      * 该类历史的整体渲染配置（title / prefix / describe* / isStep* / showInitial / gotoEnabled）。
      * 由父组件按业务类型注入，组件内部按需读取，避免逐项透传多个 props。
      */
-    config: HistoryBucketConfig<T>; /** 当前 bucket 对应的目标 id（dataSource.id 或 codeBlock.id），同时用于组装子项的 key。 */
-    bucketId: string | number; /** 当前 bucket 下的所有历史分组，按时间倒序展示（最近的操作在前）。 */
-    groups: HistoryBucketGroup<T>[]; /** 共享的折叠状态表（key -> 是否展开，缺省或 true 为展开、false 为收起），由顶层 panel 统一维护以便跨 tab 复用。 */
+    config: HistoryBucketConfig<T>;
+    /** 当前 bucket 对应的目标 id（dataSource.id 或 codeBlock.id），同时用于组装子项的 key。 */
+    bucketId: string | number;
+    /** 当前 bucket 下的所有历史分组，按时间倒序展示（最近的操作在前）。 */
+    groups: HistoryBucketGroup<T>[];
+    /** 共享的折叠状态表（key -> 是否展开，缺省或 true 为展开、false 为收起），由顶层 panel 统一维护以便跨 tab 复用。 */
     expanded: Record<string, boolean>;
   } & {
     onToggle?: ((_key: string) => any) | undefined;
@@ -6053,16 +6507,16 @@ declare const __VLS_export$9: <T extends BaseStepValue = BaseStepValue>(__VLS_pr
     (_e: "revert-step", _bucketId: string | number, _index: number): void;
   };
 }>) => import("vue").VNode & {
-  __ctx?: Awaited<typeof __VLS_setup>;
+  __ctx?: NonNullable<Awaited<typeof __VLS_setup>>;
 };
 declare const _default$22: typeof __VLS_export$9;
-type __VLS_PrettifyLocal$1<T> = (T extends any ? { [K in keyof T]: T[K] } : { [K in keyof T as K]: T[K] }) & {};
+type __VLS_PrettifyLocal$1<T> = (T extends any ? { [K in keyof T]: T[K]; } : { [K in keyof T as K]: T[K]; }) & {};
 //#endregion
 //#region temp/packages/editor/src/layouts/history-list/BucketTab.vue.d.ts
 declare const __VLS_export$8: <T extends BaseStepValue = BaseStepValue>(__VLS_props: NonNullable<Awaited<typeof __VLS_setup>>["props"], __VLS_ctx?: __VLS_PrettifyLocal<Pick<NonNullable<Awaited<typeof __VLS_setup>>, "attrs" | "emit" | "slots">>, __VLS_exposed?: NonNullable<Awaited<typeof __VLS_setup>>["expose"], __VLS_setup?: Promise<{
   props: import("vue").PublicProps & __VLS_PrettifyLocal<{
     /**
-     * 该类历史的整体渲染配置（title / prefix / describe* / isStep* / showInitial / gotoEnabled），
+     * 该类历史的整体渲染配置（title / prefix / describe* / isStep* / showInitial / gotoEnabled / showClear），
      * 由父组件按业务类型注入并整体透传给 Bucket，避免逐项透传多个 props。
      */
     config: HistoryBucketConfig<T>;
@@ -6102,26 +6556,23 @@ declare const __VLS_export$8: <T extends BaseStepValue = BaseStepValue>(__VLS_pr
     (_e: "clear"): void;
   };
 }>) => import("vue").VNode & {
-  __ctx?: Awaited<typeof __VLS_setup>;
+  __ctx?: NonNullable<Awaited<typeof __VLS_setup>>;
 };
 declare const _default$23: typeof __VLS_export$8;
-type __VLS_PrettifyLocal<T> = (T extends any ? { [K in keyof T]: T[K] } : { [K in keyof T as K]: T[K] }) & {};
+type __VLS_PrettifyLocal<T> = (T extends any ? { [K in keyof T]: T[K]; } : { [K in keyof T as K]: T[K]; }) & {};
 //#endregion
 //#region temp/packages/editor/src/layouts/history-list/HistoryDiffDialog.vue.d.ts
 type __VLS_Props$7 = {
-  /** 编辑器服务集合，由调用方传入（不再通过 inject('services') 获取）。 */services: Services;
-  /**
-   * 来自 Editor 顶层的 `extendFormState`，用于扩展 MForm.formState。
-   * 透传给 CompareForm，从而让差异对比时表单 item 中依赖业务上下文的
-   * `display` / `disabled` 等 filterFunction 正常工作。
-   */
-  extendState?: (_state: FormState) => Record<string, any> | Promise<Record<string, any>>;
+  /** 编辑器服务集合，由调用方传入（不再通过 inject('services') 获取）。 */
+  services?: Services;
   /**
    * 自定义 FormConfig 加载逻辑，透传给 CompareForm。传入后将接管内置的按 `category`
    * 取配置逻辑，可通过 `ctx.defaultLoadConfig()` 复用默认结果再做二次加工。
    */
   loadConfig?: CompareFormLoadConfig;
   width?: string;
+  /** 差异对比表单内组件的尺寸（透传给 CompareForm 的 `size`），可选 'large' | 'default' | 'small'。 */
+  size?: FieldSize;
   isConfirm?: boolean;
   onConfirm?: () => void;
   selfDiffFieldTypes?: string[];
@@ -6136,7 +6587,6 @@ declare const __VLS_export$7: import("@vue/runtime-core").DefineComponent<__VLS_
   onClose?: ((...args: any[]) => any) | undefined;
 }>, {
   width: string;
-  services: Services;
 }, {}, {}, {}, string, import("@vue/runtime-core").ComponentProvideOptions, false, {}, any>;
 declare const _default$21: typeof __VLS_export$7;
 //#endregion
@@ -6164,15 +6614,15 @@ declare const _default$21: typeof __VLS_export$7;
  * ```ts
  * import { useHistoryRevert } from '@tmagic/editor';
  *
- * const { onPageRevert, onPageDiff } = useHistoryRevert(editorRef.value); // editorRef.value 即 Editor 暴露的 services
+ * const { onPageRevert, onPageDiff } = useHistoryRevert({}, editorRef.value); // editorRef.value 即 Editor 暴露的 services
  * await onPageRevert(index); // 弹出差异 / 二次确认弹窗后回滚
  * onPageDiff(index); // 弹出只读差异弹窗查看前后值差异
  * ```
  */
-declare const useHistoryRevert: (services: Pick<Services, "editorService" | "dataSourceService" | "codeBlockService" | "historyService">, options?: UseHistoryRevertOptions) => {
-  onPageRevert: (index: number) => Promise<StepValue | null>;
-  onDataSourceRevert: (id: string | number, index: number) => Promise<DataSourceStepValue | null>;
-  onCodeBlockRevert: (id: string | number, index: number) => Promise<CodeBlockStepValue | null>;
+export declare const useHistoryRevert: (options?: UseHistoryRevertOptions, services?: Services) => {
+  onPageRevert: (index: number) => Promise<StepValue | null | undefined>;
+  onDataSourceRevert: (id: string | number, index: number) => Promise<DataSourceStepValue | null | undefined>;
+  onCodeBlockRevert: (id: string | number, index: number) => Promise<CodeBlockStepValue | null | undefined>;
   onPageDiff: (index: number) => Promise<void> | void;
   onDataSourceDiff: (id: string | number, index: number) => Promise<void> | void;
   onCodeBlockDiff: (id: string | number, index: number) => Promise<void> | void;
@@ -6194,6 +6644,11 @@ interface Position {
 type __VLS_Props$6 = {
   position?: Position;
   title?: string;
+  bodyStyle?: CSSProperties;
+  /** 浮窗初始样式，会与内部计算样式合并，外部传入优先 */
+  initialStyle?: CSSProperties;
+  /** 用于约束浮窗 left 的容器宽度，传入时按宽度收敛 left，避免超出右边界；默认取视窗宽度 */
+  frameworkWidth?: number;
   beforeClose?: (_done: (_cancel?: boolean) => void) => void;
 };
 type __VLS_ModelProps = {
@@ -6223,6 +6678,8 @@ declare const __VLS_base$2: import("@vue/runtime-core").DefineComponent<__VLS_Pu
 }>, {
   title: string;
   position: Position;
+  initialStyle: CSSProperties;
+  frameworkWidth: number;
 }, {}, {}, {}, string, import("@vue/runtime-core").ComponentProvideOptions, false, {}, any>;
 declare const __VLS_export$6: __VLS_WithSlots$2<typeof __VLS_base$2, __VLS_Slots$2>;
 declare const _default$20: typeof __VLS_export$6;
@@ -6249,7 +6706,8 @@ type __VLS_Props$5 = {
   nodeStatusMap: Map<Id, LayerNodeStatus>;
   indent?: number;
   nextLevelIndentIncrement?: number;
-  emptyText?: string; /** 自定义判断节点是否可展开（即是否要展示为拥有子节点的形态）的函数 */
+  emptyText?: string;
+  /** 自定义判断节点是否可展开（即是否要展示为拥有子节点的形态）的函数 */
   isExpandable?: IsExpandableFunction;
 };
 declare const __VLS_base$1: import("@vue/runtime-core").DefineComponent<__VLS_Props$5, {}, {}, {}, {}, import("@vue/runtime-core").ComponentOptionsMixin, import("@vue/runtime-core").ComponentOptionsMixin, {
@@ -6275,7 +6733,7 @@ declare const __VLS_base$1: import("@vue/runtime-core").DefineComponent<__VLS_Pr
   indent: number;
 }, {}, {}, {}, string, import("@vue/runtime-core").ComponentProvideOptions, false, {}, any>;
 declare const __VLS_export$5: __VLS_WithSlots$1<typeof __VLS_base$1, __VLS_Slots$1>;
-declare const _default$36: typeof __VLS_export$5;
+declare const _default$37: typeof __VLS_export$5;
 type __VLS_WithSlots$1<T, S> = T & {
   new (): {
     $slots: S;
@@ -6300,7 +6758,8 @@ type __VLS_Props$4 = {
   parentsId?: Id[];
   nodeStatusMap: Map<Id, LayerNodeStatus>;
   indent?: number;
-  nextLevelIndentIncrement?: number; /** 自定义判断节点是否可展开（即是否要展示为拥有子节点的形态）的函数 */
+  nextLevelIndentIncrement?: number;
+  /** 自定义判断节点是否可展开（即是否要展示为拥有子节点的形态）的函数 */
   isExpandable?: IsExpandableFunction;
 };
 declare const __VLS_base: import("@vue/runtime-core").DefineComponent<__VLS_Props$4, {}, {}, {}, {}, import("@vue/runtime-core").ComponentOptionsMixin, import("@vue/runtime-core").ComponentOptionsMixin, {
@@ -6326,7 +6785,7 @@ declare const __VLS_base: import("@vue/runtime-core").DefineComponent<__VLS_Prop
   isExpandable: IsExpandableFunction;
 }, {}, {}, {}, string, import("@vue/runtime-core").ComponentProvideOptions, false, {}, any>;
 declare const __VLS_export$4: __VLS_WithSlots<typeof __VLS_base, __VLS_Slots>;
-declare const _default$37: typeof __VLS_export$4;
+declare const _default$38: typeof __VLS_export$4;
 type __VLS_WithSlots<T, S> = T & {
   new (): {
     $slots: S;
@@ -6342,14 +6801,14 @@ declare const __VLS_export$3: import("@vue/runtime-core").DefineComponent<__VLS_
 }>, {
   disabled: boolean;
 }, {}, {}, {}, string, import("@vue/runtime-core").ComponentProvideOptions, false, {}, any>;
-declare const _default$28: typeof __VLS_export$3;
+declare const _default$29: typeof __VLS_export$3;
 //#endregion
 //#region temp/packages/editor/src/fields/DisplayConds.vue.d.ts
 type __VLS_Props$2 = FieldProps<DisplayCondsConfig>;
 declare const __VLS_export$2: import("@vue/runtime-core").DefineComponent<__VLS_Props$2, {}, {}, {}, {}, import("@vue/runtime-core").ComponentOptionsMixin, import("@vue/runtime-core").ComponentOptionsMixin, {
-  change: (value: DisplayCond[], eventData?: ContainerChangeEventData | undefined) => any;
+  change: (value: DisplayCond | DisplayCond[], eventData?: ContainerChangeEventData | undefined) => any;
 }, string, import("@vue/runtime-core").PublicProps, Readonly<__VLS_Props$2> & Readonly<{
-  onChange?: ((value: DisplayCond[], eventData?: ContainerChangeEventData | undefined) => any) | undefined;
+  onChange?: ((value: DisplayCond | DisplayCond[], eventData?: ContainerChangeEventData | undefined) => any) | undefined;
 }>, {
   disabled: boolean;
 }, {}, {}, {}, string, import("@vue/runtime-core").ComponentProvideOptions, false, {}, any>;
@@ -6373,11 +6832,27 @@ declare const __VLS_export: import("@vue/runtime-core").DefineComponent<__VLS_Pr
   onChange?: ((v: any, eventData: ContainerChangeEventData) => any) | undefined;
   onAddDiffCount?: (() => any) | undefined;
 }>, {}, {}, {}, {}, string, import("@vue/runtime-core").ComponentProvideOptions, false, {}, any>;
-declare const _default$32: typeof __VLS_export;
+declare const _default$33: typeof __VLS_export;
+//#endregion
+//#region temp/packages/editor/src/fields/headless-validation.d.ts
+/**
+ * 编辑器字段的无渲染登记表（不含 Vue 组件）。
+ *
+ * Node 里 `registerFields(editorFields)` 即可配合 `validateForm` / `submitForm`。
+ * 安装编辑器时由 plugin 把 `component` 叠上去再传给 `@tmagic/form`。
+ *
+ * - 叶子：内部只渲染叶子 UI，或把子表单渲染在独立的 MForm / MFormBox 实例里
+ * - innerConfig：内部再渲染 MContainer / MPanel / MGroupList，把运行期配置交出来
+ * - typeMatch：该 type 自身的类型匹配校验
+ *
+ * innerConfig 返回的 config / model / prop 与组件模板里传给内部容器的那一组保持一一对应，
+ * 且配置本身与组件共用同一份工厂（`fields/configs/`）。
+ */
+export declare const editorFields: Record<string, HeadlessFieldOptions>;
 //#endregion
 //#region temp/packages/editor/src/plugin.d.ts
-declare const _default$40: {
+declare const _default$43: {
   install: (app: App, opt?: Partial<EditorInstallOptions | DesignPluginOptions | FormInstallOptions>) => void;
 };
 //#endregion
-export { AddMNode, AddPrefixToObject, AsyncAfterHook, AsyncBeforeHook, AsyncHookPlugin, AsyncMethodName, BaseStepValue, BeforeAdd, CODE_DRAFT_STORAGE_KEY, COPY_CODE_STORAGE_KEY, COPY_DS_STORAGE_KEY, COPY_STORAGE_KEY, CanDropInFunction, CanDropInScene, _default as CodeBlockEditor, _default$1 as CodeBlockList, _default$2 as CodeBlockListPanel, CodeBlockListPanelSlots, CodeBlockListSlots, CodeBlockStepValue, CodeDeleteErrorType, CodeDslItem, CodeParamStatement, CodeRelation, _default$3 as CodeSelect, _default$4 as CodeSelectCol, CodeState, ColumnLayout, CombineInfo, CompareCategory, _default$5 as CompareForm, CompareFormLoadConfig, CompareFormLoadConfigContext, ComponentGroup, ComponentGroupState, ComponentItem, _default$6 as ComponentListPanel, ComponentListPanelSlots, _default$7 as CondOpSelect, ConfirmAndRevertOptions, _default$8 as ContentMenu, CustomContentMenuFunction, CustomDiffFormOptions, DEFAULT_LEFT_COLUMN_WIDTH, DEFAULT_RIGHT_COLUMN_WIDTH, _default$9 as DataSourceAddButton, _default$10 as DataSourceConfigPanel, _default$11 as DataSourceFieldSelect, _default$12 as DataSourceFields, _default$13 as DataSourceInput, DataSourceListSlots, _default$14 as DataSourceMethodSelect, _default$15 as DataSourceMethods, _default$16 as DataSourceMocks, _default$17 as DataSourceSelect, DataSourceStepValue, DatasourceTypeOption, DepTargetType, DiffDialogPayload, _default$18 as DisplayConds, DragClassification, DragType, DslOpOptions, DslOpWithHistoryIdsResult, EditorEvents, EditorInstallOptions, EditorNodeInfo, EditorSlots, EventBus, EventBusEvent, _default$19 as EventSelect, Fixed2Other, _default$20 as FloatingBox, FrameworkSlots, GetCodeBlockFormConfigOptions, GetColumnWidth, GetConfig, H_GUIDE_LINE_STORAGE_KEY, HistoryBucketConfig, _default$21 as HistoryDiffDialog, HistoryEvents, HistoryGroup, _default$22 as HistoryListBucket, _default$23 as HistoryListBucketTab, HistoryListExtraTab, HistoryOpOptions, HistoryOpOptionsWithChangeRecords, HistoryOpSource, HistoryOpType, HistoryPersistOptions, HistoryRowDescriptor, HistoryState, HistoryStepEntry, HistoryStepType, HistorySteps, _default$24 as Icon, IdleTask, IdleTaskEvents, IsExpandableFunction, KeyBindingCacheItem, KeyBindingCommand, KeyBindingItem, _default$25 as KeyValue, Keys, LEFT_COLUMN_WIDTH_STORAGE_KEY, LayerNodeSlots, LayerNodeStatus, LayerOffset, _default$26 as LayerPanel, LayerPanelSlots, Layout, _default$27 as LayoutContainer, _default$27 as SplitView, ListState, MIN_CENTER_COLUMN_WIDTH, MIN_LEFT_COLUMN_WIDTH, MIN_RIGHT_COLUMN_WIDTH, MenuBarData, MenuButton, MenuComponent, MenuItem, type OnDrag, PROPS_PANEL_WIDTH_STORAGE_KEY, PageBarSortOptions, _default$28 as PageFragmentSelect, PartSortableOptions, PastePosition, PersistedHistoryState, PropsFormConfigFunction, _default$29 as PropsFormPanel, PropsFormValueFunction, _default$30 as PropsPanel, PropsPanelSlots, PropsState, RIGHT_COLUMN_WIDTH_STORAGE_KEY, _default$31 as Resizer, ScrollViewer, ScrollViewerEvent, ScrollViewerSlots, SerializedUndoRedo, Services, SetColumnWidth, SideBarData, SideComponent, SideItem, SideItemKey, SidebarSlots, StageCore, StageOptions, StageOverlayState, StageRect, StageSlots, StepDiffItem, StepExtra, StepValue, StoreState, StoreStateKey, _default$32 as StyleSetter, SyncAfterHook, SyncBeforeHook, SyncHookPlugin, _default$33 as TMagicCodeEditor, _default$34 as TMagicEditor, _default$35 as ToolButton, _default$36 as Tree, _default$37 as TreeNode, TreeNodeData, UI_SELECT_MODE_EVENT_NAME, UiState, UndoRedo, UseHistoryRevertOptions, V_GUIDE_LINE_STORAGE_KEY, WorkspaceSlots, advancedTabConfig, arrayOptions, beforePaste, buildChangeRecords, calcAlignCenterStyle, calcLayerTargetIndex, calcMoveStyle, canUsePluginMethods, change2Fixed, classifyDragSources, _default$38 as codeBlockService, collectRelatedNodes, confirmHistoryAction, createStackStep, _default$39 as dataSourceService, debug, _default$40 as default, defaultIsExpandable, _default$41 as depService, describeRevertStep, describeStepForRevert, deserializeStacks, designPlugin, detectStackOpType, detectTargetId, detectTargetName, displayTabConfig, editorNodeMergeCustomizer, _default$42 as editorService, eqOptions, error, eventTabConfig, _default$43 as eventsService, fillConfig, fixNodeLeft, fixNodePosition, formPlugin, generatePageName, generatePageNameByApp, getAddParent, getCascaderOptionsFromFields, getCodeBlockFormConfig, getDefaultConfig, getDisplayField, getEditorConfig, getFieldType, getFormConfig, getFormValue, getGuideLineFromCache, getInitPositionStyle, getLastPushedHistoryIds, getNodeIndex, getOrCreateStack, getPageFragmentList, getPageList, getPageNameList, getPositionInContainer, getRelativeStyle, _default$44 as historyService, idbDelete, idbGet, idbSet, info, isIncludeDataSource, isIndexedDBSupported, _default$45 as loadMonaco, log, markStackSaved, mergeSteps, moveItemsInContainer, numberOptions, openIndexedDB, _default$46 as propsService, resolveSelectedNode, serializeConfig, serializeStacks, setChildrenLayout, setEditorConfig, setLayout, _default$47 as stageOverlayService, _default$48 as storageService, styleTabConfig, tablePlugin, toggleFixedPosition, _default$49 as uiService, undoFloor, updateStatus, useCodeBlockEdit, useEditorContentHeight, useFilter, useFloatBox, useGetSo, useHistoryRevert, useNextFloatBoxPosition, useNodeStatus, useServices, useStage, useWindowRect, warn };
+export { _default as CodeBlockEditor, _default$1 as CodeBlockList, _default$2 as CodeBlockListPanel, _default$3 as CodeSelect, _default$4 as CodeSelectCol, _default$5 as CompareForm, _default$6 as ComponentListPanel, _default$7 as CondOpSelect, _default$8 as ContentMenu, _default$9 as DataSourceAddButton, _default$10 as DataSourceConfigPanel, _default$11 as DataSourceFieldSelect, _default$12 as DataSourceFields, _default$13 as DataSourceInput, _default$14 as DataSourceMethodSelect, _default$15 as DataSourceMethods, _default$16 as DataSourceMocks, _default$17 as DataSourceSelect, DepTargetType, _default$18 as DisplayConds, _default$19 as EventSelect, _default$20 as FloatingBox, _default$21 as HistoryDiffDialog, _default$22 as HistoryListBucket, _default$23 as HistoryListBucketTab, _default$24 as Icon, _default$25 as KeyValue, _default$26 as LayerNodeContent, _default$27 as LayerPanel, _default$28 as LayoutContainer, _default$28 as SplitView, type OnDrag, _default$29 as PageFragmentSelect, _default$30 as PropsFormPanel, _default$31 as PropsPanel, _default$32 as Resizer, StageCore, _default$33 as StyleSetter, _default$34 as TMagicCodeEditor, _default$35 as TMagicEditor, _default$36 as ToolButton, _default$37 as Tree, _default$38 as TreeNode, type TypeMatchValidateContext, _default$39 as ViewForm, _default$40 as codeBlockService, _default$41 as componentListService, _default$42 as dataSourceService, _default$43 as default, _default$44 as depService, designPlugin, _default$45 as editorService, _default$46 as eventsService, formPlugin, getEditorConfig, _default$47 as historyService, isGlobalFlat, _default$48 as keybindingService, _default$49 as loadMonaco, _default$50 as propsService, setEditorConfig, _default$51 as stageOverlayService, _default$52 as storageService, tablePlugin, _default$53 as uiService };