@visactor/vrender-core 0.17.6 → 0.17.7-alpha.2

package/dist/index.js

@@ -4439,6 +4439,123 @@
     }
     const canvasAllocate = new DefaultCanvasAllocate();
 
+    const VWindow = Symbol.for('VWindow');
+    const WindowHandlerContribution = Symbol.for('WindowHandlerContribution');
+    exports.DefaultWindow = class DefaultWindow {
+        get width() {
+            if (this._handler) {
+                const wh = this._handler.getWH();
+                return (this._width = wh.width);
+            }
+            return this._width;
+        }
+        get height() {
+            if (this._handler) {
+                const wh = this._handler.getWH();
+                return (this._height = wh.height);
+            }
+            return this._height;
+        }
+        get dpr() {
+            return this._handler.getDpr();
+        }
+        constructor() {
+            this.hooks = {
+                onChange: new SyncHook(['x', 'y', 'width', 'height'])
+            };
+            this._uid = Generator.GenAutoIncrementId();
+            this.global = application.global;
+            this.postInit();
+        }
+        postInit() {
+            this.global.hooks.onSetEnv.tap('window', () => {
+                this.active();
+            });
+            this.active();
+        }
+        active() {
+            const global = this.global;
+            if (!global.env || this.actived) {
+                return;
+            }
+            const handler = container.getNamed(WindowHandlerContribution, global.env);
+            handler.configure(this, global);
+            this.actived = true;
+        }
+        get style() {
+            return this._handler.getStyle();
+        }
+        set style(style) {
+            this._handler.setStyle(style);
+        }
+        create(params) {
+            this._handler.createWindow(params);
+            const windowWH = this._handler.getWH();
+            this._width = windowWH.width;
+            this._height = windowWH.height;
+            this.title = this._handler.getTitle();
+            this.resizable = true;
+        }
+        setWindowHandler(handler) {
+            this._handler = handler;
+        }
+        setDpr(dpr) {
+            return this._handler.setDpr(dpr);
+        }
+        resize(w, h) {
+            return this._handler.resizeWindow(w, h);
+        }
+        configure() {
+            throw new Error('暂不支持');
+        }
+        release() {
+            return this._handler.releaseWindow();
+        }
+        getContext() {
+            return this._handler.getContext();
+        }
+        getNativeHandler() {
+            return this._handler.getNativeHandler();
+        }
+        getImageBuffer(type) {
+            if (!this._handler.getImageBuffer) {
+                return null;
+            }
+            return this._handler.getImageBuffer(type);
+        }
+        addEventListener(type, listener, options) {
+            return this._handler.addEventListener(type, listener, options);
+        }
+        removeEventListener(type, listener, options) {
+            return this._handler.removeEventListener(type, listener, options);
+        }
+        dispatchEvent(event) {
+            return this._handler.dispatchEvent(event);
+        }
+        getBoundingClientRect() {
+            return this._handler.getBoundingClientRect();
+        }
+        getContainer() {
+            return this._handler.container;
+        }
+        clearViewBox(viewBox, color) {
+            this._handler.clearViewBox(viewBox, color);
+        }
+        isVisible(bbox) {
+            return this._handler.isVisible(bbox);
+        }
+        onVisibleChange(cb) {
+            return this._handler.onVisibleChange(cb);
+        }
+        getTopLeft(baseWindow) {
+            return this._handler.getTopLeft(baseWindow);
+        }
+    };
+    exports.DefaultWindow = __decorate([
+        injectable(),
+        __metadata("design:paramtypes", [])
+    ], exports.DefaultWindow);
+
     exports.DefaultGraphicUtil = class DefaultGraphicUtil {
         get canvas() {
             this.tryInitCanvas();
@@ -4501,6 +4618,46 @@
                     fontSize: DefaultTextStyle.fontSize
                 }, getCanvasForMeasure: getCanvasForMeasure || (() => this.canvas), getTextBounds: undefined, specialCharSet: '-/: .,@%\'"~' + vutils.TextMeasure.ALPHABET_CHAR_SET + vutils.TextMeasure.ALPHABET_CHAR_SET.toUpperCase() }, (option !== null && option !== void 0 ? option : {})), textSpec);
         }
+        drawGraphicToCanvas(graphic, stage, canvas) {
+            if (!stage.defaultLayer) {
+                return null;
+            }
+            const window = container.get(VWindow);
+            const bounds = graphic.AABBBounds;
+            const width = bounds.width();
+            const height = bounds.height();
+            window.create({
+                width,
+                height,
+                canvas,
+                dpr: stage.window.dpr,
+                canvasControled: true,
+                offscreen: true,
+                title: ''
+            });
+            const x = -bounds.x1;
+            const y = -bounds.y1;
+            const disableCheckGraphicWidthOutRange = stage.params.optimize.disableCheckGraphicWidthOutRange;
+            stage.params.optimize.disableCheckGraphicWidthOutRange = true;
+            stage.defaultLayer.getNativeHandler().drawTo(window, [graphic], {
+                x,
+                y,
+                width,
+                height,
+                stage,
+                layer: stage.defaultLayer,
+                renderService: stage.renderService,
+                background: 'transparent',
+                clear: true,
+                updateBounds: false
+            });
+            stage.params.optimize.disableCheckGraphicWidthOutRange = disableCheckGraphicWidthOutRange;
+            const c = window.getNativeHandler();
+            if (c.nativeCanvas) {
+                return c.nativeCanvas;
+            }
+            return null;
+        }
     };
     exports.DefaultGraphicUtil = __decorate([
         injectable(),
@@ -12598,7 +12755,7 @@
             var _a;
             this.tryInit();
             let layerMode = this.getRecommendedLayerType(options.layerMode);
-            layerMode = options.canvasId ? 'static' : layerMode;
+            layerMode = options.main ? 'static' : options.canvasId ? 'static' : layerMode;
             const layerHandler = this.getLayerHandler(layerMode);
             const layer = new Layer(stage, this.global, stage.window, Object.assign(Object.assign({ main: false }, options), { layerMode, canvasId: (_a = options.canvasId) !== null && _a !== void 0 ? _a : DefaultLayerService_1.GenerateLayerId(), layerHandler }));
             const stageLayers = this.layerMap.get(stage) || [];
@@ -12643,123 +12800,6 @@
         __metadata("design:paramtypes", [])
     ], exports.DefaultLayerService);
 
