@tmagic/editor 1.5.15 → 1.5.17

package/dist/tmagic-editor.umd.cjs

@@ -5461,52 +5461,57 @@
       }
     ]
   };
-  const fillConfig$1 = (config = [], labelWidth = "80px") => [
-    {
-      type: "tab",
-      labelWidth,
-      items: [
-        {
-          title: "属性",
-          items: [
-            // 组件类型，必须要有
-            {
-              text: "type",
-              name: "type",
-              type: "hidden"
-            },
-            // 组件id，必须要有
-            {
-              name: "id",
-              text: "ID",
-              type: "text",
-              disabled: true,
-              append: {
-                type: "button",
-                text: "复制",
-                handler: (vm, { model }) => {
-                  navigator.clipboard.writeText(`${model.id}`).then(() => {
-                    designPlugin.tMagicMessage.success("已复制");
-                  }).catch(() => {
-                    designPlugin.tMagicMessage.error("复制失败");
-                  });
-                }
-              }
-            },
-            {
-              name: "name",
-              text: "组件名称"
-            },
-            ...config
-          ]
-        },
-        { ...styleTabConfig },
-        { ...eventTabConfig },
-        { ...advancedTabConfig },
-        { ...displayTabConfig }
-      ]
+  const fillConfig$1 = (config = [], labelWidth = "80px") => {
+    const propsConfig = [];
+    if (!config.find((item) => item.name === "type")) {
+      propsConfig.push({
+        text: "type",
+        name: "type",
+        type: "hidden"
+      });
     }
-  ];
+    if (!config.find((item) => item.name === "id")) {
+      propsConfig.push({
+        name: "id",
+        text: "ID",
+        type: "text",
+        disabled: true,
+        append: {
+          type: "button",
+          text: "复制",
+          handler: (vm, { model }) => {
+            navigator.clipboard.writeText(`${model.id}`).then(() => {
+              designPlugin.tMagicMessage.success("已复制");
+            }).catch(() => {
+              designPlugin.tMagicMessage.error("复制失败");
+            });
+          }
+        }
+      });
+    }
+    if (!config.find((item) => item.name === "name")) {
+      propsConfig.push({
+        name: "name",
+        text: "组件名称"
+      });
+    }
+    return [
+      {
+        type: "tab",
+        labelWidth,
+        items: [
+          {
+            title: "属性",
+            items: [...propsConfig, ...config]
+          },
+          { ...styleTabConfig },
+          { ...eventTabConfig },
+          { ...advancedTabConfig },
+          { ...displayTabConfig }
+        ]
+      }
+    ];
+  };
 
   const log = (...args) => {
     if (process.env.NODE_ENV === "development") {
@@ -7340,36 +7345,34 @@
     return newNode;
   };
 
-  function BaseFormConfig() {
-    return [
-      {
-        name: "id",
-        type: "hidden"
-      },
-      {
-        name: "type",
-        text: "类型",
-        type: "hidden",
-        defaultValue: "base"
-      },
-      {
-        name: "title",
-        text: "名称",
-        rules: [
-          {
-            required: true,
-            message: "请输入名称"
-          }
-        ]
-      },
-      {
-        name: "description",
-        text: "描述"
-      }
-    ];
-  }
+  const BaseFormConfig = () => formPlugin.defineFormConfig([
+    {
+      name: "id",
+      type: "hidden"
+    },
+    {
+      name: "type",
+      text: "类型",
+      type: "hidden",
+      defaultValue: "base"
+    },
+    {
+      name: "title",
+      text: "名称",
+      rules: [
+        {
+          required: true,
+          message: "请输入名称"
+        }
+      ]
+    },
+    {
+      name: "description",
+      text: "描述"
+    }
+  ]);
 
-  const HttpFormConfig = [
+  const HttpFormConfig = formPlugin.defineFormConfig([
     {
       name: "autoFetch",
       text: "自动请求",
@@ -7428,7 +7431,7 @@
         }
       ]
     }
-  ];
+  ]);
 
   const fillConfig = (config) => [
     ...BaseFormConfig(),
@@ -18735,6 +18738,34 @@
   }
   const dataSourceService = new DataSource();
 
