leafer-game 1.11.1 → 1.12.0

package/dist/web.cjs

@@ -12,6 +12,15 @@ var motionPath = require("@leafer-in/motion-path");
 
 var find = require("@leafer-in/find");
 
+exports.PathNodeHandleType = void 0;
+
+(function(PathNodeHandleType) {
+    PathNodeHandleType[PathNodeHandleType["none"] = 1] = "none";
+    PathNodeHandleType[PathNodeHandleType["free"] = 2] = "free";
+    PathNodeHandleType[PathNodeHandleType["mirrorAngle"] = 3] = "mirrorAngle";
+    PathNodeHandleType[PathNodeHandleType["mirror"] = 4] = "mirror";
+})(exports.PathNodeHandleType || (exports.PathNodeHandleType = {}));
+
 Object.keys(leaferUi).forEach(function(k) {
     if (k !== "default" && !Object.prototype.hasOwnProperty.call(exports, k)) Object.defineProperty(exports, k, {
         enumerable: true,

package/dist/web.esm.js

@@ -9,3 +9,14 @@ export * from "@leafer-in/animate";
 export * from "@leafer-in/motion-path";
 
 export * from "@leafer-in/find";
+
+var PathNodeHandleType;
+
+(function(PathNodeHandleType) {
+    PathNodeHandleType[PathNodeHandleType["none"] = 1] = "none";
+    PathNodeHandleType[PathNodeHandleType["free"] = 2] = "free";
+    PathNodeHandleType[PathNodeHandleType["mirrorAngle"] = 3] = "mirrorAngle";
+    PathNodeHandleType[PathNodeHandleType["mirror"] = 4] = "mirror";
+})(PathNodeHandleType || (PathNodeHandleType = {}));
+
+export { PathNodeHandleType };

package/dist/web.esm.min.js

@@ -1,2 +1,2 @@
-export*from"leafer-ui";export*from"@leafer-in/robot";export*from"@leafer-in/state";export*from"@leafer-in/animate";export*from"@leafer-in/motion-path";export*from"@leafer-in/find";
+export*from"leafer-ui";export*from"@leafer-in/robot";export*from"@leafer-in/state";export*from"@leafer-in/animate";export*from"@leafer-in/motion-path";export*from"@leafer-in/find";var r;!function(r){r[r.none=1]="none",r[r.free=2]="free",r[r.mirrorAngle=3]="mirrorAngle",r[r.mirror=4]="mirror"}(r||(r={}));export{r as PathNodeHandleType};
 //# sourceMappingURL=web.esm.min.js.map

package/dist/web.esm.min.js.map

@@ -1 +1 @@
-{"version":3,"file":"web.esm.min.js","sources":[],"sourcesContent":[],"names":[],"mappings":""}
+{"version":3,"file":"web.esm.min.js","sources":["../../../../src/leafer/packages/interface/src/path/IPathCommand.ts"],"sourcesContent":["import { IPointData } from '../math/IMath'\n\ntype Command = number\ntype x = number\ntype y = number\ntype x1 = number\ntype y1 = number\ntype x2 = number\ntype y2 = number\ntype radiusX = number\ntype radiusY = number\ntype xAxisRotation = number\ntype largeArcFlag = number\ntype sweepFlag = number\n\n\nexport type MCommandData = [Command, x, y]\nexport type HCommandData = [Command, x]\nexport type VCommandData = [Command, y]\nexport type LCommandData = MCommandData\n\nexport type CCommandData = [Command, x1, y1, x2, y2, x, y]\nexport type SCommandData = [Command, x2, y2, x, y]\n\nexport type QCommandData = [Command, x1, y1, x, y]\nexport type TCommandData = [Command, x, y]\n\nexport type ZCommandData = [Command]\n\nexport type ACommandData = [Command, radiusX, radiusY, xAxisRotation, largeArcFlag, sweepFlag, x, y]\n\n\n// 非svg标准的canvas绘图命令\ntype width = number\ntype height = number\ntype rotation = number\ntype startAngle = number\ntype endAngle = number\ntype anticlockwise = boolean\ntype cornerRadius = number | number[]\ntype radius = number\n\nexport type RectCommandData = [Command, x, y, width, height]\nexport type RoundRectCommandData = [Command, x, y, width, height, cornerRadius]\nexport type EllipseCommandData = [Command, x, y, radiusX, radiusY, rotation, startAngle, endAngle, anticlockwise]\nexport type ArcCommandData = [Command, x, y, radius, startAngle, endAngle, anticlockwise]\nexport type ArcToCommandData = [Command, x1, y1, x2, y2, radius]\n\n\nexport type CanvasPathCommand = 1 | 2 | 5 | 7 | 11 // M | L | C | Q | Z   canvas可以绘制的命令\n\nexport type IPathCommandData = number[] // ...(MCommandData | LCommandData | CCommandData | QCommandData | ZCommandData)\n\n\n// 路径命令对象\nexport interface MoveToCommandObject {\n    name: 'M'\n    x: number\n    y: number\n}\nexport interface LineToCommandObject {\n    name: 'L'\n    x: number\n    y: number\n}\n\nexport interface BezierCurveToCommandObject {\n    name: 'C'\n    x1: number\n    y1: number\n    x2: number\n    y2: number\n    x: number\n    y: number\n}\n\nexport interface QuadraticCurveToCommandObject {\n    name: 'Q'\n    x1: number\n    y1: number\n    x: number\n    y: number\n}\n\nexport interface ClosePathCommandObject {\n    name: 'Z'\n}\n\nexport type IPathCommandObject = MoveToCommandObject | LineToCommandObject | BezierCurveToCommandObject | QuadraticCurveToCommandObject | ClosePathCommandObject // M | L | C | Q | Z   canvas可以绘制的命令\n\n\n// 可视化路径节点\n\nexport interface IPathCommandNodeBase {\n    name: 'M^' | 'L^' | 'C^' | 'Z^'\n    x: number\n    y: number\n    a?: IPointData // 第一个手柄，连接上一个节点\n    b?: IPointData // 第二个手柄，连接下一个节点\n    ab?: PathNodeHandleType // 手柄类型\n}\n\nexport interface MoveToCommandNode extends IPathCommandNodeBase {\n    name: 'M^'\n}\nexport interface LineToCommandNode extends IPathCommandNodeBase {\n    name: 'L^'\n}\n\nexport interface BezierCurveToCommandNode extends IPathCommandNodeBase {\n    name: 'C^'\n}\n\nexport interface ClosePathCommandNode {\n    name: 'Z^'\n    x?: number\n    y?: number\n    a?: IPointData\n    b?: IPointData\n    ab?: PathNodeHandleType\n}\n\nexport type IPathCommandNode = MoveToCommandNode | LineToCommandNode | BezierCurveToCommandNode | ClosePathCommandNode // M | L | C | Z   路径节点命令(适合可视化编辑)\n\nexport enum PathNodeHandleType { // 手柄类型\n    none = 1, // 无手柄\n    free = 2, // 每个手柄自由控制\n    mirrorAngle = 3, // 仅镜像角度\n    mirror = 4,  // 镜像角度和长度\n}\n\nexport type PathNodeHandleName = 'a' | 'b' // 手柄名称\n\nexport interface IPathNodeBase {\n    pathNode: IPathCommandNode\n}"],"names":["PathNodeHandleType"],"mappings":"wLA4HYA,GAAZ,SAAYA,GACRA,EAAAA,EAAA,KAAA,GAAA,OACAA,EAAAA,EAAA,KAAA,GAAA,OACAA,EAAAA,EAAA,YAAA,GAAA,cACAA,EAAAA,EAAA,OAAA,GAAA,QACH,CALD,CAAYA,IAAAA,EAAkB,CAAA"}

package/dist/web.js

@@ -1,5 +1,12 @@
 var LeaferUI = function(exports) {
     "use strict";
+    exports.PathNodeHandleType = void 0;
+    (function(PathNodeHandleType) {
+        PathNodeHandleType[PathNodeHandleType["none"] = 1] = "none";
+        PathNodeHandleType[PathNodeHandleType["free"] = 2] = "free";
+        PathNodeHandleType[PathNodeHandleType["mirrorAngle"] = 3] = "mirrorAngle";
+        PathNodeHandleType[PathNodeHandleType["mirror"] = 4] = "mirror";
+    })(exports.PathNodeHandleType || (exports.PathNodeHandleType = {}));
     exports.Answer = void 0;
     (function(Answer) {
         Answer[Answer["No"] = 0] = "No";
@@ -3811,16 +3818,27 @@ var LeaferUI = function(exports) {
         recycle(image) {
             image.use--;
             setTimeout(() => {
-                if (!image.use) I$1.recycledList.push(image);
+                if (!image.use) {
+                    if (Platform.image.isLarge(image)) {
+                        if (image.url) Resource.remove(image.url);
+                    } else {
+                        image.clearLevels();
+                        I$1.recycledList.push(image);
+                    }
+                }
             });
         },
-        clearRecycled() {
+        recyclePaint(paint) {
+            I$1.recycle(paint.image);
+        },
+        clearRecycled(force) {
             const list = I$1.recycledList;
-            if (list.length > I$1.maxRecycled) {
-                list.forEach(image => !image.use && image.url && Resource.remove(image.url));
+            if (list.length > I$1.maxRecycled || force) {
+                list.forEach(image => (!image.use || force) && image.url && Resource.remove(image.url));
                 list.length = 0;
             }
         },
+        clearLevels() {},
         hasAlphaPixel(config) {
             return FileHelper.alphaPixelTypes.some(item => I$1.isFormat(item, config));
         },
@@ -3835,7 +3853,7 @@ var LeaferUI = function(exports) {
             return false;
         },
         destroy() {
-            I$1.recycledList = [];
+            this.clearRecycled(true);
         }
     };
     const I$1 = ImageManager;
@@ -3935,11 +3953,15 @@ var LeaferUI = function(exports) {
             Platform.image.setPatternTransform(pattern, transform, paint);
             return pattern;
         }
+        clearLevels(_checkUse) {}
         destroy() {
+            this.clearLevels();
+            const {view: view} = this;
+            if (view && view.close) view.close();
             this.config = {
                 url: ""
             };
-            this.cache = null;
+            this.cache = this.view = null;
             this.waitComplete.length = 0;
         }
     }
@@ -5569,6 +5591,7 @@ var LeaferUI = function(exports) {
     const LeafRender = {
         __render(canvas, options) {
             if (options.shape) return this.__renderShape(canvas, options);
+            if (options.cellList && !options.cellList.has(this)) return;
             if (this.__worldOpacity) {
                 const data = this.__;
                 if (data.bright && !options.topRendering) return options.topList.add(this);
@@ -6447,7 +6470,7 @@ var LeaferUI = function(exports) {
             this.levelMap = null;
         }
     }
-    const version = "1.11.1";
+    const version = "1.12.0";
     const debug$5 = Debug.get("LeaferCanvas");
     class LeaferCanvas extends LeaferCanvasBase {
         set zIndex(zIndex) {
@@ -6755,7 +6778,7 @@ var LeaferUI = function(exports) {
             return this.hasAdd || this.hasRemove || this.hasVisible;
         }
         get updatedList() {
-            if (this.hasRemove) {
+            if (this.hasRemove && this.config.usePartLayout) {
                 const updatedList = new LeafList;
                 this.__updatedList.list.forEach(item => {
                     if (item.leafer) updatedList.add(item);
@@ -6790,16 +6813,18 @@ var LeaferUI = function(exports) {
             if (this.running) this.target.emit(RenderEvent.REQUEST);
         }
         __onAttrChange(event) {
-            this.__updatedList.add(event.target);
+            if (this.config.usePartLayout) this.__updatedList.add(event.target);
             this.update();
         }
         __onChildEvent(event) {
-            if (event.type === ChildEvent.ADD) {
-                this.hasAdd = true;
-                this.__pushChild(event.child);
-            } else {
-                this.hasRemove = true;
-                this.__updatedList.add(event.parent);
+            if (this.config.usePartLayout) {
+                if (event.type === ChildEvent.ADD) {
+                    this.hasAdd = true;
+                    this.__pushChild(event.child);
+                } else {
+                    this.hasRemove = true;
+                    this.__updatedList.add(event.parent);
+                }
             }
             this.update();
         }
@@ -6906,7 +6931,9 @@ var LeaferUI = function(exports) {
     class Layouter {
         constructor(target, userConfig) {
             this.totalTimes = 0;
-            this.config = {};
+            this.config = {
+                usePartLayout: true
+            };
             this.__levelList = new LeafLevelList;
             this.target = target;
             if (userConfig) this.config = DataHelper.default(userConfig, this.config);
@@ -6951,7 +6978,7 @@ var LeaferUI = function(exports) {
             this.totalTimes++;
             this.layouting = true;
             this.target.emit(WatchEvent.REQUEST);
-            if (this.totalTimes > 1) {
+            if (this.totalTimes > 1 && this.config.usePartLayout) {
                 this.partLayout();
             } else {
                 this.fullLayout();
@@ -7066,7 +7093,7 @@ var LeaferUI = function(exports) {
         }
         update(change = true) {
             if (!this.changed) this.changed = change;
-            this.__requestRender();
+            if (!this.requestTime) this.__requestRender();
         }
         requestLayout() {
             this.target.emit(LayoutEvent.REQUEST);
@@ -7173,7 +7200,7 @@ var LeaferUI = function(exports) {
             Run.end(t);
         }
         __render(bounds, realBounds) {
-            const {canvas: canvas} = this, includes = bounds.includes(this.target.__world), options = includes ? {
+            const {canvas: canvas, target: target} = this, includes = bounds.includes(target.__world), options = includes ? {
                 includes: includes
             } : {
                 bounds: bounds,
@@ -7181,12 +7208,16 @@ var LeaferUI = function(exports) {
             };
             if (this.needFill) canvas.fillWorld(bounds, this.config.fill);
             if (Debug.showRepaint) Debug.drawRepaint(canvas, bounds);
-            Platform.render(this.target, canvas, options);
+            if (this.config.useCellRender) options.cellList = this.getCellList();
+            Platform.render(target, canvas, options);
             this.renderBounds = realBounds = realBounds || bounds;
             this.renderOptions = options;
             this.totalBounds.isEmpty() ? this.totalBounds = realBounds : this.totalBounds.add(realBounds);
             canvas.updateRender(realBounds);
         }
+        getCellList() {
+            return undefined;
+        }
         addBlock(block) {
             if (!this.updateBlocks) this.updateBlocks = [];
             this.updateBlocks.push(block);
@@ -7800,6 +7831,11 @@ var LeaferUI = function(exports) {
             }
             this._boxStyle = value;
         }
+        __getInputData(names, options) {
+            const data = super.__getInputData(names, options);
+            if (data.textEditing) delete data.textEditing;
+            return data;
+        }
     }
     class ImageData extends RectData {
         setUrl(value) {
@@ -11112,6 +11148,7 @@ var LeaferUI = function(exports) {
         const {boxBounds: boxBounds} = ui.__layout;
         switch (paint.type) {
           case "image":
+            if (!paint.url) return undefined;
             leafPaint = PaintImage.image(ui, attrName, paint, boxBounds, !recycleMap || !recycleMap[paint.url]);
             break;
 
@@ -11485,7 +11522,7 @@ var LeaferUI = function(exports) {
                 if (data.repeat) {
                     drawImage = false;
                 } else if (!(originPaint.changeful || Platform.name === "miniapp" && ResizeEvent.isResizing(ui) || exporting)) {
-                    drawImage = Platform.image.isLarge(image, scaleX, scaleY);
+                    drawImage = Platform.image.isLarge(image, scaleX, scaleY) || image.width * scaleX > 8096 || image.height * scaleY > 8096;
                 }
             }
             if (drawImage) {
@@ -11541,7 +11578,7 @@ var LeaferUI = function(exports) {
                 if (url) {
                     if (!recycleMap) recycleMap = {};
                     recycleMap[url] = true;
-                    ImageManager.recycle(image);
+                    ImageManager.recyclePaint(paint);
                     if (image.loading) {
                         if (!input) {
                             input = data.__input && data.__input[attrName] || [];

package/dist/web.min.cjs

@@ -1,2 +1,2 @@
-"use strict";var e=require("leafer-ui"),t=require("@leafer-in/robot"),r=require("@leafer-in/state"),o=require("@leafer-in/animate"),n=require("@leafer-in/motion-path"),c=require("@leafer-in/find");Object.keys(e).forEach(function(t){"default"===t||Object.prototype.hasOwnProperty.call(exports,t)||Object.defineProperty(exports,t,{enumerable:!0,get:function(){return e[t]}})}),Object.keys(t).forEach(function(e){"default"===e||Object.prototype.hasOwnProperty.call(exports,e)||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return t[e]}})}),Object.keys(r).forEach(function(e){"default"===e||Object.prototype.hasOwnProperty.call(exports,e)||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return r[e]}})}),Object.keys(o).forEach(function(e){"default"===e||Object.prototype.hasOwnProperty.call(exports,e)||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return o[e]}})}),Object.keys(n).forEach(function(e){"default"===e||Object.prototype.hasOwnProperty.call(exports,e)||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return n[e]}})}),Object.keys(c).forEach(function(e){"default"===e||Object.prototype.hasOwnProperty.call(exports,e)||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return c[e]}})});
+"use strict";var e,r=require("leafer-ui"),t=require("@leafer-in/robot"),o=require("@leafer-in/state"),n=require("@leafer-in/animate"),a=require("@leafer-in/motion-path"),c=require("@leafer-in/find");exports.PathNodeHandleType=void 0,(e=exports.PathNodeHandleType||(exports.PathNodeHandleType={}))[e.none=1]="none",e[e.free=2]="free",e[e.mirrorAngle=3]="mirrorAngle",e[e.mirror=4]="mirror",Object.keys(r).forEach(function(e){"default"===e||Object.prototype.hasOwnProperty.call(exports,e)||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return r[e]}})}),Object.keys(t).forEach(function(e){"default"===e||Object.prototype.hasOwnProperty.call(exports,e)||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return t[e]}})}),Object.keys(o).forEach(function(e){"default"===e||Object.prototype.hasOwnProperty.call(exports,e)||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return o[e]}})}),Object.keys(n).forEach(function(e){"default"===e||Object.prototype.hasOwnProperty.call(exports,e)||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return n[e]}})}),Object.keys(a).forEach(function(e){"default"===e||Object.prototype.hasOwnProperty.call(exports,e)||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return a[e]}})}),Object.keys(c).forEach(function(e){"default"===e||Object.prototype.hasOwnProperty.call(exports,e)||Object.defineProperty(exports,e,{enumerable:!0,get:function(){return c[e]}})});
 //# sourceMappingURL=web.min.cjs.map

package/dist/web.min.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"web.min.cjs","sources":[],"sourcesContent":[],"names":[],"mappings":""}
+{"version":3,"file":"web.min.cjs","sources":["../../../../src/leafer/packages/interface/src/path/IPathCommand.ts"],"sourcesContent":["import { IPointData } from '../math/IMath'\n\ntype Command = number\ntype x = number\ntype y = number\ntype x1 = number\ntype y1 = number\ntype x2 = number\ntype y2 = number\ntype radiusX = number\ntype radiusY = number\ntype xAxisRotation = number\ntype largeArcFlag = number\ntype sweepFlag = number\n\n\nexport type MCommandData = [Command, x, y]\nexport type HCommandData = [Command, x]\nexport type VCommandData = [Command, y]\nexport type LCommandData = MCommandData\n\nexport type CCommandData = [Command, x1, y1, x2, y2, x, y]\nexport type SCommandData = [Command, x2, y2, x, y]\n\nexport type QCommandData = [Command, x1, y1, x, y]\nexport type TCommandData = [Command, x, y]\n\nexport type ZCommandData = [Command]\n\nexport type ACommandData = [Command, radiusX, radiusY, xAxisRotation, largeArcFlag, sweepFlag, x, y]\n\n\n// 非svg标准的canvas绘图命令\ntype width = number\ntype height = number\ntype rotation = number\ntype startAngle = number\ntype endAngle = number\ntype anticlockwise = boolean\ntype cornerRadius = number | number[]\ntype radius = number\n\nexport type RectCommandData = [Command, x, y, width, height]\nexport type RoundRectCommandData = [Command, x, y, width, height, cornerRadius]\nexport type EllipseCommandData = [Command, x, y, radiusX, radiusY, rotation, startAngle, endAngle, anticlockwise]\nexport type ArcCommandData = [Command, x, y, radius, startAngle, endAngle, anticlockwise]\nexport type ArcToCommandData = [Command, x1, y1, x2, y2, radius]\n\n\nexport type CanvasPathCommand = 1 | 2 | 5 | 7 | 11 // M | L | C | Q | Z   canvas可以绘制的命令\n\nexport type IPathCommandData = number[] // ...(MCommandData | LCommandData | CCommandData | QCommandData | ZCommandData)\n\n\n// 路径命令对象\nexport interface MoveToCommandObject {\n    name: 'M'\n    x: number\n    y: number\n}\nexport interface LineToCommandObject {\n    name: 'L'\n    x: number\n    y: number\n}\n\nexport interface BezierCurveToCommandObject {\n    name: 'C'\n    x1: number\n    y1: number\n    x2: number\n    y2: number\n    x: number\n    y: number\n}\n\nexport interface QuadraticCurveToCommandObject {\n    name: 'Q'\n    x1: number\n    y1: number\n    x: number\n    y: number\n}\n\nexport interface ClosePathCommandObject {\n    name: 'Z'\n}\n\nexport type IPathCommandObject = MoveToCommandObject | LineToCommandObject | BezierCurveToCommandObject | QuadraticCurveToCommandObject | ClosePathCommandObject // M | L | C | Q | Z   canvas可以绘制的命令\n\n\n// 可视化路径节点\n\nexport interface IPathCommandNodeBase {\n    name: 'M^' | 'L^' | 'C^' | 'Z^'\n    x: number\n    y: number\n    a?: IPointData // 第一个手柄，连接上一个节点\n    b?: IPointData // 第二个手柄，连接下一个节点\n    ab?: PathNodeHandleType // 手柄类型\n}\n\nexport interface MoveToCommandNode extends IPathCommandNodeBase {\n    name: 'M^'\n}\nexport interface LineToCommandNode extends IPathCommandNodeBase {\n    name: 'L^'\n}\n\nexport interface BezierCurveToCommandNode extends IPathCommandNodeBase {\n    name: 'C^'\n}\n\nexport interface ClosePathCommandNode {\n    name: 'Z^'\n    x?: number\n    y?: number\n    a?: IPointData\n    b?: IPointData\n    ab?: PathNodeHandleType\n}\n\nexport type IPathCommandNode = MoveToCommandNode | LineToCommandNode | BezierCurveToCommandNode | ClosePathCommandNode // M | L | C | Z   路径节点命令(适合可视化编辑)\n\nexport enum PathNodeHandleType { // 手柄类型\n    none = 1, // 无手柄\n    free = 2, // 每个手柄自由控制\n    mirrorAngle = 3, // 仅镜像角度\n    mirror = 4,  // 镜像角度和长度\n}\n\nexport type PathNodeHandleName = 'a' | 'b' // 手柄名称\n\nexport interface IPathNodeBase {\n    pathNode: IPathCommandNode\n}"],"names":["PathNodeHandleType"],"mappings":"iBA4HYA,sLAAAA,QAAAA,wBAAAA,GAAAA,EAAAA,QAAAA,qBAAAA,2BAAkB,CAAA,IAC1BA,EAAA,KAAA,GAAA,OACAA,EAAAA,EAAA,KAAA,GAAA,OACAA,EAAAA,EAAA,YAAA,GAAA,cACAA,EAAAA,EAAA,OAAA,GAAA"}