@tmagic/editor 1.5.19 → 1.5.21

package/dist/tmagic-editor.js

@@ -5436,7 +5436,7 @@ const _sfc_main$1d = /* @__PURE__ */ defineComponent({
       {
         label: "参数",
         prop: "params",
-        formatter: (params) => params.map((item) => item.name).join(", ")
+        formatter: (params = []) => params.map((item) => item.name).join(", ")
       },
       {
         label: "操作",
@@ -6311,14 +6311,14 @@ const _sfc_main$18 = /* @__PURE__ */ defineComponent({
           const node = editorService.getNodeById(model.to);
           if (!node?.type) return [];
           let methods = [];
-          methods = eventsService.getMethod(node.type);
+          methods = eventsService.getMethod(node.type, model.to);
           if (node.type === "page-fragment-container" && node.pageFragmentId) {
             const pageFragment = editorService.get("root")?.items?.find((page) => page.id === node.pageFragmentId);
             if (pageFragment) {
               methods = [];
               pageFragment.items.forEach((node2) => {
                 traverseNode(node2, (node3) => {
-                  const nodeMethods = node3.type && eventsService.getMethod(node3.type) || [];
+                  const nodeMethods = node3.type && eventsService.getMethod(node3.type, node3.id) || [];
                   if (nodeMethods.length) {
                     methods.push({
                       label: `${node3.name}_${node3.id}`,
@@ -6384,7 +6384,7 @@ const _sfc_main$18 = /* @__PURE__ */ defineComponent({
           options: (mForm, { model }) => {
             const node = editorService.getNodeById(model.to);
             if (!node?.type) return [];
-            return eventsService.getMethod(node.type).map((option) => ({
+            return eventsService.getMethod(node.type, model.to).map((option) => ({
               text: option.label,
               value: option.value
             }));
@@ -14203,7 +14203,7 @@ class Events extends BaseService {
   setMethod(type, method) {
     methodMap[toLine(type)] = [...method];
   }
-  getMethod(type) {
+  getMethod(type, _targetId) {
     return cloneDeep(methodMap[toLine(type)]) || [];
   }
   resetState() {
@@ -14736,6 +14736,7 @@ const initServiceState = (props, {
   });
 };
 const initServiceEvents = (props, emit, { editorService, codeBlockService, dataSourceService, depService }) => {
+  let getTMagicAppPrimise = null;
   const getTMagicApp = () => {
     const renderer = editorService.get("stage")?.renderer;
     if (!renderer) {
@@ -14744,17 +14745,21 @@ const initServiceEvents = (props, emit, { editorService, codeBlockService, dataS
     if (renderer.runtime) {
       return Promise.resolve(renderer.runtime.getApp?.());
     }
-    return new Promise((resolve) => {
+    if (getTMagicAppPrimise) {
+      return getTMagicAppPrimise;
+    }
+    getTMagicAppPrimise = new Promise((resolve) => {
       const timeout = globalThis.setTimeout(() => {
         resolve(void 0);
       }, 1e4);
-      renderer.on("runtime-ready", () => {
+      renderer.once("runtime-ready", () => {
         if (timeout) {
           globalThis.clearTimeout(timeout);
         }
         resolve(renderer.runtime?.getApp?.());
       });
     });
+    return getTMagicAppPrimise;
   };
   const updateStageNodes = (nodes) => {
     for (const node of nodes) {
@@ -15185,6 +15190,19 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
       disabledMultiSelect: props.disabledMultiSelect
     };
     stageOverlayService.set("stageOptions", stageOptions);
+    watch(
+      () => props.runtimeUrl,
+      (url) => {
+        if (!url) {
+          return;
+        }
+        const stage = editorService.get("stage");
+        if (!stage) {
+          return;
+        }
+        stage.reloadIframe(url);
+      }
+    );
     provide("services", services);
     provide("codeOptions", props.codeOptions);
     provide("stageOptions", stageOptions);

package/dist/tmagic-editor.umd.cjs

@@ -10229,7 +10229,7 @@
         {
           label: "参数",
           prop: "params",
-          formatter: (params) => params.map((item) => item.name).join(", ")
+          formatter: (params = []) => params.map((item) => item.name).join(", ")
         },
         {
           label: "操作",
@@ -11104,14 +11104,14 @@
             const node = editorService.getNodeById(model.to);
             if (!node?.type) return [];
             let methods = [];
-            methods = eventsService.getMethod(node.type);
+            methods = eventsService.getMethod(node.type, model.to);
             if (node.type === "page-fragment-container" && node.pageFragmentId) {
               const pageFragment = editorService.get("root")?.items?.find((page) => page.id === node.pageFragmentId);
               if (pageFragment) {
                 methods = [];
                 pageFragment.items.forEach((node2) => {
                   utils.traverseNode(node2, (node3) => {
-                    const nodeMethods = node3.type && eventsService.getMethod(node3.type) || [];
+                    const nodeMethods = node3.type && eventsService.getMethod(node3.type, node3.id) || [];
                     if (nodeMethods.length) {
                       methods.push({
                         label: `${node3.name}_${node3.id}`,
@@ -11177,7 +11177,7 @@
             options: (mForm, { model }) => {
               const node = editorService.getNodeById(model.to);
               if (!node?.type) return [];
-              return eventsService.getMethod(node.type).map((option) => ({
+              return eventsService.getMethod(node.type, model.to).map((option) => ({
                 text: option.label,
                 value: option.value
               }));
@@ -18996,7 +18996,7 @@
     setMethod(type, method) {
       methodMap[utils.toLine(type)] = [...method];
     }
-    getMethod(type) {
+    getMethod(type, _targetId) {
       return cloneDeep(methodMap[utils.toLine(type)]) || [];
     }
     resetState() {
@@ -19529,6 +19529,7 @@
     });
   };
   const initServiceEvents = (props, emit, { editorService, codeBlockService, dataSourceService, depService }) => {
+    let getTMagicAppPrimise = null;
     const getTMagicApp = () => {
       const renderer = editorService.get("stage")?.renderer;
       if (!renderer) {
@@ -19537,17 +19538,21 @@
       if (renderer.runtime) {
         return Promise.resolve(renderer.runtime.getApp?.());
       }
-      return new Promise((resolve) => {
+      if (getTMagicAppPrimise) {
+        return getTMagicAppPrimise;
+      }
+      getTMagicAppPrimise = new Promise((resolve) => {
         const timeout = globalThis.setTimeout(() => {
           resolve(void 0);
         }, 1e4);
-        renderer.on("runtime-ready", () => {
+        renderer.once("runtime-ready", () => {
           if (timeout) {
             globalThis.clearTimeout(timeout);
           }
           resolve(renderer.runtime?.getApp?.());
         });
       });
+      return getTMagicAppPrimise;
     };
     const updateStageNodes = (nodes) => {
       for (const node of nodes) {
@@ -19978,6 +19983,19 @@
         disabledMultiSelect: props.disabledMultiSelect
       };
       stageOverlayService.set("stageOptions", stageOptions);
+      vue.watch(
+        () => props.runtimeUrl,
+        (url) => {
+          if (!url) {
+            return;
+          }
+          const stage = editorService.get("stage");
+          if (!stage) {
+            return;
+          }
+          stage.reloadIframe(url);
+        }
+      );
       vue.provide("services", services);
       vue.provide("codeOptions", props.codeOptions);
       vue.provide("stageOptions", stageOptions);

package/package.json

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

package/src/Editor.vue

@@ -128,7 +128,7 @@
 <script lang="ts" setup>
 import { EventEmitter } from 'events';
 
-import { provide } from 'vue';
+import { provide, watch } from 'vue';
 
 import type { MApp } from '@tmagic/core';
 
@@ -209,6 +209,22 @@ const stageOptions: StageOptions = {
 
 stageOverlayService.set('stageOptions', stageOptions);
 
+watch(
+  () => props.runtimeUrl,
+  (url) => {
+    if (!url) {
+      return;
+    }
+
+    const stage = editorService.get('stage');
+    if (!stage) {
+      return;
+    }
+
+    stage.reloadIframe(url);
+  },
+);
+
 provide('services', services);
 
 provide('codeOptions', props.codeOptions);

package/src/fields/DataSourceMethods.vue

@@ -64,7 +64,7 @@ const methodColumns: ColumnConfig[] = [
   {
     label: '参数',
     prop: 'params',
-    formatter: (params: CodeParamStatement[]) => params.map((item) => item.name).join(', '),
+    formatter: (params: CodeParamStatement[] = []) => params.map((item) => item.name).join(', '),
   },
   {
     label: '操作',

package/src/fields/EventSelect.vue

@@ -232,7 +232,7 @@ const compActionConfig = computed(() => {
 
       let methods: EventOption[] | CascaderOption[] = [];
 
-      methods = eventsService.getMethod(node.type);
+      methods = eventsService.getMethod(node.type, model.to);
 
       if (node.type === 'page-fragment-container' && node.pageFragmentId) {
         const pageFragment = editorService.get('root')?.items?.find((page) => page.id === node.pageFragmentId);
@@ -240,7 +240,7 @@ const compActionConfig = computed(() => {
           methods = [];
           pageFragment.items.forEach((node: MComponent | MContainer) => {
             traverseNode<MComponent | MContainer>(node, (node) => {
-              const nodeMethods = (node.type && eventsService.getMethod(node.type)) || [];
+              const nodeMethods = (node.type && eventsService.getMethod(node.type, node.id)) || [];
 
               if (nodeMethods.length) {
                 methods.push({
@@ -317,7 +317,7 @@ const tableConfig = computed(() => ({
         const node = editorService.getNodeById(model.to);
         if (!node?.type) return [];
 
-        return eventsService.getMethod(node.type).map((option: any) => ({
+        return eventsService.getMethod(node.type, model.to).map((option: any) => ({
           text: option.label,
           value: option.value,
         }));

package/src/initService.ts

@@ -215,6 +215,8 @@ export const initServiceEvents = (
     ((event: 'update:modelValue', value: MApp | null) => void),
   { editorService, codeBlockService, dataSourceService, depService }: Services,
 ) => {
+  let getTMagicAppPrimise: Promise<TMagicCore | undefined> | null = null;
+
   const getTMagicApp = (): Promise<TMagicCore | undefined> => {
     const renderer = editorService.get('stage')?.renderer;
     if (!renderer) {
@@ -225,19 +227,25 @@ export const initServiceEvents = (
       return Promise.resolve(renderer.runtime.getApp?.());
     }
 
-    return new Promise<TMagicCore | undefined>((resolve) => {
+    if (getTMagicAppPrimise) {
+      return getTMagicAppPrimise;
+    }
+
+    getTMagicAppPrimise = new Promise<TMagicCore | undefined>((resolve) => {
       // 设置 10s 超时
       const timeout = globalThis.setTimeout(() => {
         resolve(void 0);
       }, 10000);
 
-      renderer.on('runtime-ready', () => {
+      renderer.once('runtime-ready', () => {
         if (timeout) {
           globalThis.clearTimeout(timeout);
         }
         resolve(renderer.runtime?.getApp?.());
       });
     });
+
+    return getTMagicAppPrimise;
   };
 
   const updateStageNodes = (nodes: MComponent[]) => {

package/src/services/events.ts

@@ -20,7 +20,7 @@ import { reactive } from 'vue';
 import { cloneDeep } from 'lodash-es';
 import type { Writable } from 'type-fest';
 
-import { type EventOption } from '@tmagic/core';
+import { type EventOption, type Id } from '@tmagic/core';
 import { toLine } from '@tmagic/utils';
 
 import type { AsyncHookPlugin, SyncHookPlugin } from '@editor/type';
@@ -70,7 +70,7 @@ class Events extends BaseService {
     methodMap[toLine(type)] = [...method];
   }
 
-  public getMethod(type: string) {
+  public getMethod(type: string, _targetId: Id) {
     return cloneDeep(methodMap[toLine(type)]) || [];
   }
 

package/types/index.d.ts

@@ -540,7 +540,7 @@ declare class Events extends export_default {
     getEvent(type: string): EventOption[];
     setMethods(methods: Record<string, EventOption[]>): void;
     setMethod(type: string, method: EventOption[]): void;
-    getMethod(type: string): EventOption[];
+    getMethod(type: string, _targetId: Id): EventOption[];
     resetState(): void;
     destroy(): void;
     usePlugin(options: AsyncHookPlugin<AsyncMethodName$2, Events> & SyncHookPlugin<SyncMethodName$3, Events>): void;