@tmagic/editor 1.5.0-beta.9 → 1.5.0

package/dist/tmagic-editor.js

@@ -1,21 +1,21 @@
 import designPlugin__default, { TMagicIcon, TMagicButton, TMagicCard, getDesignConfig, TMagicSelect, useZIndex, tMagicMessage, tMagicMessageBox, TMagicCascader, TMagicTooltip, TMagicTag, TMagicDialog, TMagicSwitch, TMagicInput, TMagicDivider, TMagicDropdown, TMagicDropdownMenu, TMagicDropdownItem, TMagicPopover, TMagicScrollbar, TMagicCollapse, TMagicCollapseItem } from '@tmagic/design';
 export * from '@tmagic/design';
 export { default as designPlugin } from '@tmagic/design';
-import formPlugin__default, { MContainer, MForm, filterFunction, createValues, MFormBox, MSelect, MGroupList, MPanel } from '@tmagic/form';
+import formPlugin__default, { MContainer, MForm, filterFunction, createValues, MFormBox, MSelect, MGroupList, MPanel, createForm } from '@tmagic/form';
 export * from '@tmagic/form';
 export { default as formPlugin } from '@tmagic/form';
 import tablePlugin__default, { MagicTable } from '@tmagic/table';
 export * from '@tmagic/table';
 export { default as tablePlugin } from '@tmagic/table';
-import { defineComponent, openBlock, createBlock, unref, withCtx, createVNode, createElementVNode, createElementBlock, normalizeClass, resolveDynamicComponent, toRaw, ref, watch, onMounted, onBeforeUnmount, Teleport, normalizeStyle, computed, reactive, resolveComponent, inject, createCommentVNode, Fragment, renderList, mergeProps, mergeModels, useModel, nextTick, provide, renderSlot, toDisplayString, createTextVNode, isRef, createStaticVNode, watchEffect, withModifiers, toHandlers, resolveDirective, withDirectives, createSlots, markRaw, getCurrentInstance, vShow, Transition, mergeDefaults } from 'vue';
-import { Edit, FullScreen, View, Close, Coin, Delete, Plus, ArrowDown, ArrowLeftBold, ArrowRightBold, Files, CaretBottom, DocumentCopy, Grid, Memo, ScaleToOriginal, ZoomOut, ZoomIn, Right, Back, Document, Search, ArrowRight, CopyDocument, Hide, Goods, List, EditPen, CloseBold, Top, Bottom } from '@element-plus/icons-vue';
-import { throttle, isEmpty, cloneDeep, mergeWith, isObject, uniq, get, map, has, pick, keys } from 'lodash-es';
+import { defineComponent, openBlock, createBlock, unref, withCtx, createVNode, createElementVNode, createElementBlock, normalizeClass, resolveDynamicComponent, toRaw, ref, watch, onMounted, onBeforeUnmount, Teleport, normalizeStyle, computed, reactive, resolveComponent, inject, createCommentVNode, Fragment, renderList, mergeProps, mergeModels, useModel, nextTick, provide, renderSlot, toDisplayString, createTextVNode, isRef, createStaticVNode, watchEffect, withModifiers, toHandlers, createSlots, markRaw, getCurrentInstance, withDirectives, vShow, Transition, resolveDirective, mergeDefaults } from 'vue';
+import { Edit, FullScreen, View, Close, Coin, Delete, Plus, ArrowDown, ArrowLeftBold, ArrowRightBold, Files, Search, CaretBottom, DocumentCopy, Grid, Memo, ScaleToOriginal, ZoomOut, ZoomIn, Right, Back, Document, ArrowRight, CopyDocument, Hide, Goods, List, EditPen, CloseBold, Top, Bottom } from '@element-plus/icons-vue';
+import { throttle, isEmpty, isObject, cloneDeep, mergeWith, uniq, get, map, has, pick, keys } from 'lodash-es';
 import serialize from 'serialize-javascript';
 import { emmetHTML, emmetCSS } from 'emmet-monaco-es';
 import * as monaco from 'monaco-editor';
 import { HookCodeType, HookType, NODE_CONDS_KEY, Target, Watcher, NodeType, ActionType, DepTargetType, DEFAULT_EVENTS, DEFAULT_METHODS, createCodeBlockTarget, createDataSourceTarget, createDataSourceMethodTarget, createDataSourceCondTarget } from '@tmagic/core';
 export { DepTargetType } from '@tmagic/core';
-import { isPage, isPageFragment, isPop, getNodePath, isNumber, getElById, calcValueByFontsize, toLine, guid, getValueByKeyPath, setValueByKeyPath, dataSourceTemplateRegExp, getKeysArray, DATA_SOURCE_FIELDS_SELECT_VALUE_PREFIX, getKeys, convertToNumber, getIdFromEl, getDefaultValueFromFields, DATA_SOURCE_FIELDS_CHANGE_EVENT_PREFIX, removeClassName, addClassName, removeClassNameByClassName } from '@tmagic/utils';
+import { isPage, isPageFragment, isPop, getNodePath, isNumber, getElById, calcValueByFontsize, isValueIncludeDataSource, toLine, guid, getValueByKeyPath, setValueByKeyPath, getNodeInfo, dataSourceTemplateRegExp, getKeysArray, DATA_SOURCE_FIELDS_SELECT_VALUE_PREFIX, getKeys, convertToNumber, getIdFromEl, traverseNode, getDefaultValueFromFields, DATA_SOURCE_FIELDS_CHANGE_EVENT_PREFIX, removeClassName, addClassName, removeClassNameByClassName, getNodes } from '@tmagic/utils';
 export * from '@tmagic/utils';
 import VanillaMoveable from 'moveable';
 import StageCore__default, { isFixed, GuidesType, getOffset, RenderType, CONTAINER_HIGHLIGHT_CLASS_NAME, ContainerHighlightType } from '@tmagic/stage';
@@ -23,10 +23,11 @@ export * from '@tmagic/stage';
 export { default as StageCore } from '@tmagic/stage';
 import { EventEmitter } from 'events';
 import Gesto from 'gesto';
+import { detailedDiff } from 'deep-object-diff';
 import Sortable from 'sortablejs';
 import KeyController from 'keycon';
 
