efront 3.35.2 → 3.35.4

package/coms/basic/#loader.js

@@ -23,6 +23,7 @@ var {
     console,
     efrontURI,
     parseFloat,
+    encodeURI,
     preventFrame,
     PREVENT_FRAMEWORK_MODE = preventFrame,
     devicePixelRatio = 1,
@@ -46,6 +47,7 @@ var efront_time = +new Date;
 var _devicePixelRatio = devicePixelRatio;
 var request = window.request || function (url, onload, onerror, version) {
     var xhr = new (XMLHttpRequest || ActiveXObject)("Microsoft.XMLHTTP");
+    url = encodeURI(url);
     xhr.open("POST", url);
     xhr.onreadystatechange = function () {
         if (xhr.readyState === 4) {

package/coms/basic/Speed.js

@@ -41,20 +41,25 @@ function inertia(gun) {
         var id = smooth_timer;
         var res = gun.apply(that, args);
         if (id !== smooth_timer) return;
+
         if (false === res) {
             spd.reset();
             train.state = 回弹;
             smooth_timer = requestAnimationFrame(_decrease);
             return;
         }
-        if (decrease && args.filter(a => Math.abs(a) > 1).length === 0) {
+        if (args.stop || rate && args.rate < rate) {
+            if (!decrease) {
+                train.state = 停止;
+                return;
+            }
             train.state = 回弹;
             smooth_timer = requestAnimationFrame(_decrease);
             return;
         }
         smooth_timer = requestAnimationFrame(smooth);
     };
-    var spd, smooth_timer, that, decrease;
+    var spd, smooth_timer, that, decrease, rate;
     var train = function () {
         _cancel();
         var args = [].slice.call(arguments, 0, arguments.length);
@@ -63,9 +68,10 @@ function inertia(gun) {
         gun.apply(this, args);
         that = this;
     };
-    train.smooth = function (d) {
+    train.smooth = function (d, r) {
         _cancel();
         decrease = d;
+        rate = r;
         if (train.state === 移动) {
             train.state = 减速;
             smooth_timer = requestAnimationFrame(smooth);
@@ -162,16 +168,20 @@ class Speed extends Array {
         for (var v of values) sum += v * v;
         v = Math.sqrt(sum);
         var a = this.accelerate * Math.atan(v + 1);
+        values.rate = v;
         if (v > a + 1e-14) {
             v = Math.sqrt(v * (v - a)) / v;
         }
         else {
-            v = 1e-9;
+            if (v < 1e-6) {
+                values.stop = true;
+            }
+            v = 0.6180339887498949;
         }
         var r = ratio * v;
         for (var cx = 0, dx = values.length; cx < dx; cx++) {
             values[cx] *= r;
-            if (Math.abs(this[cx]) > .1) this[cx] *= v;
+            if (Math.abs(this[cx]) > 1e-16) this[cx] *= v;
         }
         return values;
     }

package/coms/basic/Speed_test.js

@@ -0,0 +1,58 @@
+var test = function (queue, wait = 40) {
+    var spd = new Speed;
+    var now = 0;
+    var writted = [];
+    for (var cx = 0, dx = queue.length; cx < dx; cx++) {
+        var s = queue[cx];
+        if (s instanceof Array && !Array.isArray(queue[cx + 1])) {
+            spd.write(s, now = queue[++cx]);
+            writted.push(s, now);
+        }
+        else {
+            spd.write([].concat(s), now = cx * 16 + 20 + Math.random() * 16);
+            writted.push([].concat(s), now);
+        }
+    }
+    for (var cx = now + wait, dx = now + 20000; cx < dx; cx += 16 + Math.random() * 16) {
+        var a = spd.read(cx);
+        if (a.stop) break;
+    }
+    if (!a.stop) {
+        console.log("测试数据：", writted, "\r\n当前状态：", a);
+        throw `已等待 ${+((cx - now) / 1000).toFixed(3)} 秒，未停止运行`;
+    }
+    console.log(cx - now, a.stop);
+};
+Speed.debug = true;
+test([
+    [2.1878654669544666],
+    27.956586758709825,
+    [2.1878654669544666],
+    37.21775999809554,
+    [3.1878654669544666],
+    67.83162606867668
+])
+test([1.1878654669544668, 1.1878654669544668, 1.1878654669544668]);
+test([2.1878654669544668, 2.1878654669544668, 3.1878654669544668]);
+test([
+    0.3251661026176258,
+    0.44988734829376603,
+    0.43652435853899707,
+    0.43652435853899707,
+    0.47438616350792273,
+    0.4253885330796093,
+    0.5300652921323553,
+    0.5256109608866051,
+]);
+test([
+    [0, false], 2880.300000011921,
+    [0, false], 2894.300000011921,
+    [0, false], 2969,
+    [0, false], 2971.199999988079,
+    [0, false], 3019.600000023842,
+    [0, false], 3026.800000011921,
+    [0, false], 3044.5,
+    [0, false], 3114.900000035763,
+    [0, false], 3250.199999988079,
+    [0, false], 3314.699999988079
+], 900);

package/coms/basic_/#checkPromise.js

@@ -1,7 +1,7 @@
 if (Promise) {
     var SafePromise = void 0;
     Promise.resolve({
-        then() {
+        get then() {
             SafePromise = Promise;
         }
     });

package/coms/basic_/Promise.js

@@ -2,6 +2,7 @@ var window = this;
 var Array = window.Array;
 var setTimeout = window.setTimeout;
 var Function = window.Function;
+var Object = window.Object;
 var console = window.console;
 var navigator = window.navigator;
 var requestAnimationFrame = window.setImmediate || window.setTimeout;
@@ -15,33 +16,40 @@ if (!Promise) {
         return pendding instanceof Promise || pendding && isFunction(pendding.then);
     };
     var queue = [];
+    var running = false;
     var run = function (q) {
-        var threads = queue.splice(0, queue.length);
-        for (var t of threads) {
-            if (t.oked) {
-                for (var r of t.PromiseFulfillReactions) {
-                    r.call(null, t.oked[0]);
-                }
-            }
-            if (t.ohed) {
-                var throwed = t.throwed;
-                t.throwed = true;
-                if (!throwed && !t.PromiseRejectReactions.length) {
-                    // <!--
-                    console.warn("在异步过程中发现未处理的异常：", t.ohed[0], t.ohed[1], t.ohed[2]);
-                    // -->
-                    throw t.ohed[0];
+        running = true;
+        while (queue.length) {
+            var threads = queue.splice(0, queue.length);
+            for (var t of threads) {
+                if (!t.oked && !t.ohed) continue;
+                var PromiseRejectReactions = t.PromiseRejectReactions.splice(0, t.PromiseRejectReactions.length);
+                var PromiseFulfillReactions = t.PromiseFulfillReactions.splice(0, t.PromiseFulfillReactions.length);
+
+                if (t.oked) {
+                    for (var r of PromiseFulfillReactions) {
+                        r.call(null, t.oked[0]);
+                    }
                 }
-                for (var r of t.PromiseRejectReactions) {
-                    r.apply(null, t.ohed);
+                if (t.ohed) {
+                    var throwed = t.throwed;
+                    t.throwed = true;
+                    if (!throwed && PromiseRejectReactions.length) {
+                        // <!--
+                        console.warn("在异步过程中发现未处理的异常：", t.ohed[0], t.ohed[1], t.ohed[2]);
+                        // -->
+                        throw t.ohed[0];
+                    }
+                    for (var r of PromiseRejectReactions) {
+                        r.apply(null, t.ohed);
+                    }
                 }
             }
-            t.PromiseRejectReactions.splice(0, t.PromiseRejectReactions.length);
-            t.PromiseFulfillReactions.splice(0, t.PromiseFulfillReactions.length);
         }
+        running = false;
     };
     var fire = function (p) {
-        if (queue.length) return queue.push(p);
+        if (running) return queue.push(p);
         queue.push(p);
         requestAnimationFrame(run);
     };
@@ -59,12 +67,12 @@ if (!Promise) {
                 fire(p);
             }
         };
-
         var ResolvingFunctions_reject = function (e) { //oh
             if (p.oked || p.ohed) return;
             p.ohed = arguments;
             fire(p);
         };
+        fire(p);
         executor(ResolvingFunctions_resolve, ResolvingFunctions_reject);
     };
     Promise.prototype = {
@@ -147,5 +155,4 @@ if (!Promise) {
             ok.apply(null, args);
         });
     };
-
 }

package/coms/compile/Html.js

@@ -243,7 +243,7 @@ Html.prototype.createString = function (code) {
     for (var c of code) {
         switch (c.type) {
             case PIECE:
-                if (p && p.type === PIECE) dist.push(" ");
+                if (p && p.type & (PIECE | EXPRESS)) dist.push(" ");
                 dist.push(c.text);
                 break;
             case SPACE:

package/coms/compile/Program.js

@@ -549,6 +549,9 @@ class Program {
                 var scope = [];
                 scope.entry = m;
                 scope.type = SCOPED;
+                scope.start = match.index;
+                scope.col = match.index - colstart;
+                scope.row = row;
                 var last = queue.last;
                 if (m === "{") {
                     if (!last) {
@@ -579,7 +582,6 @@ class Program {
                     scope.isExpress = queue.inExpress;
                     scope.inExpress = true;
                 }
-                scope.start = match.index;
                 push_parents(scope);
                 continue;
             }
@@ -596,13 +598,13 @@ class Program {
                 pop_parents();
                 continue;
             }
-
+            if (this.scope_leave[m]) console.warn("标记不匹配", queue.entry, m, "queue:", `${queue.row}:${queue.col}`, "position:", `${row}:${index - colstart}\r\n`, text.slice(queue.start, index));
             if (this.stamp_reg.test(m)) {
                 save(STAMP);
             }
 
         }
-        if (queue !== origin) throw console.log(createString(origin), createString([queue])), new Error("代码异常结束");
+        if (queue !== origin) throw console.log(createString(origin), `\r\n------ deep: ${parents.length} - enrty: ${queue.entry} - length: ${queue.length} - last: ${createString([queue.last])} -----\r\n`, createString([queue])), "代码异常结束";
         return queue;
     }
     commit() {
@@ -619,11 +621,13 @@ class Program {
         quoteslike.forEach(q => {
             var a = q[0];
             if (a instanceof RegExp) a = stringsFromRegExp(a);
-            if (typeof a === "string" && a.length === 1) tokens[a] = true;
             if (a instanceof Array) {
-                a.forEach(a => quote_map[a] = q);
+                a.forEach(a => {
+                    quote_map[a] = q;
+                    tokens[a.charAt(0)] = true;
+                });
             }
-            else quote_map[a] = q;
+            else quote_map[a] = q, tokens[a.charAt(0)] = true;
             var r = q.slice(q[2] ? 2 : 3).concat(q[1]).map(q => {
                 if (q instanceof Array) {
                     q = q[q.length - 2];

package/coms/compile/namelist.js

@@ -76,7 +76,7 @@ source += source.toUpperCase() + "_$";
 var number = source + '0123456789';
 // source += "ªµºΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤΥΦΧΨΩαβγδεζηθικλμνξοπρςστυφχψω";
 source += function () {
-    var reg = /\xAA\xB5\xBA\xC0-\xD5\xD8-\xF2\xF8-\u02af\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u052F\u0531-\u0556\u0559\u0561-\u0587\u05D0-\u05EA\u05F0-\u05F2\u0620-\u064A\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA/;
+    var reg = /\xAA\xB5\xBA\xC0-\xD5\xD8-\xF2\xF8-\u02AF\u0388-\u038A\u038C\u038E-\u03A1\u03A3-\u03F5\u03F7-\u0481\u048A-\u0523\u0531-\u0556\u0559\u0561-\u0587\u05D0-\u05EA\u05F0-\u05F2\u0621-\u064A\u066E\u066F\u0671-\u06D3\u06D5\u06E5\u06E6\u06EE\u06EF\u06FA-\u06FC\u06FF\u0710\u0712-\u072F\u074D-\u07A5\u07B1\u07CA-\u07EA/;
     var dist = [];
     reg.source.replace(/\\[xu]([0-9a-f]+)(?:\-\\[xu]([0-9a-f]+))?/ig, function (_, a, b) {
         a = parseInt(a, 16);

package/coms/compile/scanner2_test.js

@@ -96,15 +96,21 @@ function testJsxOnlyHtml() {
     <component1 ng-bind="expression"><child1></child1></component1>`);
     console.log(m.toString());
 }
+function testSpaceLess() {
+    var m = scanner(`if(n<0)return'_f("'+t+'")('+e+")"`);
+    console.log(m.toString());
+}
+Program.debug = true;
 // testSpeed();
 // testVariables();
 // testRegexp();
 // testStatic();
 // testAssign();
 // testFormat();
-testJsx();
-testJsx2();
+// testJsx();
+// testJsx2();
 // testJsx3();
-testJsxOnlyHtml();
+// testJsxOnlyHtml();
+testSpaceLess();
 // var typescript = require("../typescript/index");
 // typescript.transpile(data.toString(), { noEmitHelpers: true });

package/coms/zimoli/autodragchildren.js

@@ -70,6 +70,7 @@ var scrollX = function (targetBox, moveChildren) {
         scrollDelta = dragPosition.right + 20 - areaPosition.right;
     }
     if (scrollDelta) {
+        if (targetBox === document.documentElement) return;
         vscroll.X.call(targetBox, scrollDelta / 16, false);
         moveChildren();
     }

package/coms/zimoli/checkbox.js

@@ -20,7 +20,7 @@ function main(elem = document.createElement("checkbox-group")) {
             options,
             select(a) {
                 a.checked = !a.checked;
-                elem.value = this.options.filter(a => !!a.checked);
+                elem.checked = elem.value = this.options.filter(a => !!a.checked);
                 buildValue(elem.value, this.options);
                 dispatch(elem, 'change');
             }

package/coms/zimoli/grid.js

@@ -308,6 +308,7 @@ function grid(breakpoints) {
 }
 class Point extends Array {
     constructor(value, range) {
+        super();
         var solid = false;
         if (isObject(value)) {
             this.value = value.value;

package/coms/zimoli/list.js

@@ -390,7 +390,7 @@ function ylist(container, generator, $Y) {
         }
         if (absy <= 1) y = target_y;
         else {
-            var speed = Math.abs(spd.read()[0]);
+            var speed = spd.read().rate;
             if (speed < 1) speed = 1;
             if (absy < 3) speed = .5;
             y = last_y + (target_y > last_y ? speed : -speed);

package/coms/zimoli/menuItem.html

@@ -1,14 +1,17 @@
-<template -if='useIcon?||hasIcon?||icon?'>
-    <i -class="icon?" -style="{color:color?}"></i>
-    <template -if="name?">
+<template -if='hasIcon?'>
+    <i -class="icon?" -style="{color:menu.color}"></i>
+    <template -if="menu.name">
         &nbsp;&nbsp;
     </template>
 </template>
-<span -html="name?" -style="{color:color?}"></span>
-<template -if="typeof hotkey==='string'">
+<span -html="menu.name" -style="{color:menu.color}"></span>
+<template -if="typeof menu.hotkey==='string'">
     &nbsp;&nbsp; <span class="hotkey" -html="hotkey"></span>
 </template>
-<template -elseif="hotkey?.length">
-    &nbsp;&nbsp; <span ng-repeat="k of hotkey" class="hotkey" ng-html="k"></span>
+<template -elseif="menu.hotkey?.length">
+    &nbsp;&nbsp; <span ng-repeat="k of menu.hotkey" class="hotkey" ng-html="k"></span>
+</template>
+<template -if="menu.isChecked?menu.isChecked():''">
+    &nbsp;&nbsp;✓
 </template>
 <s></s>

package/coms/zimoli/menuItem.js

@@ -7,16 +7,21 @@ function main(elem, scope, hasIcon) {
     else if (item.$scope) {
         var scope = item.$scope;
     }
-    if (scope.menu || scope.$item) scope = scope.menu || scope.$item;
-    if (hasIcon === undefined) hasIcon = !!scope.icon;
-    if (scope.disabled || scope.enabled === false) {
+    var menu = scope;
+    if (menu.menu || menu.$item) menu = menu.menu || menu.$item;
+    if (menu.disabled || menu.enabled === false) {
         item.setAttribute('disabled', '');
     }
     else {
         item.removeAttribute("disabled");
     }
-    render(item.children, scope, hasIcon instanceof Array ? hasIcon : [{ useIcon: hasIcon, hasIcon }]);
-    if (scope.line) item.setAttribute("line", ''), on("click")(item, preventDefault);
+    scope = {
+        menu,
+        checker,
+    };
+    if (hasIcon) scope.hasIcon = true;
+    render(item.children, scope);
+    if (menu.line) item.setAttribute("line", ''), on("click")(item, preventDefault);
     return item;
 }
 main.template = menuItem;

package/coms/zimoli/option.less

@@ -4,7 +4,7 @@
     top: 0;
     left: 0;
     bottom: 0;
-    padding: 0 !important;
+    padding: 0;
     color: #333;
     right: 0;
     display: block;

package/coms/zimoli/table.html

@@ -1,18 +1,18 @@
-<thead @mounted="setFixedColumn.call(this.parentNode)">
+<thead @mounted="setFixedColumn.call(this.parentNode),setContextMenu(this)">
     <tr inline-block #adapter thead @mounted="resizeT(this)">
         <td draggable="false" fixed row-index>序号</td>
         <td fixed:="f.fixed" -repeat="f in fields track by f.id" :style="{width:f.width}" @dblclick="sort(f)"><i
                 -if="f.icon" -class="f.icon"></i><span -if="f.name" -html="f.name"></span><template
                 -else>&nbsp;</template>
         </td>
+        <td style="min-width: 0;" draggable="false">&nbsp;</td>
     </tr>
 </thead>
-<tbody -src="(d,i) in data" :style="tbodyHeight(this)">
-    <tr inline-block @mounted="this.style.width=adapter.style.width">
-        <td draggable="false" fixed row-index -bind="i+1" @mounted="this.style=adapter.firstChild.getAttribute('style')">
+<tbody -src="(d,i) in data" :style="tbodyHeight(this,hasFoot)">
+    <tr inline-block :style="{width:adapter.style.width}" @click="rowClick(d,i,event)">
+        <td fixed row-index -bind="i+1" :style="adapter.firstChild.getAttribute('style')">
         </td>
-        <td fixed:="f.fixed" -repeat="(f,i) in fields"
-            @mounted="this.style=adapter.children[i+1].getAttribute('style')">
+        <td fixed:="f.fixed" -repeat="(f,i) in fields" :style="adapter.children[i+1].getAttribute('style')">
             <model -if="f.key&&!isEmpty(d[f.key])" :field=f :data=d readonly></model>
             <template -else>&nbsp;</template>
             <a on-click="o.do(d)" -if="!f.key&&f.options&&(!o.when||o.when(d))"
@@ -20,13 +20,19 @@
                 <span -text="o.name instanceof Function?o.name(d):o.name"></span>
             </a>
         </td>
+        <td :style="adapter.lastChild.getAttribute('style')">&nbsp;</td>
     </tr>
 </tbody>
 <tfoot>
-    <tr -if="!data||!data.length" style="padding-bottom: 20px;">
+    <tr .fade -if="!data||!data.length" style="padding-bottom: 20px;">
         <td style="text-align: center;">
             <template -if="data.is_loading">加载中</template>
             <template -else>无数据</template>
         </td>
     </tr>
+    <tr -elseif="hasFoot">
+        <td>
+            共&nbsp;<span -bind="data.length"></span>&nbsp;个
+        </td>
+    </tr>
 </tfoot>