efront 4.35.7 → 4.35.8

package/coms/basic/Matrix.js

@@ -237,7 +237,7 @@ class Matrix extends Array {
     }
     toDOMString() {
         if (this.size()[1] === 2) return `matrix(${this.getTransform()})`;
-        return `matrix(${this})`;
+        return `matrix3d(${this})`;
     }
 }
 

package/coms/compile/autoeval.js

@@ -296,7 +296,7 @@ function solve(body, ox, dx) {
                 var p1 = p;
                 var pt1 = pt;
                 var p2 = p;
-                while (p1 <= cache[cache.length - 1]) {
+                while (p <= cache[cache.length - 1]) {
                     p2 = p1;
                     p1 = cache.pop();
                     pt1 = cache.pop();
@@ -306,7 +306,7 @@ function solve(body, ox, dx) {
                     if (p === p1 && p > powermap[">>>"]) cache.push(bx, pt1, p1);
                     continue;
                 }
-                var cx1 = make(body, bx, cx, p === p2 ? pt1 : null);
+                var cx1 = make(body, bx, cx, pt1);
                 if (cx1 !== cx) {
                     dx -= cx - cx1;
                     cx = cx1;
@@ -316,6 +316,12 @@ function solve(body, ox, dx) {
             }
             if (p === 0) {
                 cache.splice(0, cache.length);
+                continue;
+            }
+            if (p > p0) {
+                bx = cx + 1;
+                cache.push(bx, pt, p);
+                continue;
             }
             continue;
         }

package/coms/compile/autoeval_test.js

@@ -65,7 +65,6 @@ t("a+ b*3**2", "a + b * 9");
 t("a+ 2*3**b", "a + 2 * 3 ** b");
 t("a+ 2*3 +c", "a + 6 + c");
 t("a+ 2*3 +4+c", "a + 10 + c");
-autoeval.debug = true;
 t("a- 2*3 +4+c", "a - 2 + c");
 t("a- 1 +4", "a + 3");
 t("a / 6 * 3", "a * 0.5");
@@ -84,14 +83,17 @@ tc("calc(10 / 20)", "0.5");
 tc("calc(10 / 20)", "0.5");
 tc("Math.log(f) / Math.LN2 / 10 | 0", "Math.log(f) * 0.14426950408889633 | 0");
 tc("Math.log(f) / Math.LN2 / 10 * 10 | 0", "Math.log(f) * 1.4426950408889634 | 0");
+autoeval.debug = true;
 tc("Math.log(f) / Math.LN2 / 10 ** 2 | 0", "Math.log(f) * 0.014426950408889633 | 0");
+autoeval.debug = false;
 // tf(path.join(__dirname, "../zimoli/spacechar_test.js"))
 t("1<<0", '1');
 t("1<<3", '8');
-t("(1 << 10) | (1 << 8) | (1 << 5) | (1 << 4) | (1 << 2) | (1 << 1) | (1 << 0)",'1335')
-t("(1 << 12) | (1 << 11) | (1 << 10) | (1 << 9) | (1 << 8) | (1 << 5) | (1 << 2) | (1 << 0)","7973")
-t("(1 << 14) | (1 << 12) | (1 << 10) | (1 << 4) | (1 << 1)","21522")
-t('1n<<32n','4294967296n');
-t('4294967296n*4294967296n','18446744073709551616n');
-t('4294967296n*2147483648n','9223372036854775808n');
-t('0x20000000n*0x1000000n','9007199254740992n');
+t("(1 << 10) | (1 << 8) | (1 << 5) | (1 << 4) | (1 << 2) | (1 << 1) | (1 << 0)", '1335')
+t("(1 << 12) | (1 << 11) | (1 << 10) | (1 << 9) | (1 << 8) | (1 << 5) | (1 << 2) | (1 << 0)", "7973")
+t("(1 << 14) | (1 << 12) | (1 << 10) | (1 << 4) | (1 << 1)", "21522")
+t('1n<<32n', '4294967296n');
+t('4294967296n*4294967296n', '18446744073709551616n');
+t('4294967296n*2147483648n', '9223372036854775808n');
+t('0x20000000n*0x1000000n', '9007199254740992n');
+t("1 + 1 / 2 + 1 / 3 + 1 / 4 + 1 / 5 + 1 / 6 + 1 / 7 + 1 / 8 + 1 / 9 + 1 / 10 + 1 / 11 + 1 / 12 + 1 / 13 + 1 / 14 + 1 / 15 + 1 / 16 + 1 / 17 + 1 / 18 + 1 / 19 + 1 / 20", "3.5977396571436824")

package/coms/compile/wraphtml.js

@@ -1,3 +1,3 @@
 function wrapHtml(htmldata) {
-    return htmldata ? `\`${String(htmldata).replace(/>\s+</g, "><").trim()}\`` : '``';
+    return htmldata ? `\`${String(htmldata).replace(/>\s+</g, "><").replace(/\\[^`]/g, "\\$&").trim()}\`` : '``';
 }

