Merge branch 'main' of github.com:le5le-com/visualization-design

src/services/register.ts

@@ -10,6 +10,8 @@ import { register as registerEcharts } from '@meta2d/chart-diagram';
 import { formPens } from '@meta2d/form-diagram';
 import { chartsPens } from '@meta2d/le5le-charts';
 import { ftaPens, ftaPensbyCtx, ftaAnchors } from '@meta2d/fta-diagram';
+import { iotCanvasPens, iotPens } from '@2d-components/iot';
+import { domFormPens, domFormCanvasPens } from '@2d-components/domForm';
 
 export function registerBasicDiagram() {
   register(flowPens());
@@ -26,4 +28,8 @@ export function registerBasicDiagram() {
   registerCanvasDraw(ftaPensbyCtx());
   registerAnchors(ftaAnchors());
   //特殊图元注册
+  register(iotPens());
+  registerCanvasDraw(iotCanvasPens());
+  register(domFormPens());
+  registerCanvasDraw(domFormCanvasPens());
 }

src/views/components/Actions.vue

@@ -314,7 +314,7 @@
             />
           </div>
         </template>
-        <template v-else-if="a.action == 16">
+        <template v-else-if="a.action == 5">
           <div class="form-item mt-8">
             <label>函数</label>
             <div class="w-full">

src/views/components/Graphics.vue

@@ -398,8 +398,8 @@ const dragStart = async (event: DragEvent | MouseEvent, item: any) => {
     return;
   }
 
-  if (item.draggable === false) {
-    data = item;
+  if (!item.draggable) {
+    data = item.data;
   } else if (item['3d']) {
     data = {
       name: 'iframe',

tsconfig.json

@@ -14,6 +14,7 @@
     "paths": {
       "@/*": ["src/*"],
       "@meta2d/*": ["../meta2d.js/packages/*"],
+      "@2d-components/*": ["../2d-components/packages/*"],
     },
   },
   "include": ["src/**/*.ts", "src/**/*.d.ts", "src/**/*.tsx", "src/**/*.vue"],

vite.config.ts

@@ -12,6 +12,7 @@ export default defineConfig({
     alias: {
       '@': path.resolve(__dirname, './src/'),
       '@meta2d': path.resolve(__dirname, '../meta2d.js/packages'),
+      '@2d-components': path.resolve(__dirname, '../2d-components/packages'),
     },
   },
   build: {