@tmagic/editor 1.5.14 → 1.5.16

package/dist/tmagic-editor.js

@@ -668,52 +668,57 @@ const displayTabConfig = {
     }
   ]
 };
-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(() => {
-                  tMagicMessage.success("已复制");
-                }).catch(() => {
-                  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(() => {
+            tMagicMessage.success("已复制");
+          }).catch(() => {
+            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") {
@@ -14651,10 +14656,10 @@ const initServiceEvents = (props, emit, { editorService, codeBlockService, dataS
   const getTMagicApp = () => {
     const renderer = editorService.get("stage")?.renderer;
     if (!renderer) {
-      return void 0;
+      return Promise.resolve(void 0);
     }
     if (renderer.runtime) {
-      return renderer.runtime.getApp?.();
+      return Promise.resolve(renderer.runtime.getApp?.());
     }
     return new Promise((resolve) => {
       const timeout = globalThis.setTimeout(() => {

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") {
@@ -19444,10 +19449,10 @@
     const getTMagicApp = () => {
       const renderer = editorService.get("stage")?.renderer;
       if (!renderer) {
-        return void 0;
+        return Promise.resolve(void 0);
       }
       if (renderer.runtime) {
-        return renderer.runtime.getApp?.();
+        return Promise.resolve(renderer.runtime.getApp?.());
       }
       return new Promise((resolve) => {
         const timeout = globalThis.setTimeout(() => {

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.5.14",
+  "version": "1.5.16",
   "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.14",
-    "@tmagic/form": "1.5.14",
-    "@tmagic/table": "1.5.14",
-    "@tmagic/stage": "1.5.14",
-    "@tmagic/utils": "1.5.14"
+    "@tmagic/form": "1.5.16",
+    "@tmagic/stage": "1.5.16",
+    "@tmagic/table": "1.5.16",
+    "@tmagic/design": "1.5.16",
+    "@tmagic/utils": "1.5.16"
   },
   "devDependencies": {
     "@types/events": "^3.0.0",
@@ -76,7 +76,7 @@
     "monaco-editor": "^0.48.0",
     "typescript": "*",
     "vue": ">=3.5.0",
-    "@tmagic/core": "1.5.14"
+    "@tmagic/core": "1.5.16"
   },
   "peerDependenciesMeta": {
     "typescript": {

package/src/initService.ts

@@ -214,20 +214,20 @@ export const initServiceEvents = (
     ((event: 'update:modelValue', value: MApp | null) => void),
   { editorService, codeBlockService, dataSourceService, depService }: Services,
 ) => {
-  const getTMagicApp = () => {
+  const getTMagicApp = (): Promise<TMagicCore | undefined> => {
     const renderer = editorService.get('stage')?.renderer;
     if (!renderer) {
-      return undefined;
+      return Promise.resolve(void 0);
     }
 
     if (renderer.runtime) {
-      return renderer.runtime.getApp?.();
+      return Promise.resolve(renderer.runtime.getApp?.());
     }
 
     return new Promise<TMagicCore | undefined>((resolve) => {
       // 设置 10s 超时
       const timeout = globalThis.setTimeout(() => {
-        resolve(undefined);
+        resolve(void 0);
       }, 10000);
 
       renderer.on('runtime-ready', () => {

package/src/utils/props.ts

@@ -156,52 +156,63 @@ export const displayTabConfig: TabPaneConfig = {
  * @param config 组件属性配置
  * @returns Object
  */
-export const fillConfig = (config: FormConfig = [], labelWidth = '80px'): FormConfig => [
-  {
-    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(() => {
-                    tMagicMessage.success('已复制');
-                  })
-                  .catch(() => {
-                    tMagicMessage.error('复制失败');
-                  });
-              },
-            },
-          },
-          {
-            name: 'name',
-            text: '组件名称',
-          },
-          ...config,
-        ],
+export const fillConfig = (config: FormConfig = [], labelWidth = '80px'): FormConfig => {
+  const propsConfig: FormConfig = [];
+
+  // 组件类型，必须要有
+  if (!config.find((item) => item.name === 'type')) {
+    propsConfig.push({
+      text: 'type',
+      name: 'type',
+      type: 'hidden',
+    });
+  }
+
+  if (!config.find((item) => item.name === 'id')) {
+    // 组件id，必须要有
+    propsConfig.push({
+      name: 'id',
+      text: 'ID',
+      type: 'text',
+      disabled: true,
+      append: {
+        type: 'button',
+        text: '复制',
+        handler: (vm, { model }) => {
+          navigator.clipboard
+            .writeText(`${model.id}`)
+            .then(() => {
+              tMagicMessage.success('已复制');
+            })
+            .catch(() => {
+              tMagicMessage.error('复制失败');
+            });
+        },
       },
-      { ...styleTabConfig },
-      { ...eventTabConfig },
-      { ...advancedTabConfig },
-      { ...displayTabConfig },
-    ],
-  },
-];
+    });
+  }
+
+  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 },
+      ],
+    },
+  ];
+};