@meta2d/core 1.0.38 → 1.0.40

package/src/canvas/canvasImage.js

@@ -354,7 +354,8 @@ var CanvasImage = /** @class */ (function () {
     //   ctx.restore();
     // }
     CanvasImage.prototype.renderRule = function (ctx) {
-        var _a = this.store, data = _a.data, options = _a.options;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _j = this.store, data = _j.data, options = _j.options;
         var rule = data.rule, ruleColor = data.ruleColor, scale = data.scale, origin = data.origin;
         if (!(rule !== null && rule !== void 0 ? rule : options.rule)) {
             // rule false 时不绘制, undefined 时看 options.rule
@@ -366,38 +367,64 @@ var CanvasImage = /** @class */ (function () {
         ctx.strokeStyle = rgba(finalRuleColor, 0.7);
         var x = origin.x + data.x;
         var y = origin.y + data.y;
-        var _b = this.canvas, width = _b.width, height = _b.height;
+        var _k = this.canvas, width = _k.width, height = _k.height;
+        var h = ((_a = options.ruleOptions) === null || _a === void 0 ? void 0 : _a.height) || 20;
+        if ((_b = options.ruleOptions) === null || _b === void 0 ? void 0 : _b.background) {
+            //背景颜色
+            ctx.beginPath();
+            ctx.fillStyle = (_c = options.ruleOptions) === null || _c === void 0 ? void 0 : _c.background;
+            ctx.rect(0, 0, width, h);
+            ctx.fill();
+            ctx.rect(0, 0, h, height);
+            ctx.fill();
+        }
+        if ((_d = options.ruleOptions) === null || _d === void 0 ? void 0 : _d.underline) {
+            ctx.beginPath();
+            ctx.fillStyle = rgba(finalRuleColor, 0.7);
+            ctx.moveTo(0, h);
+            ctx.lineTo(width, h);
+            ctx.stroke();
+            ctx.moveTo(h, 0);
+            ctx.lineTo(h, height);
+            ctx.stroke();
+        }
+        var b_y = h / 4;
+        if (((_e = options.ruleOptions) === null || _e === void 0 ? void 0 : _e.baseline) === "bottom") {
+            b_y = h * 3 / 4;
+        }
         // horizontal rule
         ctx.beginPath();
-        ctx.lineWidth = 12;
+        ctx.lineWidth = h / 2;
         ctx.lineDashOffset = -x % span;
         ctx.setLineDash([1, span - 1]);
-        ctx.moveTo(0, 0);
-        ctx.lineTo(width, 0);
+        ctx.moveTo(0, b_y);
+        ctx.lineTo(width, b_y);
         ctx.stroke();
         // vertical rule
         ctx.beginPath();
         ctx.lineDashOffset = -y % span;
-        ctx.moveTo(0, 0);
-        ctx.lineTo(0, height);
+        ctx.moveTo(b_y, 0);
+        ctx.lineTo(b_y, height);
         ctx.stroke();
         // the big rule
         ctx.strokeStyle = finalRuleColor;
         ctx.beginPath();
-        ctx.lineWidth = 24;
+        ctx.lineWidth = h;
         ctx.lineDashOffset = -x % (span * 10);
         ctx.setLineDash([1, span * 10 - 1]);
-        ctx.moveTo(0, 0);
-        ctx.lineTo(width, 0);
+        ctx.moveTo(0, h / 2);
+        ctx.lineTo(width, h / 2);
         ctx.stroke();
         ctx.beginPath();
         ctx.lineDashOffset = -y % (span * 10);
-        ctx.moveTo(0, 0);
-        ctx.lineTo(0, height);
+        ctx.moveTo(h / 2, 0);
+        ctx.lineTo(h / 2, height);
         ctx.stroke();
         ctx.beginPath();
-        ctx.fillStyle = ctx.strokeStyle;
+        ctx.fillStyle = ((_f = options.ruleOptions) === null || _f === void 0 ? void 0 : _f.textColor) || ctx.strokeStyle;
         var text = 0 - Math.floor(x / span / 10) * 100;
+        var textTop = ((_g = options.ruleOptions) === null || _g === void 0 ? void 0 : _g.textTop) || 16;
+        var textLeft = ((_h = options.ruleOptions) === null || _h === void 0 ? void 0 : _h.textLeft) || 4;
         if (x < 0) {
             text -= 100;
         }
@@ -405,7 +432,7 @@ var CanvasImage = /** @class */ (function () {
             if (span < 3 && text % 500) {
                 continue;
             }
-            ctx.fillText(text.toString(), i + 4, 16);
+            ctx.fillText(text.toString(), i + textLeft, textTop);
         }
         text = 0 - Math.floor(y / span / 10) * 100;
         if (y < 0) {
@@ -417,7 +444,7 @@ var CanvasImage = /** @class */ (function () {
             }
             ctx.save();
             ctx.beginPath();
-            ctx.translate(16, i - 4);
+            ctx.translate(textTop, i - textLeft);
             ctx.rotate((270 * Math.PI) / 180);
             ctx.fillText(text.toString(), 0, 0);
             ctx.restore();

package/src/canvas/canvasImage.js.map

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

package/src/core.d.ts

@@ -445,5 +445,6 @@ export declare class Meta2d {
     clearHover(): void;
     closeSocket(): void;
     setElemPosition: typeof setElemPosition;
+    setLifeCycleFunc: (pen: Pen, lifeCycle: any, func: Function, del?: boolean) => () => void;
     destroy(onlyData?: boolean): void;
 }

package/src/core.js

@@ -83,7 +83,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 };
 import { commonAnchors, commonPens, cube } from './diagrams';
 import { Canvas } from './canvas';
-import { calcInView, calcTextDrawRect, calcTextLines, calcTextRect, facePen, formatAttrs, getAllChildren, getFromAnchor, getParent, getToAnchor, getWords, LockState, PenType, renderPenRaw, setElemPosition, connectLine, nearestAnchor, setChildValue, isAncestor, isShowChild, CanvasLayer, validationPlugin, } from './pen';
+import { calcInView, calcTextDrawRect, calcTextLines, calcTextRect, facePen, formatAttrs, getAllChildren, getFromAnchor, getParent, getToAnchor, getWords, LockState, PenType, renderPenRaw, setElemPosition, connectLine, nearestAnchor, setChildValue, isAncestor, isShowChild, CanvasLayer, validationPlugin, setLifeCycleFunc, } from './pen';
 import { rotatePoint } from './point';
 import { clearStore, EditType, globalStore, register, registerAnchors, registerCanvasDraw, useStore, } from './store';
 import { formatPadding, loadCss, s8, valueInArray, valueInRange, } from './utils';
@@ -307,6 +307,7 @@ var Meta2d = /** @class */ (function () {
         };
         this.renderPenRaw = renderPenRaw;
         this.setElemPosition = setElemPosition;
+        this.setLifeCycleFunc = setLifeCycleFunc;
         this.store = useStore(s8());
         this.setOptions(opts);
         this.setDatabyOptions(opts);
@@ -375,21 +376,33 @@ var Meta2d = /** @class */ (function () {
         configurable: true
     });
     Meta2d.prototype.setOptions = function (opts) {
+        var _a;
         if (opts === void 0) { opts = {}; }
         if (opts.grid !== undefined ||
             opts.gridColor !== undefined ||
             opts.gridSize !== undefined) {
-            this.setGrid({
-                grid: opts.grid,
-                gridColor: opts.gridColor,
-                gridSize: opts.gridSize,
-            });
+            // this.setGrid({
+            //   grid: opts.grid,
+            //   gridColor: opts.gridColor,
+            //   gridSize: opts.gridSize,
+            // });
+            this.canvas && (this.canvas.canvasTemplate.bgPatchFlags = true);
         }
-        if (opts.rule !== undefined || opts.ruleColor !== undefined) {
-            this.setRule({
-                rule: opts.rule,
-                ruleColor: opts.ruleColor,
-            });
+        if (opts.rule !== undefined || opts.ruleColor !== undefined || opts.ruleOptions !== undefined) {
+            // this.setRule({
+            //   rule: opts.rule,
+            //   ruleColor: opts.ruleColor,
+            // });
+            this.store.patchFlagsTop = true;
+            if (opts.ruleOptions) {
+                if ((_a = this.store.options) === null || _a === void 0 ? void 0 : _a.ruleOptions) {
+                    Object.assign(this.store.options.ruleOptions, opts.ruleOptions);
+                    opts.ruleOptions = this.store.options.ruleOptions;
+                }
+            }
+        }
+        if (opts.background !== undefined) {
+            this.canvas && (this.canvas.canvasTemplate.bgPatchFlags = true);
         }
         if (opts.resizeMode !== undefined) {
             if (!opts.resizeMode) {
@@ -468,6 +481,13 @@ var Meta2d = /** @class */ (function () {
             console.warn('[meta2d] SetProps value is not an object');
         };
         this.events[EventAction.StartAnimate] = function (pen, e) {
+            var _pen = pen;
+            if (e.value) {
+                _pen = _this.findOne(e.value);
+            }
+            if (_this.store.animates.has(_pen) && !_pen.calculative.pause) {
+                return;
+            }
             if (e.targetType && e.params) {
                 _this.startAnimate(e.value || [pen], e.params);
                 return;
@@ -695,6 +715,10 @@ var Meta2d = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         network = deepClone(_network);
+                        if (network.data) {
+                            Object.assign(network, network.data);
+                            delete network.data;
+                        }
                         if (!network.url) {
                             return [2 /*return*/];
                         }
@@ -2120,6 +2144,9 @@ var Meta2d = /** @class */ (function () {
             }
             this.store.pensNetwork[pen.id] = penNetwork;
         }
+        else {
+            delete this.store.pensNetwork[pen.id];
+        }
     };
     //获取动态参数
     Meta2d.prototype.getDynamicParam = function (key) {
@@ -3429,6 +3456,7 @@ var Meta2d = /** @class */ (function () {
             }
             finally { if (e_11) throw e_11.error; }
         }
+        this.store.emitter.emit('layer', { type: 'top', pens: pens });
     };
     /**
      * 若本次改变的画笔存在图片，并且在上层 or 下层，需要擦除上层 or 下层
@@ -3489,6 +3517,7 @@ var Meta2d = /** @class */ (function () {
             }
             finally { if (e_12) throw e_12.error; }
         }
+        this.store.emitter.emit('layer', { type: 'bottom', pens: pens });
     };
     /**
      * data.pens 决定了绘制顺序，即越后面的越在上层
@@ -3557,6 +3586,7 @@ var Meta2d = /** @class */ (function () {
     };
     //特殊图元层级处理
     Meta2d.prototype.specificLayerMove = function (pen, type) {
+        var _a;
         //image
         if (pen.image && pen.name !== 'gif') {
             // let isBottom = false;
@@ -3595,7 +3625,7 @@ var Meta2d = /** @class */ (function () {
                 }
             }
             this.setValue({ id: pen.id, zIndex: zIndex }, { render: false, doEvent: false, history: false });
-            pen.calculative.singleton.div &&
+            ((_a = pen.calculative.singleton) === null || _a === void 0 ? void 0 : _a.div) &&
                 setElemPosition(pen, pen.calculative.singleton.div);
         }
     };
@@ -3666,6 +3696,7 @@ var Meta2d = /** @class */ (function () {
             }
             finally { if (e_14) throw e_14.error; }
         }
+        this.store.emitter.emit('layer', { type: 'up', pens: pens });
     };
     /**
      * 该画笔下移，即把该画笔在该数组中的位置前移一个
@@ -3736,6 +3767,7 @@ var Meta2d = /** @class */ (function () {
             }
             finally { if (e_15) throw e_15.error; }
         }
+        this.store.emitter.emit('layer', { type: 'down', pens: pens });
     };
     Meta2d.prototype.setLayer = function (pen, toIndex, pens) {
         if (pens === void 0) { pens = this.store.data.pens; }