@meta2d/core 1.0.67 → 1.0.69

package/src/diagrams/form.d.ts

@@ -0,0 +1,5 @@
+import { Pen } from '../pen';
+export declare function form(pen: Pen, ctx?: CanvasRenderingContext2D): Path2D;
+export declare function updateFormData(pen: any, key?: string): void;
+export declare function submit(pen: Pen): void;
+export declare function reset(pen: Pen): void;

package/src/diagrams/{panel.js → form.js}

@@ -1,7 +1,7 @@
 import { movingSuffix } from '../canvas';
 import { rectInRect } from '../rect';
 import { deepClone } from '../utils';
-export function panel(pen, ctx) {
+export function form(pen, ctx) {
     const path = !ctx ? new Path2D() : ctx;
     if (!pen.onDestroy) {
         pen.onDestroy = destory;
@@ -13,6 +13,7 @@ export function panel(pen, ctx) {
         pen.onMouseUp = mouseUp;
         pen.onInput = input;
     }
+    pen.formId = pen.id;
     let wr = pen.calculative.borderRadius || 0, hr = wr;
     const { x, y, width, height, ex, ey } = pen.calculative.worldRect;
     const { x: textX } = pen.calculative.worldTextRect;
@@ -27,11 +28,14 @@ export function panel(pen, ctx) {
     if (height < 2 * r) {
         r = height / 2;
     }
-    const textWidth = getTextWidth(pen.text, pen.calculative.fontSize);
+    // let textWidth = -5;
+    // if(pen.text){
+    //   textWidth = getTextWidth(pen.text, pen.calculative.fontSize);
+    // }
     path.moveTo(x + r, y);
-    path.lineTo(textX - 5, y);
-    path.moveTo(textX + textWidth + 5, y);
-    path.lineTo(textX + textWidth + 5, y);
+    // path.lineTo(textX - 5, y);
+    // path.moveTo(textX + textWidth + 5, y);
+    // path.lineTo(textX + textWidth + 5, y);
     path.arcTo(ex, y, ex, ey, r);
     path.arcTo(ex, ey, x, ey, r);
     path.arcTo(x, ey, x, y, r);
@@ -95,6 +99,7 @@ function mouseLeave(pen) {
                         let isIn = rectInRect(movingPen.calculative.worldRect, pen.calculative.worldRect, true);
                         if (!isIn) {
                             pen.followers.splice(idx, 1);
+                            delete activePen.formId;
                         }
                     }
                 }
@@ -120,6 +125,7 @@ function mouseUp(pen) {
                     if (!pen.followers.includes(activePen.id)) {
                         pen.followers.push(activePen.id);
                     }
+                    activePen.formId = pen.id;
                 }
             }
         });
@@ -128,4 +134,39 @@ function mouseUp(pen) {
 function mouseMove(pen, e) {
     //  console.log(e,pen.calculative.canvas.store.active);
 }
-//# sourceMappingURL=panel.js.map
+//更新表单数据
+export function updateFormData(pen, key) {
+    if (pen.formId && pen.formKey && pen.formValue) {
+        //表单图元更新值
+        const leaderPen = pen.calculative.canvas.store.pens[pen.formId];
+        if (leaderPen) {
+            if (!leaderPen.formData) {
+                leaderPen.formData = {};
+            }
+            leaderPen.formData[pen.formKey] = pen[pen.formValue];
+        }
+    }
+}
+//提交表单
+export function submit(pen) {
+}
+//重置表单
+export function reset(pen) {
+    const formPen = pen.calculative.canvas.store.pens[pen.formId];
+    formPen.followers.forEach((id) => {
+        const follower = pen.calculative.canvas.store.pens[id];
+        if (follower.formId && follower.formKey && formPen.formData[follower.formKey]) {
+            const value = follower[follower.formValue];
+            let data = '';
+            if (Array.isArray(value)) {
+                data = [];
+            }
+            // follower[follower.formValue] = data;
+            // follower.calculative[follower.formValue] = data;
+            pen.calculative.canvas.parent.setValue({ id: follower.id, [follower.formValue]: data }, { render: false, doEvent: false, history: false });
+        }
+    });
+    formPen.formData = {};
+    pen.calculative.canvas.parent.render();
+}
+//# sourceMappingURL=form.js.map

package/src/diagrams/form.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"form.js","sourceRoot":"","sources":["../../../../packages/core/src/diagrams/form.ts"],"names":[],"mappings":"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"}

