feat:conflict

package.json

@@ -12,7 +12,7 @@
     "@meta2d/activity-diagram": "^1.0.0",
     "@meta2d/chart-diagram": "^1.0.6",
     "@meta2d/class-diagram": "^1.0.1",
-    "@meta2d/core": "^1.0.28",
+    "@meta2d/core": "^1.0.51",
     "@meta2d/flow-diagram": "^1.0.0",
     "@meta2d/form-diagram": "^1.0.8",
     "@meta2d/fta-diagram": "^1.0.0",

src/services/defaults.ts

@@ -1586,7 +1586,7 @@ export const formComponents = [
         name: '表格',
         icon: 'l-biaoge',
         data: {
-          name: 'table',
+          name: 'tablePlus',
           width: 0,
           height: 0,
           disableAnchor: true,
@@ -1700,7 +1700,7 @@ export const formComponents = [
         name: '斑马纹表格',
         icon: 'l-biaoge',
         data: {
-          name: 'table',
+          name: 'tablePlus',
           width: 0,
           height: 0,
           disableAnchor: true,
@@ -1897,7 +1897,7 @@ export const formComponents = [
         name: '滚动表格',
         icon: 'l-biaoge',
         data: {
-          name: 'table',
+          name: 'tablePlus',
           width: 0,
           height: 0,
           disableAnchor: true,

src/views/components/Graphics.vue

@@ -1197,8 +1197,9 @@ const dragStart = async (event: DragEvent | MouseEvent|TouchEvent, item: any) =>
       delete item.rect;
       data = item;
     }else{
+      // 普通图元
       data = item.data;
-      if(data.name==='table'){
+      if(data.name==='tablePlus'){
         if(data.tableType === 'longlist'){
           const _data = new Array(100).fill(0)
           .map((_, row) => new Array(10).fill(0)