@leafer-in/export 1.7.0 → 1.9.0

package/src/export.ts

@@ -1,5 +1,5 @@
 import { IExportModule, IExportOptions, IExportResult, IExportResultFunction, IUI, IExportFileType, IFunction, IRenderOptions, IBoundsData, IBounds, ILocationType, ILeaf } from '@leafer-ui/interface'
-import { Creator, Matrix, TaskProcessor, FileHelper, Bounds, Platform, MathHelper, Resource } from '@leafer-ui/draw'
+import { Creator, Matrix, TaskProcessor, FileHelper, Bounds, Platform, MathHelper, Resource, Export, isUndefined } from '@leafer-ui/draw'
 
 import { getTrimBounds } from './trim'
 
@@ -8,146 +8,155 @@ export const ExportModule: IExportModule = {
 
     syncExport(leaf: IUI, filename: string, options?: IExportOptions | number | boolean): IExportResult {
 
-        this.running = true
+        Export.running = true
 
         let result: IExportResult
-        const fileType = FileHelper.fileType(filename)
-        const isDownload = filename.includes('.')
-        options = FileHelper.getExportOptions(options)
 
-        const { toURL } = Platform
-        const { download } = Platform.origin
+        try {
 
+            const fileType = FileHelper.fileType(filename)
+            const isDownload = filename.includes('.')
+            options = FileHelper.getExportOptions(options)
 
-        if (fileType === 'json') {
+            const { toURL } = Platform
+            const { download } = Platform.origin
 
-            isDownload && download(toURL(JSON.stringify(leaf.toJSON(options.json)), 'text'), filename)
-            result = { data: isDownload ? true : leaf.toJSON(options.json) }
 
-        } else if (fileType === 'svg') {
+            if (fileType === 'json') {
 
-            isDownload && download(toURL(leaf.toSVG(), 'svg'), filename)
-            result = { data: isDownload ? true : leaf.toSVG() }
+                isDownload && download(toURL(JSON.stringify(leaf.toJSON(options.json)), 'text'), filename)
+                result = { data: isDownload ? true : leaf.toJSON(options.json) }
 
-        } else {
+            } else if (fileType === 'svg') {
 
-            let renderBounds: IBoundsData, trimBounds: IBounds, scaleX = 1, scaleY = 1
-            const { worldTransform, isLeafer, leafer, isFrame } = leaf
-            const { slice, clip, trim, screenshot, padding, onCanvas } = options
-            const smooth = options.smooth === undefined ? (leafer ? leafer.config.smooth : true) : options.smooth
-            const contextSettings = options.contextSettings || (leafer ? leafer.config.contextSettings : undefined)
+                isDownload && download(toURL(leaf.toSVG(), 'svg'), filename)
+                result = { data: isDownload ? true : leaf.toSVG() }
 
-            const fill = (isLeafer && screenshot) ? (options.fill === undefined ? leaf.fill : options.fill) : options.fill // leafer use 
-            const needFill = FileHelper.isOpaqueImage(filename) || fill, matrix = new Matrix()
-
-            // 获取元素大小
-            if (screenshot) {
-                renderBounds = screenshot === true ? (isLeafer ? leafer.canvas.bounds : leaf.worldRenderBounds) : screenshot
             } else {
-                let relative: ILocationType | ILeaf = options.relative || (isLeafer ? 'inner' : 'local')
-
-                scaleX = worldTransform.scaleX
-                scaleY = worldTransform.scaleY
-
-                switch (relative) {
-                    case 'inner':
-                        matrix.set(worldTransform)
-                        break
-                    case 'local':
-                        matrix.set(worldTransform).divide(leaf.localTransform)
-                        scaleX /= leaf.scaleX
-                        scaleY /= leaf.scaleY
-                        break
-                    case 'world':
-                        scaleX = 1
-                        scaleY = 1
-                        break
-                    case 'page':
-                        relative = leafer || leaf
-                    default:
-                        matrix.set(worldTransform).divide(leaf.getTransform(relative))
-                        const l = relative.worldTransform
-                        scaleX /= scaleX / l.scaleX
-                        scaleY /= scaleY / l.scaleY
+
+                let renderBounds: IBoundsData, trimBounds: IBounds, scaleX = 1, scaleY = 1
+                const { worldTransform, isLeafer, leafer, isFrame } = leaf
+                const { slice, clip, trim, screenshot, padding, onCanvas } = options
+                const smooth = isUndefined(options.smooth) ? (leafer ? leafer.config.smooth : true) : options.smooth
+                const contextSettings = options.contextSettings || (leafer ? leafer.config.contextSettings : undefined)
+
+                const fill = (isLeafer && screenshot) ? (isUndefined(options.fill) ? leaf.fill : options.fill) : options.fill // leafer use 
+                const needFill = FileHelper.isOpaqueImage(filename) || fill, matrix = new Matrix()
+
+                // 获取元素大小
+                if (screenshot) {
+                    renderBounds = screenshot === true ? (isLeafer ? leafer.canvas.bounds : leaf.worldRenderBounds) : screenshot
+                } else {
+                    let relative: ILocationType | ILeaf = options.relative || (isLeafer ? 'inner' : 'local')
+
+                    scaleX = worldTransform.scaleX
+                    scaleY = worldTransform.scaleY
+
+                    switch (relative) {
+                        case 'inner':
+                            matrix.set(worldTransform)
+                            break
+                        case 'local':
+                            matrix.set(worldTransform).divide(leaf.localTransform)
+                            scaleX /= leaf.scaleX
+                            scaleY /= leaf.scaleY
+                            break
+                        case 'world':
+                            scaleX = 1
+                            scaleY = 1
+                            break
+                        case 'page':
+                            relative = leafer || leaf
+                        default:
+                            matrix.set(worldTransform).divide(leaf.getTransform(relative))
+                            const l = relative.worldTransform
+                            scaleX /= scaleX / l.scaleX
+                            scaleY /= scaleY / l.scaleY
+                    }
+
+                    renderBounds = leaf.getBounds('render', relative)
                 }
 
-                renderBounds = leaf.getBounds('render', relative)
-            }
 
+                // 缩放元素
+                const scaleData = { scaleX: 1, scaleY: 1 }
+                MathHelper.getScaleData(options.scale, options.size, renderBounds, scaleData)
 
-            // 缩放元素
-            const scaleData = { scaleX: 1, scaleY: 1 }
-            MathHelper.getScaleData(options.scale, options.size, renderBounds, scaleData)
+                let pixelRatio = options.pixelRatio || 1
 
-            let pixelRatio = options.pixelRatio || 1
 
+                // 导出元素
+                let { x, y, width, height } = new Bounds(renderBounds).scale(scaleData.scaleX, scaleData.scaleY)
+                if (clip) x += clip.x, y += clip.y, width = clip.width, height = clip.height
 
-            // 导出元素
-            let { x, y, width, height } = new Bounds(renderBounds).scale(scaleData.scaleX, scaleData.scaleY)
-            if (clip) x += clip.x, y += clip.y, width = clip.width, height = clip.height
+                const renderOptions: IRenderOptions = { exporting: true, matrix: matrix.scale(1 / scaleData.scaleX, 1 / scaleData.scaleY).invert().translate(-x, -y).withScale(1 / scaleX * scaleData.scaleX, 1 / scaleY * scaleData.scaleY) }
+                let canvas = Creator.canvas({ width: Math.floor(width), height: Math.floor(height), pixelRatio, smooth, contextSettings })
 
-            const renderOptions: IRenderOptions = { exporting: true, matrix: matrix.scale(1 / scaleData.scaleX, 1 / scaleData.scaleY).invert().translate(-x, -y).withScale(1 / scaleX * scaleData.scaleX, 1 / scaleY * scaleData.scaleY) }
-            let canvas = Creator.canvas({ width: Math.floor(width), height: Math.floor(height), pixelRatio, smooth, contextSettings })
+                let sliceLeaf: IUI
+                if (slice) {
+                    sliceLeaf = leaf
+                    sliceLeaf.__worldOpacity = 0 // hide slice
 
-            let sliceLeaf: IUI
-            if (slice) {
-                sliceLeaf = leaf
-                sliceLeaf.__worldOpacity = 0 // hide slice
+                    leaf = leafer || leaf // render all in bounds
+                    renderOptions.bounds = canvas.bounds
+                }
 
-                leaf = leafer || leaf // render all in bounds
-                renderOptions.bounds = canvas.bounds
-            }
 
+                canvas.save()
 
-            canvas.save()
+                if (isFrame && !isUndefined(fill)) {
+                    const oldFill = leaf.get('fill')
+                    leaf.fill = ''
+                    leaf.__render(canvas, renderOptions)
+                    leaf.fill = oldFill as string
+                } else {
+                    leaf.__render(canvas, renderOptions)
+                }
 
-            if (isFrame && fill !== undefined) {
-                const oldFill = leaf.get('fill')
-                leaf.fill = ''
-                leaf.__render(canvas, renderOptions)
-                leaf.fill = oldFill as string
-            } else {
-                leaf.__render(canvas, renderOptions)
-            }
+                canvas.restore()
 
-            canvas.restore()
+                if (sliceLeaf) sliceLeaf.__updateWorldOpacity() // show slice
 
+                if (trim) {
+                    trimBounds = getTrimBounds(canvas)
+                    const old = canvas, { width, height } = trimBounds
+                    const config = { x: 0, y: 0, width, height, pixelRatio }
 
-            if (sliceLeaf) sliceLeaf.__updateWorldOpacity() // show slice
+                    canvas = Creator.canvas(config)
+                    canvas.copyWorld(old, trimBounds, config)
+                    old.destroy()
+                }
 
-            if (trim) {
-                trimBounds = getTrimBounds(canvas)
-                const old = canvas, { width, height } = trimBounds
-                const config = { x: 0, y: 0, width, height, pixelRatio }
+                if (padding) {
+                    const [top, right, bottom, left] = MathHelper.fourNumber(padding)
+                    const old = canvas, { width, height } = old
 
-                canvas = Creator.canvas(config)
-                canvas.copyWorld(old, trimBounds, config)
-            }
+                    canvas = Creator.canvas({ width: width + left + right, height: height + top + bottom, pixelRatio })
+                    canvas.copyWorld(old, old.bounds, { x: left, y: top, width, height })
+                    old.destroy()
+                }
 
-            if (padding) {
-                const [top, right, bottom, left] = MathHelper.fourNumber(padding)
-                const old = canvas, { width, height } = old
+                if (needFill) canvas.fillWorld(canvas.bounds, fill || '#FFFFFF', 'destination-over')
+                if (onCanvas) onCanvas(canvas)
 
-                canvas = Creator.canvas({ width: width + left + right, height: height + top + bottom, pixelRatio })
-                canvas.copyWorld(old, old.bounds, { x: left, y: top, width, height })
-            }
+                const data = filename === 'canvas' ? canvas : canvas.export(filename, options)
+                result = { data, width: canvas.pixelWidth, height: canvas.pixelHeight, renderBounds, trimBounds }
 
-            if (needFill) canvas.fillWorld(canvas.bounds, fill || '#FFFFFF', 'destination-over')
-            if (onCanvas) onCanvas(canvas)
+            }
 
-            const data = filename === 'canvas' ? canvas : canvas.export(filename, options)
-            result = { data, width: canvas.pixelWidth, height: canvas.pixelHeight, renderBounds, trimBounds }
+        } catch (error) {
 
+            result = { data: '', error }
         }
 
-        this.running = false
+        Export.running = false
 
         return result
     },
 
     export(leaf: IUI, filename: IExportFileType | string, options?: IExportOptions | number | boolean): Promise<IExportResult> {
 
-        this.running = true
+        Export.running = true
 
         return addTask((success: IExportResultFunction) =>
 
@@ -155,7 +164,7 @@ export const ExportModule: IExportModule = {
 
                 const getResult = async () => {
                     if (!Resource.isComplete) return Platform.requestRender(getResult)
-                    const result: IExportResult = ExportModule.syncExport(leaf, filename, options)
+                    const result: IExportResult = Export.syncExport(leaf, filename, options)
                     if (result.data instanceof Promise) result.data = await result.data
                     success(result)
                     resolve()

package/src/trim.ts

@@ -19,6 +19,9 @@ export function getTrimBounds(canvas: ILeaferCanvas): IBounds {
     }
 
     const bounds = new Bounds()
-    toBounds(pointBounds, bounds)
-    return bounds.scale(1 / canvas.pixelRatio).ceil()
+    if (pointBounds) {
+        toBounds(pointBounds, bounds)
+        bounds.scale(1 / canvas.pixelRatio).ceil()
+    }
+    return bounds
 }

package/types/index.d.ts

@@ -1,2 +1,2 @@
 
-export {  }
+export { };