+  const jsContent = "(function () {\n  'use strict';\n\n  var events = {exports: {}};\n\n  var hasRequiredEvents;\n\n  function requireEvents () {\n  \tif (hasRequiredEvents) return events.exports;\n  \thasRequiredEvents = 1;\n\n  \tvar R = typeof Reflect === 'object' ? Reflect : null;\n  \tvar ReflectApply = R && typeof R.apply === 'function'\n  \t  ? R.apply\n  \t  : function ReflectApply(target, receiver, args) {\n  \t    return Function.prototype.apply.call(target, receiver, args);\n  \t  };\n\n  \tvar ReflectOwnKeys;\n  \tif (R && typeof R.ownKeys === 'function') {\n  \t  ReflectOwnKeys = R.ownKeys;\n  \t} else if (Object.getOwnPropertySymbols) {\n  \t  ReflectOwnKeys = function ReflectOwnKeys(target) {\n  \t    return Object.getOwnPropertyNames(target)\n  \t      .concat(Object.getOwnPropertySymbols(target));\n  \t  };\n  \t} else {\n  \t  ReflectOwnKeys = function ReflectOwnKeys(target) {\n  \t    return Object.getOwnPropertyNames(target);\n  \t  };\n  \t}\n\n  \tfunction ProcessEmitWarning(warning) {\n  \t  if (console && console.warn) console.warn(warning);\n  \t}\n\n  \tvar NumberIsNaN = Number.isNaN || function NumberIsNaN(value) {\n  \t  return value !== value;\n  \t};\n\n  \tfunction EventEmitter() {\n  \t  EventEmitter.init.call(this);\n  \t}\n  \tevents.exports = EventEmitter;\n  \tevents.exports.once = once;\n\n  \t// Backwards-compat with node 0.10.x\n  \tEventEmitter.EventEmitter = EventEmitter;\n\n  \tEventEmitter.prototype._events = undefined;\n  \tEventEmitter.prototype._eventsCount = 0;\n  \tEventEmitter.prototype._maxListeners = undefined;\n\n  \t// By default EventEmitters will print a warning if more than 10 listeners are\n  \t// added to it. This is a useful default which helps finding memory leaks.\n  \tvar defaultMaxListeners = 10;\n\n  \tfunction checkListener(listener) {\n  \t  if (typeof listener !== 'function') {\n  \t    throw new TypeError('The \"listener\" argument must be of type Function. Received type ' + typeof listener);\n  \t  }\n  \t}\n\n  \tObject.defineProperty(EventEmitter, 'defaultMaxListeners', {\n  \t  enumerable: true,\n  \t  get: function() {\n  \t    return defaultMaxListeners;\n  \t  },\n  \t  set: function(arg) {\n  \t    if (typeof arg !== 'number' || arg < 0 || NumberIsNaN(arg)) {\n  \t      throw new RangeError('The value of \"defaultMaxListeners\" is out of range. It must be a non-negative number. Received ' + arg + '.');\n  \t    }\n  \t    defaultMaxListeners = arg;\n  \t  }\n  \t});\n\n  \tEventEmitter.init = function() {\n\n  \t  if (this._events === undefined ||\n  \t      this._events === Object.getPrototypeOf(this)._events) {\n  \t    this._events = Object.create(null);\n  \t    this._eventsCount = 0;\n  \t  }\n\n  \t  this._maxListeners = this._maxListeners || undefined;\n  \t};\n\n  \t// Obviously not all Emitters should be limited to 10. This function allows\n  \t// that to be increased. Set to zero for unlimited.\n  \tEventEmitter.prototype.setMaxListeners = function setMaxListeners(n) {\n  \t  if (typeof n !== 'number' || n < 0 || NumberIsNaN(n)) {\n  \t    throw new RangeError('The value of \"n\" is out of range. It must be a non-negative number. Received ' + n + '.');\n  \t  }\n  \t  this._maxListeners = n;\n  \t  return this;\n  \t};\n\n  \tfunction _getMaxListeners(that) {\n  \t  if (that._maxListeners === undefined)\n  \t    return EventEmitter.defaultMaxListeners;\n  \t  return that._maxListeners;\n  \t}\n\n  \tEventEmitter.prototype.getMaxListeners = function getMaxListeners() {\n  \t  return _getMaxListeners(this);\n  \t};\n\n  \tEventEmitter.prototype.emit = function emit(type) {\n  \t  var args = [];\n  \t  for (var i = 1; i < arguments.length; i++) args.push(arguments[i]);\n  \t  var doError = (type === 'error');\n\n  \t  var events = this._events;\n  \t  if (events !== undefined)\n  \t    doError = (doError && events.error === undefined);\n  \t  else if (!doError)\n  \t    return false;\n\n  \t  // If there is no 'error' event listener then throw.\n  \t  if (doError) {\n  \t    var er;\n  \t    if (args.length > 0)\n  \t      er = args[0];\n  \t    if (er instanceof Error) {\n  \t      // Note: The comments on the `throw` lines are intentional, they show\n  \t      // up in Node's output if this results in an unhandled exception.\n  \t      throw er; // Unhandled 'error' event\n  \t    }\n  \t    // At least give some kind of context to the user\n  \t    var err = new Error('Unhandled error.' + (er ? ' (' + er.message + ')' : ''));\n  \t    err.context = er;\n  \t    throw err; // Unhandled 'error' event\n  \t  }\n\n  \t  var handler = events[type];\n\n  \t  if (handler === undefined)\n  \t    return false;\n\n  \t  if (typeof handler === 'function') {\n  \t    ReflectApply(handler, this, args);\n  \t  } else {\n  \t    var len = handler.length;\n  \t    var listeners = arrayClone(handler, len);\n  \t    for (var i = 0; i < len; ++i)\n  \t      ReflectApply(listeners[i], this, args);\n  \t  }\n\n  \t  return true;\n  \t};\n\n  \tfunction _addListener(target, type, listener, prepend) {\n  \t  var m;\n  \t  var events;\n  \t  var existing;\n\n  \t  checkListener(listener);\n\n  \t  events = target._events;\n  \t  if (events === undefined) {\n  \t    events = target._events = Object.create(null);\n  \t    target._eventsCount = 0;\n  \t  } else {\n  \t    // To avoid recursion in the case that type === \"newListener\"! Before\n  \t    // adding it to the listeners, first emit \"newListener\".\n  \t    if (events.newListener !== undefined) {\n  \t      target.emit('newListener', type,\n  \t                  listener.listener ? listener.listener : listener);\n\n  \t      // Re-assign `events` because a newListener handler could have caused the\n  \t      // this._events to be assigned to a new object\n  \t      events = target._events;\n  \t    }\n  \t    existing = events[type];\n  \t  }\n\n  \t  if (existing === undefined) {\n  \t    // Optimize the case of one listener. Don't need the extra array object.\n  \t    existing = events[type] = listener;\n  \t    ++target._eventsCount;\n  \t  } else {\n  \t    if (typeof existing === 'function') {\n  \t      // Adding the second element, need to change to array.\n  \t      existing = events[type] =\n  \t        prepend ? [listener, existing] : [existing, listener];\n  \t      // If we've already got an array, just append.\n  \t    } else if (prepend) {\n  \t      existing.unshift(listener);\n  \t    } else {\n  \t      existing.push(listener);\n  \t    }\n\n  \t    // Check for listener leak\n  \t    m = _getMaxListeners(target);\n  \t    if (m > 0 && existing.length > m && !existing.warned) {\n  \t      existing.warned = true;\n  \t      // No error code for this since it is a Warning\n  \t      // eslint-disable-next-line no-restricted-syntax\n  \t      var w = new Error('Possible EventEmitter memory leak detected. ' +\n  \t                          existing.length + ' ' + String(type) + ' listeners ' +\n  \t                          'added. Use emitter.setMaxListeners() to ' +\n  \t                          'increase limit');\n  \t      w.name = 'MaxListenersExceededWarning';\n  \t      w.emitter = target;\n  \t      w.type = type;\n  \t      w.count = existing.length;\n  \t      ProcessEmitWarning(w);\n  \t    }\n  \t  }\n\n  \t  return target;\n  \t}\n\n  \tEventEmitter.prototype.addListener = function addListener(type, listener) {\n  \t  return _addListener(this, type, listener, false);\n  \t};\n\n  \tEventEmitter.prototype.on = EventEmitter.prototype.addListener;\n\n  \tEventEmitter.prototype.prependListener =\n  \t    function prependListener(type, listener) {\n  \t      return _addListener(this, type, listener, true);\n  \t    };\n\n  \tfunction onceWrapper() {\n  \t  if (!this.fired) {\n  \t    this.target.removeListener(this.type, this.wrapFn);\n  \t    this.fired = true;\n  \t    if (arguments.length === 0)\n  \t      return this.listener.call(this.target);\n  \t    return this.listener.apply(this.target, arguments);\n  \t  }\n  \t}\n\n  \tfunction _onceWrap(target, type, listener) {\n  \t  var state = { fired: false, wrapFn: undefined, target: target, type: type, listener: listener };\n  \t  var wrapped = onceWrapper.bind(state);\n  \t  wrapped.listener = listener;\n  \t  state.wrapFn = wrapped;\n  \t  return wrapped;\n  \t}\n\n  \tEventEmitter.prototype.once = function once(type, listener) {\n  \t  checkListener(listener);\n  \t  this.on(type, _onceWrap(this, type, listener));\n  \t  return this;\n  \t};\n\n  \tEventEmitter.prototype.prependOnceListener =\n  \t    function prependOnceListener(type, listener) {\n  \t      checkListener(listener);\n  \t      this.prependListener(type, _onceWrap(this, type, listener));\n  \t      return this;\n  \t    };\n\n  \t// Emits a 'removeListener' event if and only if the listener was removed.\n  \tEventEmitter.prototype.removeListener =\n  \t    function removeListener(type, listener) {\n  \t      var list, events, position, i, originalListener;\n\n  \t      checkListener(listener);\n\n  \t      events = this._events;\n  \t      if (events === undefined)\n  \t        return this;\n\n  \t      list = events[type];\n  \t      if (list === undefined)\n  \t        return this;\n\n  \t      if (list === listener || list.listener === listener) {\n  \t        if (--this._eventsCount === 0)\n  \t          this._events = Object.create(null);\n  \t        else {\n  \t          delete events[type];\n  \t          if (events.removeListener)\n  \t            this.emit('removeListener', type, list.listener || listener);\n  \t        }\n  \t      } else if (typeof list !== 'function') {\n  \t        position = -1;\n\n  \t        for (i = list.length - 1; i >= 0; i--) {\n  \t          if (list[i] === listener || list[i].listener === listener) {\n  \t            originalListener = list[i].listener;\n  \t            position = i;\n  \t            break;\n  \t          }\n  \t        }\n\n  \t        if (position < 0)\n  \t          return this;\n\n  \t        if (position === 0)\n  \t          list.shift();\n  \t        else {\n  \t          spliceOne(list, position);\n  \t        }\n\n  \t        if (list.length === 1)\n  \t          events[type] = list[0];\n\n  \t        if (events.removeListener !== undefined)\n  \t          this.emit('removeListener', type, originalListener || listener);\n  \t      }\n\n  \t      return this;\n  \t    };\n\n  \tEventEmitter.prototype.off = EventEmitter.prototype.removeListener;\n\n  \tEventEmitter.prototype.removeAllListeners =\n  \t    function removeAllListeners(type) {\n  \t      var listeners, events, i;\n\n  \t      events = this._events;\n  \t      if (events === undefined)\n  \t        return this;\n\n  \t      // not listening for removeListener, no need to emit\n  \t      if (events.removeListener === undefined) {\n  \t        if (arguments.length === 0) {\n  \t          this._events = Object.create(null);\n  \t          this._eventsCount = 0;\n  \t        } else if (events[type] !== undefined) {\n  \t          if (--this._eventsCount === 0)\n  \t            this._events = Object.create(null);\n  \t          else\n  \t            delete events[type];\n  \t        }\n  \t        return this;\n  \t      }\n\n  \t      // emit removeListener for all listeners on all events\n  \t      if (arguments.length === 0) {\n  \t        var keys = Object.keys(events);\n  \t        var key;\n  \t        for (i = 0; i < keys.length; ++i) {\n  \t          key = keys[i];\n  \t          if (key === 'removeListener') continue;\n  \t          this.removeAllListeners(key);\n  \t        }\n  \t        this.removeAllListeners('removeListener');\n  \t        this._events = Object.create(null);\n  \t        this._eventsCount = 0;\n  \t        return this;\n  \t      }\n\n  \t      listeners = events[type];\n\n  \t      if (typeof listeners === 'function') {\n  \t        this.removeListener(type, listeners);\n  \t      } else if (listeners !== undefined) {\n  \t        // LIFO order\n  \t        for (i = listeners.length - 1; i >= 0; i--) {\n  \t          this.removeListener(type, listeners[i]);\n  \t        }\n  \t      }\n\n  \t      return this;\n  \t    };\n\n  \tfunction _listeners(target, type, unwrap) {\n  \t  var events = target._events;\n\n  \t  if (events === undefined)\n  \t    return [];\n\n  \t  var evlistener = events[type];\n  \t  if (evlistener === undefined)\n  \t    return [];\n\n  \t  if (typeof evlistener === 'function')\n  \t    return unwrap ? [evlistener.listener || evlistener] : [evlistener];\n\n  \t  return unwrap ?\n  \t    unwrapListeners(evlistener) : arrayClone(evlistener, evlistener.length);\n  \t}\n\n  \tEventEmitter.prototype.listeners = function listeners(type) {\n  \t  return _listeners(this, type, true);\n  \t};\n\n  \tEventEmitter.prototype.rawListeners = function rawListeners(type) {\n  \t  return _listeners(this, type, false);\n  \t};\n\n  \tEventEmitter.listenerCount = function(emitter, type) {\n  \t  if (typeof emitter.listenerCount === 'function') {\n  \t    return emitter.listenerCount(type);\n  \t  } else {\n  \t    return listenerCount.call(emitter, type);\n  \t  }\n  \t};\n\n  \tEventEmitter.prototype.listenerCount = listenerCount;\n  \tfunction listenerCount(type) {\n  \t  var events = this._events;\n\n  \t  if (events !== undefined) {\n  \t    var evlistener = events[type];\n\n  \t    if (typeof evlistener === 'function') {\n  \t      return 1;\n  \t    } else if (evlistener !== undefined) {\n  \t      return evlistener.length;\n  \t    }\n  \t  }\n\n  \t  return 0;\n  \t}\n\n  \tEventEmitter.prototype.eventNames = function eventNames() {\n  \t  return this._eventsCount > 0 ? ReflectOwnKeys(this._events) : [];\n  \t};\n\n  \tfunction arrayClone(arr, n) {\n  \t  var copy = new Array(n);\n  \t  for (var i = 0; i < n; ++i)\n  \t    copy[i] = arr[i];\n  \t  return copy;\n  \t}\n\n  \tfunction spliceOne(list, index) {\n  \t  for (; index + 1 < list.length; index++)\n  \t    list[index] = list[index + 1];\n  \t  list.pop();\n  \t}\n\n  \tfunction unwrapListeners(arr) {\n  \t  var ret = new Array(arr.length);\n  \t  for (var i = 0; i < ret.length; ++i) {\n  \t    ret[i] = arr[i].listener || arr[i];\n  \t  }\n  \t  return ret;\n  \t}\n\n  \tfunction once(emitter, name) {\n  \t  return new Promise(function (resolve, reject) {\n  \t    function errorListener(err) {\n  \t      emitter.removeListener(name, resolver);\n  \t      reject(err);\n  \t    }\n\n  \t    function resolver() {\n  \t      if (typeof emitter.removeListener === 'function') {\n  \t        emitter.removeListener('error', errorListener);\n  \t      }\n  \t      resolve([].slice.call(arguments));\n  \t    }\n  \t    eventTargetAgnosticAddListener(emitter, name, resolver, { once: true });\n  \t    if (name !== 'error') {\n  \t      addErrorHandlerIfEventEmitter(emitter, errorListener, { once: true });\n  \t    }\n  \t  });\n  \t}\n\n  \tfunction addErrorHandlerIfEventEmitter(emitter, handler, flags) {\n  \t  if (typeof emitter.on === 'function') {\n  \t    eventTargetAgnosticAddListener(emitter, 'error', handler, flags);\n  \t  }\n  \t}\n\n  \tfunction eventTargetAgnosticAddListener(emitter, name, listener, flags) {\n  \t  if (typeof emitter.on === 'function') {\n  \t    if (flags.once) {\n  \t      emitter.once(name, listener);\n  \t    } else {\n  \t      emitter.on(name, listener);\n  \t    }\n  \t  } else if (typeof emitter.addEventListener === 'function') {\n  \t    // EventTarget does not have `error` event semantics like Node\n  \t    // EventEmitters, we do not listen for `error` events here.\n  \t    emitter.addEventListener(name, function wrapListener(arg) {\n  \t      // IE does not have builtin `{ once: true }` support so we\n  \t      // have to do it manually.\n  \t      if (flags.once) {\n  \t        emitter.removeEventListener(name, wrapListener);\n  \t      }\n  \t      listener(arg);\n  \t    });\n  \t  } else {\n  \t    throw new TypeError('The \"emitter\" argument must be of type EventEmitter. Received type ' + typeof emitter);\n  \t  }\n  \t}\n  \treturn events.exports;\n  }\n\n  requireEvents();\n\n  /*! *****************************************************************************\r\n  Copyright (c) Microsoft Corporation.\r\n\r\n  Permission to use, copy, modify, and/or distribute this software for any\r\n  purpose with or without fee is hereby granted.\r\n\r\n  THE SOFTWARE IS PROVIDED \"AS IS\" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH\r\n  REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY\r\n  AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,\r\n  INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM\r\n  LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR\r\n  OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR\r\n  PERFORMANCE OF THIS SOFTWARE.\r\n  ***************************************************************************** */\r\n\r\n\n  let cachedTextEncoder = new TextEncoder(\"utf-8\");\n\n  typeof cachedTextEncoder.encodeInto === \"function\"\n      ? function (arg, view) {\n          return cachedTextEncoder.encodeInto(arg, view);\n        }\n      : function (arg, view) {\n          const buf = cachedTextEncoder.encode(arg);\n          view.set(buf);\n          return {\n            read: arg.length,\n            written: buf.length,\n          };\n        };\n\n  const NODE_CONDS_KEY = \"displayConds\";\n  var HookType = /* @__PURE__ */ ((HookType2) => {\n    HookType2[\"CODE\"] = \"code\";\n    return HookType2;\n  })(HookType || {});\n\n  const isObject = (obj) => Object.prototype.toString.call(obj) === \"[object Object]\";\n  const getKeysArray = (keys) => (\n    // 将 array[0] 转成 array.0\n    `${keys}`.replaceAll(/\\[(\\d+)\\]/g, \".$1\").split(\".\")\n  );\n  const DATA_SOURCE_FIELDS_SELECT_VALUE_PREFIX = \"ds-field::\";\n  const dataSourceTemplateRegExp = /\\$\\{([\\s\\S]+?)\\}/g;\n\n  var DepTargetType = /* @__PURE__ */ ((DepTargetType2) => {\n    DepTargetType2[\"DEFAULT\"] = \"default\";\n    DepTargetType2[\"CODE_BLOCK\"] = \"code-block\";\n    DepTargetType2[\"DATA_SOURCE\"] = \"data-source\";\n    DepTargetType2[\"DATA_SOURCE_METHOD\"] = \"data-source-method\";\n    DepTargetType2[\"DATA_SOURCE_COND\"] = \"data-source-cond\";\n    return DepTargetType2;\n  })(DepTargetType || {});\n\n  class Target {\n    /**\n     * 如何识别目标\n     */\n    isTarget;\n    /**\n     * 目标id，不可重复\n     * 例如目标是代码块，则为代码块id\n     */\n    id;\n    /**\n     * 目标名称，用于显示在依赖列表中\n     */\n    name;\n    /**\n     * 不同的目标可以进行分类，例如代码块，数据源可以为两个不同的type\n     */\n    type = DepTargetType.DEFAULT;\n    /**\n     * 依赖详情\n     * 实例：{ 'node_id': { name: 'node_name', keys: [ created, mounted ] } }\n     */\n    deps = {};\n    /**\n     * 是否默认收集，默认为true，当值为false时需要传入type参数给collect方法才会被收集\n     */\n    isCollectByDefault;\n    constructor(options) {\n      this.isTarget = options.isTarget;\n      this.id = options.id;\n      this.name = options.name;\n      this.isCollectByDefault = options.isCollectByDefault ?? true;\n      if (options.type) {\n        this.type = options.type;\n      }\n      if (options.initialDeps) {\n        this.deps = options.initialDeps;\n      }\n    }\n    /**\n     * 更新依赖\n     * @param option 节点配置\n     * @param key 哪个key配置了这个目标的id\n     */\n    updateDep({ id, name, key, data }) {\n      const dep = this.deps[id] || {\n        name,\n        keys: []\n      };\n      dep.name = name;\n      dep.data = data;\n      this.deps[id] = dep;\n      if (dep.keys.indexOf(key) === -1) {\n        dep.keys.push(key);\n      }\n    }\n    /**\n     * 删除依赖\n     * @param node 哪个节点的依赖需要移除，如果为空，则移除所有依赖\n     * @param key 节点下哪个key需要移除，如果为空，则移除改节点下的所有依赖key\n     * @returns void\n     */\n    removeDep(id, key) {\n      if (typeof id === \"undefined\") {\n        Object.keys(this.deps).forEach((depKey) => {\n          delete this.deps[depKey];\n        });\n        return;\n      }\n      const dep = this.deps[id];\n      if (!dep) return;\n      if (key) {\n        const index = dep.keys.indexOf(key);\n        dep.keys.splice(index, 1);\n        if (dep.keys.length === 0) {\n          delete this.deps[id];\n        }\n      } else {\n        delete this.deps[id];\n      }\n    }\n    /**\n     * 判断指定节点下的指定key是否存在在依赖列表中\n     * @param node 哪个节点\n     * @param key 哪个key\n     * @returns boolean\n     */\n    hasDep(id, key) {\n      const dep = this.deps[id];\n      return Boolean(dep?.keys.find((d) => d === key));\n    }\n    destroy() {\n      this.deps = {};\n    }\n  }\n\n  const createCodeBlockTarget = (id, codeBlock, initialDeps = {}) => new Target({\n    type: DepTargetType.CODE_BLOCK,\n    id,\n    initialDeps,\n    name: codeBlock.name,\n    isTarget: (_key, value) => {\n      if (id === value) {\n        return true;\n      }\n      if (value?.hookType === HookType.CODE && Array.isArray(value.hookData)) {\n        const index = value.hookData.findIndex((item) => item.codeId === id);\n        return Boolean(index > -1);\n      }\n      return false;\n    }\n  });\n  const isIncludeArrayField = (keys, fields) => {\n    let f = fields;\n    return keys.some((key, index) => {\n      const field = f.find(({ name }) => name === key);\n      f = field?.fields || [];\n      return field && field.type === \"array\" && // 不是整数\n      /^(?!\\d+$).*$/.test(`${keys[index + 1]}`) && index < keys.length - 1;\n    });\n  };\n  const isDataSourceTemplate = (value, ds, hasArray = false) => {\n    const templates = value.match(dataSourceTemplateRegExp) || [];\n    if (templates.length <= 0) {\n      return false;\n    }\n    const arrayFieldTemplates = [];\n    const fieldTemplates = [];\n    templates.forEach((tpl) => {\n      const expression = tpl.substring(2, tpl.length - 1);\n      const keys = getKeysArray(expression);\n      const dsId = keys.shift();\n      if (!dsId || dsId !== ds.id) {\n        return;\n      }\n      if (isIncludeArrayField(keys, ds.fields)) {\n        arrayFieldTemplates.push(tpl);\n      } else {\n        fieldTemplates.push(tpl);\n      }\n    });\n    if (hasArray) {\n      return arrayFieldTemplates.length > 0;\n    }\n    return fieldTemplates.length > 0;\n  };\n  const isSpecificDataSourceTemplate = (value, dsId) => value?.isBindDataSourceField && value.dataSourceId && value.dataSourceId === dsId && typeof value.template === \"string\";\n  const isUseDataSourceField = (value, id) => {\n    if (!Array.isArray(value) || typeof value[0] !== \"string\") {\n      return false;\n    }\n    const [prefixId] = value;\n    const prefixIndex = prefixId.indexOf(DATA_SOURCE_FIELDS_SELECT_VALUE_PREFIX);\n    if (prefixIndex === -1) {\n      return false;\n    }\n    const dsId = prefixId.substring(prefixIndex + DATA_SOURCE_FIELDS_SELECT_VALUE_PREFIX.length);\n    return dsId === id;\n  };\n  const isDataSourceTarget = (ds, key, value, hasArray = false) => {\n    if (!value || ![\"string\", \"object\"].includes(typeof value)) {\n      return false;\n    }\n    if (`${key}`.startsWith(NODE_CONDS_KEY)) {\n      return false;\n    }\n    if (typeof value === \"string\") {\n      return isDataSourceTemplate(value, ds, hasArray);\n    }\n    if (isObject(value) && value?.isBindDataSource && value.dataSourceId && value.dataSourceId === ds.id) {\n      return true;\n    }\n    if (isSpecificDataSourceTemplate(value, ds.id)) {\n      return true;\n    }\n    if (isUseDataSourceField(value, ds.id)) {\n      const [, ...keys] = value;\n      const includeArray = isIncludeArrayField(keys, ds.fields);\n      if (hasArray) {\n        return includeArray;\n      }\n      return !includeArray;\n    }\n    return false;\n  };\n  const isDataSourceCondTarget = (ds, key, value, hasArray = false) => {\n    if (!Array.isArray(value) || !ds) {\n      return false;\n    }\n    const [dsId, ...keys] = value;\n    if (dsId !== ds.id || !`${key}`.startsWith(NODE_CONDS_KEY)) {\n      return false;\n    }\n    if (ds.fields?.find((field) => field.name === keys[0])) {\n      const includeArray = isIncludeArrayField(keys, ds.fields);\n      if (hasArray) {\n        return includeArray;\n      }\n      return !includeArray;\n    }\n    return false;\n  };\n  const createDataSourceTarget = (ds, initialDeps = {}) => new Target({\n    type: DepTargetType.DATA_SOURCE,\n    id: ds.id,\n    initialDeps,\n    isTarget: (key, value) => isDataSourceTarget(ds, key, value)\n  });\n  const createDataSourceCondTarget = (ds, initialDeps = {}) => new Target({\n    type: DepTargetType.DATA_SOURCE_COND,\n    id: ds.id,\n    initialDeps,\n    isTarget: (key, value) => isDataSourceCondTarget(ds, key, value)\n  });\n  const createDataSourceMethodTarget = (ds, initialDeps = {}) => new Target({\n    type: DepTargetType.DATA_SOURCE_METHOD,\n    id: ds.id,\n    initialDeps,\n    isTarget: (_key, value) => {\n      if (!Array.isArray(value)) {\n        return false;\n      }\n      const [dsId, methodName] = value;\n      if (!methodName || dsId !== ds.id) {\n        return false;\n      }\n      if (ds.methods?.find((method) => method.name === methodName)) {\n        return true;\n      }\n      if (ds.fields?.find((field) => field.name === methodName)) {\n        return false;\n      }\n      return true;\n    }\n  });\n  const traverseTarget = (targetsList, cb, type) => {\n    for (const targets of Object.values(targetsList)) {\n      for (const target of Object.values(targets)) {\n        if (type && target.type !== type) {\n          continue;\n        }\n        cb(target);\n      }\n    }\n  };\n\n  class Watcher {\n    targetsList = {};\n    childrenProp = \"items\";\n    idProp = \"id\";\n    nameProp = \"name\";\n    constructor(options) {\n      if (options?.initialTargets) {\n        this.targetsList = options.initialTargets;\n      }\n      if (options?.childrenProp) {\n        this.childrenProp = options.childrenProp;\n      }\n    }\n    getTargetsList() {\n      return this.targetsList;\n    }\n    /**\n     * 获取指定类型中的所有target\n     * @param type 分类\n     * @returns Target[]\n     */\n    getTargets(type = DepTargetType.DEFAULT) {\n      return this.targetsList[type] || {};\n    }\n    /**\n     * 添加新的目标\n     * @param target Target\n     */\n    addTarget(target) {\n      const targets = this.getTargets(target.type) || {};\n      this.targetsList[target.type] = targets;\n      targets[target.id] = target;\n    }\n    /**\n     * 获取指定id的target\n     * @param id target id\n     * @returns Target\n     */\n    getTarget(id, type = DepTargetType.DEFAULT) {\n      return this.getTargets(type)[id];\n    }\n    /**\n     * 判断是否存在指定id的target\n     * @param id target id\n     * @returns boolean\n     */\n    hasTarget(id, type = DepTargetType.DEFAULT) {\n      return Boolean(this.getTarget(id, type));\n    }\n    /**\n     * 判断是否存在指定类型的target\n     * @param type target type\n     * @returns boolean\n     */\n    hasSpecifiedTypeTarget(type = DepTargetType.DEFAULT) {\n      return Object.keys(this.getTargets(type)).length > 0;\n    }\n    /**\n     * 删除指定id的target\n     * @param id target id\n     */\n    removeTarget(id, type = DepTargetType.DEFAULT) {\n      const targets = this.getTargets(type);\n      if (targets[id]) {\n        targets[id].destroy();\n        delete targets[id];\n      }\n    }\n    /**\n     * 删除指定分类的所有target\n     * @param type 分类\n     * @returns void\n     */\n    removeTargets(type = DepTargetType.DEFAULT) {\n      const targets = this.targetsList[type];\n      if (!targets) return;\n      for (const target of Object.values(targets)) {\n        target.destroy();\n      }\n      delete this.targetsList[type];\n    }\n    /**\n     * 删除所有target\n     */\n    clearTargets() {\n      for (const key of Object.keys(this.targetsList)) {\n        delete this.targetsList[key];\n      }\n    }\n    /**\n     * 收集依赖\n     * @param nodes 需要收集的节点\n     * @param deep 是否需要收集子节点\n     * @param type 强制收集指定类型的依赖\n     */\n    collect(nodes, depExtendedData = {}, deep = false, type) {\n      this.collectByCallback(nodes, type, ({ node, target }) => {\n        this.removeTargetDep(target, node);\n        this.collectItem(node, target, depExtendedData, deep);\n      });\n    }\n    collectByCallback(nodes, type, cb) {\n      traverseTarget(\n        this.targetsList,\n        (target) => {\n          if (!type && !target.isCollectByDefault) {\n            return;\n          }\n          for (const node of nodes) {\n            cb({ node, target });\n          }\n        },\n        type\n      );\n    }\n    /**\n     * 清除所有目标的依赖\n     * @param nodes 需要清除依赖的节点\n     */\n    clear(nodes, type) {\n      let { targetsList } = this;\n      if (type) {\n        targetsList = {\n          [type]: this.getTargets(type)\n        };\n      }\n      const clearedItemsNodeIds = [];\n      traverseTarget(targetsList, (target) => {\n        if (nodes) {\n          for (const node of nodes) {\n            target.removeDep(node[this.idProp]);\n            if (Array.isArray(node[this.childrenProp]) && node[this.childrenProp].length && !clearedItemsNodeIds.includes(node[this.idProp])) {\n              clearedItemsNodeIds.push(node[this.idProp]);\n              this.clear(node[this.childrenProp]);\n            }\n          }\n        } else {\n          target.removeDep();\n        }\n      });\n    }\n    /**\n     * 清除指定类型的依赖\n     * @param type 类型\n     * @param nodes 需要清除依赖的节点\n     */\n    clearByType(type, nodes) {\n      this.clear(nodes, type);\n    }\n    collectItem(node, target, depExtendedData = {}, deep = false) {\n      const collectTarget = (config, prop = \"\") => {\n        const doCollect = (key, value) => {\n          const keyIsItems = key === this.childrenProp;\n          const fullKey = prop ? `${prop}.${key}` : key;\n          if (target.isTarget(fullKey, value)) {\n            target.updateDep({\n              id: node[this.idProp],\n              name: `${node[this.nameProp] || node[this.idProp]}`,\n              data: depExtendedData,\n              key: fullKey\n            });\n          } else if (!keyIsItems && Array.isArray(value)) {\n            for (let i = 0, l = value.length; i < l; i++) {\n              const item = value[i];\n              if (isObject(item)) {\n                collectTarget(item, `${fullKey}[${i}]`);\n              }\n            }\n          } else if (isObject(value)) {\n            collectTarget(value, fullKey);\n          }\n          if (keyIsItems && deep && Array.isArray(value)) {\n            for (const child of value) {\n              this.collectItem(child, target, depExtendedData, deep);\n            }\n          }\n        };\n        for (const [key, value] of Object.entries(config)) {\n          if (typeof value === \"undefined\" || value === \"\") continue;\n          doCollect(key, value);\n        }\n      };\n      collectTarget(node);\n    }\n    removeTargetDep(target, node, key) {\n      target.removeDep(node[this.idProp], key);\n      if (typeof key === \"undefined\" && Array.isArray(node[this.childrenProp]) && node[this.childrenProp].length) {\n        for (const item of node[this.childrenProp]) {\n          this.removeTargetDep(target, item, key);\n        }\n      }\n    }\n  }\n\n  const error = (...args) => {\n    if (process.env.NODE_ENV === \"development\") {\n      console.error(\"magic editor: \", ...args);\n    }\n  };\n\n  onmessage = (e) => {\n    const watcher = new Watcher({ initialTargets: {} });\n    const { dsl } = e.data;\n    try {\n      const mApp = eval(`(${dsl})`);\n      if (!mApp) {\n        postMessage({});\n      }\n      if (mApp.codeBlocks) {\n        for (const [id, code] of Object.entries(mApp.codeBlocks)) {\n          watcher.addTarget(createCodeBlockTarget(id, code));\n        }\n      }\n      if (mApp.dataSources) {\n        for (const ds of mApp.dataSources) {\n          watcher.addTarget(createDataSourceTarget(ds, {}));\n          watcher.addTarget(createDataSourceMethodTarget(ds, {}));\n          watcher.addTarget(createDataSourceCondTarget(ds, {}));\n        }\n      }\n      watcher.collectByCallback(mApp.items, void 0, ({ node, target }) => {\n        watcher.collectItem(node, target, { pageId: node.id }, true);\n      });\n      const data = {\n        [DepTargetType.DATA_SOURCE]: {},\n        [DepTargetType.DATA_SOURCE_METHOD]: {},\n        [DepTargetType.DATA_SOURCE_COND]: {},\n        [DepTargetType.CODE_BLOCK]: {}\n      };\n      traverseTarget(watcher.getTargetsList(), (target) => {\n        data[target.type][target.id] = target.deps;\n      });\n      postMessage(data);\n    } catch (e2) {\n      error(e2);\n      postMessage({});\n    }\n  };\n\n})();\n";
+            const blob = typeof self !== "undefined" && self.Blob && new Blob([jsContent], { type: "text/javascript;charset=utf-8" });
+            function WorkerWrapper(options) {
+              let objURL;
+              try {
+                objURL = blob && (self.URL || self.webkitURL).createObjectURL(blob);
+                if (!objURL) throw ''
+                const worker = new Worker(objURL, {
+          
+          name: options?.name
+        });
+                worker.addEventListener("error", () => {
+                  (self.URL || self.webkitURL).revokeObjectURL(objURL);
+                });
+                return worker;
+              } catch(e) {
+                return new Worker(
+                  'data:text/javascript;charset=utf-8,' + encodeURIComponent(jsContent),
+                  {
+          
+          name: options?.name
+        }
+                );
+              } finally {
+                      objURL && (self.URL || self.webkitURL).revokeObjectURL(objURL);
+                    }
+            }
+
   class Dep extends BaseService {
     state = vue.shallowReactive({
       collecting: false,
@@ -18742,6 +18773,7 @@
     });
     idleTask = new IdleTask();
     watcher = new core.Watcher({ initialTargets: vue.reactive({}) });
+    waitingWorker;
     constructor() {
       super();
       this.idleTask.on(
@@ -18791,7 +18823,10 @@
       this.emit("collected", nodes, deep);
       this.emit("ds-collected", nodes, deep);
     }
-    collectIdle(nodes, depExtendedData = {}, deep = false, type) {
+    async collectIdle(nodes, depExtendedData = {}, deep = false, type) {
+      if (this.waitingWorker) {
+        await this.waitingWorker;
+      }
       this.set("collecting", true);
       let startTask = false;
       this.watcher.collectByCallback(nodes, type, ({ node, target }) => {
@@ -18815,6 +18850,41 @@
         });
       });
     }
+    collectByWorker(dsl) {
+      this.set("collecting", true);
+      const { promise, resolve: waitingResolve } = Promise.withResolvers();
+      this.waitingWorker = promise;
+      return new Promise((resolve) => {
+        const worker = new WorkerWrapper();
+        worker.postMessage({
+          dsl: serialize(dsl)
+        });
+        worker.onmessage = (e) => {
+          resolve(e.data);
+        };
+        worker.onerror = () => {
+          resolve({});
+        };
+      }).then((depsData) => {
+        core.traverseTarget(this.watcher.getTargetsList(), (target) => {
+          if (depsData[target.type]?.[target.id]) {
+            target.deps = vue.reactive(depsData[target.type][target.id]);
+            if (target.type === core.DepTargetType.DATA_SOURCE && dsl.dataSourceDeps) {
+              dsl.dataSourceDeps[target.id] = target.deps;
+            } else if (target.type === core.DepTargetType.DATA_SOURCE_COND && dsl.dataSourceCondDeps) {
+              dsl.dataSourceCondDeps[target.id] = target.deps;
+            } else if (target.type === core.DepTargetType.DATA_SOURCE_METHOD) {
+              dsl.dataSourceMethodDeps[target.id] = target.deps;
+            }
+          }
+        });
+        this.set("collecting", false);
+        this.emit("collected", dsl.items, true);
+        this.emit("ds-collected", dsl.items, true);
+        waitingResolve();
+        return depsData;
+      });
+    }
     collectNode(node, target, depExtendedData = {}, deep = false) {
       if (utils.isPage(node)) {
         for (const [depKey, dep] of Object.entries(target.deps)) {
@@ -19493,18 +19563,17 @@
         }
       });
     };
