efront 4.1.9 → 4.1.11

package/coms/compile/common.js

@@ -30,10 +30,15 @@ var skipAssignment = function (o, cx) {
         while (o && o.type & (SPACE | COMMENT)) o = body[++ox];
         cx = ox + 1;
     }
+    else if (o.type & (SPACE | COMMENT)) o = o.next;
     var needpunc = false;
     var qcount = 0;
     var ifdeep = 0;
+    var labeled = o && o.type === LABEL;
+    while (o && o.type === LABEL) next();
     loop: while (o) switch (o.type) {
+        case LABEL:
+            if (!ifdeep) break loop;
         case STAMP:
             switch (o.text) {
                 case ";":
@@ -43,7 +48,7 @@ var skipAssignment = function (o, cx) {
                     next();
                     break;
                 case ",":
-                    if (!ifdeep) break loop;
+                    if (!ifdeep && !labeled) break loop;
                     needpunc = false;
                     next();
                     break;
@@ -259,7 +264,7 @@ function snapSentenceHead(o) {
             break;
         }
         if (p.type === STAMP) {
-            if (/=>|[,;]/.test(p.text)) {
+            if (/=>|;/.test(p.text)) {
                 break;
             }
             if (/^[\?\:]$/.test(p.text)) {
@@ -1293,7 +1298,7 @@ var pickSentence = function (o) {
     if (o && o.type === STAMP && o.prev) o = o.prev;
     if (o.type === STRAP && /^(in|instanceof|as|of)$/.test(o.text) && o.prev) o = o.prev;
     var h = snapSentenceHead(o);
-    var e = skipAssignment(o);
+    var e = skipAssignment(h);
     var q = o.queue;
     if (q) {
         var qh = q.indexOf(h);

package/coms/compile/common_test.js

@@ -0,0 +1,12 @@
+function testPickSentence(text, index, except) {
+    var code = scanner2(text);
+    assert(common.createString(common.pickSentence(code[index])), except);
+}
+testPickSentence(`function 九尾妖狐(){}`, 0, "function 九尾妖狐() {}")
+testPickSentence(`function 九尾妖狐(){}`, 2, "function 九尾妖狐() {}")
+testPickSentence(`a: function 九尾妖狐(){}`, 1, "a: function 九尾妖狐() {}")
+testPickSentence(`a: function 九尾妖狐(){}`, 0, "a: function 九尾妖狐() {}")
+testPickSentence(`a: function 九尾妖狐(){}`, 2, "a: function 九尾妖狐() {}")
+testPickSentence(`a: 王天霸, 步惊云 b:叶流云, 四顾剑`, 2, "a: 王天霸, 步惊云")
+testPickSentence(`a: 王天霸, 步惊云 b:叶流云, 四顾剑`, 4, "b: 叶流云, 四顾剑")
+testPickSentence(`a: 王天霸, 步惊云; b:叶流云, 四顾剑`, 4, "a: 王天霸, 步惊云")

package/coms/compile/translate.js

@@ -61,6 +61,11 @@ function getI18nPrefixedText(code, dist = []) {
         c.fields = refilm([c.translate]);
         dist.push(c);
     }, 字段名);
+    if (envs.refilm_decode) get(used.refilm_decode.filter(o => o.text === 'refilm_decode').map(o => o.next), c => {
+        c.fields = refilm([c.translate]);
+        c.warn = false;
+        dist.push(c);
+    }, 字段名);
     return dist;
 }
 var ctn = function (tt, t) {
@@ -86,10 +91,10 @@ function translate([imap, supports], code) {
         if (a.start > b.start && a.end < b.end) return -1;
         return 0;
     });
-    var getm = function (tt) {
+    var getm = function (tt, warn) {
         tt = tt.trim();
         if (!imap[tt]) {
-            console.warn(`<yellow>${i18n`国际化翻译缺失：`}</yellow>${tt}`);
+            if (warn !== false) console.warn(`<yellow>${i18n`国际化翻译缺失：`}</yellow>${tt}`);
             imap[tt] = supports.map(_ => tt);
         }
         return imap[tt].map(m => strings.encode(m || tt, '`'));
@@ -110,8 +115,14 @@ function translate([imap, supports], code) {
         else if (t.transtype === 字段名) {
             var i = t.queue.indexOf(t.prev);
             var e = t.queue.indexOf(t, i);
-            var ui = used.refilm.indexOf(t.prev);
-            used.refilm.splice(ui, 1);
+            if (t.warn === false) {
+                var ui = used.refilm_decode.indexOf(t.prev);
+                if (ui >= 0) used.refilm_decode.splice(ui, 1);
+            }
+            else {
+                var ui = used.refilm.indexOf(t.prev);
+                if (ui >= 0) used.refilm.splice(ui, 1);
+            }
             if (!used.i18n) {
                 used.i18n = [];
                 code.envs.i18n = true;
@@ -127,7 +138,7 @@ function translate([imap, supports], code) {
                         if (a in t) v = t[a];
                         else v = scanner2(JSON.stringify(v));
                     }
-                    else if (k === 'name') v = ctn(`i18n(${getm(v)})`, t);
+                    else if (k === 'name') v = ctn(`i18n(${getm(v, t.warn)})`, t);
                     else v = scanner2(JSON.stringify(v));
                     o.push({ type: PROPERTY, isprop: true, text: JSON.stringify(k) }, { type: STAMP, text: ':' }, ...v, { type: STAMP, text: ',' });
                 })

package/coms/zimoli/autodragchildren.js

@@ -237,8 +237,10 @@ var hooka = function (matcher, move, event, targetChild, isMovingSource) {
             var children = targetBox.children;
             var srcElement = children[src];
             var dstElement = children[dst + delta];
-            src = bindTarget(src, isMovingSource ? targetChild : srcElement);
-            dst = bindTarget(dst, dstElement);
+            if (srcElement) {
+                src = bindTarget(src, isMovingSource ? targetChild : srcElement);
+                dst = bindTarget(dst, dstElement);
+            }
             var needFire = !isFunction(move) || move(src, dst, dst + delta, appendSibling, targetBox) !== false;
             if (needFire && srcElement === children[src] && dstElement === children[dst + delta] && srcElement && dstElement) appendSibling(dstElement, srcElement);
         } else if (isMovingSource === false) {

package/coms/zimoli/colorpad.js

@@ -182,6 +182,7 @@ function main(e) {
     elem.setValue = function (v) {
         var [_x, _y, z, a] = color2xyz(v);
         hue.value = z;
+        sethue(z);
         opa.value = 1 - a;
         css(huepointer, { top: +(z * 100).toFixed(6) + '%' })
         css(opapointer, { top: +(100 - a * 100).toFixed(6) + '%' })
@@ -208,19 +209,20 @@ function main(e) {
         var c0 = color.parse(c).slice(0, 3).map(a => xy2c(a, x, y));
         c0[3] = a;
         var p = color.stringify(c0);
+        var lc = color.stringify(c0.slice(0, 3));
         var value = p;
         css(padpointer, {
             left: +(x * 100).toFixed(6) + "%",
             top: +(y * 100).toFixed(6) + "%",
             background: p,
-            outlineColor: color.pair(p),
+            outlineColor: color.pair(lc),
         });
         css(huepointer, {
             outlineColor: color.pair(c),
             background: c
         });
         css(opapointer, {
-            outlineColor: color.pair(p),
+            outlineColor: a > .6 ? color.pair(lc) : "#000",
             background: p
         });
         buildopa(opa, p);
@@ -229,7 +231,7 @@ function main(e) {
         rgb.setValue(value);
         hsl.setValue(value);
         bg.style.borderColor = value;
-        val.style.color = color.pair(value);
+        val.style.color = a > .6 ? color.pair(lc) : "#000";
         elem.value = value;
         dispatch(elem, 'change');
         // console.log(value, hex.value, valuergb, valuehsl);

package/coms/zimoli/render.js

@@ -472,8 +472,13 @@ var src2 = function (search) {
         } else if (isEmpty(origin)) {
             temp = "";
         }
-        var changes = getChanges(temp, savedValue);
-        if (!changes || isEmpty(origin) && isEmpty(this.src) && isEmpty(savedValue)) return;
+        if (savedValue !== undefined && savedValue !== null) {
+            var changes = getChanges(temp, savedValue);
+            if (!changes || isEmpty(origin) && isEmpty(this.src) && isEmpty(savedValue)) return;
+        }
+        else {
+            if (isSame(savedValue, temp)) return;
+        }
         savedValue = temp;
         this.src = origin;
         cast(this, origin);

package/package.json

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