-const _hoisted_1$w = ["src"];
+const _hoisted_1$x = ["src"];
 const _sfc_main$Y = /* @__PURE__ */ defineComponent({
   ...{
     name: "MEditorIcon"
@@ -51,7 +52,7 @@ const _sfc_main$Y = /* @__PURE__ */ defineComponent({
         class: "magic-editor-icon"
       }, {
         default: withCtx(() => [
-          createElementVNode("img", { src: _ctx.icon }, null, 8, _hoisted_1$w)
+          createElementVNode("img", { src: _ctx.icon }, null, 8, _hoisted_1$x)
         ]),
         _: 1
       })) : typeof _ctx.icon === "string" ? (openBlock(), createElementBlock("i", {
@@ -79,7 +80,7 @@ const getEditorConfig = (key) => $TMAGIC_EDITOR[key];
 emmetHTML(monaco);
 emmetCSS(monaco, ["css", "scss"]);
 
-const _hoisted_1$v = {
+const _hoisted_1$w = {
   class: /* @__PURE__ */ normalizeClass(`magic-code-editor`)
 };
 const _sfc_main$X = /* @__PURE__ */ defineComponent({
@@ -239,7 +240,7 @@ const _sfc_main$X = /* @__PURE__ */ defineComponent({
       }
     });
     return (_ctx, _cache) => {
-      return openBlock(), createElementBlock("div", _hoisted_1$v, [
+      return openBlock(), createElementBlock("div", _hoisted_1$w, [
         (openBlock(), createBlock(Teleport, {
           to: "body",
           disabled: !fullScreen.value
@@ -290,9 +291,7 @@ const _sfc_main$W = /* @__PURE__ */ defineComponent({
   emits: ["change"],
   setup(__props, { emit: __emit }) {
     const emit = __emit;
-    const props = __props;
     const save = (v) => {
-      props.model[props.name] = v;
       emit("change", v);
     };
     return (_ctx, _cache) => {
@@ -442,11 +441,13 @@ const _sfc_main$U = /* @__PURE__ */ defineComponent({
                 { value: HookCodeType.DATA_SOURCE_METHOD, text: "数据源方法" }
               ],
               defaultValue: "code",
-              onChange: (mForm, v, { model }) => {
+              onChange: (mForm, v, { model, prop, changeRecords }) => {
                 if (v === HookCodeType.DATA_SOURCE_METHOD) {
                   model.codeId = [];
+                  changeRecords.push({ propPath: prop.replace("codeType", "codeId"), value: [] });
                 } else {
                   model.codeId = "";
+                  changeRecords.push({ propPath: prop.replace("codeType", "codeId"), value: "" });
                 }
                 return v;
               }
@@ -485,9 +486,7 @@ const _sfc_main$U = /* @__PURE__ */ defineComponent({
         immediate: true
       }
     );
-    const changeHandler = async () => {
-      emit("change", props.model[props.name]);
-    };
+    const changeHandler = (v, eventData) => emit("change", v, eventData);
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", {
         class: normalizeClass(["m-fields-code-select", _ctx.config.className])
@@ -569,7 +568,7 @@ const styleTabConfig = {
               fieldConfig: {
                 type: "text"
               },
-              disabled: (vm, { model }) => model.position === "fixed" && model._magic_position === "fixedBottom"
+              disabled: (_vm, { model }) => model.position === "fixed" && model._magic_position === "fixedBottom"
             },
             {
               type: "data-source-field-select",
@@ -590,7 +589,7 @@ const styleTabConfig = {
               fieldConfig: {
                 type: "text"
               },
-              disabled: (vm, { model }) => model.position === "fixed" && model._magic_position === "fixedTop"
+              disabled: (_vm, { model }) => model.position === "fixed" && model._magic_position === "fixedTop"
             }
           ]
         },
@@ -839,7 +838,7 @@ const advancedTabConfig = {
 };
 const displayTabConfig = {
   title: "显示条件",
-  display: (vm, { model }) => model.type !== "page",
+  display: (_vm, { model }) => model.type !== "page",
   items: [
     {
       type: "display-conds",
@@ -1147,15 +1146,6 @@ const serializeConfig = (config) => serialize(config, {
   space: 2,
   unsafe: true
 }).replace(/"(\w+)":\s/g, "$1: ");
-const traverseNode = (node, cb, parents = []) => {
-  cb(node, parents);
-  if (Array.isArray(node.items) && node.items.length) {
-    parents.push(node);
-    node.items.forEach((item) => {
-      traverseNode(item, cb, [...parents]);
-    });
-  }
-};
 const moveItemsInContainer = (sourceIndices, parent, targetIndex) => {
   sourceIndices.sort((a, b) => a - b);
   for (let i = sourceIndices.length - 1; i >= 0; i--) {
@@ -1172,6 +1162,55 @@ const moveItemsInContainer = (sourceIndices, parent, targetIndex) => {
     }
   }
 };
+const isIncludeDataSourceByDiffAddResult = (diffResult) => {
+  for (const value of Object.values(diffResult)) {
+    const result = isValueIncludeDataSource(value);
+    if (result) {
+      return true;
+    }
+    if (isObject(value)) {
+      return isIncludeDataSourceByDiffAddResult(value);
+    }
+  }
+  return false;
+};
+const isIncludeDataSourceByDiffUpdatedResult = (diffResult, oldNode) => {
+  for (const [key, value] of Object.entries(diffResult)) {
+    if (isValueIncludeDataSource(value)) {
+      return true;
+    }
+    if (isValueIncludeDataSource(oldNode[key])) {
+      return true;
+    }
+    if (isObject(value)) {
+      return isIncludeDataSourceByDiffUpdatedResult(value, oldNode[key]);
+    }
+  }
+  return false;
+};
+const isIncludeDataSource = (node, oldNode) => {
+  const diffResult = detailedDiff(oldNode, node);
+  let isIncludeDataSource2 = false;
+  if (diffResult.updated) {
+    if (diffResult.updated[NODE_CONDS_KEY]) {
+      return true;
+    }
+    isIncludeDataSource2 = isIncludeDataSourceByDiffUpdatedResult(diffResult.updated, oldNode);
+    if (isIncludeDataSource2) return true;
+  }
+  if (diffResult.added) {
+    isIncludeDataSource2 = isIncludeDataSourceByDiffAddResult(diffResult.added);
+    if (isIncludeDataSource2) return true;
+  }
+  if (diffResult.deleted) {
+    if (diffResult.deleted[NODE_CONDS_KEY]) {
+      return true;
+    }
+    isIncludeDataSource2 = isIncludeDataSourceByDiffAddResult(diffResult.deleted);
+    if (isIncludeDataSource2) return true;
+  }
+  return isIncludeDataSource2;
+};
 
 const compose = (middleware, isAsync) => {
   if (!Array.isArray(middleware)) throw new TypeError("Middleware 必须是一个数组!");
@@ -1877,28 +1916,7 @@ class Editor extends BaseService {
     if (raw) {
       root = toRaw(root);
     }
-    const info = {
-      node: null,
-      parent: null,
-      page: null
-    };
-    if (!root) return info;
-    if (id === root.id) {
-      info.node = root;
-      return info;
-    }
-    const path = getNodePath(id, root.items);
-    if (!path.length) return info;
-    path.unshift(root);
-    info.node = path[path.length - 1];
-    info.parent = path[path.length - 2];
-    path.forEach((item) => {
-      if (isPage(item) || isPageFragment(item)) {
-        info.page = item;
-        return;
-      }
-    });
-    return info;
+    return getNodeInfo(id, root);
   }
   /**
    * 根据ID获取指点节点配置
@@ -2119,10 +2137,10 @@ class Editor extends BaseService {
     const rootItems = root.items || [];
     if (isPage(node)) {
       this.state.pageLength -= 1;
-      await selectDefault(getPageList(root));
+      await selectDefault(rootItems);
     } else if (isPageFragment(node)) {
       this.state.pageFragmentLength -= 1;
-      await selectDefault(getPageFragmentList(root));
+      await selectDefault(rootItems);
     } else {
       await this.select(parent);
       stage?.select(parent.id);
@@ -2145,13 +2163,13 @@ class Editor extends BaseService {
     }
     this.emit("remove", nodes);
   }
-  async doUpdate(config) {
+  async doUpdate(config, { changeRecords = [] } = {}) {
     const root = this.get("root");
     if (!root) throw new Error("root为空");
     if (!config?.id) throw new Error("没有配置或者配置缺少id值");
     const info = this.getNodeInfo(config.id, false);
     if (!info.node) throw new Error(`获取不到id为${config.id}的节点`);
-    const node = cloneDeep(toRaw(info.node));
+    const node = toRaw(info.node);
     let newConfig = await this.toggleFixedPosition(toRaw(config), node, root);
     newConfig = mergeWith(cloneDeep(node), newConfig, (objValue, srcValue, key) => {
       if (typeof srcValue === "undefined" && Object.hasOwn(newConfig, key)) {
@@ -2167,7 +2185,11 @@ class Editor extends BaseService {
     if (!newConfig.type) throw new Error("配置缺少type值");
     if (newConfig.type === NodeType.ROOT) {
       this.set("root", newConfig);
-      return newConfig;
+      return {
+        oldNode: node,
+        newNode: newConfig,
+        changeRecords
+      };
     }
     const { parent } = info;
     if (!parent) throw new Error("获取不到父级节点");
@@ -2184,30 +2206,29 @@ class Editor extends BaseService {
     const targetIndex = nodes.findIndex((nodeItem) => `${nodeItem.id}` === `${newConfig.id}`);
     nodes.splice(targetIndex, 1, newConfig);
     this.set("nodes", [...nodes]);
-    this.get("stage")?.update({
-      config: cloneDeep(newConfig),
-      parentId: parent.id,
-      root: cloneDeep(root)
-    });
     if (isPage(newConfig) || isPageFragment(newConfig)) {
       this.set("page", newConfig);
     }
     this.addModifiedNodeId(newConfig.id);
-    return newConfig;
+    return {
+      oldNode: node,
+      newNode: newConfig,
+      changeRecords
+    };
   }
   /**
    * 更新节点
    * @param config 新的节点配置，配置中需要有id信息
    * @returns 更新后的节点配置
    */
-  async update(config) {
+  async update(config, data = {}) {
     const nodes = Array.isArray(config) ? config : [config];
-    const newNodes = await Promise.all(nodes.map((node) => this.doUpdate(node)));
-    if (newNodes[0]?.type !== NodeType.ROOT) {
+    const updateData = await Promise.all(nodes.map((node) => this.doUpdate(node, data)));
+    if (updateData[0].oldNode?.type !== NodeType.ROOT) {
       this.pushHistoryState();
     }
-    this.emit("update", newNodes);
-    return Array.isArray(config) ? newNodes : newNodes[0];
+    this.emit("update", updateData);
+    return Array.isArray(config) ? updateData.map((item) => item.newNode) : updateData[0].newNode;
   }
   /**
    * 将id为id1的组件移动到id为id2的组件位置上，例如：[1,2,3,4] -> sort(1,3) -> [2,1,3,4]
@@ -2401,7 +2422,7 @@ class Editor extends BaseService {
       parent.items?.splice(index, 1);
       await stage.remove({ id: node.id, parentId: parent.id, root: cloneDeep(root) });
       const layout = await this.getLayout(target);
-      const newConfig = mergeWith(cloneDeep(node), config, (objValue, srcValue) => {
+      const newConfig = mergeWith(cloneDeep(node), config, (_objValue, srcValue) => {
         if (Array.isArray(srcValue)) {
           return srcValue;
         }
@@ -2410,7 +2431,11 @@ class Editor extends BaseService {
       target.items.push(newConfig);
       await stage.select(targetId);
       const targetParent = this.getParentById(target.id);
-      await stage.update({ config: cloneDeep(target), parentId: targetParent?.id, root: cloneDeep(root) });
+      await stage.update({
+        config: cloneDeep(target),
+        parentId: targetParent?.id,
+        root: cloneDeep(root)
+      });
       await this.select(newConfig);
       stage.select(newConfig.id);
       this.addModifiedNodeId(target.id);
@@ -2763,6 +2788,7 @@ const HttpFormConfig = [
         name: "params",
         type: "key-value",
         defaultValue: {},
+        advanced: true,
         text: "参数"
       },
       {
@@ -2776,6 +2802,7 @@ const HttpFormConfig = [
         name: "headers",
         type: "key-value",
         defaultValue: {},
+        advanced: true,
         text: "请求头"
       }
     ]
@@ -2830,7 +2857,7 @@ const fillConfig = (config) => [
       },
       {
         title: "请求参数裁剪",
-        display: (formState, { model }) => model.type === "http",
+        display: (_formState, { model }) => model.type === "http",
         items: [
           {
             name: "beforeRequest",
@@ -2842,7 +2869,7 @@ const fillConfig = (config) => [
       },
       {
         title: "响应数据裁剪",
-        display: (formState, { model }) => model.type === "http",
+        display: (_formState, { model }) => model.type === "http",
         items: [
           {
             name: "afterResponse",
@@ -3009,6 +3036,10 @@ globalThis.requestIdleCallback = globalThis.requestIdleCallback || function(cb)
 class IdleTask extends EventEmitter {
   taskList = [];
   taskHandle = null;
+  constructor() {
+    super();
+    this.setMaxListeners(1e3);
+  }
   enqueueTask(taskHandler, taskData) {
     this.taskList.push({
       handler: taskHandler,
@@ -3018,6 +3049,9 @@ class IdleTask extends EventEmitter {
       this.taskHandle = globalThis.requestIdleCallback(this.runTaskQueue.bind(this), { timeout: 1e4 });
     }
   }
+  clearTasks() {
+    this.taskList = [];
+  }
   on(eventName, listener) {
     return super.on(eventName, listener);
   }
@@ -3028,12 +3062,30 @@ class IdleTask extends EventEmitter {
     return super.emit(eventName, ...args);
   }
   runTaskQueue(deadline) {
-    while ((deadline.timeRemaining() > 15 || deadline.didTimeout) && this.taskList.length) {
-      const task = this.taskList.shift();
-      task.handler(task.data);
+    while (deadline.timeRemaining() > 0 && this.taskList.length) {
+      const timeRemaining = deadline.timeRemaining();
+      let times = 0;
+      if (timeRemaining <= 5) {
+        times = 10;
+      } else if (timeRemaining <= 10) {
+        times = 100;
+      } else if (timeRemaining <= 15) {
+        times = 300;
+      } else {
+        times = 600;
+      }
+      for (let i = 0; i < times; i++) {
+        const task = this.taskList.shift();
+        if (task) {
+          task.handler(task.data);
+        }
+        if (this.taskList.length === 0) {
+          break;
+        }
+      }
     }
     if (this.taskList.length) {
-      this.taskHandle = globalThis.requestIdleCallback(this.runTaskQueue.bind(this), { timeout: 1e4 });
+      this.taskHandle = globalThis.requestIdleCallback(this.runTaskQueue.bind(this), { timeout: 300 });
     } else {
       this.taskHandle = 0;
       this.emit("finish");
@@ -3215,10 +3267,10 @@ const _sfc_main$T = /* @__PURE__ */ defineComponent({
         }))
       )
     );
-    const onParamsChangeHandler = async () => {
+    const onParamsChangeHandler = async (v, eventData) => {
       try {
         const value = await form.value?.submitForm(true);
-        emit("change", value);
+        emit("change", value, eventData);
       } catch (e) {
         error(e);
       }
@@ -3238,8 +3290,8 @@ const _sfc_main$T = /* @__PURE__ */ defineComponent({
   }
 });
 
-const _hoisted_1$u = { class: "m-fields-code-select-col" };
-const _hoisted_2$g = { class: "code-select-container" };
+const _hoisted_1$v = { class: "m-fields-code-select-col" };
+const _hoisted_2$h = { class: "code-select-container" };
 const _sfc_main$S = /* @__PURE__ */ defineComponent({
   ...{
     name: "MFieldsCodeSelectCol"
@@ -3311,22 +3363,39 @@ const _sfc_main$S = /* @__PURE__ */ defineComponent({
         return codeId;
       }
     };
-    const onParamsChangeHandler = (value) => {
+    const onCodeIdChangeHandler = (value) => {
       props.model.params = value.params;
-      emit("change", props.model);
+      emit("change", props.model, {
+        changeRecords: [
+          {
+            propPath: props.prop,
+            value: value[props.name]
+          }
+        ]
+      });
+    };
+    const onParamsChangeHandler = (value, eventData) => {
+      props.model.params = value.params;
+      emit("change", props.model, {
+        ...eventData,
+        changeRecords: (eventData.changeRecords || []).map((item) => ({
+          prop: `${props.prop.replace(props.name, "")}${item.propPath}`,
+          value: item.value
+        }))
+      });
     };
     const editCode = (id) => {
       eventBus?.emit("edit-code", id);
     };
     return (_ctx, _cache) => {
-      return openBlock(), createElementBlock("div", _hoisted_1$u, [
-        createElementVNode("div", _hoisted_2$g, [
+      return openBlock(), createElementBlock("div", _hoisted_1$v, [
+        createElementVNode("div", _hoisted_2$h, [
           createVNode(unref(MContainer), {
             class: "select",
             config: selectConfig,
             model: _ctx.model,
             size: _ctx.size,
-            onChange: onParamsChangeHandler
+            onChange: onCodeIdChangeHandler
           }, null, 8, ["model", "size"]),
           _ctx.model[_ctx.name] && hasCodeBlockSidePanel.value ? (openBlock(), createBlock(unref(TMagicButton), {
             key: 0,
@@ -3625,7 +3694,7 @@ const useCodeBlockEdit = (codeBlockService) => {
     }
     codeConfig.value = {
       name: "",
-      content: `({app, params}) => {
+      content: `({app, params, flowState}) => {
   // place your code here
 }`,
       params: []
@@ -3671,78 +3740,6 @@ const useCodeBlockEdit = (codeBlockService) => {
   };
 };
 
-const useDataSourceMethod = () => {
-  const codeConfig = ref();
-  const codeBlockEditor = ref();
-  const dataSource = ref();
-  const dataSourceMethod = ref("");
-  return {
-    codeConfig,
-    codeBlockEditor,
-    createCode: async (model) => {
-      codeConfig.value = {
-        name: "",
-        content: `({ params, dataSource, app }) => {
-  // place your code here
-}`,
-        params: []
-      };
-      await nextTick();
-      dataSource.value = model;
-      dataSourceMethod.value = "";
-      codeBlockEditor.value?.show();
-    },
-    editCode: async (model, methodName) => {
-      const method = model.methods?.find((method2) => method2.name === methodName);
-      if (!method) {
-        tMagicMessage.error("获取数据源方法失败");
-        return;
-      }
-      let codeContent = method.content || `({ params, dataSource, app }) => {
-  // place your code here
-}`;
-      if (typeof codeContent !== "string") {
-        codeContent = codeContent.toString();
-      }
-      codeConfig.value = {
-        ...cloneDeep(method),
-        content: codeContent
-      };
-      await nextTick();
-      dataSource.value = model;
-      dataSourceMethod.value = methodName;
-      codeBlockEditor.value?.show();
-    },
-    deleteCode: async (model, methodName) => {
-      if (!model.methods) return;
-      const index = model.methods.findIndex((method) => method.name === methodName);
-      if (index === -1) {
-        return;
-      }
-      model.methods.splice(index, 1);
-    },
-    submitCode: (values) => {
-      if (!dataSource.value) return;
-      if (!dataSource.value.methods) {
-        dataSource.value.methods = [];
-      }
-      if (values.content) {
-        const parseDSL = getEditorConfig("parseDSL");
-        if (typeof values.content === "string") {
-          values.content = parseDSL(values.content);
-        }
-      }
-      if (dataSourceMethod.value) {
-        const index = dataSource.value.methods.findIndex((method) => method.name === dataSourceMethod.value);
-        dataSource.value.methods.splice(index, 1, values);
-      } else {
-        dataSource.value.methods.push(values);
-      }
-      codeBlockEditor.value?.hide();
-    }
-  };
-};
-
 const state = reactive({
   uiSelectMode: false,
   showSrc: false,
@@ -4190,8 +4187,8 @@ const useNodeStatus$1 = (nodeData) => {
   };
 };
 
-const _hoisted_1$t = { class: "m-editor-data-source-fields" };
-const _hoisted_2$f = { class: "m-editor-data-source-fields-footer" };
+const _hoisted_1$u = { class: "m-editor-data-source-fields" };
+const _hoisted_2$g = { class: "m-editor-data-source-fields-footer" };
 const _sfc_main$P = /* @__PURE__ */ defineComponent({
   ...{
     name: "MFieldsDataSourceFields"
@@ -4229,14 +4226,28 @@ const _sfc_main$P = /* @__PURE__ */ defineComponent({
       calcBoxPosition();
       addDialogVisible.value = true;
     };
-    const fieldChange = ({ index, ...value }) => {
+    const fieldChange = ({ index, ...value }, data) => {
+      addDialogVisible.value = false;
       if (index > -1) {
-        props.model[props.name][index] = value;
+        emit("change", value, {
+          modifyKey: index,
+          changeRecords: (data.changeRecords || []).map((item) => ({
+            propPath: `${props.prop}.${index}.${item.propPath}`,
+            value: item.value
+          }))
+        });
       } else {
-        props.model[props.name].push(value);
+        const modifyKey = props.model[props.name].length;
+        emit("change", value, {
+          modifyKey,
+          changeRecords: [
+            {
+              propPath: `${props.prop}.${modifyKey}`,
+              value
+            }
+          ]
+        });
       }
-      addDialogVisible.value = false;
-      emit("change", props.model[props.name]);
     };
     const fieldColumns = [
       {
@@ -4430,9 +4441,8 @@ const _sfc_main$P = /* @__PURE__ */ defineComponent({
     const addFromJsonFromChange = ({ data }) => {
       try {
         const value = JSON.parse(data);
-        props.model[props.name] = getFieldsConfig(value, props.model[props.name]);
         addFromJsonDialogVisible.value = false;
-        emit("change", props.model[props.name]);
+        emit("change", getFieldsConfig(value, props.model[props.name]));
       } catch (e) {
         tMagicMessage.error(e.message);
       }
@@ -4443,12 +4453,12 @@ const _sfc_main$P = /* @__PURE__ */ defineComponent({
     const parentFloating = inject("parentFloating", ref(null));
     const { boxPosition, calcBoxPosition } = useNextFloatBoxPosition(services?.uiService, parentFloating);
     return (_ctx, _cache) => {
-      return openBlock(), createElementBlock("div", _hoisted_1$t, [
+      return openBlock(), createElementBlock("div", _hoisted_1$u, [
         createVNode(unref(MagicTable), {
           data: _ctx.model[_ctx.name],
           columns: fieldColumns
         }, null, 8, ["data"]),
-        createElementVNode("div", _hoisted_2$f, [
+        createElementVNode("div", _hoisted_2$g, [
           createVNode(unref(TMagicButton), {
             size: "small",
             disabled: _ctx.disabled,
@@ -4521,7 +4531,7 @@ const _sfc_main$P = /* @__PURE__ */ defineComponent({
   }
 });
 
-const _hoisted_1$s = { class: "m-editor-data-source-field-select" };
+const _hoisted_1$t = { class: "m-editor-data-source-field-select" };
 const _sfc_main$O = /* @__PURE__ */ defineComponent({
   __name: "FieldSelect",
   props: /* @__PURE__ */ mergeModels({
@@ -4603,7 +4613,7 @@ const _sfc_main$O = /* @__PURE__ */ defineComponent({
       eventBus?.emit("edit-data-source", removeDataSourceFieldPrefix(id));
     };
     return (_ctx, _cache) => {
-      return openBlock(), createElementBlock("div", _hoisted_1$s, [
+      return openBlock(), createElementBlock("div", _hoisted_1$t, [
         _ctx.checkStrictly ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
           createVNode(unref(TMagicSelect), {
             "model-value": selectDataSourceId.value,
@@ -4685,7 +4695,7 @@ const _sfc_main$O = /* @__PURE__ */ defineComponent({
   }
 });
 
-const _hoisted_1$r = { class: "m-fields-data-source-field-select" };
+const _hoisted_1$s = { class: "m-fields-data-source-field-select" };
 const _sfc_main$N = /* @__PURE__ */ defineComponent({
   ...{
     name: "MFieldsDataSourceFieldSelect"
@@ -4787,7 +4797,7 @@ const _sfc_main$N = /* @__PURE__ */ defineComponent({
       }
     };
     return (_ctx, _cache) => {
-      return openBlock(), createElementBlock("div", _hoisted_1$r, [
+      return openBlock(), createElementBlock("div", _hoisted_1$s, [
         showDataSourceFieldSelect.value || !_ctx.config.fieldConfig ? (openBlock(), createBlock(_sfc_main$O, {
           key: 0,
           "model-value": _ctx.model[_ctx.name],
@@ -4835,8 +4845,8 @@ const _sfc_main$N = /* @__PURE__ */ defineComponent({
   }
 });
 
-const _hoisted_1$q = { style: { "display": "flex", "flex-direction": "column", "line-height": "1.2em" } };
-const _hoisted_2$e = { style: { "font-size": "10px", "color": "rgba(0, 0, 0, 0.6)" } };
+const _hoisted_1$r = { style: { "display": "flex", "flex-direction": "column", "line-height": "1.2em" } };
+const _hoisted_2$f = { style: { "font-size": "10px", "color": "rgba(0, 0, 0, 0.6)" } };
 const _hoisted_3$4 = { class: "el-input__inner t-input__inner" };
 const _sfc_main$M = /* @__PURE__ */ defineComponent({
   ...{
@@ -5041,9 +5051,9 @@ const _sfc_main$M = /* @__PURE__ */ defineComponent({
           createVNode(_sfc_main$Y, { icon: unref(Coin) }, null, 8, ["icon"])
         ]),
         default: withCtx(({ item }) => [
-          createElementVNode("div", _hoisted_1$q, [
+          createElementVNode("div", _hoisted_1$r, [
             createElementVNode("div", null, toDisplayString(item.text), 1),
-            createElementVNode("span", _hoisted_2$e, toDisplayString(item.value), 1)
+            createElementVNode("span", _hoisted_2$f, toDisplayString(item.value), 1)
           ])
         ]),
         _: 1
@@ -5084,8 +5094,8 @@ const _sfc_main$M = /* @__PURE__ */ defineComponent({
   }
 });
 
-const _hoisted_1$p = { style: { "display": "flex", "margin-bottom": "10px" } };
-const _hoisted_2$d = { style: { "flex": "1" } };
+const _hoisted_1$q = { style: { "display": "flex", "margin-bottom": "10px" } };
+const _hoisted_2$e = { style: { "flex": "1" } };
 const _hoisted_3$3 = { style: { "flex": "1" } };
 const _hoisted_4$3 = { class: "dialog-footer" };
 const _sfc_main$L = /* @__PURE__ */ defineComponent({
@@ -5216,9 +5226,9 @@ const _sfc_main$L = /* @__PURE__ */ defineComponent({
         }
       }
     ]);
-    const submitForm = (values) => {
+    const submitForm = (values, data) => {
       changedValue.value = void 0;
-      emit("submit", values);
+      emit("submit", values, data);
     };
     const errorHandler = (error) => {
       tMagicMessage.error(error.message);
@@ -5239,7 +5249,7 @@ const _sfc_main$L = /* @__PURE__ */ defineComponent({
         type: "warning",
         distinguishCancelAndClose: true
       }).then(() => {
-        changedValue.value && submitForm(changedValue.value);
+        changedValue.value && submitForm(changedValue.value, { changeRecords: formBox.value?.form?.changeRecords });
         done();
       }).catch((action) => {
         done(action === "cancel");
@@ -5338,8 +5348,8 @@ const _sfc_main$L = /* @__PURE__ */ defineComponent({
               ])
             ]),
             default: withCtx(() => [
-              createElementVNode("div", _hoisted_1$p, [
-                createElementVNode("div", _hoisted_2$d, [
+              createElementVNode("div", _hoisted_1$q, [
+                createElementVNode("div", _hoisted_2$e, [
                   createVNode(unref(TMagicTag), {
                     size: "small",
                     type: "info"
@@ -5381,8 +5391,8 @@ const _sfc_main$L = /* @__PURE__ */ defineComponent({
   }
 });
 
-const _hoisted_1$o = { class: "m-editor-data-source-methods" };
-const _hoisted_2$c = { class: "m-editor-data-source-methods-footer" };
+const _hoisted_1$p = { class: "m-editor-data-source-methods" };
+const _hoisted_2$d = { class: "m-editor-data-source-methods-footer" };
 const _sfc_main$K = /* @__PURE__ */ defineComponent({
   ...{
     name: "MFieldsDataSourceMethods"
@@ -5403,7 +5413,9 @@ const _sfc_main$K = /* @__PURE__ */ defineComponent({
   setup(__props, { emit: __emit }) {
     const props = __props;
     const emit = __emit;
-    const { codeConfig, codeBlockEditor, createCode, editCode, deleteCode, submitCode } = useDataSourceMethod();
+    const codeConfig = ref();
+    const codeBlockEditor = ref();
+    let editIndex = -1;
     const methodColumns = [
       {
         label: "名称",
@@ -5428,16 +5440,29 @@ const _sfc_main$K = /* @__PURE__ */ defineComponent({
         actions: [
           {
             text: "编辑",
-            handler: (row) => {
-              editCode(props.model, row.name);
-              emit("change", props.model[props.name]);
+            handler: (method, index) => {
+              let codeContent = method.content || `({ params, dataSource, app }) => {
+  // place your code here
+}`;
+              if (typeof codeContent !== "string") {
+                codeContent = codeContent.toString();
+              }
+              codeConfig.value = {
+                ...cloneDeep(method),
+                content: codeContent
+              };
+              editIndex = index;
+              nextTick(() => {
+                codeBlockEditor.value?.show();
+              });
             }
           },
           {
             text: "删除",
             buttonType: "danger",
-            handler: (row) => {
-              deleteCode(props.model, row.name);
+            handler: async (row, index) => {
+              await tMagicMessageBox.confirm(`确定删除${row.name}?`, "提示");
+              props.model[props.name].splice(index, 1);
               emit("change", props.model[props.name]);
             }
           }
@@ -5445,20 +5470,56 @@ const _sfc_main$K = /* @__PURE__ */ defineComponent({
       }
     ];
     const createCodeHandler = () => {
-      createCode(props.model);
-      emit("change", props.model[props.name]);
+      codeConfig.value = {
+        name: "",
+        content: `({ params, dataSource, app, flowState }) => {
+  // place your code here
+}`,
+        params: []
+      };
+      editIndex = -1;
+      nextTick(() => {
+        codeBlockEditor.value?.show();
+      });
     };
-    const submitCodeHandler = (values) => {
-      submitCode(values);
-      emit("change", props.model[props.name]);
+    const submitCodeHandler = (value, data) => {
+      if (value.content) {
+        const parseDSL = getEditorConfig("parseDSL");
+        if (typeof value.content === "string") {
+          value.content = parseDSL(value.content);
+        }
+      }
+      if (editIndex > -1) {
+        emit("change", value, {
+          modifyKey: editIndex,
+          changeRecords: (data.changeRecords || []).map((item) => ({
+            propPath: `${props.prop}.${editIndex}.${item.propPath}`,
+            value: item.value
+          }))
+        });
+      } else {
+        const modifyKey = props.model[props.name].length;
+        emit("change", value, {
+          modifyKey,
+          changeRecords: [
+            {
+              propPath: `${props.prop}.${modifyKey}`,
+              value
+            }
+          ]
+        });
+      }
+      editIndex = -1;
+      codeConfig.value = void 0;
+      codeBlockEditor.value?.hide();
     };
     return (_ctx, _cache) => {
-      return openBlock(), createElementBlock("div", _hoisted_1$o, [
+      return openBlock(), createElementBlock("div", _hoisted_1$p, [
         createVNode(unref(MagicTable), {
           data: _ctx.model[_ctx.name],
           columns: methodColumns
         }, null, 8, ["data"]),
-        createElementVNode("div", _hoisted_2$c, [
+        createElementVNode("div", _hoisted_2$d, [
           createVNode(unref(TMagicButton), {
             size: "small",
             type: "primary",
@@ -5472,12 +5533,12 @@ const _sfc_main$K = /* @__PURE__ */ defineComponent({
             _: 1
           }, 8, ["disabled"])
         ]),
-        unref(codeConfig) ? (openBlock(), createBlock(_sfc_main$L, {
+        codeConfig.value ? (openBlock(), createBlock(_sfc_main$L, {
           key: 0,
           ref_key: "codeBlockEditor",
           ref: codeBlockEditor,
           disabled: _ctx.disabled,
-          content: unref(codeConfig),
+          content: codeConfig.value,
           "is-data-source": true,
           "data-source-type": _ctx.model.type,
           onSubmit: submitCodeHandler
@@ -5487,8 +5548,8 @@ const _sfc_main$K = /* @__PURE__ */ defineComponent({
   }
 });
 
-const _hoisted_1$n = { class: "m-fields-data-source-method-select" };
-const _hoisted_2$b = { class: "data-source-method-select-container" };
+const _hoisted_1$o = { class: "m-fields-data-source-method-select" };
+const _hoisted_2$c = { class: "data-source-method-select-container" };
 const _sfc_main$J = /* @__PURE__ */ defineComponent({
   ...{
     name: "MFieldsDataSourceMethodSelect"
@@ -5575,8 +5636,8 @@ const _sfc_main$J = /* @__PURE__ */ defineComponent({
       eventBus?.emit("edit-data-source", id);
     };
     return (_ctx, _cache) => {
-      return openBlock(), createElementBlock("div", _hoisted_1$n, [
-        createElementVNode("div", _hoisted_2$b, [
+      return openBlock(), createElementBlock("div", _hoisted_1$o, [
+        createElementVNode("div", _hoisted_2$c, [
           createVNode(unref(MContainer), {
             class: "select",
             config: cascaderConfig.value,
@@ -5619,8 +5680,8 @@ const _sfc_main$J = /* @__PURE__ */ defineComponent({
   }
 });
 
-const _hoisted_1$m = { class: "m-editor-data-source-fields" };
-const _hoisted_2$a = { class: "m-editor-data-source-fields-footer" };
+const _hoisted_1$n = { class: "m-editor-data-source-fields" };
+const _hoisted_2$b = { class: "m-editor-data-source-fields-footer" };
 const _sfc_main$I = /* @__PURE__ */ defineComponent({
   ...{
     name: "MFieldsDataSourceMocks"
@@ -5825,12 +5886,12 @@ const _sfc_main$I = /* @__PURE__ */ defineComponent({
     const parentFloating = inject("parentFloating", ref(null));
     const { boxPosition, calcBoxPosition } = useNextFloatBoxPosition(services?.uiService, parentFloating);
     return (_ctx, _cache) => {
-      return openBlock(), createElementBlock("div", _hoisted_1$m, [
+      return openBlock(), createElementBlock("div", _hoisted_1$n, [
         createVNode(unref(MagicTable), {
           data: _ctx.model[_ctx.name],
           columns
         }, null, 8, ["data"]),
-        createElementVNode("div", _hoisted_2$a, [
+        createElementVNode("div", _hoisted_2$b, [
           createVNode(unref(TMagicButton), {
             size: "small",
             type: "primary",
@@ -5872,7 +5933,7 @@ const _sfc_main$I = /* @__PURE__ */ defineComponent({
   }
 });
 
-const _hoisted_1$l = { class: "m-fields-data-source-select" };
+const _hoisted_1$m = { class: "m-fields-data-source-select" };
 const _sfc_main$H = /* @__PURE__ */ defineComponent({
   ...{
     name: "MFieldsDataSourceSelect"
@@ -5930,7 +5991,7 @@ const _sfc_main$H = /* @__PURE__ */ defineComponent({
       eventBus?.emit("edit-data-source", id);
     };
     return (_ctx, _cache) => {
-      return openBlock(), createElementBlock("div", _hoisted_1$l, [
+      return openBlock(), createElementBlock("div", _hoisted_1$m, [
         createVNode(unref(MSelect), {
           model: _ctx.model,
           name: _ctx.name,
@@ -6075,8 +6136,11 @@ const _sfc_main$G = /* @__PURE__ */ defineComponent({
         }
       ]
     }));
-    const changeHandler = (v) => {
-      emit("change", v);
+    const changeHandler = (v, eventData) => {
+      if (!Array.isArray(props.model[props.name])) {
+        props.model[props.name] = [];
+      }
+      emit("change", v, eventData);
     };
     return (_ctx, _cache) => {
       return openBlock(), createBlock(unref(MGroupList), {
@@ -6094,8 +6158,8 @@ const _sfc_main$G = /* @__PURE__ */ defineComponent({
   }
 });
 
-const _hoisted_1$k = { class: "m-fields-event-select" };
-const _hoisted_2$9 = {
+const _hoisted_1$l = { class: "m-fields-event-select" };
+const _hoisted_2$a = {
   key: 1,
   class: "fullWidth"
 };
@@ -6147,7 +6211,7 @@ const _sfc_main$F = /* @__PURE__ */ defineComponent({
               if (pageFragment) {
                 events = [
                   {
-                    label: pageFragment.name || "迭代器容器",
+                    label: pageFragment.name || "页面片容器",
                     value: pageFragment.id,
                     children: events
                   }
@@ -6360,20 +6424,22 @@ const _sfc_main$F = /* @__PURE__ */ defineComponent({
       if (!props.model[props.name]) {
         props.model[props.name] = [];
       }
-      props.model[props.name].push(defaultEvent);
-      onChangeHandler();
+      emit("change", defaultEvent, {
+        modifyKey: props.model[props.name].length
+      });
     };
     const removeEvent = (index) => {
       if (!props.name) return;
       props.model[props.name].splice(index, 1);
-      onChangeHandler();
+      emit("change", props.model[props.name]);
     };
-    const onChangeHandler = () => {
-      emit("change", props.model);
+    const eventNameChangeHandler = (v, eventData) => {
+      emit("change", props.model[props.name], eventData);
     };
+    const onChangeHandler = (v, eventData) => emit("change", props.model[props.name], eventData);
     return (_ctx, _cache) => {
       const _component_m_form_table = resolveComponent("m-form-table");
-      return openBlock(), createElementBlock("div", _hoisted_1$k, [
+      return openBlock(), createElementBlock("div", _hoisted_1$l, [
         isOldVersion.value ? (openBlock(), createBlock(_component_m_form_table, {
           key: 0,
           ref: "eventForm",
@@ -6383,7 +6449,7 @@ const _sfc_main$F = /* @__PURE__ */ defineComponent({
           model: _ctx.model,
           config: tableConfig.value,
           onChange: onChangeHandler
-        }, null, 8, ["size", "disabled", "model", "config"])) : (openBlock(), createElementBlock("div", _hoisted_2$9, [
+        }, null, 8, ["size", "disabled", "model", "config"])) : (openBlock(), createElementBlock("div", _hoisted_2$a, [
           createVNode(unref(TMagicButton), {
             class: "create-button",
             type: "primary",
@@ -6401,6 +6467,7 @@ const _sfc_main$F = /* @__PURE__ */ defineComponent({
               key: index,
               disabled: _ctx.disabled,
               size: _ctx.size,
+              prop: `${_ctx.prop}.${index}`,
               config: actionsConfig.value,
               model: cardItem,
               "label-width": _ctx.config.labelWidth || "100px",
@@ -6413,8 +6480,9 @@ const _sfc_main$F = /* @__PURE__ */ defineComponent({
                   model: cardItem,
                   disabled: _ctx.disabled,
                   size: _ctx.size,
-                  onChange: onChangeHandler
-                }, null, 8, ["config", "model", "disabled", "size"]),
+                  prop: `${_ctx.prop}.${index}`,
+                  onChange: eventNameChangeHandler
+                }, null, 8, ["config", "model", "disabled", "size", "prop"]),
                 createVNode(unref(TMagicButton), {
                   style: { "color": "#f56c6c" },
                   link: "",
@@ -6425,7 +6493,7 @@ const _sfc_main$F = /* @__PURE__ */ defineComponent({
                 }, null, 8, ["icon", "disabled", "size", "onClick"])
               ]),
               _: 2
-            }, 1032, ["disabled", "size", "config", "model", "label-width"]);
+            }, 1032, ["disabled", "size", "prop", "config", "model", "label-width"]);
           }), 128))
         ]))
       ]);
@@ -6433,7 +6501,7 @@ const _sfc_main$F = /* @__PURE__ */ defineComponent({
   }
 });
 
-const _hoisted_1$j = {
+const _hoisted_1$k = {
   viewBox: "0 0 32 32",
   version: "1.1",
   xmlns: "http://www.w3.org/2000/svg",
@@ -6446,15 +6514,15 @@ const _sfc_main$E = /* @__PURE__ */ defineComponent({
   __name: "CodeIcon",
   setup(__props) {
     return (_ctx, _cache) => {
-      return openBlock(), createElementBlock("svg", _hoisted_1$j, _cache[0] || (_cache[0] = [
+      return openBlock(), createElementBlock("svg", _hoisted_1$k, _cache[0] || (_cache[0] = [
         createStaticVNode('<defs><rect id="path-1" x="0" y="0" width="32" height="32"></rect></defs><g id="组件规范" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd"><g id="03图标" transform="translate(-561.000000, -2356.000000)"><g id="icon/line/Universal/code" transform="translate(561.000000, 2356.000000)"><g id="路径"><mask id="mask-2" fill="white"><use xlink:href="#path-1"></use></mask><use id="蒙版" fill="#D8D8D8" opacity="0" xlink:href="#path-1"></use><path d="M21.9284587,7.9482233 L29.8079004,15.827665 C29.9055315,15.9252961 29.9055315,16.0835874 29.8079004,16.1812184 L21.9284587,24.0606602 C21.8308276,24.1582912 21.6725364,24.1582912 21.5749053,24.0606602 L20.3374684,22.8232233 C20.2419143,22.7276698 20.2398813,22.5740096 20.331369,22.4759832 L20.3374687,22.4696702 L26.8027181,16.0044417 L20.3374687,9.53921328 C20.2398372,9.44158265 20.2398369,9.2832914 20.3374679,9.18566017 L21.5749053,7.9482233 C21.6725364,7.85059223 21.8308276,7.85059223 21.9284587,7.9482233 Z M10.3999684,7.9482233 L11.6374053,9.18566017 C11.7329594,9.28121371 11.7349925,9.43487387 11.6435048,9.53290029 L11.637405,9.53921328 L5.17215562,16.0044417 L11.637405,22.4696702 C11.7329593,22.5652236 11.7349926,22.7188837 11.643505,22.8169103 L11.6374053,22.8232233 L10.3999684,24.0606602 C10.3023374,24.1582912 10.1440461,24.1582912 10.046415,24.0606602 L2.1669733,16.1812184 C2.06934223,16.0835874 2.06934223,15.9252961 2.1669733,15.827665 L10.046415,7.9482233 C10.1440461,7.85059223 10.3023374,7.85059223 10.3999684,7.9482233 Z M17.2612532,9.29310422 L18.9262468,9.83189578 C19.0576112,9.87440526 19.1296423,10.0153579 19.0871328,10.1467222 L15.0848232,22.514807 C15.0423138,22.6461714 14.9013612,22.7182025 14.7699968,22.675693 L13.1050032,22.1369014 C12.9736388,22.0943919 12.9016077,21.9534393 12.9441172,21.822075 L16.9464268,9.45399022 C16.9889362,9.32262585 17.1298888,9.25059474 17.2612532,9.29310422 Z" id="形状" fill="#1D1F24" mask="url(#mask-2)"></path></g></g><g id="icon切图" transform="translate(226.000000, 1782.000000)"></g></g></g>', 2)
       ]));
     };
   }
 });
 
-const _hoisted_1$i = { class: "m-fields-key-value" };
-const _hoisted_2$8 = { key: 0 };
+const _hoisted_1$j = { class: "m-fields-key-value" };
+const _hoisted_2$9 = { key: 0 };
 const _sfc_main$D = /* @__PURE__ */ defineComponent({
   ...{
     name: "MFieldsKeyValue"
@@ -6478,14 +6546,18 @@ const _sfc_main$D = /* @__PURE__ */ defineComponent({
     const records = ref([]);
     const showCode = ref(false);
     watchEffect(() => {
-      const initValues = Object.entries(props.model[props.name] || {});
-      for (const [, value] of initValues) {
-        if (typeof value !== "string") {
-          showCode.value = true;
-          break;
+      if (typeof props.model[props.name] === "function") {
+        showCode.value = true;
+      } else {
+        const initValues = Object.entries(props.model[props.name] || {});
+        for (const [, value] of initValues) {
+          if (typeof value !== "string") {
+            showCode.value = true;
+            break;
+          }
         }
+        records.value = initValues;
       }
-      records.value = initValues;
     });
     const getValue = () => {
       const record = {};
@@ -6513,8 +6585,8 @@ const _sfc_main$D = /* @__PURE__ */ defineComponent({
       emit("change", v);
     };
     return (_ctx, _cache) => {
-      return openBlock(), createElementBlock("div", _hoisted_1$i, [
-        !showCode.value ? (openBlock(), createElementBlock("div", _hoisted_2$8, [
+      return openBlock(), createElementBlock("div", _hoisted_1$j, [
+        !showCode.value ? (openBlock(), createElementBlock("div", _hoisted_2$9, [
           (openBlock(true), createElementBlock(Fragment, null, renderList(records.value, (item, index) => {
             return openBlock(), createElementBlock("div", {
               class: "m-fields-key-value-item",
@@ -6567,7 +6639,7 @@ const _sfc_main$D = /* @__PURE__ */ defineComponent({
           key: 1,
           height: "200px",
           "init-values": _ctx.model[_ctx.name],
-          language: "json",
+          language: "javascript",
           options: {
             readOnly: _ctx.disabled
           },
@@ -6587,8 +6659,8 @@ const _sfc_main$D = /* @__PURE__ */ defineComponent({
   }
 });
 
-const _hoisted_1$h = { class: "m-fields-page-fragment-select" };
-const _hoisted_2$7 = { class: "page-fragment-select-container" };
+const _hoisted_1$i = { class: "m-fields-page-fragment-select" };
+const _hoisted_2$8 = { class: "page-fragment-select-container" };
 const _sfc_main$C = /* @__PURE__ */ defineComponent({
   ...{
     name: "MFieldsPageFragmentSelect"
@@ -6635,8 +6707,8 @@ const _sfc_main$C = /* @__PURE__ */ defineComponent({
     };
     return (_ctx, _cache) => {
       const _component_m_form_container = resolveComponent("m-form-container");
-      return openBlock(), createElementBlock("div", _hoisted_1$h, [
-        createElementVNode("div", _hoisted_2$7, [
+      return openBlock(), createElementBlock("div", _hoisted_1$i, [
+        createElementVNode("div", _hoisted_2$8, [
           createVNode(_component_m_form_container, {
             class: "select",
             config: selectConfig,
@@ -6656,7 +6728,7 @@ const _sfc_main$C = /* @__PURE__ */ defineComponent({
   }
 });
 
-const _hoisted_1$g = {
+const _hoisted_1$h = {
   key: 1,
   class: "m-fields-ui-select",
   style: { "display": "flex" }
@@ -6692,7 +6764,10 @@ const _sfc_main$B = /* @__PURE__ */ defineComponent({
       globalThis.document.removeEventListener(UI_SELECT_MODE_EVENT_NAME, clickHandler);
     };
     const clickHandler = ({ detail }) => {
-      const id = getIdFromEl()(detail);
+      let { id } = detail;
+      if (detail.nodeType) {
+        id = getIdFromEl()(detail) || id;
+      }
       if (id) {
         props.model[props.name] = id;
         emit("change", id);
@@ -6756,7 +6831,7 @@ const _sfc_main$B = /* @__PURE__ */ defineComponent({
           ])),
           _: 1
         }, 8, ["icon", "disabled", "size"])
-      ])) : (openBlock(), createElementBlock("div", _hoisted_1$g, [
+      ])) : (openBlock(), createElementBlock("div", _hoisted_1$h, [
         val.value ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
           createVNode(unref(TMagicTooltip), {
             content: "清除",
@@ -7005,11 +7080,11 @@ const _sfc_main$z = /* @__PURE__ */ defineComponent({
   }
 });
 
-const _hoisted_1$f = {
+const _hoisted_1$g = {
   key: 1,
   class: "menu-item-text"
 };
-const _hoisted_2$6 = { class: "el-dropdown-link menubar-menu-button" };
+const _hoisted_2$7 = { class: "el-dropdown-link menubar-menu-button" };
 const _sfc_main$y = /* @__PURE__ */ defineComponent({
   ...{
     name: "MEditorToolButton"
@@ -7081,7 +7156,7 @@ const _sfc_main$y = /* @__PURE__ */ defineComponent({
         _ctx.data.type === "divider" ? (openBlock(), createBlock(unref(TMagicDivider), {
           key: 0,
           direction: _ctx.data.direction || "vertical"
-        }, null, 8, ["direction"])) : _ctx.data.type === "text" ? (openBlock(), createElementBlock("div", _hoisted_1$f, toDisplayString(_ctx.data.text), 1)) : _ctx.data.type === "button" ? (openBlock(), createElementBlock(Fragment, { key: 2 }, [
+        }, null, 8, ["direction"])) : _ctx.data.type === "text" ? (openBlock(), createElementBlock("div", _hoisted_1$g, toDisplayString(_ctx.data.text), 1)) : _ctx.data.type === "button" ? (openBlock(), createElementBlock(Fragment, { key: 2 }, [
           _ctx.data.tooltip ? (openBlock(), createBlock(unref(TMagicTooltip), {
             key: 0,
             effect: "dark",
@@ -7146,7 +7221,7 @@ const _sfc_main$y = /* @__PURE__ */ defineComponent({
             })) : createCommentVNode("", true)
           ]),
           default: withCtx(() => [
-            createElementVNode("span", _hoisted_2$6, [
+            createElementVNode("span", _hoisted_2$7, [
               createTextVNode(toDisplayString(_ctx.data.text), 1),
               createVNode(unref(TMagicIcon), { class: "el-icon--right" }, {
                 default: withCtx(() => [
@@ -7163,7 +7238,12 @@ const _sfc_main$y = /* @__PURE__ */ defineComponent({
   }
 });
 
-const _hoisted_1$e = {
+const _hoisted_1$f = {
+  key: 0,
+  id: "m-editor-page-bar-add-icon",
+  class: "m-editor-page-bar-item m-editor-page-bar-item-icon"
+};
+const _hoisted_2$6 = {
   key: 1,
   style: { "width": "21px" }
 };
@@ -7172,35 +7252,51 @@ const _sfc_main$x = /* @__PURE__ */ defineComponent({
     name: "MEditorPageBarAddButton"
   },
   __name: "AddButton",
-  props: {
-    type: {}
-  },
   setup(__props) {
-    const props = __props;
     const services = inject("services");
     const uiService = services?.uiService;
     const editorService = services?.editorService;
     const showAddPageButton = computed(() => uiService?.get("showAddPageButton"));
-    const addPage = () => {
+    const addPage = (type) => {
       if (!editorService) return;
       const root = toRaw(editorService.get("root"));
       if (!root) throw new Error("root 不能为空");
       const pageConfig = {
-        type: props.type,
-        name: generatePageNameByApp(root, props.type),
+        type,
+        name: generatePageNameByApp(root, type),
         items: []
       };
       editorService.add(pageConfig);
     };
     return (_ctx, _cache) => {
-      return showAddPageButton.value ? (openBlock(), createElementBlock("div", {
-        key: 0,
-        id: "m-editor-page-bar-add-icon",
-        class: "m-editor-page-bar-item m-editor-page-bar-item-icon",
-        onClick: addPage
-      }, [
-        createVNode(_sfc_main$Y, { icon: unref(Plus) }, null, 8, ["icon"])
-      ])) : (openBlock(), createElementBlock("div", _hoisted_1$e));
+      return showAddPageButton.value ? (openBlock(), createElementBlock("div", _hoisted_1$f, [
+        createVNode(unref(TMagicPopover), { "popper-class": "data-source-list-panel-add-menu" }, {
+          reference: withCtx(() => [
+            createVNode(_sfc_main$Y, { icon: unref(Plus) }, null, 8, ["icon"])
+          ]),
+          default: withCtx(() => [
+            createVNode(_sfc_main$y, {
+              data: {
+                type: "button",
+                text: "页面",
+                handler: () => {
+                  addPage(unref(NodeType).PAGE);
+                }
+              }
+            }, null, 8, ["data"]),
+            createVNode(_sfc_main$y, {
+              data: {
+                type: "button",
+                text: "页面片",
+                handler: () => {
+                  addPage(unref(NodeType).PAGE_FRAGMENT);
+                }
+              }
+            }, null, 8, ["data"])
+          ]),
+          _: 1
+        })
+      ])) : (openBlock(), createElementBlock("div", _hoisted_2$6));
     };
   }
 });
@@ -7211,10 +7307,10 @@ const _sfc_main$w = /* @__PURE__ */ defineComponent({
   },
   __name: "PageBarScrollContainer",
   props: {
-    type: {},
-    pageBarSortOptions: {}
+    pageBarSortOptions: {},
+    length: {}
   },
-  setup(__props) {
+  setup(__props, { expose: __expose }) {
     const props = __props;
     const services = inject("services");
     const editorService = services?.editorService;
@@ -7225,7 +7321,7 @@ const _sfc_main$w = /* @__PURE__ */ defineComponent({
     const showPageListButton = computed(() => uiService?.get("showPageListButton"));
     const itemsContainerWidth = ref(0);
     const setCanScroll = () => {
-      itemsContainerWidth.value = (pageBar.value?.clientWidth || 0) - 37 * 2 - (showAddPageButton.value ? 37 : 21) - (showPageListButton.value ? 37 : 0);
+      itemsContainerWidth.value = (pageBar.value?.clientWidth || 0) - 37 * 2 - 37 - (showAddPageButton.value ? 37 : 21) - (showPageListButton.value ? 37 : 0);
       nextTick(() => {
         if (itemsContainer.value) {
           canScroll.value = itemsContainer.value.scrollWidth - itemsContainerWidth.value > 1;
@@ -7244,38 +7340,43 @@ const _sfc_main$w = /* @__PURE__ */ defineComponent({
     });
     let translateLeft = 0;
     const scroll = (type) => {
-      if (!itemsContainer.value) return;
+      if (!itemsContainer.value || !canScroll.value) return;
       const maxScrollLeft = itemsContainer.value.scrollWidth - itemsContainerWidth.value;
       if (type === "left") {
-        translateLeft += 100;
-        if (translateLeft > 0) {
-          translateLeft = 0;
-        }
+        scrollTo(translateLeft + 200);
       } else if (type === "right") {
-        translateLeft -= 100;
-        if (-translateLeft > maxScrollLeft) {
-          translateLeft = -maxScrollLeft;
-        }
+        scrollTo(translateLeft - 200);
       } else if (type === "start") {
-        translateLeft = 0;
+        scrollTo(0);
       } else if (type === "end") {
-        translateLeft = -maxScrollLeft;
+        scrollTo(-maxScrollLeft);
+      }
+    };
+    const scrollTo = (value) => {
+      if (!itemsContainer.value || !canScroll.value) return;
+      const maxScrollLeft = itemsContainer.value.scrollWidth - itemsContainerWidth.value;
+      if (value >= 0) {
+        value = 0;
       }
+      if (-value > maxScrollLeft) {
+        value = -maxScrollLeft;
+      }
+      translateLeft = value;
       itemsContainer.value.style.transform = `translate(${translateLeft}px, 0px)`;
     };
-    const pageLength = computed(() => editorService?.get("pageLength") || 0);
-    const pageFragmentLength = computed(() => editorService?.get("pageFragmentLength") || 0);
-    const crateWatchLength = (length) => watch(
-      length,
-      (length2 = 0, preLength = 0) => {
+    watch(
+      () => props.length,
+      (length = 0, preLength = 0) => {
         setTimeout(() => {
           setCanScroll();
-          if (length2 < preLength) {
-            scroll("start");
-          } else {
-            scroll("end");
-          }
-          if (length2 > 1) {
+          nextTick(() => {
+            if (length < preLength || preLength === 0) {
+              scroll("start");
+            } else {
+              scroll("end");
+            }
+          });
+          if (length > 1) {
             const el = document.querySelector(".m-editor-page-bar-items");
             let beforeDragList = [];
             const options = {
@@ -7311,25 +7412,14 @@ const _sfc_main$w = /* @__PURE__ */ defineComponent({
         immediate: true
       }
     );
-    let unWatchPageLength;
-    let unWatchPageFragmentLength;
-    watch(
-      () => props.type,
-      (type) => {
-        if (type === NodeType.PAGE) {
-          unWatchPageFragmentLength?.();
-          unWatchPageFragmentLength = null;
-          unWatchPageLength = crateWatchLength(pageLength);
-        } else {
-          unWatchPageLength?.();
-          unWatchPageLength = null;
-          unWatchPageFragmentLength = crateWatchLength(pageFragmentLength);
-        }
-      },
-      {
-        immediate: true
+    __expose({
+      itemsContainerWidth,
+      scroll,
+      scrollTo,
+      getTranslateLeft() {
+        return translateLeft;
       }
-    );
+    });
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", {
         class: "m-editor-page-bar",
@@ -7337,25 +7427,24 @@ const _sfc_main$w = /* @__PURE__ */ defineComponent({
         ref: pageBar
       }, [
         renderSlot(_ctx.$slots, "prepend"),
-        canScroll.value ? (openBlock(), createElementBlock("div", {
+        _ctx.length ? (openBlock(), createElementBlock("div", {
           key: 0,
-          class: "m-editor-page-bar-item m-editor-page-bar-item-icon",
-          onClick: _cache[0] || (_cache[0] = ($event) => scroll("left"))
-        }, [
-          createVNode(_sfc_main$Y, { icon: unref(ArrowLeftBold) }, null, 8, ["icon"])
-        ])) : createCommentVNode("", true),
-        _ctx.type === unref(NodeType).PAGE && pageLength.value || _ctx.type === unref(NodeType).PAGE_FRAGMENT && pageFragmentLength.value ? (openBlock(), createElementBlock("div", {
-          key: 1,
           class: "m-editor-page-bar-items",
           ref_key: "itemsContainer",
-          ref: itemsContainer,
-          style: normalizeStyle(`width: ${itemsContainerWidth.value}px`)
+          ref: itemsContainer
         }, [
           renderSlot(_ctx.$slots, "default")
-        ], 4)) : createCommentVNode("", true),
+        ], 512)) : createCommentVNode("", true),
+        canScroll.value ? (openBlock(), createElementBlock("div", {
+          key: 1,
+          class: "m-editor-page-bar-item m-editor-page-bar-item-icon m-editor-page-bar-item-left-icon",
+          onClick: _cache[0] || (_cache[0] = ($event) => scroll("left"))
+        }, [
+          createVNode(_sfc_main$Y, { icon: unref(ArrowLeftBold) }, null, 8, ["icon"])
+        ])) : createCommentVNode("", true),
         canScroll.value ? (openBlock(), createElementBlock("div", {
           key: 2,
-          class: "m-editor-page-bar-item m-editor-page-bar-item-icon",
+          class: "m-editor-page-bar-item m-editor-page-bar-item-icon m-editor-page-bar-item-right-icon",
           onClick: _cache[1] || (_cache[1] = ($event) => scroll("right"))
         }, [
           createVNode(_sfc_main$Y, { icon: unref(ArrowRightBold) }, null, 8, ["icon"])
@@ -7365,7 +7454,7 @@ const _sfc_main$w = /* @__PURE__ */ defineComponent({
   }
 });
 
-const _hoisted_1$d = {
+const _hoisted_1$e = {
   key: 0,
   id: "m-editor-page-bar-list-icon",
   class: "m-editor-page-bar-item m-editor-page-bar-item-icon"
@@ -7383,11 +7472,12 @@ const _sfc_main$v = /* @__PURE__ */ defineComponent({
     const uiService = services?.uiService;
     const editorService = services?.editorService;
     const showPageListButton = computed(() => uiService?.get("showPageListButton"));
-    const switchPage = (id) => {
-      editorService?.select(id);
+    const page = computed(() => editorService?.get("page"));
+    const switchPage = async (id) => {
+      await editorService?.select(id);
     };
     return (_ctx, _cache) => {
-      return showPageListButton.value ? (openBlock(), createElementBlock("div", _hoisted_1$d, [
+      return showPageListButton.value ? (openBlock(), createElementBlock("div", _hoisted_1$e, [
         createVNode(unref(TMagicPopover), {
           "popper-class": "page-bar-popover",
           placement: "top",
@@ -7411,6 +7501,7 @@ const _sfc_main$v = /* @__PURE__ */ defineComponent({
                     data: {
                       type: "button",
                       text: item.devconfig?.tabName || item.name || item.id,
+                      className: item.id === page.value?.id ? "active" : "",
                       handler: () => switchPage(item.id)
                     },
                     key: index
@@ -7426,52 +7517,72 @@ const _sfc_main$v = /* @__PURE__ */ defineComponent({
   }
 });
 
+const _hoisted_1$d = { class: "m-editor-page-bar-item m-editor-page-bar-item-icon m-editor-page-bar-search" };
 const _sfc_main$u = /* @__PURE__ */ defineComponent({
-  ...{
-    name: "MEditorPageBarSwitchTypeButton"
-  },
-  __name: "SwitchTypeButton",
+  __name: "Search",
   props: {
-    modelValue: {}
+    "query": {},
+    "queryModifiers": {}
   },
-  emits: ["update:modelValue"],
+  emits: /* @__PURE__ */ mergeModels(["search"], ["update:query"]),
   setup(__props, { emit: __emit }) {
-    const data = [
+    const emit = __emit;
+    const query = useModel(__props, "query");
+    const formConfig = createForm([
       {
-        type: NodeType.PAGE,
-        text: "页面"
+        type: "checkbox-group",
+        name: "pageType",
+        options: [
+          {
+            value: NodeType.PAGE,
+            text: "页面"
+          },
+          {
+            value: NodeType.PAGE_FRAGMENT,
+            text: "页面片段"
+          }
+        ]
       },
       {
-        type: NodeType.PAGE_FRAGMENT,
-        text: "页面片"
+        name: "keyword",
+        type: "text",
+        placeholder: "请输入关键字",
+        clearable: true
       }
-    ];
-    const emit = __emit;
-    const clickHandler = (value) => {
-      emit("update:modelValue", value);
+    ]);
+    const visible = ref(false);
+    const onFormChange = (values) => {
+      query.value = values;
+      emit("search", values);
     };
     return (_ctx, _cache) => {
-      return openBlock(), createElementBlock(Fragment, null, renderList(data, (item) => {
-        return createVNode(unref(TMagicButton), {
-          class: normalizeClass(["m-editor-page-bar-switch-type-button", { active: _ctx.modelValue === item.type }]),
-          size: "small",
-          key: item.type,
-          link: "",
-          type: _ctx.modelValue === item.type ? "primary" : "",
-          onClick: ($event) => clickHandler(item.type)
-        }, {
-          default: withCtx(() => [
-            createTextVNode(toDisplayString(item.text), 1)
-          ]),
-          _: 2
-        }, 1032, ["class", "type", "onClick"]);
-      }), 64);
+      return openBlock(), createElementBlock("div", _hoisted_1$d, [
+        createVNode(_sfc_main$Y, {
+          icon: unref(Search),
+          onClick: _cache[0] || (_cache[0] = ($event) => visible.value = !visible.value),
+          class: normalizeClass({ "icon-active": visible.value })
+        }, null, 8, ["icon", "class"]),
+        visible.value ? (openBlock(), createBlock(Teleport, {
+          key: 0,
+          to: ".m-editor-page-bar-tabs"
+        }, [
+          query.value ? (openBlock(), createBlock(unref(MForm), {
+            key: 0,
+            class: "m-editor-page-bar-search-panel",
+            inline: true,
+            config: unref(formConfig),
+            "init-values": query.value,
+            "prevent-submit-default": true,
+            onChange: onFormChange
+          }, null, 8, ["config", "init-values"])) : createCommentVNode("", true)
+        ])) : createCommentVNode("", true)
+      ]);
     };
   }
 });
 
 const _hoisted_1$c = { class: "m-editor-page-bar-tabs" };
-const _hoisted_2$5 = ["page-id", "onClick"];
+const _hoisted_2$5 = ["data-page-id", "onClick"];
 const _hoisted_3$2 = { class: "m-editor-page-bar-title" };
 const _hoisted_4$2 = ["title"];
 const _sfc_main$t = /* @__PURE__ */ defineComponent({
@@ -7481,63 +7592,33 @@ const _sfc_main$t = /* @__PURE__ */ defineComponent({
   __name: "PageBar",
   props: {
     disabledPageFragment: { type: Boolean },
-    pageBarSortOptions: {}
+    pageBarSortOptions: {},
+    filterFunction: { type: Function, default: (page, keyword) => page.name?.includes(keyword) || `${page.id}`.includes(keyword) }
   },
   setup(__props) {
-    const active = ref(NodeType.PAGE);
+    const props = __props;
     const services = inject("services");
     const editorService = services?.editorService;
     const root = computed(() => editorService?.get("root"));
     const page = computed(() => editorService?.get("page"));
-    const pageList = computed(() => getPageList(root.value));
-    const pageFragmentList = computed(() => getPageFragmentList(root.value));
-    const list = computed(() => active.value === NodeType.PAGE ? pageList.value : pageFragmentList.value);
-    const activePage = ref("");
-    const activePageFragment = ref("");
-    watch(
-      page,
-      (page2) => {
-        if (!page2) {
-          if (active.value === NodeType.PAGE) {
-            activePage.value = "";
-          }
-          if (active.value === NodeType.PAGE_FRAGMENT) {
-            activePageFragment.value = "";
-          }
-          return;
-        }
-        if (isPage(page2)) {
-          activePage.value = page2?.id;
-          if (active.value !== NodeType.PAGE) {
-            active.value = NodeType.PAGE;
-          }
-        } else if (isPageFragment(page2)) {
-          activePageFragment.value = page2?.id;
-          if (active.value !== NodeType.PAGE_FRAGMENT) {
-            active.value = NodeType.PAGE_FRAGMENT;
-          }
-        }
-      },
-      {
-        immediate: true
-      }
-    );
-    watch(active, (active2) => {
-      if (active2 === NodeType.PAGE) {
-        if (!activePage.value && !pageList.value.length) {
-          editorService?.selectRoot();
-          return;
-        }
-        switchPage(activePage.value);
-        return;
+    const query = ref({
+      pageType: [NodeType.PAGE, NodeType.PAGE_FRAGMENT],
+      keyword: ""
+    });
+    const list = computed(() => {
+      const { pageType, keyword } = query.value;
+      if (pageType.length === 0) {
+        return [];
       }
-      if (active2 === NodeType.PAGE_FRAGMENT) {
-        if (!activePageFragment.value && !pageFragmentList.value.length) {
-          editorService?.selectRoot();
-          return;
+      return (root.value?.items || []).filter((item) => {
+        if (pageType.includes(item.type)) {
+          if (keyword) {
+            return props.filterFunction(item, keyword);
+          }
+          return true;
         }
-        switchPage(activePageFragment.value || pageFragmentList.value[0].id);
-      }
+        return false;
+      });
     });
     const switchPage = (id) => {
       editorService?.select(id);
@@ -7552,19 +7633,49 @@ const _sfc_main$t = /* @__PURE__ */ defineComponent({
     const remove = (node) => {
       editorService?.remove(node);
     };
+    const pageBarScrollContainer = ref();
+    const pageBarItems = ref();
+    watch(page, (page2) => {
+      if (!page2 || !pageBarScrollContainer.value?.itemsContainerWidth || !pageBarItems.value || pageBarItems.value.length < 2) {
+        return;
+      }
+      const firstItem = pageBarItems.value[0];
+      const lastItem = pageBarItems.value[pageBarItems.value.length - 1];
+      if (page2.id === firstItem.dataset.pageId) {
+        pageBarScrollContainer.value.scroll("start");
+      } else if (page2.id === lastItem.dataset.pageId) {
+        pageBarScrollContainer.value.scroll("end");
+      } else {
+        const pageItem = pageBarItems.value.find((item) => item.dataset.pageId === page2.id);
+        if (!pageItem) {
+          return;
+        }
+        const pageItemRect = pageItem.getBoundingClientRect();
+        const offsetLeft = pageItemRect.left - firstItem.getBoundingClientRect().left;
+        const { itemsContainerWidth } = pageBarScrollContainer.value;
+        const left = itemsContainerWidth - offsetLeft - pageItemRect.width;
+        const translateLeft = pageBarScrollContainer.value.getTranslateLeft();
+        if (offsetLeft + translateLeft < 0 || offsetLeft + pageItemRect.width > itemsContainerWidth - translateLeft) {
+          pageBarScrollContainer.value.scrollTo(left);
+        }
+      }
+    });
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", _hoisted_1$c, [
-        !_ctx.disabledPageFragment ? (openBlock(), createBlock(_sfc_main$u, {
-          key: 0,
-          modelValue: active.value,
-          "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => active.value = $event)
-        }, null, 8, ["modelValue"])) : createCommentVNode("", true),
         createVNode(_sfc_main$w, {
-          type: active.value,
-          "page-bar-sort-options": _ctx.pageBarSortOptions
+          ref_key: "pageBarScrollContainer",
+          ref: pageBarScrollContainer,
+          "page-bar-sort-options": _ctx.pageBarSortOptions,
+          length: list.value.length
         }, {
           prepend: withCtx(() => [
-            createVNode(_sfc_main$x, { type: active.value }, null, 8, ["type"]),
+            renderSlot(_ctx.$slots, "page-bar-add-button", {}, () => [
+              createVNode(_sfc_main$x)
+            ]),
+            createVNode(_sfc_main$u, {
+              query: query.value,
+              "onUpdate:query": _cache[0] || (_cache[0] = ($event) => query.value = $event)
+            }, null, 8, ["query"]),
             createVNode(_sfc_main$v, { list: list.value }, {
               "page-list-popover": withCtx(({ list: list2 }) => [
                 renderSlot(_ctx.$slots, "page-list-popover", { list: list2 })
@@ -7576,8 +7687,11 @@ const _sfc_main$t = /* @__PURE__ */ defineComponent({
             (openBlock(true), createElementBlock(Fragment, null, renderList(list.value, (item) => {
               return openBlock(), createElementBlock("div", {
                 class: normalizeClass(["m-editor-page-bar-item", { active: page.value?.id === item.id }]),
+                ref_for: true,
+                ref_key: "pageBarItems",
+                ref: pageBarItems,
                 key: item.id,
-                "page-id": item.id,
+                "data-page-id": item.id,
                 onClick: ($event) => switchPage(item.id)
               }, [
                 createElementVNode("div", _hoisted_3$2, [
@@ -7630,7 +7744,7 @@ const _sfc_main$t = /* @__PURE__ */ defineComponent({
             }), 128))
           ]),
           _: 3
-        }, 8, ["type", "page-bar-sort-options"])
+        }, 8, ["page-bar-sort-options", "length"])
       ]);
     };
   }
@@ -7698,7 +7812,8 @@ const _sfc_main$r = /* @__PURE__ */ defineComponent({
   __name: "Framework",
   props: {
     disabledPageFragment: { type: Boolean },
-    pageBarSortOptions: {}
+    pageBarSortOptions: {},
+    pageFilterFunction: { type: Function }
   },
   setup(__props) {
     const codeOptions = inject("codeOptions", {});
@@ -7708,7 +7823,6 @@ const _sfc_main$r = /* @__PURE__ */ defineComponent({
     const root = computed(() => editorService?.get("root"));
     const page = computed(() => editorService?.get("page"));
     const pageLength = computed(() => editorService?.get("pageLength") || 0);
-    const stageLoading = computed(() => editorService?.get("stageLoading") || false);
     const showSrc = computed(() => uiService?.get("showSrc"));
     const getLeftColumnWidthCacheData = () => Number(globalThis.localStorage.getItem(LEFT_COLUMN_WIDTH_STORAGE_KEY)) || DEFAULT_LEFT_COLUMN_WIDTH;
     const getRightColumnWidthCacheData = () => Number(globalThis.localStorage.getItem(RIGHT_COLUMN_WIDTH_STORAGE_KEY)) || DEFAULT_RIGHT_COLUMN_WIDTH;
@@ -7759,7 +7873,6 @@ const _sfc_main$r = /* @__PURE__ */ defineComponent({
       }
     };
     return (_ctx, _cache) => {
-      const _directive_loading = resolveDirective("loading");
       return openBlock(), createElementBlock("div", {
         class: "m-editor",
         ref_key: "content",
@@ -7776,9 +7889,8 @@ const _sfc_main$r = /* @__PURE__ */ defineComponent({
             options: unref(codeOptions),
             onSave: saveCode
           }, null, 8, ["init-values", "options"])
-        ]) : withDirectives((openBlock(), createBlock(_sfc_main$z, {
+        ]) : (openBlock(), createBlock(_sfc_main$z, {
           key: 1,
-          "element-loading-text": "Runtime 加载中...",
           ref_key: "splitView",
           ref: splitView,
           class: "m-editor-content",
@@ -7805,8 +7917,12 @@ const _sfc_main$r = /* @__PURE__ */ defineComponent({
             renderSlot(_ctx.$slots, "page-bar", {}, () => [
               createVNode(_sfc_main$t, {
                 "disabled-page-fragment": _ctx.disabledPageFragment,
-                "page-bar-sort-options": _ctx.pageBarSortOptions
+                "page-bar-sort-options": _ctx.pageBarSortOptions,
+                "filter-function": _ctx.pageFilterFunction
               }, {
+                "page-bar-add-button": withCtx(() => [
+                  renderSlot(_ctx.$slots, "page-bar-add-button")
+                ]),
                 "page-bar-title": withCtx(({ page: page2 }) => [
                   renderSlot(_ctx.$slots, "page-bar-title", { page: page2 })
                 ]),
@@ -7817,7 +7933,7 @@ const _sfc_main$r = /* @__PURE__ */ defineComponent({
                   renderSlot(_ctx.$slots, "page-list-popover", { list })
                 ]),
                 _: 3
-              }, 8, ["disabled-page-fragment", "page-bar-sort-options"])
+              }, 8, ["disabled-page-fragment", "page-bar-sort-options", "filter-function"])
             ])
           ]),
           _: 2
@@ -7834,9 +7950,7 @@ const _sfc_main$r = /* @__PURE__ */ defineComponent({
             ]),
             key: "0"
           } : void 0
-        ]), 1032, ["left", "right", "width"])), [
-          [_directive_loading, stageLoading.value]
-        ]),
+        ]), 1032, ["left", "right", "width"])),
         renderSlot(_ctx.$slots, "content-after"),
         renderSlot(_ctx.$slots, "footer")
       ], 512);
@@ -8085,10 +8199,10 @@ const _sfc_main$p = /* @__PURE__ */ defineComponent({
         configForm.value.formState.stage = stage.value;
       }
     });
-    const submit = async () => {
+    const submit = async (v, eventData) => {
       try {
         const values2 = await configForm.value?.submitForm();
-        services?.editorService.update(values2);
+        services?.editorService.update(values2, { changeRecords: eventData.changeRecords });
       } catch (e) {
         emit("submit-error", e);
       }
@@ -8390,6 +8504,7 @@ const _sfc_main$l = /* @__PURE__ */ defineComponent({
     const emit = __emit;
     const services = inject("services");
     const { codeBlockService, depService, editorService } = services || {};
+    const collecting = computed(() => depService?.get("collecting"));
     const codeList = computed(
       () => Object.entries(codeBlockService?.getCodeDsl() || {}).map(([codeId, code]) => {
         const target = depService?.getTarget(codeId, DepTargetType.CODE_BLOCK);
@@ -8489,8 +8604,19 @@ const _sfc_main$l = /* @__PURE__ */ defineComponent({
           }, toDisplayString(data.name) + " " + toDisplayString(data.key ? `(${data.key})` : ""), 3)
         ]),
         "tree-node-tool": withCtx(({ data }) => [
-          data.type === "code" ? (openBlock(), createBlock(unref(TMagicTooltip), {
+          collecting.value && data.type === "code" ? (openBlock(), createBlock(unref(TMagicTag), {
             key: 0,
+            type: "info",
+            size: "small",
+            style: { "margin-right": "5px" }
+          }, {
+            default: withCtx(() => _cache[0] || (_cache[0] = [
+              createTextVNode("依赖收集中")
+            ])),
+            _: 1
+          })) : createCommentVNode("", true),
+          data.type === "code" ? (openBlock(), createBlock(unref(TMagicTooltip), {
+            key: 1,
             effect: "dark",
             content: editable.value ? "编辑" : "查看",
             placement: "bottom"
@@ -8505,7 +8631,7 @@ const _sfc_main$l = /* @__PURE__ */ defineComponent({
             _: 2
           }, 1032, ["content"])) : createCommentVNode("", true),
           data.type === "code" && editable.value ? (openBlock(), createBlock(unref(TMagicTooltip), {
-            key: 1,
+            key: 2,
             effect: "dark",
             content: "删除",
             placement: "bottom"
@@ -8621,9 +8747,9 @@ const useDataSourceEdit = (dataSourceService) => {
     dialogTitle.value = `编辑${dataSourceValues.value.title || ""}`;
     editDialog.value.show();
   };
-  const submitDataSourceHandler = (value) => {
+  const submitDataSourceHandler = (value, eventData) => {
     if (value.id) {
-      dataSourceService?.update(value);
+      dataSourceService?.update(value, { changeRecords: eventData.changeRecords });
     } else {
       dataSourceService?.add(value);
     }
@@ -8670,8 +8796,8 @@ const _sfc_main$j = /* @__PURE__ */ defineComponent({
       initValues.value = props.values;
       dataSourceConfig.value = services?.dataSourceService.getFormConfig(initValues.value.type) || [];
     });
-    const submitHandler = (values) => {
-      emit("submit", values);
+    const submitHandler = (values, data) => {
+      emit("submit", values, data);
     };
     const errorHandler = (error) => {
       tMagicMessage.error(error.message);
@@ -8727,6 +8853,7 @@ const _sfc_main$i = /* @__PURE__ */ defineComponent({
   setup(__props, { expose: __expose, emit: __emit }) {
     const emit = __emit;
     const { depService, editorService, dataSourceService } = inject("services") || {};
+    const collecting = computed(() => depService?.get("collecting"));
     const editable = computed(() => dataSourceService?.get("editable") ?? true);
     const dataSources = computed(() => dataSourceService?.get("dataSources") || []);
     const dsDep = computed(() => depService?.getTargets(DepTargetType.DATA_SOURCE) || {});
@@ -8832,8 +8959,19 @@ const _sfc_main$i = /* @__PURE__ */ defineComponent({
           }, toDisplayString(data.name) + " " + toDisplayString(data.key ? `(${data.key})` : ""), 3)
         ]),
         "tree-node-tool": withCtx(({ data }) => [
-          data.type === "ds" ? (openBlock(), createBlock(unref(TMagicTooltip), {
+          collecting.value && data.type === "ds" ? (openBlock(), createBlock(unref(TMagicTag), {
             key: 0,
+            type: "info",
+            size: "small",
+            style: { "margin-right": "5px" }
+          }, {
+            default: withCtx(() => _cache[0] || (_cache[0] = [
+              createTextVNode("依赖收集中")
+            ])),
+            _: 1
+          })) : createCommentVNode("", true),
+          data.type === "ds" ? (openBlock(), createBlock(unref(TMagicTooltip), {
+            key: 1,
             effect: "dark",
             content: editable.value ? "编辑" : "查看",
             placement: "bottom"
@@ -8848,7 +8986,7 @@ const _sfc_main$i = /* @__PURE__ */ defineComponent({
             _: 2
           }, 1032, ["content"])) : createCommentVNode("", true),
           data.type === "ds" && editable.value ? (openBlock(), createBlock(unref(TMagicTooltip), {
-            key: 1,
+            key: 2,
             effect: "dark",
             content: "删除",
             placement: "bottom"
@@ -10114,6 +10252,7 @@ const _sfc_main$a = /* @__PURE__ */ defineComponent({
   setup(__props, { expose: __expose }) {
     const props = __props;
     const services = inject("services");
+    const collecting = computed(() => services?.depService.get("collecting"));
     const columnLeftWidth = computed(() => services?.uiService.get("columnWidth")[ColumnLayout.LEFT] || 0);
     const { height: editorContentHeight } = useEditorContentHeight();
     const columnLeftHeight = ref(0);
@@ -10256,7 +10395,7 @@ const _sfc_main$a = /* @__PURE__ */ defineComponent({
           ]),
           (openBlock(true), createElementBlock(Fragment, null, renderList(sideBarItems.value, (config, index) => {
             return withDirectives((openBlock(), createElementBlock("div", {
-              class: "m-editor-sidebar-content",
+              class: normalizeClass(["m-editor-sidebar-content", { "m-editor-dep-collecting": collecting.value }]),
               key: config.$key ?? index
             }, [
               config?.component && !unref(floatBoxStates)[config.$key]?.status ? (openBlock(), createBlock(resolveDynamicComponent(config.component), mergeProps({
@@ -10382,7 +10521,7 @@ const _sfc_main$a = /* @__PURE__ */ defineComponent({
                   key: "11"
                 } : void 0
               ]), 1040)) : createCommentVNode("", true)
-            ])), [
+            ], 2)), [
               [vShow, [config.text, config.$key, `${index}`].includes(activeTabName.value)]
             ]);
           }), 128))
@@ -10963,15 +11102,17 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
   },
   __name: "Stage",
   props: {
+    stageOptions: {},
     stageContentMenu: {},
     disabledStageOverlay: { type: Boolean, default: false },
     customContentMenu: {}
   },
   setup(__props) {
+    const props = __props;
     let stage = null;
     let runtime = null;
     const services = inject("services");
-    const stageOptions = inject("stageOptions");
+    const stageLoading = computed(() => services?.editorService.get("stageLoading") || false);
     const stageWrap = ref();
     const stageContainer = ref();
     const menu = ref();
@@ -10986,8 +11127,8 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
     watchEffect(() => {
       if (stage || !page.value) return;
       if (!stageContainer.value) return;
-      if (!(stageOptions?.runtimeUrl || stageOptions?.render) || !root.value) return;
-      stage = useStage(stageOptions);
+      if (!(props.stageOptions?.runtimeUrl || props.stageOptions?.render) || !root.value) return;
+      stage = useStage(props.stageOptions);
       stage.on("select", () => {
         stageWrap.value?.container?.focus();
       });
@@ -11007,14 +11148,23 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
     });
     onBeforeUnmount(() => {
       stage?.destroy();
+      services?.editorService.set("stage", null);
     });
     watch(zoom, (zoom2) => {
       if (!stage || !zoom2) return;
       stage.setZoom(zoom2);
     });
+    let timeoutId = null;
     watch(page, (page2) => {
       if (runtime && page2) {
         services?.editorService.set("stageLoading", true);
+        if (timeoutId) {
+          globalThis.clearTimeout(timeoutId);
+        }
+        timeoutId = globalThis.setTimeout(() => {
+          services?.editorService.set("stageLoading", false);
+          timeoutId = null;
+        }, 3e3);
         runtime.updatePageId?.(page2.id);
         nextTick(() => {
           stage?.select(page2.id);
@@ -11066,7 +11216,9 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
       if (!config || config.dragType !== DragType.COMPONENT_LIST) return;
       e.preventDefault();
       const doc = stage?.renderer?.contentWindow?.document;
-      const parentEl = doc?.querySelector(`.${stageOptions?.containerHighlightClassName}`);
+      const parentEl = doc?.querySelector(
+        `.${props.stageOptions?.containerHighlightClassName}`
+      );
       let parent = page.value;
       const parentId = getIdFromEl()(parentEl);
       if (parentId) {
@@ -11105,11 +11257,13 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
       }
     };
     return (_ctx, _cache) => {
-      return openBlock(), createBlock(_sfc_main$8, {
+      const _directive_loading = resolveDirective("loading");
+      return withDirectives((openBlock(), createBlock(_sfc_main$8, {
         class: "m-editor-stage",
         ref_key: "stageWrap",
         ref: stageWrap,
         tabindex: "-1",
+        "element-loading-text": "Runtime 加载中...",
         width: stageRect.value?.width,
         height: stageRect.value?.height,
         "wrap-width": stageContainerRect.value?.width,
@@ -11146,7 +11300,9 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
           createVNode(_sfc_main$7)
         ]),
         _: 1
-      }, 8, ["width", "height", "wrap-width", "wrap-height", "zoom"]);
+      }, 8, ["width", "height", "wrap-width", "wrap-height", "zoom"])), [
+        [_directive_loading, stageLoading.value]
+      ]);
     };
   }
 });
@@ -11208,18 +11364,20 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     customContentMenu: {}
   },
   setup(__props) {
+    const stageOptions = inject("stageOptions");
     const services = inject("services");
     const page = computed(() => services?.editorService.get("page"));
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", _hoisted_1, [
         createVNode(_sfc_main$2),
         renderSlot(_ctx.$slots, "stage", {}, () => [
-          page.value ? (openBlock(), createBlock(_sfc_main$3, {
+          page.value && (unref(stageOptions)?.render || unref(stageOptions)?.runtimeUrl) ? (openBlock(), createBlock(_sfc_main$3, {
             key: 0,
+            "stage-options": unref(stageOptions),
             "disabled-stage-overlay": _ctx.disabledStageOverlay,
             "stage-content-menu": _ctx.stageContentMenu,
             "custom-content-menu": _ctx.customContentMenu
-          }, null, 8, ["disabled-stage-overlay", "stage-content-menu", "custom-content-menu"])) : createCommentVNode("", true)
+          }, null, 8, ["stage-options", "disabled-stage-overlay", "stage-content-menu", "custom-content-menu"])) : createCommentVNode("", true)
         ]),
         renderSlot(_ctx.$slots, "workspace-content")
       ]);
@@ -11569,12 +11727,17 @@ class DataSource extends BaseService {
     this.emit("add", newConfig);
     return newConfig;
   }
-  update(config) {
+  update(config, { changeRecords = [] } = {}) {
     const dataSources = this.get("dataSources");
     const index = dataSources.findIndex((ds) => ds.id === config.id);
-    dataSources[index] = cloneDeep(config);
-    this.emit("update", config);
-    return config;
+    const oldConfig = dataSources[index];
+    const newConfig = cloneDeep(config);
+    dataSources[index] = newConfig;
+    this.emit("update", newConfig, {
+      oldConfig,
+      changeRecords
+    });
+    return newConfig;
   }
   remove(id) {
     const dataSources = this.get("dataSources");
@@ -11650,7 +11813,16 @@ const dataSourceService = new DataSource();
 
 const idleTask = new IdleTask();
 class Dep extends BaseService {
+  state = reactive({
+    collecting: false
+  });
   watcher = new Watcher({ initialTargets: reactive({}) });
+  set(name, value) {
+    this.state[name] = value;
+  }
+  get(name) {
+    return this.state[name];
+  }
   removeTargets(type = DepTargetType.DEFAULT) {
     this.watcher.removeTargets(type);
     const targets = this.watcher.getTargets(type);
@@ -11677,26 +11849,32 @@ class Dep extends BaseService {
     this.watcher.clearTargets();
   }
   collect(nodes, depExtendedData = {}, deep = false, type) {
+    this.set("collecting", true);
     this.watcher.collectByCallback(nodes, type, ({ node, target }) => {
       this.collectNode(node, target, depExtendedData, deep);
     });
+    this.set("collecting", false);
     this.emit("collected", nodes, deep);
   }
   collectIdle(nodes, depExtendedData = {}, deep = false, type) {
+    this.set("collecting", true);
+    let startTask = false;
     this.watcher.collectByCallback(nodes, type, ({ node, target }) => {
-      idleTask.enqueueTask(
-        ({ node: node2, deep: deep2, target: target2 }) => {
-          this.collectNode(node2, target2, depExtendedData, deep2);
-        },
-        {
-          node,
-          deep,
-          target
-        }
-      );
-    });
-    idleTask.once("finish", () => {
-      this.emit("collected", nodes, deep);
+      startTask = true;
+      this.enqueueTask(node, target, depExtendedData, deep);
+    });
+    return new Promise((resolve) => {
+      if (!startTask) {
+        this.emit("collected", nodes, deep);
+        this.set("collecting", false);
+        resolve();
+        return;
+      }
+      idleTask.once("finish", () => {
+        this.emit("collected", nodes, deep);
+        this.set("collecting", false);
+        resolve();
+      });
     });
   }
   collectNode(node, target, depExtendedData = {}, deep = false) {
@@ -11723,6 +11901,9 @@ class Dep extends BaseService {
   hasSpecifiedTypeTarget(type = DepTargetType.DEFAULT) {
     return this.watcher.hasSpecifiedTypeTarget(type);
   }
+  clearIdleTasks() {
+    idleTask.clearTasks();
+  }
   on(eventName, listener) {
     return super.on(eventName, listener);
   }
@@ -11732,6 +11913,23 @@ class Dep extends BaseService {
   emit(eventName, ...args) {
     return super.emit(eventName, ...args);
   }
+  enqueueTask(node, target, depExtendedData, deep) {
+    idleTask.enqueueTask(
+      ({ node: node2, deep: deep2, target: target2 }) => {
+        this.collectNode(node2, target2, depExtendedData, deep2);
+      },
+      {
+        node,
+        deep: false,
+        target
+      }
+    );
+    if (deep && Array.isArray(node.items) && node.items.length) {
+      node.items.forEach((item) => {
+        this.enqueueTask(item, target, depExtendedData, deep);
+      });
+    }
+  }
 }
 const depService = new Dep();
 
@@ -12305,6 +12503,7 @@ const initServiceEvents = (props, emit, { editorService, codeBlockService, dataS
       initDataSourceDepTarget(ds);
     });
     if (Array.isArray(value.items)) {
+      depService.clearIdleTasks();
       collectIdle(value.items, true);
     } else {
       depService.clear();
@@ -12329,15 +12528,66 @@ const initServiceEvents = (props, emit, { editorService, codeBlockService, dataS
       emit("update:modelValue", value);
     }
   };
-  const getApp = () => {
-    const stage = editorService.get("stage");
-    return stage?.renderer?.runtime?.getApp?.();
-  };
-  const updateDataSourceSchema = () => {
+  const stage = computed(() => editorService.get("stage"));
+  watch(stage, (stage2) => {
+    if (!stage2) {
+      return;
+    }
+    stage2.on("rerender", () => {
+      const node = editorService.get("node");
+      if (!node) return;
+      collectIdle([node], true).then(() => {
+        afterUpdateNodes([node]);
+      });
+    });
+  });
+  const getApp = () => stage.value?.renderer?.runtime?.getApp?.();
+  const updateDataSourceSchema = (nodes, deep) => {
     const root = editorService.get("root");
+    const app = getApp();
+    if (root && app?.dsl) {
+      app.dsl.dataSourceDeps = root.dataSourceDeps;
+      app.dsl.dataSourceCondDeps = root.dataSourceCondDeps;
+      app.dsl.dataSources = root.dataSources;
+    }
     if (root?.dataSources) {
       getApp()?.dataSourceManager?.updateSchema(root.dataSources);
     }
+    if (!root || !stage.value) return;
+    const allNodes = [];
+    if (deep) {
+      nodes.forEach((node) => {
+        traverseNode(node, (node2) => {
+          if (!allNodes.includes(node2)) {
+            allNodes.push(node2);
+          }
+        });
+      });
+    } else {
+      allNodes.push(...nodes);
+    }
+    const deps = Object.values(root.dataSourceDeps || {});
+    deps.forEach((dep) => {
+      Object.keys(dep).forEach((id) => {
+        const node = allNodes.find((node2) => node2.id === id);
+        node && stage.value?.update({
+          config: cloneDeep(node),
+          parentId: editorService.getParentById(node.id)?.id,
+          root: cloneDeep(root)
+        });
+      });
+    });
+  };
+  const afterUpdateNodes = (nodes) => {
+    const root = editorService.get("root");
+    if (!root) return;
+    for (const node of nodes) {
+      stage.value?.update({
+        config: cloneDeep(node),
+        parentId: editorService.getParentById(node.id)?.id,
+        root: cloneDeep(root)
+      });
+    }
   };
   const targetAddHandler = (target) => {
     const root = editorService.get("root");
@@ -12357,59 +12607,32 @@ const initServiceEvents = (props, emit, { editorService, codeBlockService, dataS
   };
   const targetRemoveHandler = (id) => {
     const root = editorService.get("root");
-    if (root?.dataSourceDeps) {
+    if (!root) return;
+    if (root.dataSourceDeps) {
       delete root.dataSourceDeps[id];
     }
-    if (root?.dataSourceCondDeps) {
+    if (root.dataSourceCondDeps) {
       delete root.dataSourceCondDeps[id];
     }
   };
-  const collectedHandler = (nodes, deep) => {
+  const depCollectedHandler = () => {
     const root = editorService.get("root");
-    const stage = editorService.get("stage");
-    if (!root || !stage) return;
+    if (!root) return;
     const app = getApp();
-    if (!app) return;
-    if (app.dsl) {
+    if (app?.dsl) {
       app.dsl.dataSourceDeps = root.dataSourceDeps;
-      app.dsl.dataSourceCondDeps = root.dataSourceCondDeps;
-      app.dsl.dataSources = root.dataSources;
     }
-    updateDataSourceSchema();
-    const allNodes = [];
-    if (deep) {
-      nodes.forEach((node) => {
-        traverseNode(node, (node2) => {
-          if (!allNodes.includes(node2)) {
-            allNodes.push(node2);
-          }
-        });
-      });
-    } else {
-      allNodes.push(...nodes);
-    }
-    const deps = Object.values(root.dataSourceDeps || {});
-    deps.forEach((dep) => {
-      Object.keys(dep).forEach((id) => {
-        const node = allNodes.find((node2) => node2.id === id);
-        node && stage.update({
-          config: cloneDeep(node),
-          parentId: editorService.getParentById(node.id)?.id,
-          root: cloneDeep(root)
-        });
-      });
-    });
   };
   depService.on("add-target", targetAddHandler);
   depService.on("remove-target", targetRemoveHandler);
-  depService.on("collected", collectedHandler);
+  depService.on("collected", depCollectedHandler);
   const initDataSourceDepTarget = (ds) => {
     depService.addTarget(createDataSourceTarget(ds, reactive({})));
     depService.addTarget(createDataSourceMethodTarget(ds, reactive({})));
     depService.addTarget(createDataSourceCondTarget(ds, reactive({})));
   };
-  const collectIdle = (nodes, deep) => {
-    nodes.forEach((node) => {
+  const collectIdle = (nodes, deep) => Promise.all(
+    nodes.map((node) => {
       let pageId;
       if (isPage(node)) {
         pageId = node.id;
@@ -12417,20 +12640,47 @@ const initServiceEvents = (props, emit, { editorService, codeBlockService, dataS
         const info = editorService.getNodeInfo(node.id);
         pageId = info.page?.id;
       }
-      depService.collectIdle([node], { pageId }, deep);
-    });
-  };
+      return depService.collectIdle([node], { pageId }, deep);
+    })
+  );
   const nodeAddHandler = (nodes) => {
-    collectIdle(nodes, true);
+    collectIdle(nodes, true).then(() => {
+      afterUpdateNodes(nodes);
+    });
   };
-  const nodeUpdateHandler = (nodes) => {
-    collectIdle(nodes, true);
+  const nodeUpdateHandler = (data) => {
+    const needRecollectNodes = [];
+    const normalNodes = [];
+    data.forEach(({ newNode, oldNode, changeRecords }) => {
+      if (changeRecords?.length) {
+        for (const record of changeRecords) {
+          if (!record.propPath || new RegExp(`${NODE_CONDS_KEY}.(\\d)+.cond`).test(record.propPath) || new RegExp(`${NODE_CONDS_KEY}.(\\d)+.cond.(\\d)+.value`).test(record.propPath) || record.propPath === NODE_CONDS_KEY || isValueIncludeDataSource(record.value)) {
+            needRecollectNodes.push(newNode);
+          } else {
+            normalNodes.push(newNode);
+          }
+        }
+      } else if (isIncludeDataSource(newNode, oldNode)) {
+        needRecollectNodes.push(newNode);
+      } else {
+        normalNodes.push(newNode);
+      }
+    });
+    if (needRecollectNodes.length) {
+      collectIdle(needRecollectNodes, true).then(() => {
+        afterUpdateNodes(needRecollectNodes);
+      });
+    } else if (normalNodes.length) {
+      afterUpdateNodes(normalNodes);
+    }
   };
   const nodeRemoveHandler = (nodes) => {
     depService.clear(nodes);
   };
   const historyChangeHandler = (page) => {
-    collectIdle([page], true);
+    collectIdle([page], true).then(() => {
+      updateDataSourceSchema([page], true);
+    });
   };
   editorService.on("history-change", historyChangeHandler);
   editorService.on("root-change", rootChangeHandler);
@@ -12453,11 +12703,30 @@ const initServiceEvents = (props, emit, { editorService, codeBlockService, dataS
     initDataSourceDepTarget(config);
     getApp()?.dataSourceManager?.addDataSource(config);
   };
-  const dataSourceUpdateHandler = (config) => {
+  const dataSourceUpdateHandler = (config, { changeRecords }) => {
+    let needRecollectDep = false;
+    for (const changeRecord of changeRecords) {
+      if (!changeRecord.propPath) {
+        continue;
+      }
+      needRecollectDep = changeRecord.propPath === "fields" || changeRecord.propPath === "methods" || /fields.(\d)+.name/.test(changeRecord.propPath) || /fields.(\d)+$/.test(changeRecord.propPath) || /methods.(\d)+.name/.test(changeRecord.propPath) || /methods.(\d)+$/.test(changeRecord.propPath);
+      if (needRecollectDep) {
+        break;
+      }
+    }
     const root = editorService.get("root");
-    removeDataSourceTarget(config.id);
-    initDataSourceDepTarget(config);
-    collectIdle(root?.items || [], true);
+    if (needRecollectDep) {
+      if (Array.isArray(root?.items)) {
+        depService.clearIdleTasks();
+        removeDataSourceTarget(config.id);
+        initDataSourceDepTarget(config);
+        collectIdle(root.items, true).then(() => {
+          updateDataSourceSchema(root?.items || [], true);
+        });
+      }
+    } else if (root?.dataSources) {
+      getApp()?.dataSourceManager?.updateSchema(root.dataSources);
+    }
   };
   const removeDataSourceTarget = (id) => {
     depService.removeTarget(id, DepTargetType.DATA_SOURCE);
@@ -12465,8 +12734,13 @@ const initServiceEvents = (props, emit, { editorService, codeBlockService, dataS
     depService.removeTarget(id, DepTargetType.DATA_SOURCE_METHOD);
   };
   const dataSourceRemoveHandler = (id) => {
+    const root = editorService.get("root");
+    const nodeIds = Object.keys(root?.dataSourceDeps?.[id] || {});
+    const nodes = getNodes(nodeIds, root?.items);
+    collectIdle(nodes, false).then(() => {
+      updateDataSourceSchema(nodes, false);
+    });
     removeDataSourceTarget(id);
-    getApp()?.dataSourceManager?.removeDataSource(id);
   };
   dataSourceService.on("add", dataSourceAddHandler);
   dataSourceService.on("update", dataSourceUpdateHandler);
@@ -12474,7 +12748,7 @@ const initServiceEvents = (props, emit, { editorService, codeBlockService, dataS
   onBeforeUnmount(() => {
     depService.off("add-target", targetAddHandler);
     depService.off("remove-target", targetRemoveHandler);
-    depService.off("collected", collectedHandler);
+    depService.off("collected", depCollectedHandler);
     editorService.off("history-change", historyChangeHandler);
     editorService.off("root-change", rootChangeHandler);
     editorService.off("add", nodeAddHandler);
@@ -12531,7 +12805,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     isContainer: { type: Function },
     customContentMenu: { type: Function },
     extendFormState: { type: Function },
-    pageBarSortOptions: {}
+    pageBarSortOptions: {},
+    pageFilterFunction: { type: Function }
   }, defaultEditorProps),
   emits: ["props-panel-mounted", "update:modelValue", "props-form-error", "props-submit-error"],
   setup(__props, { expose: __expose, emit: __emit }) {
@@ -12580,7 +12855,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     return (_ctx, _cache) => {
       return openBlock(), createBlock(_sfc_main$r, {
         "disabled-page-fragment": _ctx.disabledPageFragment,
-        "page-bar-sort-options": _ctx.pageBarSortOptions
+        "page-bar-sort-options": _ctx.pageBarSortOptions,
+        "page-filter-function": _ctx.pageFilterFunction
       }, {
         header: withCtx(() => [
           renderSlot(_ctx.$slots, "header")
@@ -12693,6 +12969,9 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         "page-bar": withCtx(() => [
           renderSlot(_ctx.$slots, "page-bar")
         ]),
+        "page-bar-add-button": withCtx(() => [
+          renderSlot(_ctx.$slots, "page-bar-add-button")
+        ]),
         "page-bar-title": withCtx(({ page }) => [
           renderSlot(_ctx.$slots, "page-bar-title", { page })
         ]),
@@ -12703,7 +12982,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           renderSlot(_ctx.$slots, "page-list-popover", { list })
         ]),
         _: 3
-      }, 8, ["disabled-page-fragment", "page-bar-sort-options"]);
+      }, 8, ["disabled-page-fragment", "page-bar-sort-options", "page-filter-function"]);
     };
   }
 });
@@ -12742,4 +13021,4 @@ const index = {
   }
 };
 
-export { CODE_DRAFT_STORAGE_KEY, COPY_CODE_STORAGE_KEY, COPY_DS_STORAGE_KEY, COPY_STORAGE_KEY, _sfc_main$L as CodeBlockEditor, _sfc_main$l as CodeBlockList, _sfc_main$k as CodeBlockListPanel, CodeDeleteErrorType, _sfc_main$U as CodeSelect, _sfc_main$S as CodeSelectCol, ColumnLayout, _sfc_main$b as ComponentListPanel, _sfc_main$R as CondOpSelect, _sfc_main$g as ContentMenu, _sfc_main$j as DataSourceConfigPanel, _sfc_main$N as DataSourceFieldSelect, _sfc_main$P as DataSourceFields, _sfc_main$M as DataSourceInput, _sfc_main$J as DataSourceMethodSelect, _sfc_main$K as DataSourceMethods, _sfc_main$I as DataSourceMocks, _sfc_main$H as DataSourceSelect, _sfc_main$G as DisplayConds, DragType, _sfc_main$F as EventSelect, Fixed2Other, _sfc_main$Q as FloatingBox, H_GUIDE_LINE_STORAGE_KEY, _sfc_main$Y as Icon, IdleTask, KeyBindingCommand, _sfc_main$D as KeyValue, Keys, LayerOffset, _sfc_main$c as LayerPanel, Layout, _sfc_main$z as LayoutContainer, _sfc_main$C as PageFragmentSelect, _sfc_main$p as PropsPanel, _sfc_main$A as Resizer, ScrollViewer, SideItemKey, _sfc_main$z as SplitView, _sfc_main$X as TMagicCodeEditor, _sfc_main as TMagicEditor, _sfc_main$y as ToolButton, _sfc_main$m as Tree, _sfc_main$n as TreeNode, UI_SELECT_MODE_EVENT_NAME, UndoRedo, V_GUIDE_LINE_STORAGE_KEY, advancedTabConfig, arrayOptions, beforePaste, change2Fixed, codeBlockService, dataSourceService, debug, index as default, depService, displayTabConfig, editorService, eqOptions, error, eventTabConfig, eventsService, fillConfig$1 as fillConfig, fixNodeLeft, fixNodePosition, generatePageName, generatePageNameByApp, getAddParent, getCascaderOptionsFromFields, getDefaultConfig, getDisplayField, getEditorConfig, getFormConfig, getFormValue, getGuideLineFromCache, getInitPositionStyle, getNodeIndex, getPageFragmentList, getPageList, getPageNameList, getPositionInContainer, getRelativeStyle, historyService, info, log, moveItemsInContainer, numberOptions, propsService, removeDataSourceFieldPrefix, serializeConfig, setChildrenLayout, setEditorConfig, setLayout, stageOverlayService, storageService, styleTabConfig, traverseNode, uiService, updateStatus, useCodeBlockEdit, useDataSourceMethod, useEditorContentHeight, useFilter, useFloatBox, useGetSo, useNextFloatBoxPosition, useNodeStatus$1 as useNodeStatus, useStage, useWindowRect, warn };
+export { CODE_DRAFT_STORAGE_KEY, COPY_CODE_STORAGE_KEY, COPY_DS_STORAGE_KEY, COPY_STORAGE_KEY, _sfc_main$L as CodeBlockEditor, _sfc_main$l as CodeBlockList, _sfc_main$k as CodeBlockListPanel, CodeDeleteErrorType, _sfc_main$U as CodeSelect, _sfc_main$S as CodeSelectCol, ColumnLayout, _sfc_main$b as ComponentListPanel, _sfc_main$R as CondOpSelect, _sfc_main$g as ContentMenu, _sfc_main$j as DataSourceConfigPanel, _sfc_main$N as DataSourceFieldSelect, _sfc_main$P as DataSourceFields, _sfc_main$M as DataSourceInput, _sfc_main$J as DataSourceMethodSelect, _sfc_main$K as DataSourceMethods, _sfc_main$I as DataSourceMocks, _sfc_main$H as DataSourceSelect, _sfc_main$G as DisplayConds, DragType, _sfc_main$F as EventSelect, Fixed2Other, _sfc_main$Q as FloatingBox, H_GUIDE_LINE_STORAGE_KEY, _sfc_main$Y as Icon, IdleTask, KeyBindingCommand, _sfc_main$D as KeyValue, Keys, LayerOffset, _sfc_main$c as LayerPanel, Layout, _sfc_main$z as LayoutContainer, _sfc_main$C as PageFragmentSelect, _sfc_main$p as PropsPanel, _sfc_main$A as Resizer, ScrollViewer, SideItemKey, _sfc_main$z as SplitView, _sfc_main$X as TMagicCodeEditor, _sfc_main as TMagicEditor, _sfc_main$y as ToolButton, _sfc_main$m as Tree, _sfc_main$n as TreeNode, UI_SELECT_MODE_EVENT_NAME, UndoRedo, V_GUIDE_LINE_STORAGE_KEY, advancedTabConfig, arrayOptions, beforePaste, change2Fixed, codeBlockService, dataSourceService, debug, index as default, depService, displayTabConfig, editorService, eqOptions, error, eventTabConfig, eventsService, fillConfig$1 as fillConfig, fixNodeLeft, fixNodePosition, generatePageName, generatePageNameByApp, getAddParent, getCascaderOptionsFromFields, getDefaultConfig, getDisplayField, getEditorConfig, getFormConfig, getFormValue, getGuideLineFromCache, getInitPositionStyle, getNodeIndex, getPageFragmentList, getPageList, getPageNameList, getPositionInContainer, getRelativeStyle, historyService, info, isIncludeDataSource, log, moveItemsInContainer, numberOptions, propsService, removeDataSourceFieldPrefix, serializeConfig, setChildrenLayout, setEditorConfig, setLayout, stageOverlayService, storageService, styleTabConfig, uiService, updateStatus, useCodeBlockEdit, useEditorContentHeight, useFilter, useFloatBox, useGetSo, useNextFloatBoxPosition, useNodeStatus$1 as useNodeStatus, useStage, useWindowRect, warn };