package/src/diagrams/gif.js

@@ -13,7 +13,9 @@ export function gif(pen) {
     if (!pen.image) {
         return;
     }
-    if (!gifsList[pen.id]) {
+    const meta2dId = pen.calculative.canvas.store.id;
+    const id = meta2dId + '-' + pen.id;
+    if (!gifsList[id]) {
         const img = new Image();
         img.crossOrigin = 'anonymous';
         img.src = pen.image;
@@ -23,9 +25,9 @@ export function gif(pen) {
                 pen.image.startsWith('data:image'))) {
             img.src = pen.calculative.canvas.parent.store.options.cdn + pen.image;
         }
-        gifsList[pen.id] = img; // 提前赋值，避免重复创建
+        gifsList[id] = img; // 提前赋值，避免重复创建
         img.onload = () => {
-            if (gifsList[pen.id] !== img) {
+            if (gifsList[id] !== img) {
                 return;
             }
             pen.calculative.img = img;
@@ -36,44 +38,53 @@ export function gif(pen) {
             setImagePosition(pen, img);
         };
     }
-    if (pen.calculative.patchFlags && gifsList[pen.id]) {
-        setImagePosition(pen, gifsList[pen.id]);
+    if (pen.calculative.patchFlags && gifsList[id]) {
+        setImagePosition(pen, gifsList[id]);
     }
     return path;
 }
 function destory(pen) {
-    if (gifsList[pen.id]) {
-        gifsList[pen.id].remove();
-        gifsList[pen.id] = undefined;
+    const meta2dId = pen.calculative.canvas.store.id;
+    const id = meta2dId + '-' + pen.id;
+    if (gifsList[id]) {
+        gifsList[id].remove();
+        gifsList[id] = undefined;
     }
 }
 function move(pen) {
-    if (!gifsList[pen.id]) {
+    const meta2dId = pen.calculative.canvas.store.id;
+    const id = meta2dId + '-' + pen.id;
+    if (!gifsList[id]) {
         return;
     }
-    setImagePosition(pen, gifsList[pen.id]);
+    setImagePosition(pen, gifsList[id]);
 }
 function resize(pen) {
-    if (!gifsList[pen.id]) {
+    const meta2dId = pen.calculative.canvas.store.id;
+    const id = meta2dId + '-' + pen.id;
+    if (!gifsList[id]) {
         return;
     }
-    setImagePosition(pen, gifsList[pen.id]);
+    setImagePosition(pen, gifsList[id]);
 }
 function value(pen) {
-    if (!gifsList[pen.id]) {
+    const meta2dId = pen.calculative.canvas.store.id;
+    const id = meta2dId + '-' + pen.id;
+    if (!gifsList[id]) {
         return;
     }
-    setImagePosition(pen, gifsList[pen.id]);
-    if (gifsList[pen.id].getAttribute('src') !== pen.image) {
-        gifsList[pen.id].src = pen.image;
+    setImagePosition(pen, gifsList[id]);
+    if (gifsList[id].getAttribute('src') !== pen.image) {
+        gifsList[id].src = pen.image;
     }
 }
 function changeId(pen, oldId, newId) {
-    if (!gifsList[oldId]) {
+    const meta2dId = pen.calculative.canvas.store.id;
+    if (!gifsList[meta2dId + '-' + oldId]) {
         return;
     }
-    gifsList[newId] = gifsList[oldId];
-    delete gifsList[oldId];
+    gifsList[meta2dId + '-' + newId] = gifsList[meta2dId + '-' + oldId];
+    delete gifsList[meta2dId + '-' + oldId];
 }
 /**
  * gif 保持比例，除了更改 position ，还需要是否可保持比例

package/src/diagrams/gif.js.map

@@ -1 +1 @@
-{"version":3,"file":"gif.js","sourceRoot":"","sources":["../../../../packages/core/src/diagrams/gif.ts"],"names":[],"mappings":"AAAA,OAAO,EAAO,eAAe,EAAE,MAAM,QAAQ,CAAC;AAE9C,MAAM,CAAC,MAAM,QAAQ,GAEjB,EAAE,CAAC;AAEP,MAAM,UAAU,GAAG,CAAC,GAAQ;IAC1B,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC;QACnB,GAAG,CAAC,SAAS,GAAG,OAAO,CAAC;QACxB,GAAG,CAAC,MAAM,GAAG,IAAI,CAAC;QAClB,GAAG,CAAC,QAAQ,GAAG,MAAM,CAAC;QACtB,GAAG,CAAC,QAAQ,GAAG,IAAI,CAAC;QACpB,GAAG,CAAC,OAAO,GAAG,KAAK,CAAC;QACpB,GAAG,CAAC,UAAU,GAAG,QAAQ,CAAC;IAC5B,CAAC;IAED,MAAM,IAAI,GAAG,IAAI,MAAM,EAAE,CAAC;IAC1B,IAAI,CAAC,GAAG,CAAC,KAAK,EAAE,CAAC;QACf,OAAO;IACT,CAAC;IAED,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;QACtB,MAAM,GAAG,GAAG,IAAI,KAAK,EAAE,CAAC;QACxB,GAAG,CAAC,WAAW,GAAG,WAAW,CAAC;QAC9B,GAAG,CAAC,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC;QACpB,IACE,GAAG,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG;YAC/C,CAAC,CACC,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,MAAM,CAAC;gBAC5B,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC;gBAC1B,GAAG,CAAC,KAAK,CAAC,UAAU,CAAC,YAAY,CAAC,CACnC,EACD,CAAC;YACD,GAAG,CAAC,GAAG,GAAG,GAAG,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC;QACxE,CAAC;QACD,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,CAAC,cAAc;QACtC,GAAG,CAAC,MAAM,GAAG,GAAG,EAAE;YAChB,IAAI,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,KAAK,GAAG,EAAE,CAAC;gBAC7B,OAAO;YACT,CAAC;YACD,GAAG,CAAC,WAAW,CAAC,GAAG,GAAG,GAAG,CAAC;YAC1B,GAAG,CAAC,WAAW,CAAC,eAAe,GAAG,GAAG,CAAC,YAAY,IAAI,GAAG,CAAC,SAAS,CAAC;YACpE,GAAG,CAAC,WAAW,CAAC,gBAAgB,GAAG,GAAG,CAAC,aAAa,IAAI,GAAG,CAAC,UAAU,CAAC;YACvE,6DAA6D;YAC7D,GAAG,CAAC,WAAW,CAAC,MAAM,CAAC,gBAAgB,EAAE,aAAa,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;YACxE,gBAAgB,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QAC7B,CAAC,CAAC;IACJ,CAAC;IAED,IAAI,GAAG,CAAC,WAAW,CAAC,UAAU,IAAI,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;QACnD,gBAAgB,CAAC,GAAG,EAAE,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;IAC1C,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,OAAO,CAAC,GAAQ;IACvB,IAAI,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;QACrB,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,MAAM,EAAE,CAAC;QAC1B,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC;IAC/B,CAAC;AACH,CAAC;AAED,SAAS,IAAI,CAAC,GAAQ;IACpB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;QACtB,OAAO;IACT,CAAC;IACD,gBAAgB,CAAC,GAAG,EAAE,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;AAC1C,CAAC;AAED,SAAS,MAAM,CAAC,GAAQ;IACtB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;QACtB,OAAO;IACT,CAAC;IACD,gBAAgB,CAAC,GAAG,EAAE,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;AAC1C,CAAC;AAED,SAAS,KAAK,CAAC,GAAQ;IACrB,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAAC;QACtB,OAAO;IACT,CAAC;IACD,gBAAgB,CAAC,GAAG,EAAE,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;IACxC,IAAI,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,YAAY,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,KAAK,EAAE,CAAC;QACvD,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,GAAG,GAAG,GAAG,CAAC,KAAK,CAAC;IACnC,CAAC;AACH,CAAC;AAED,SAAS,QAAQ,CAAC,GAAQ,EAAE,KAAa,EAAE,KAAa;IACtD,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;QACrB,OAAO;IACT,CAAC;IACD,QAAQ,CAAC,KAAK,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAClC,OAAO,QAAQ,CAAC,KAAK,CAAC,CAAC;AACzB,CAAC;AAED;;;;GAIG;AACH,SAAS,gBAAgB,CAAC,GAAQ,EAAE,IAAsB;IACxD,0CAA0C;IAC1C,IAAI,CAAC,KAAK,CAAC,SAAS,GAAG,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC;IAC3D,6CAA6C;IAC7C,eAAe,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;AAC7B,CAAC"}
+{"version":3,"file":"gif.js","sourceRoot":"","sources":["../../../../packages/core/src/diagrams/gif.ts"],"names":[],"mappings":"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"}

package/src/diagrams/index.d.ts

@@ -15,7 +15,7 @@ export * from './people';
 export * from './line';
 export * from './iframe';
 export * from './video';
-export * from './panel';
+export * from './form';
 import { rectangle } from './rectangle';
 import { circle } from './circle';
 import { svgPath } from './svgPath';
@@ -35,7 +35,7 @@ import { video } from './video';
 import { gif } from './gif';
 import { mindNode, mindNodeAnchors } from './mindNode';
 import { mindLine, mindLineAnchors } from './mindLine';
-import { panel } from './panel';
+import { form } from './form';
 export declare function commonPens(): {
     rectangle: typeof rectangle;
     square: typeof rectangle;
@@ -60,7 +60,7 @@ export declare function commonPens(): {
     mindNode: typeof mindNode;
     mindLine: typeof mindLine;
     mindNode2: typeof rectangle;
-    panel: typeof panel;
+    form: typeof form;
     combine: typeof rectangle;
 };
 export declare function commonAnchors(): {

package/src/diagrams/index.js

@@ -15,7 +15,7 @@ export * from './people';
 export * from './line';
 export * from './iframe';
 export * from './video';
-export * from './panel';
+export * from './form';
 import { rectangle, square } from './rectangle';
 import { circle } from './circle';
 import { svgPath } from './svgPath';
@@ -36,7 +36,7 @@ import { video } from './video';
 import { gif } from './gif';
 import { mindNode, mindNodeAnchors } from './mindNode';
 import { mindLine, mindLineAnchors } from './mindLine';
-import { panel } from './panel';
+import { form } from './form';
 export function commonPens() {
     return {
         rectangle,
@@ -62,7 +62,7 @@ export function commonPens() {
         mindNode,
         mindLine,
         mindNode2: rectangle,
-        panel,
+        form,
         combine: rectangle,
     };
 }

package/src/diagrams/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/core/src/diagrams/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC;AACxB,cAAc,QAAQ,CAAC;AACvB,cAAc,QAAQ,CAAC;AACvB,cAAc,UAAU,CAAC;AACzB,cAAc,QAAQ,CAAC;AACvB,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,SAAS,CAAC;AAExB,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AACvD,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAC7D,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,iCAAiC;AACjC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAC5B,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AACvD,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AACvD,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAEhC,MAAM,UAAU,UAAU;IACxB,OAAO;QACL,SAAS;QACT,MAAM;QACN,MAAM;QACN,OAAO;QACP,OAAO;QACP,QAAQ;QACR,QAAQ;QACR,SAAS;QACT,OAAO;QACP,SAAS;QACT,UAAU;QACV,WAAW;QACX,OAAO;QACP,KAAK;QACL,IAAI;QACJ,MAAM;QACN,IAAI;QACJ,MAAM;QACN,KAAK;QACL,GAAG;QACH,QAAQ;QACR,QAAQ;QACR,SAAS,EAAC,SAAS;QACnB,KAAK;QACL,OAAO,EAAC,SAAS;KAClB,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,aAAa;IAC3B,OAAO;QACL,QAAQ,EAAE,eAAe;QACzB,QAAQ,EAAE,eAAe;QACzB,SAAS,EAAE,gBAAgB;QAC3B,QAAQ,EAAE,eAAe;QACzB,QAAQ,EAAE,eAAe;KAC1B,CAAC;AACJ,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/core/src/diagrams/index.ts"],"names":[],"mappings":"AAAA,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC;AACxB,cAAc,QAAQ,CAAC;AACvB,cAAc,QAAQ,CAAC;AACvB,cAAc,UAAU,CAAC;AACzB,cAAc,QAAQ,CAAC;AACvB,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,QAAQ,CAAC;AAEvB,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AACvD,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AACvD,OAAO,EAAE,SAAS,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAC7D,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,iCAAiC;AACjC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAC5B,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AACvD,OAAO,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AACvD,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAE9B,MAAM,UAAU,UAAU;IACxB,OAAO;QACL,SAAS;QACT,MAAM;QACN,MAAM;QACN,OAAO;QACP,OAAO;QACP,QAAQ;QACR,QAAQ;QACR,SAAS;QACT,OAAO;QACP,SAAS;QACT,UAAU;QACV,WAAW;QACX,OAAO;QACP,KAAK;QACL,IAAI;QACJ,MAAM;QACN,IAAI;QACJ,MAAM;QACN,KAAK;QACL,GAAG;QACH,QAAQ;QACR,QAAQ;QACR,SAAS,EAAC,SAAS;QACnB,IAAI;QACJ,OAAO,EAAC,SAAS;KAClB,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,aAAa;IAC3B,OAAO;QACL,QAAQ,EAAE,eAAe;QACzB,QAAQ,EAAE,eAAe;QACzB,SAAS,EAAE,gBAAgB;QAC3B,QAAQ,EAAE,eAAe;QACzB,QAAQ,EAAE,eAAe;KAC1B,CAAC;AACJ,CAAC"}

package/src/event/event.d.ts

@@ -2,7 +2,7 @@ import { Meta2d } from '../core';
 import { IValue, Pen } from '../pen';
 import { Network } from '../store';
 export type EventValue = string | IValue | undefined | null;
-export type EventName = 'enter' | 'leave' | 'active' | 'inactive' | 'click' | 'mousedown' | 'mouseup' | 'dblclick' | 'valueUpdate' | 'message' | 'contextmenu' | 'input' | 'change';
+export type EventName = 'enter' | 'leave' | 'active' | 'inactive' | 'click' | 'mousedown' | 'mouseup' | 'dblclick' | 'valueUpdate' | 'message' | 'contextmenu' | 'input' | 'change' | 'submit' | 'reset';
 export interface Event {
     name: EventName;
     action: EventAction;

package/src/event/event.js.map

@@ -1 +1 @@
-{"version":3,"file":"event.js","sourceRoot":"","sources":["../../../../packages/core/src/event/event.ts"],"names":[],"mappings":"AAiDA,MAAM,CAAN,IAAY,WAoBX;AApBD,WAAY,WAAW;IACrB,6CAAI,CAAA;IACJ,qDAAQ,CAAA;IACR,6DAAY,CAAA;IACZ,6DAAY,CAAA;IACZ,2DAAW,CAAA;IACX,yCAAE,CAAA;IACF,qDAAQ,CAAA;IACR,6CAAI,CAAA;IACJ,yDAAU,CAAA;IACV,yDAAU,CAAA;IACV,wDAAS,CAAA;IACT,8DAAY,CAAA;IACZ,4DAAW,CAAA;IACX,wDAAS,CAAA;IACT,kDAAM,CAAA;IACN,sDAAQ,CAAA;IACR,4DAAW,CAAA;IACX,4EAAmB,CAAA;IACnB,oDAAO,CAAA;AACT,CAAC,EApBW,WAAW,KAAX,WAAW,QAoBtB"}
+{"version":3,"file":"event.js","sourceRoot":"","sources":["../../../../packages/core/src/event/event.ts"],"names":[],"mappings":"AAmDA,MAAM,CAAN,IAAY,WAoBX;AApBD,WAAY,WAAW;IACrB,6CAAI,CAAA;IACJ,qDAAQ,CAAA;IACR,6DAAY,CAAA;IACZ,6DAAY,CAAA;IACZ,2DAAW,CAAA;IACX,yCAAE,CAAA;IACF,qDAAQ,CAAA;IACR,6CAAI,CAAA;IACJ,yDAAU,CAAA;IACV,yDAAU,CAAA;IACV,wDAAS,CAAA;IACT,8DAAY,CAAA;IACZ,4DAAW,CAAA;IACX,wDAAS,CAAA;IACT,kDAAM,CAAA;IACN,sDAAQ,CAAA;IACR,4DAAW,CAAA;IACX,4EAAmB,CAAA;IACnB,oDAAO,CAAA;AACT,CAAC,EApBW,WAAW,KAAX,WAAW,QAoBtB"}

package/src/pen/model.d.ts

@@ -284,6 +284,11 @@ export interface Pen extends Rect {
     childActive?: boolean;
     draw?: boolean;
     copyIndex?: number;
+    formId?: string;
+    formData?: any;
+    formKey?: string;
+    formValue?: string;
+    formType?: string;
     calculative?: {
         x?: number;
         y?: number;

package/src/pen/model.js.map

@@ -1 +1 @@
-{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../../packages/core/src/pen/model.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"model.js","sourceRoot":"","sources":["../../../../packages/core/src/pen/model.ts"],"names":[],"mappings":"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"}

package/src/pen/render.d.ts

@@ -17,7 +17,7 @@ export declare function drawImage(ctx: CanvasRenderingContext2D | OffscreenCanva
 /**
  * 获取文字颜色， textColor 优先其次 color
  */
-export declare function getTextColor(pen: Pen, store: Meta2dStore): string;
+export declare function getTextColor(pen: Pen, store: Meta2dStore): any;
 export declare function drawIcon(ctx: CanvasRenderingContext2D | OffscreenCanvasRenderingContext2D, pen: Pen): void;
 export declare function drawDropdown(ctx: CanvasRenderingContext2D | OffscreenCanvasRenderingContext2D, pen: Pen): void;
 /**

package/src/pen/render.js

@@ -738,13 +738,11 @@ export function drawImage(ctx, pen) {
  */
 export function getTextColor(pen, store) {
     const { textColor, color } = pen.calculative;
-    const { data, options } = store;
+    const { globalStyle } = store;
     return (textColor ||
         color ||
-        data.textColor ||
-        data.color ||
-        options.textColor ||
-        options.color);
+        globalStyle.textColor ||
+        globalStyle.color);
 }
 function drawText(ctx, pen) {
     const { fontStyle, fontWeight, fontSize, fontFamily, lineHeight, text, hiddenText, canvas, textHasShadow, textBackground, textType, } = pen.calculative;
@@ -766,10 +764,10 @@ function drawText(ctx, pen) {
                 pSBC(0.4, getTextColor(pen, store));
     }
     else if (pen.calculative.hover) {
-        fill = pen.hoverTextColor || pen.hoverColor || store.options.hoverColor;
+        fill = pen.hoverTextColor || pen.hoverColor || store.globalStyle.hoverColor;
     }
     else if (pen.calculative.active) {
-        fill = pen.activeTextColor || pen.activeColor || store.options.activeColor;
+        fill = pen.activeTextColor || pen.activeColor || store.globalStyle.activeColor;
     }
     let gradient = undefined;
     if (textType === Gradient.Linear) {
@@ -879,10 +877,10 @@ function drawFillText(ctx, pen, text) {
     ctx.save();
     let fill = undefined;
     if (pen.calculative.hover) {
-        fill = pen.hoverTextColor || pen.hoverColor || store.options.hoverColor;
+        fill = pen.hoverTextColor || pen.hoverColor || store.globalStyle.hoverColor;
     }
     else if (pen.calculative.active) {
-        fill = pen.activeTextColor || pen.activeColor || store.options.activeColor;
+        fill = pen.activeTextColor || pen.activeColor || store.globalStyle.activeColor;
     }
     ctx.fillStyle = fill || getTextColor(pen, store);
     ctx.font = getFont({
@@ -1084,20 +1082,20 @@ export function renderPen(ctx, pen, download) {
     if (pen.calculative.disabled) {
         _stroke =
             pen.disabledColor ||
-                store.options.disabledColor ||
-                pSBC(0.4, pen.calculative.color || getGlobalColor(store));
+                store.globalStyle.disabledColor ||
+                pSBC(0.4, pen.calculative.color || store.globalStyle.color);
         fill =
             pen.disabledBackground ||
-                store.options.disabledBackground ||
-                pSBC(0.4, pen.calculative.background || store.data.penBackground);
+                store.globalStyle.disabledBackground ||
+                pSBC(0.4, pen.calculative.background || store.globalStyle.penBackground);
     }
     else if (pen.mouseDownValid && pen.calculative.mouseDown) {
         _stroke =
             pen.mouseDownColor ||
-                pSBC(-0.4, pen.calculative.color || getGlobalColor(store));
+                pSBC(-0.4, pen.calculative.color || store.globalStyle.color);
         fill =
             pen.mouseDownBackground ||
-                pSBC(-0.4, pen.calculative.background || store.data.penBackground);
+                pSBC(-0.4, pen.calculative.background || store.globalStyle.penBackground);
     }
     else if (pen.switch && pen.calculative.checked) {
         if (!pen.calculative.bkType) {
@@ -1105,23 +1103,23 @@ export function renderPen(ctx, pen, download) {
         }
     }
     else if (pen.calculative.hover) {
-        _stroke = pen.hoverColor || store.options.hoverColor;
-        fill = pen.hoverBackground || store.options.hoverBackground;
+        _stroke = pen.hoverColor || store.globalStyle.hoverColor;
+        fill = pen.hoverBackground || store.globalStyle.hoverBackground;
         //  ctx.fillStyle = fill;
         //  fill && (setBack = false);
     }
     else if (pen.calculative.active) {
-        _stroke = pen.activeColor || store.options.activeColor;
-        fill = pen.activeBackground || store.options.activeBackground;
+        _stroke = pen.activeColor || store.globalStyle.activeColor;
+        fill = pen.activeBackground || store.globalStyle.activeBackground;
         // ctx.fillStyle = fill;
         // fill && (setBack = false);
     }
     else if (pen.calculative.isDock) {
         if (pen.type === PenType.Line) {
-            _stroke = store.options.dockPenColor;
+            _stroke = store.globalStyle.dockPenColor;
         }
         else {
-            fill = rgba(store.options.dockPenColor, 0.2);
+            fill = rgba(store.globalStyle.dockPenColor, 0.2);
             //  ctx.fillStyle = fill;
             //  fill && (setBack = false);
         }
@@ -1155,7 +1153,7 @@ export function renderPen(ctx, pen, download) {
             }
         }
         else {
-            stroke = pen.calculative.color || (pen.type ? store.data.lineColor : '') || getGlobalColor(store);
+            stroke = pen.calculative.color || (pen.type ? store.data.lineColor : '') || store.globalStyle.color;
         }
         ctx.strokeStyle = _stroke || stroke;
     }
@@ -1201,7 +1199,7 @@ export function renderPen(ctx, pen, download) {
             }
         }
         else {
-            back = pen.calculative.background || store.data.penBackground;
+            back = pen.calculative.background || store.globalStyle.penBackground;
         }
         ctx.fillStyle = fill || back;
         fill = !!back;
@@ -1326,14 +1324,14 @@ export function renderPenRaw(ctx, pen, rect, download) {
     }
     let fill;
     if (pen.calculative.hover) {
-        ctx.strokeStyle = pen.hoverColor || store.options.hoverColor;
-        ctx.fillStyle = pen.hoverBackground || store.options.hoverBackground;
-        fill = pen.hoverBackground || store.options.hoverBackground;
+        ctx.strokeStyle = pen.hoverColor || store.globalStyle.hoverColor;
+        ctx.fillStyle = pen.hoverBackground || store.globalStyle.hoverBackground;
+        fill = pen.hoverBackground || store.globalStyle.hoverBackground;
     }
     else if (pen.calculative.active) {
-        ctx.strokeStyle = pen.activeColor || store.options.activeColor;
-        ctx.fillStyle = pen.activeBackground || store.options.activeBackground;
-        fill = pen.activeBackground || store.options.activeBackground;
+        ctx.strokeStyle = pen.activeColor || store.globalStyle.activeColor;
+        ctx.fillStyle = pen.activeBackground || store.globalStyle.activeBackground;
+        fill = pen.activeBackground || store.globalStyle.activeBackground;
     }
     else {
         if (pen.strokeImage) {
@@ -1350,7 +1348,7 @@ export function renderPenRaw(ctx, pen, rect, download) {
                 lineGradientFlag = true;
             }
             else {
-                stroke = pen.calculative.color || getGlobalColor(store);
+                stroke = pen.calculative.color || store.globalStyle.color; //getGlobalColor(store);
             }
             ctx.strokeStyle = stroke;
         }
@@ -1691,11 +1689,11 @@ export function ctxDrawLinePath(canUsePath = true, ctx, pen, store) {
  * 设置线条动画，ctx 的 strokeStyle lineDash 等属性更改
  */
 export function setCtxLineAnimate(ctx, pen, store) {
-    ctx.strokeStyle = pen.animateColor || store.options.animateColor;
+    ctx.strokeStyle = pen.animateColor || store.globalStyle.animateColor;
     if (pen.animateShadow) {
         ctx.shadowBlur = pen.animateShadowBlur || pen.animateLineWidth || 6;
         ctx.shadowColor =
-            pen.animateShadowColor || pen.animateColor || store.options.animateColor;
+            pen.animateShadowColor || pen.animateColor || store.globalStyle.animateColor;
     }
     pen.calculative.animateLineWidth &&
         (ctx.lineWidth = pen.calculative.animateLineWidth * store.data.scale);
@@ -1736,11 +1734,11 @@ export function setCtxLineAnimate(ctx, pen, store) {
             ctx.setLineDash([0.1, pen.length]);
             break;
         case LineAnimateType.Arrow:
-            ctx.fillStyle = pen.animateColor || store.options.animateColor;
+            ctx.fillStyle = pen.animateColor || store.globalStyle.animateColor;
             ctx.lineWidth = 1;
             break;
         case LineAnimateType.WaterDrop:
-            ctx.fillStyle = pen.animateColor || store.options.animateColor;
+            ctx.fillStyle = pen.animateColor || store.globalStyle.animateColor;
             ctx.lineWidth = 1;
             break;
         default:
@@ -1772,7 +1770,7 @@ export function renderLineAnchors(ctx, pen) {
     const store = pen.calculative.canvas.store;
     ctx.save();
     ctx.lineWidth = 1;
-    ctx.fillStyle = pen.activeColor || store.options.activeColor;
+    ctx.fillStyle = pen.activeColor || store.globalStyle.activeColor; //store.options.activeColor;
     pen.calculative.worldAnchors.forEach((pt) => {
         !pt.hidden && !pt.isTemp && renderAnchor(ctx, pt, pen);
     });
@@ -3002,10 +3000,11 @@ function commandTransfer(command, pen, startX, startY) {
     // VISIO
     const map = {
         'visio': dealWithVisio,
-        'dxf': dealWithDXF
+        'dxf': dealWithDXF,
+        'canvas': dealWithCanvas
     };
     // CAD
-    return map[pen.parseType](command, pen, startX, startY);
+    return map[pen.parseType]?.(command, pen, startX, startY) || command;
 }
 function dealWithDXF(command, pen, startX, startY) {
     const { x, y, width, height } = pen.calculative.worldRect;
@@ -3093,6 +3092,85 @@ function dealWithDXF(command, pen, startX, startY) {
             return c;
     }
 }
+function dealWithCanvas(command, pen, startX, startY) {
+    const { x, y, width, height } = pen.calculative.worldRect;
+    const { originWidth, originHeight } = pen.origin;
+    switch (command.c) {
+        case "beginPath":
+            return {
+                c: 'beginPath',
+                v: {}
+            };
+        case "closePath":
+            return {
+                c: 'closePath',
+                v: {}
+            };
+        case "moveTo":
+            return {
+                c: 'moveTo',
+                v: {
+                    x: command.v.x * (width / originWidth) + x,
+                    y: command.v.y * (height / originHeight) + y
+                }
+            };
+        case "lineTo":
+            return {
+                c: 'lineTo',
+                v: {
+                    x: command.v.x * (width / originWidth) + x,
+                    y: command.v.y * (height / originHeight) + y
+                }
+            };
+        case "arc":
+            return {
+                c: 'ellipse',
+                v: {
+                    x: command.v.x * (width / originWidth) + x,
+                    y: (command.v.y * (height / originHeight)) + y,
+                    rx: command.v.xr * (width / originWidth),
+                    ry: command.v.yr * (height / originHeight),
+                    rotation: command.v.rotation || 0,
+                    startAngle: command.v.startAngle,
+                    endAngle: command.v.endAngle,
+                    a: command.v.aclockwise ?? true
+                }
+            };
+        case "ellipse":
+            return {
+                c: 'ellipse',
+                v: {
+                    x: command.v.x * (width / originWidth) + x,
+                    y: (command.v.y * (height / originHeight)) + y,
+                    rx: command.v.xr * (width / originWidth),
+                    ry: command.v.yr * (height / originHeight),
+                    rotation: command.v.rotation || 0,
+                    startAngle: command.v.startAngle,
+                    endAngle: command.v.endAngle,
+                    a: command.v.aclockwise ?? true
+                }
+            };
+        case "_font":
+            return {
+                c: '_font',
+                v: {
+                    value: command.v.fontSize * pen.calculative.canvas.store.data.scale + 'px ' + (command.v.fontFamily || pen.calculative.canvas.store.options.fontFamily)
+                }
+            };
+        default:
+            const c = {
+                c: command.c,
+                v: {
+                    ...command.v,
+                }
+            };
+            if ((c.v.x) !== undefined)
+                c.v.x = command.v.x * (width / originWidth) + x;
+            if (c.v.y !== undefined)
+                c.v.y = (command.v.y * (height / originHeight)) + y;
+            return c;
+    }
+}
 function dealWithVisio(command, pen, startX, startY) {
     const { x, y, width, height } = pen.calculative.worldRect;
     const { width: originWidth, height: originHeight } = pen.origin;