efront 4.3.9 → 4.3.11

package/coms/basic/assert.js

@@ -1,7 +1,14 @@
 var mark = require("./mark");
-var gray = console.format('<gray>;</gray>').split(';');
-var green = console.format('<green>;</green>').split(';');
-var crack = console.format('<red2>;</red2>').split(';');
+if (console.format) {
+    var gray = console.format('<gray>;</gray>').split(';');
+    var green = console.format('<green>;</green>').split(';');
+    var crack = console.format('<red2>;</red2>').split(';');
+}
+else {
+    var gray = [, ,];
+    var green = [, ,];
+    var crack = [, ,];
+}
 var dump = function (a, msg) {
     if (a instanceof Object) console.error('属性错误'), console.log(msg ? msg + " " : "  {\r\n", Object.keys(a).map(k => `  ${k}${gray.join(':')}\r\n      ${a[k]}`).join('\r\n') + "\r\n }");
     else if (msg) console.log(msg + ":", a);

package/coms/compile/Javascript.js

@@ -386,7 +386,7 @@ Javascript.prototype.setType = function (o) {
     if (o.type === STAMP) {
         if (!last || last.type & (STAMP | STRAP) || last.type === SCOPED && /^[\{\[]$/.test(last.entry) && !last.isExpress) {
             o.unary = /^[^=;,\*]$|.[^\=\>\<\|\&\^]$/.test(o.text);
-            if (o.unary && last && last.type === STAMP && /^(\+\+|\-\-)$/.test(last.text)) o.unary = !/^[\+\-]$/.test(o.text);
+            if (o.unary && /^(\+|\-)$/.test(o.text) && last && last.type === STAMP && /^(\+\+|\-\-)$/.test(last.text)) o.unary = !!last.unary;
         }
         if (last && /^(\+\+|\-\-)$/.test(o.text)) {
             var i = 1;

package/coms/compile/common.js

@@ -55,6 +55,7 @@ var skipAssignment = function (o, cx) {
                     break;
                 case "++":
                 case "--":
+                    if (needpunc && o.unary) break loop;
                     next();
                     break;
                 case "!":

package/coms/compile/unstruct.js

@@ -938,7 +938,6 @@ var _express = function (body, getname, ret) {
     }
     var result = [];
     var q = [];
-    var needpunc = false;
     var bx = 0;
     var cache = [];
     var n = null;
@@ -966,10 +965,8 @@ var _express = function (body, getname, ret) {
         }
         if (o.type & (STRAP | STAMP)) {
             var p = 0;
-            if (/^([!~]|\+\-|\-\+)*$/.test(o.text)) p = powermap["!"];
-            if (!p && /^[\+\-]$/.test(o.text)) p = needpunc ? powermap["+"] : powermap["!"];
-            if (!p) p = powermap[o.text];
-            needpunc = /^(\+\+|\-\-)$/.test(o.text) ? needpunc : false;
+            if (o.unary) p = powermap["!"];
+            else p = powermap[o.text];
             var b = body.slice(bx, cx + 1);
             bx = cx + 1;
             b.index = nameindex;
@@ -1021,7 +1018,6 @@ var _express = function (body, getname, ret) {
             }
         }
         else {
-            needpunc = true;
             if (o.type === EXPRESS) {
                 exps.push(o);
             }

package/coms/compile/unstruct_test.js

@@ -137,7 +137,6 @@ test("rgb=(rgb<<8|rgb>>16)&0xffffff", "_ = rgb << 8, _0 = rgb >> 16, _ = _ | _0;
 test(`if (c) a; else return true; return false`, "if (!c) return [1, 0]; a; return [2, 0];\r\n return [true, 2];\r\n return [false, 2]")
 test(`switch(a){case a:a=a?1:0;break;case b:a=b;break;}`, "if (a === a) return [1, 0]; if (a === b) return [4, 0]; return [5, 0];\r\n if (!a) return [1, 0]; a = 1; return [2, 0];\r\n a = 0; return [1, 0];\r\n return [2, 0];\r\n a = b; return [1, 0]");
 test(`a=typeof a!==1`, "_ = typeof a, a = _ !== 1");
-unstruct.debug = true; r++;
 test(`a[0]++`, "a[0]++");
 test(`1+a[0]++`, "_ = a[0]++, 1 + _");
 test(`a[0]++ + 1`, "_ = a[0]++, _ + 1");
@@ -145,3 +144,9 @@ test(`a[0]-- + 1`, "_ = a[0]--, _ + 1");
 test(`a[0]-- +1`, "_ = a[0]--, _ + 1");
 test(`a[0]--+1`, "_ = a[0]--, _ + 1");
 test(`a[0]+++1`, "_ = a[0]++, _ + 1");
+test(`c=b\r\n++a`, "c = b; ++a");
+test(`c=b+\r\n++a`, "_ =\r\n++a, c = b + _");
+test(`c=b+ ++a`, "_ = ++a, c = b + _");
+unstruct.debug = true; r++;
+test(`c=b+ +a`, "_ = +a, c = b + _");
+test(`c=b+ !a`, "_ = !a, c = b + _");

package/coms/explorer/main.js

@@ -21,7 +21,6 @@ var touch = {
          */
         var t = this;
         var start = () => {
-            if (onclick.preventClick) return;
             var a = t.$scope.toActive(e);
             touchitems = t.querySelectorAll("fileitem");
             if (a && t.$scope.selected.indexOf(a.$scope.d) >= 0) {
@@ -38,7 +37,10 @@ var touch = {
             css(rect, { left: e.clientX - pos.left - t.clientLeft, top: e.clientY - t.clientTop, width: 0, height: 0 })
         };
         if (/^touch/.test(e.type)) {
-            touch.ing = setTimeout(start, 600);
+            touch.ing = setTimeout(function () {
+                if (onclick.preventClick) return;
+                start();
+            }, 600);
         }
         else {
             start();

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "4.3.9",
+    "version": "4.3.11",
     "description": "简化前端开发，优化web性能",
     "main": "public/efront.js",
     "directories": {