-    const collectIdle = (nodes, deep, type) => Promise.all(
-      nodes.map((node) => {
-        let pageId;
-        if (utils.isPage(node)) {
-          pageId = node.id;
-        } else {
-          const info = editorService.getNodeInfo(node.id);
-          pageId = info.page?.id;
-        }
-        return depService.collectIdle([node], { pageId }, deep, type);
-      })
-    );
+    const getPageIdByNode = (node) => {
+      let pageId;
+      if (utils.isPage(node)) {
+        pageId = node.id;
+      } else {
+        const info = editorService.getNodeInfo(node.id);
+        pageId = info.page?.id;
+      }
+      return pageId;
+    };
+    const collectIdle = (nodes, deep, type) => Promise.all(nodes.map((node) => depService.collectIdle([node], { pageId: getPageIdByNode(node) }, deep, type)));
     vue.watch(
       () => editorService.get("stage"),
       (stage) => {
@@ -19539,7 +19608,7 @@
       }
       if (Array.isArray(value.items)) {
         depService.clearIdleTasks();
-        collectIdle(value.items, true).then(() => {
+        (typeof Worker === "undefined" ? collectIdle(value.items, true) : depService.collectByWorker(value)).then(() => {
           updateStageNodes(value.items);
         });
       } else {
@@ -19752,14 +19821,12 @@
           root.dataSourceDeps = {};
         }
         root.dataSourceDeps[target.id] = target.deps;
-      }
-      if (target.type === core.DepTargetType.DATA_SOURCE_COND) {
+      } else if (target.type === core.DepTargetType.DATA_SOURCE_COND) {
         if (!root.dataSourceCondDeps) {
           root.dataSourceCondDeps = {};
         }
         root.dataSourceCondDeps[target.id] = target.deps;
-      }
-      if (target.type === core.DepTargetType.DATA_SOURCE_METHOD) {
+      } else if (target.type === core.DepTargetType.DATA_SOURCE_METHOD) {
         if (!root.dataSourceMethodDeps) {
           root.dataSourceMethodDeps = {};
         }

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.5.15",
+  "version": "1.5.17",
   "name": "@tmagic/editor",
   "type": "module",
   "sideEffects": [
@@ -58,11 +58,11 @@
     "moveable": "^0.53.0",
     "serialize-javascript": "^6.0.0",
     "sortablejs": "^1.15.2",
-    "@tmagic/stage": "1.5.15",
-    "@tmagic/form": "1.5.15",
-    "@tmagic/table": "1.5.15",
-    "@tmagic/design": "1.5.15",
-    "@tmagic/utils": "1.5.15"
+    "@tmagic/design": "1.5.17",
+    "@tmagic/utils": "1.5.17",
+    "@tmagic/form": "1.5.17",
+    "@tmagic/stage": "1.5.17",
+    "@tmagic/table": "1.5.17"
   },
   "devDependencies": {
     "@types/events": "^3.0.0",
@@ -76,7 +76,7 @@
     "monaco-editor": "^0.48.0",
     "typescript": "*",
     "vue": ">=3.5.0",
-    "@tmagic/core": "1.5.15"
+    "@tmagic/core": "1.5.17"
   },
   "peerDependenciesMeta": {
     "typescript": {

package/src/fields/Code.vue

@@ -13,7 +13,7 @@
 </template>
 
 <script lang="ts" setup>
-import type { FieldProps, FormItem } from '@tmagic/form';
+import type { CodeConfig, FieldProps } from '@tmagic/form';
 
 import MagicCodeEditor from '@editor/layouts/CodeEditor.vue';
 
@@ -25,23 +25,9 @@ const emit = defineEmits<{
   change: [value: string | any];
 }>();
 
-withDefaults(
-  defineProps<
-    FieldProps<
-      {
-        language?: string;
-        options?: {
-          [key: string]: any;
-        };
-        height?: string;
-        parse?: boolean;
-      } & FormItem
-    >
-  >(),
-  {
-    disabled: false,
-  },
-);
+withDefaults(defineProps<FieldProps<CodeConfig>>(), {
+  disabled: false,
+});
 
 const save = (v: string | any) => {
   emit('change', v);

package/src/fields/CodeLink.vue

@@ -6,7 +6,7 @@
 import { computed, reactive, watch } from 'vue';
 import serialize from 'serialize-javascript';
 
-import type { FieldProps, FormItem } from '@tmagic/form';
+import type { CodeLinkConfig, FieldProps } from '@tmagic/form';
 
 import { getEditorConfig } from '@editor/utils/config';
 
@@ -14,15 +14,7 @@ defineOptions({
   name: 'MFieldsCodeLink',
 });
 
-const props = defineProps<
-  FieldProps<
-    {
-      type: 'code-link';
-      formTitle?: string;
-      codeOptions?: Object;
-    } & FormItem
-  >
->();
+const props = defineProps<FieldProps<CodeLinkConfig>>();
 
 const emit = defineEmits(['change']);
 

package/src/fields/CodeSelect.vue

@@ -21,7 +21,7 @@ import { isEmpty } from 'lodash-es';
 
 import { HookCodeType, HookType } from '@tmagic/core';
 import { TMagicCard } from '@tmagic/design';
-import type { ContainerChangeEventData, FieldProps, FormItem, GroupListConfig } from '@tmagic/form';
+import type { CodeSelectConfig, ContainerChangeEventData, FieldProps, GroupListConfig } from '@tmagic/form';
 import { MContainer } from '@tmagic/form';
 
 import { useServices } from '@editor/hooks/use-services';
@@ -36,16 +36,7 @@ const emit = defineEmits<{
 
 const { dataSourceService, codeBlockService } = useServices();
 
-const props = withDefaults(
-  defineProps<
-    FieldProps<
-      {
-        className?: string;
-      } & FormItem
-    >
-  >(),
-  {},
-);
+const props = withDefaults(defineProps<FieldProps<CodeSelectConfig>>(), {});
 
 const codeConfig = computed<GroupListConfig>(() => ({
   type: 'group-list',

package/src/fields/CodeSelectCol.vue

@@ -42,6 +42,7 @@ import { isEmpty, map } from 'lodash-es';
 import type { Id } from '@tmagic/core';
 import { TMagicButton } from '@tmagic/design';
 import {
+  type CodeSelectColConfig,
   type ContainerChangeEventData,
   createValues,
   type FieldProps,
@@ -53,7 +54,7 @@ import {
 import CodeParams from '@editor/components/CodeParams.vue';
 import MIcon from '@editor/components/Icon.vue';
 import { useServices } from '@editor/hooks/use-services';
-import type { CodeParamStatement, CodeSelectColConfig, EventBus } from '@editor/type';
+import type { CodeParamStatement, EventBus } from '@editor/type';
 import { SideItemKey } from '@editor/type';
 
 defineOptions({

package/src/fields/CondOpSelect.vue

@@ -30,10 +30,9 @@
 import { computed } from 'vue';
 
 import { getDesignConfig, TMagicSelect } from '@tmagic/design';
-import type { FieldProps } from '@tmagic/form';
+import type { CondOpSelectConfig, FieldProps } from '@tmagic/form';
 
 import { useServices } from '@editor/hooks/use-services';
-import type { CondOpSelectConfig } from '@editor/type';
 import { arrayOptions, eqOptions, numberOptions } from '@editor/utils';
 
 defineOptions({

package/src/fields/DataSourceFieldSelect/Index.vue

@@ -44,12 +44,11 @@ import { Coin } from '@element-plus/icons-vue';
 
 import { DataSchema } from '@tmagic/core';
 import { TMagicButton, tMagicMessage, TMagicTooltip } from '@tmagic/design';
-import type { ContainerChangeEventData, FieldProps, FormState } from '@tmagic/form';
+import type { ContainerChangeEventData, DataSourceFieldSelectConfig, FieldProps, FormState } from '@tmagic/form';
 import { DATA_SOURCE_FIELDS_SELECT_VALUE_PREFIX } from '@tmagic/utils';
 
 import MIcon from '@editor/components/Icon.vue';
 import { useServices } from '@editor/hooks/use-services';
-import type { DataSourceFieldSelectConfig } from '@editor/type';
 import { removeDataSourceFieldPrefix } from '@editor/utils';
 
 import FieldSelect from './FieldSelect.vue';

package/src/fields/DataSourceFields.vue

@@ -53,6 +53,7 @@ import type { DataSchema } from '@tmagic/core';
 import { TMagicButton, tMagicMessage, tMagicMessageBox } from '@tmagic/design';
 import {
   type ContainerChangeEventData,
+  type DataSourceFieldsConfig,
   type FieldProps,
   type FormConfig,
   type FormState,
@@ -71,16 +72,9 @@ defineOptions({
   name: 'MFieldsDataSourceFields',
 });
 
-const props = withDefaults(
-  defineProps<
-    FieldProps<{
-      type: 'data-source-fields';
-    }>
-  >(),
-  {
-    disabled: false,
-  },
-);
+const props = withDefaults(defineProps<FieldProps<DataSourceFieldsConfig>>(), {
+  disabled: false,
+});
 
 const emit = defineEmits<{
   change: [v: any, eventData?: ContainerChangeEventData];

package/src/fields/DataSourceInput.vue

@@ -53,7 +53,7 @@ import { Coin } from '@element-plus/icons-vue';
 
 import type { DataSchema, DataSourceSchema } from '@tmagic/core';
 import { getDesignConfig, TMagicAutocomplete, TMagicTag } from '@tmagic/design';
-import type { FieldProps, FormItem } from '@tmagic/form';
+import type { DataSourceInputConfig, FieldProps } from '@tmagic/form';
 import { getKeysArray, isNumber } from '@tmagic/utils';
 
 import Icon from '@editor/components/Icon.vue';
@@ -64,18 +64,9 @@ defineOptions({
   name: 'MFieldsDataSourceInput',
 });
 
-const props = withDefaults(
-  defineProps<
-    FieldProps<
-      {
-        type: 'data-source-input';
-      } & FormItem
-    >
-  >(),
-  {
-    disabled: false,
-  },
-);
+const props = withDefaults(defineProps<FieldProps<DataSourceInputConfig>>(), {
+  disabled: false,
+});
 
 const emit = defineEmits<{
   change: [value: string];

package/src/fields/DataSourceMethodSelect.vue

@@ -39,6 +39,7 @@ import type { Id } from '@tmagic/core';
 import { TMagicButton, TMagicTooltip } from '@tmagic/design';
 import {
   createValues,
+  type DataSourceMethodSelectConfig,
   type FieldProps,
   filterFunction,
   type FormState,
@@ -49,7 +50,7 @@ import {
 import CodeParams from '@editor/components/CodeParams.vue';
 import MIcon from '@editor/components/Icon.vue';
 import { useServices } from '@editor/hooks/use-services';
-import type { CodeParamStatement, DataSourceMethodSelectConfig, EventBus } from '@editor/type';
+import type { CodeParamStatement, EventBus } from '@editor/type';
 import { SideItemKey } from '@editor/type';
 
 defineOptions({