package/coms/frame/chat.js

@@ -164,10 +164,11 @@ async function pullFileWithRTC(scope, file) {
         // <!-- console.log('接收端打开') -->
         report();
     };
-    channel.onclose = function () {
+    channel.onclose = async function () {
         // <!-- console.log('接收端关闭') -->
         if (writed === file.size) tipbox.setText(`接收完成`, 'success');
         else tipbox.setText('接收异常', "error");
+        await writable.close();
     };
     channel.onerror = function (event) {
         // <!-- console.log('接收端异常',event) -->

package/coms/zimoli/bggrid-func.less

@@ -1,7 +1,7 @@
 .grid() {
-    @mask-color1 : rgba(255, 255, 255, .6);
+    @mask-color1 : rgba(255, 255, 255, .3);
     @mask-color2 : rgba(0, 0, 0, 0);
-    @mask-color3 : rgba(0, 0, 0, .1);
+    @mask-color3 : rgba(0, 0, 0, .3);
     background-image:
         linear-gradient(45deg, @mask-color1, 25%, @mask-color1, 25%, @mask-color2, 75%, @mask-color1, 75%, @mask-color1),
         linear-gradient(45deg, @mask-color1, 25%, @mask-color1, 25%, @mask-color2, 75%, @mask-color1, 75%, @mask-color1),

package/coms/zimoli/drag.js

@@ -16,7 +16,8 @@ var getOffset = function (e) {
     if (isFinite(e.screenX)) return [e.screenX, e.screenY];
 };
 
-var getMouse = function (e) {
+var getMousePosition = function (e) {
+    if ('screenX' in e) return [e.screenX, e.screenY];
     return [e.clientX, e.clientY];
 };
 var z;
@@ -51,7 +52,7 @@ function drag(target, initialEvent, preventOverflow, isMovingSource) {
     if ((!target.hasAttribute || target.hasAttribute('draggable')) && target.draggable === false) return;
     initialEvent.preventDefault();
     var target_offset = getOffset(target);
-    var saved_delta = { x: target_offset[0] - initialEvent.clientX, y: target_offset[1] - initialEvent.clientY };
+    var saved_delta = { x: target_offset[0] - getMousePosition(initialEvent)[0], y: target_offset[1] - getMousePosition(initialEvent)[1] };
     var clone;
     if (target.style) {
         var saved_opacity = target.style.opacity;
@@ -90,12 +91,13 @@ function drag(target, initialEvent, preventOverflow, isMovingSource) {
             extraClones.map(c => document.body.appendChild(c));
             saved_delta.x += clone_left - target_left;
             saved_delta.y += clone_top - target_top;
-            target.setAttribute("dragging", '');
+            if (target.setAttribute) target.setAttribute("dragging", '');
             dispatch("dragstart", target);
         }
         event.moveLocked = true;
-        var offsetLeft = saved_delta.x + event.clientX;
-        var offsetTop = saved_delta.y + event.clientY;
+        var [screenX, screenY] = getMousePosition(event);
+        var offsetLeft = saved_delta.x + screenX;
+        var offsetTop = saved_delta.y + screenY;
         var [c_left, c_top] = getOffset(clone);
         var cloneDeltaLeft = -c_left, cloneDeltaTop = -c_top;
         var [c_left, c_top] = move.call(clone, offsetLeft, offsetTop, preventOverflow);
@@ -115,7 +117,10 @@ function drag(target, initialEvent, preventOverflow, isMovingSource) {
         remove(extraClones);
         extraTargets.map((target, cx) => css(target, extraStyles[cx]));
         if (tgz != null) css(target, { zIndex: tgz });
-        if (saved_delta.ing) target.removeAttribute("dragging"), dispatch("dragend", target);
+        if (saved_delta.ing) {
+            if (target.removeAttribute) target.removeAttribute("dragging");
+            dispatch("dragend", target);
+        }
         drag.target = null;
         saved_delta = null;
     };

package/coms/zimoli/moveupon.js

@@ -50,16 +50,35 @@ var locktouch = function (target, handles) {
         }
     }
 };
-
+var getX = function (event) {
+    if ('screenX' in event) return event.screenX;
+    return event.clientX;
+};
+var getY = function (event) {
+    if ('screenY' in event) return event.screenY;
+    return event.clientY;
+};
 function moveupon(target, handles, initialEvent) {
     var { start, move, end } = handles;
     var touchLocked = false;
+    var savedX, savedY;
     var offmouseup, offtouchend, offtouchcancel;
+    var setMovement = function (event) {
+        if ("movementX" in event) return
+        var x = getX(event);
+        event.movementX = x - savedX;
+        savedX = x;
+        var y = getY(event);
+        event.movementY = y - savedY;
+        savedY = y;
+    }
     var mousemove = function (event) {
+        setMovement(event);
         if (isFunction(move)) move.call(target, event);
     };
 
     var touchmove = function (event) {
+        setMovement(event);
         extendTouchEvent(event);
         if (isFunction(move)) move.call(target, event);
     };
@@ -87,6 +106,7 @@ function moveupon(target, handles, initialEvent) {
 
     if (initialEvent) {
         if (locktouch(initialEvent.target, handles)) return;
+        if (target.notouch) return;
         if (initialEvent.type === "touchstart") {
             extendTouchEvent(initialEvent);
             initialEvent.preventDefault();
@@ -100,8 +120,11 @@ function moveupon(target, handles, initialEvent) {
     onmousedown(target, function (event) {
         if (touchLocked) return;
         if (locktouch(event.target, handles)) return;
+        if (target.notouch) return;
         touchLocked = true;
         hookmouse(event);
+        savedX = getX(event);
+        savedY = getY(event);
         if (isFunction(start)) start.call(this, event);
     });
     ontouchstart(target, function (event) {
@@ -109,6 +132,8 @@ function moveupon(target, handles, initialEvent) {
         if (locktouch(event.target, handles)) return;
         touchLocked = true;
         extendTouchEvent(event);
+        savedX = getX(event);
+        savedY = getY(event);
         hooktouch(event);
         if (isFunction(start)) start.call(this, event);
     });

package/coms/zimoli/picture.less

@@ -1,3 +1,4 @@
+@import "bggrid-func.less";
 & {
     width: 100%;
     height: 100%;
@@ -10,24 +11,6 @@
     background-color: #000;
 }
 
-
-.grid() {
-    @mask-color1 : rgba(255, 255, 255, .6);
-    @mask-color2 : rgba(0, 0, 0, 0);
-    @mask-color3 : rgba(0, 0, 0, .1);
-    background-image:
-        linear-gradient(45deg, @mask-color1, 25%, @mask-color1, 25%, @mask-color2, 75%, @mask-color1, 75%, @mask-color1),
-        linear-gradient(45deg, @mask-color1, 25%, @mask-color1, 25%, @mask-color2, 75%, @mask-color1, 75%, @mask-color1),
-        linear-gradient(45deg, @mask-color3, 25%, @mask-color3, 25%, @mask-color2, 75%, @mask-color3, 75%, @mask-color3),
-        linear-gradient(45deg, @mask-color3, 25%, @mask-color3, 25%, @mask-color2, 75%, @mask-color3, 75%, @mask-color3);
-    background-size: 20px 20px;
-    background-position: 0 0, 10px 10px, 10px 0, 0 10px;
-    background-repeat: repeat;
-    background-clip: border-box;
-    background-color: #fff;
-
-}
-
 &[grid],
 &.grid,
 &[type=grid] {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "4.35.7",
+    "version": "4.35.8",
     "description": "一个开发环境，提供一种自由的前端开发模式，也可作为辅助工具使用。",
     "main": "public/efront.js",
     "directories": {