-    const VWindow = Symbol.for('VWindow');
-    const WindowHandlerContribution = Symbol.for('WindowHandlerContribution');
-    exports.DefaultWindow = class DefaultWindow {
-        get width() {
-            if (this._handler) {
-                const wh = this._handler.getWH();
-                return (this._width = wh.width);
-            }
-            return this._width;
-        }
-        get height() {
-            if (this._handler) {
-                const wh = this._handler.getWH();
-                return (this._height = wh.height);
-            }
-            return this._height;
-        }
-        get dpr() {
-            return this._handler.getDpr();
-        }
-        constructor() {
-            this.hooks = {
-                onChange: new SyncHook(['x', 'y', 'width', 'height'])
-            };
-            this._uid = Generator.GenAutoIncrementId();
-            this.global = application.global;
-            this.postInit();
-        }
-        postInit() {
-            this.global.hooks.onSetEnv.tap('window', () => {
-                this.active();
-            });
-            this.active();
-        }
-        active() {
-            const global = this.global;
-            if (!global.env || this.actived) {
-                return;
-            }
-            const handler = container.getNamed(WindowHandlerContribution, global.env);
-            handler.configure(this, global);
-            this.actived = true;
-        }
-        get style() {
-            return this._handler.getStyle();
-        }
-        set style(style) {
-            this._handler.setStyle(style);
-        }
-        create(params) {
-            this._handler.createWindow(params);
-            const windowWH = this._handler.getWH();
-            this._width = windowWH.width;
-            this._height = windowWH.height;
-            this.title = this._handler.getTitle();
-            this.resizable = true;
-        }
-        setWindowHandler(handler) {
-            this._handler = handler;
-        }
-        setDpr(dpr) {
-            return this._handler.setDpr(dpr);
-        }
-        resize(w, h) {
-            return this._handler.resizeWindow(w, h);
-        }
-        configure() {
-            throw new Error('暂不支持');
-        }
-        release() {
-            return this._handler.releaseWindow();
-        }
-        getContext() {
-            return this._handler.getContext();
-        }
-        getNativeHandler() {
-            return this._handler.getNativeHandler();
-        }
-        getImageBuffer(type) {
-            if (!this._handler.getImageBuffer) {
-                return null;
-            }
-            return this._handler.getImageBuffer(type);
-        }
-        addEventListener(type, listener, options) {
-            return this._handler.addEventListener(type, listener, options);
-        }
-        removeEventListener(type, listener, options) {
-            return this._handler.removeEventListener(type, listener, options);
-        }
-        dispatchEvent(event) {
-            return this._handler.dispatchEvent(event);
-        }
-        getBoundingClientRect() {
-            return this._handler.getBoundingClientRect();
-        }
-        getContainer() {
-            return this._handler.container;
-        }
-        clearViewBox(viewBox, color) {
-            this._handler.clearViewBox(viewBox, color);
-        }
-        isVisible(bbox) {
-            return this._handler.isVisible(bbox);
-        }
-        onVisibleChange(cb) {
-            return this._handler.onVisibleChange(cb);
-        }
-        getTopLeft(baseWindow) {
-            return this._handler.getTopLeft(baseWindow);
-        }
-    };
-    exports.DefaultWindow = __decorate([
-        injectable(),
-        __metadata("design:paramtypes", [])
-    ], exports.DefaultWindow);
-
     var coreModule = new ContainerModule(bind => {
         bind(VGlobal).to(exports.DefaultGlobal).inSingletonScope();
         bind(VWindow).to(exports.DefaultWindow);
@@ -22937,8 +22977,8 @@
             context.inuse = true;
             context.clearMatrix();
             context.setTransformForCurrent(true);
-            const drawInArea = dirtyBounds.width() * context.dpr !== context.canvas.width ||
-                dirtyBounds.height() * context.dpr !== context.canvas.height;
+            const drawInArea = dirtyBounds.width() * context.dpr < context.canvas.width ||
+                dirtyBounds.height() * context.dpr < context.canvas.height;
             context.save();
             context.translate(x, y, true);
             if (drawInArea) {
@@ -22958,7 +22998,9 @@
                 return ((_a = a.attribute.zIndex) !== null && _a !== void 0 ? _a : DefaultAttribute.zIndex) - ((_b = b.attribute.zIndex) !== null && _b !== void 0 ? _b : DefaultAttribute.zIndex);
             })
                 .forEach(group => {
-                this.renderGroup(group, drawContext, matrixAllocate.allocate(1, 0, 0, 1, 0, 0));
+                group.isContainer
+                    ? this.renderGroup(group, drawContext, matrixAllocate.allocate(1, 0, 0, 1, 0, 0))
+                    : this.renderItem(group, drawContext);
             });
             context.restore();
             context.restore();