efront 3.14.0 → 3.14.8

package/coms/zimoli/slider.js

@@ -123,17 +123,18 @@ function slider(autoplay, circle = true) {
     var park = function () {
         direction = 0;
         var singleTarget = getSingleTarget();
+        var spd = _speed();
         if (singleTarget) {
             negative_index = round(negative_index);
         }
         else if (delta_negative_index > 0) {
-            if (negative_index - floor(negative_index) > 0.2 / (1 + 6 * abs(_speed())))
+            if (negative_index - floor(negative_index) > 0.2 / (1 + abs(spd)))
                 negative_index = ceil(negative_index);
             else
                 negative_index = floor(negative_index);
         }
         else if (delta_negative_index < 0) {
-            if (ceil(negative_index) - negative_index > 0.2 / (1 + 6 * abs(_speed())))
+            if (ceil(negative_index) - negative_index > 0.2 / (1 + abs(spd)))
                 negative_index = floor(negative_index);
             else
                 negative_index = ceil(negative_index);
@@ -239,6 +240,7 @@ function slider(autoplay, circle = true) {
     });
     moveupon(outter, {
         start(event) {
+            event.preventDefault();
             cancelAnimationFrame(timer_animate);
             clearTimeout(timer_playyer);
             moving = true;

package/coms/zimoli/speed.js

@@ -1,17 +1,13 @@
-function speed(time_splitter = 1) {
-    var lastmoveTime = new Date, speed = 0;
-    return function (deltay) {
-        var now = new Date;
-        var deltat = now - lastmoveTime;
-        if (arguments.length) {
-            if (deltat) {
-                lastmoveTime = now;
-                if (deltay) speed = speed ? (speed + deltay * time_splitter / deltat) / 2 : deltay * time_splitter / deltat;
-                else if (deltay === 0) speed = 0;
-            }
-        } else if (deltat > 120) {
-            speed = 0;
+
+function speed() {
+    var speed = new Speed();
+    return function (a) {
+        var now = performance.now ? performance.now() : Date.now();
+        if (isFinite(a)) {
+            if (a === 0) speed.reset();
+            else speed.write([a], now);
+            return a;
         }
-        return speed;
+        return speed.read(now)[0];
     };
 }

package/coms/zimoli/speed_test.js

@@ -0,0 +1,34 @@
+var s = speed();
+var id = 0;
+var passed = Date.now();
+var test = async function (wait, write = '') {
+    var _id = ++id;
+    await new Promise(ok => setTimeout(ok, wait));
+    if (write) var read = s(write);
+    else var read = s();
+    var now = Date.now();
+    if (passed) var waited = now - passed;
+    else waited = 0;
+    passed = now;
+    console.log({ _id, wait, waited, read, write });
+    return read > 0.1;
+};
+await test(10, 20)
+await test(20, 30);
+await test(20, 30);
+await test(20, 30);
+await test(20);
+await test(20);
+await test(20);
+await test(20);
+await test(20);
+await test(20);
+await test(20);
+await test(20);
+await test(20);
+await test(20);
+await test(20);
+await test(20);
+await test(20);
+await test(20);
+while (await test(20));

package/coms/zimoli/table.html

@@ -1,10 +1,12 @@
-<tbody -src="d in data" :style="{'max-height':((innerHeight-46)/32|0)*32+36}">
+<tbody -src="(d,i) in data" :style="tbodyHeight()">
     <tr thead #adapter insert>
+        <td row-index>序号</td>
         <td -repeat="f in fields track by f.id" :style="{width:f.width}" @dblclick="sort(f)"><i -if="f.icon"
                 -class="f.icon"></i></span><span -if="f.name" -html="f.name"></span>
         </td>
     </tr>
     <tr>
+        <td row-index -bind="i+1"></td>
         <td -repeat="f in fields">
             <model -if="f.key" :field=f :data=d readonly></model>
             <a on-click="o.do(d)" -if="!f.key&&f.options&&(!o.when||o.when(d))"

package/coms/zimoli/table.js

@@ -146,7 +146,6 @@ function enrichField(f) {
     f.width = width + 60;
 }
 
-
 function table(elem) {
     var tableElement = isElement(elem) ? elem : document.createElement("table");
     var activeCols = [];
@@ -214,18 +213,21 @@ function table(elem) {
     table.dragbox = function () {
         return thead;
     };
+    var tbodyHeight = e => ({ 'max-height': ((innerHeight - getScreenPosition(table).top - 46) / 32 | 0) * 32 + 36 });
     care(table, function ([fields, data]) {
         thead = null;
-        this.innerHTML = template;
         fields.forEach(enrichField);
+        remove(this.children);
+        this.innerHTML = template;
+
         render(this, {
             fields,
-            tbody: list,
-            innerHeight: {
-                valueOf() {
-                    return innerHeight - getScreenPosition(table).top;
-                }
+            tbody() {
+                var e = list.apply(null, arguments);
+                css(e, tbodyHeight());
+                return e;
             },
+            tbodyHeight,
             data,
             adapter: null,
             model,
@@ -250,9 +252,10 @@ function table(elem) {
         cellMatchManager,
         function (src, dst, rel, append, parentNode) {
             if (table.src) {
-                var [fields] = table.src;
-                var [f] = fields.splice(src, 1);
-                fields.splice(dst, 0, f);
+                if (src < 1 || dst < 1) return false;
+                var fields = parentNode.$scope.fields;
+                var [f] = fields.splice(src - 1, 1);
+                fields.splice(dst - 1, 0, f);
             }
             var children = parentNode.children;
             var srcElement = children[src];

package/coms/zimoli/table.less

@@ -10,6 +10,9 @@
                 box-shadow: 1px 0 0 0 #00000033, -1px 0 0 0 #00000033;
             }
 
+            &:insert {
+                background: #999;
+            }
         }
     }
 
@@ -25,10 +28,15 @@ table,
     box-sizing: border-box;
 }
 
+* {
+    vertical-align: top;
+}
+
 & {
     outline: 1px solid #0006;
 }
 
+
 .y-ing {
     &:before {
         content: "";
@@ -91,21 +99,14 @@ table,
         }
 
         &:nth-of-type(odd) {
-
-            >td,
-            >th {
-                background-color: #eee;
-            }
+            background-color: #eee;
         }
 
         &:nth-of-type(even) {
-
-            >td,
-            >th {
-                background-color: #fff;
-            }
+            background-color: #fff;
         }
 
+
         &:hover {
 
             >td,
@@ -121,12 +122,28 @@ table,
         z-index: 1;
 
         >td {
-            background: #6669;
-            backdrop-filter: blur(20px);
             z-index: 1;
+            background: #999;
             color: #fff;
         }
     }
+
+}
+
+
+tr {
+
+    >th,
+    >td {
+        background: inherit;
+
+        &[row-index] {
+            user-select: none;
+            // pointer-events: none;
+            background: #fff;
+            text-align: right;
+        }
+    }
 }
 
 [thead] {

package/coms/zimoli/tree.less

@@ -10,8 +10,6 @@
         background-color: inherit;
         color: inherit;
         padding-right: 10px;
-        padding-top: 4px;
-        padding-bottom: 4px;
         box-shadow: none;
 
         &.line,

package/coms/zimoli/vbox.js

@@ -1,11 +1,5 @@
 function ybox(generator) {
-    var scrollY = vscroll.Y;
-    var abs = Math.abs;
-    var sqrt = Math.sqrt;
-    var sign = Math.sign || function (a) {
-        return +a > 0 ? 1 : -a > 0 ? -1 : 0;
-    };
-    var { min, max } = Math;
+    var scrollY = inertia(vscroll.Y);
     var _box;
     if (isNode(generator)) {
         _box = generator;
@@ -31,57 +25,34 @@ function ybox(generator) {
         }
         return _box.scrollTop;
     };
-    _box.stopY = _box.stopY || function (stopedY) {
-        if (isNumber(stopedY)) {
-            return stopedY;
-        }
-        return _box.Top();
-    };
     _box.scrollY = function (deltay, useIncrease = true) {
         var _Top = _box.Top();
         var top = _Top + deltay;
         var height = _box.height();
         var scrollHeight = _box.Height();
+        var r = true;
         if (top < 0) {
-            // if (speed > 30) speed = 30;
-            __speed = __speed >> 1;
-            useIncrease && _Top <= 0 && increase(top);
-            top = 0;
-            _Top = _box.Top(top);
-        } else if (top + height > scrollHeight) {
-            // if (speed > 30) speed = 30;
+            if (useIncrease && _Top <= 0) {
+                r = increase(top);
+            }
+            _box.Top(0);
+        } else if (top + height >= scrollHeight) {
             if (top + height - scrollHeight > increase_height) {
                 top = increase_height + scrollHeight - height;
             }
-            __speed = __speed >> 1;
-            useIncrease && _Top + height >= scrollHeight && increase(top + height - scrollHeight);
-            _Top = _box.Top(top);
+            if (useIncrease && top + height >= scrollHeight) {
+                r = increase(top + height - scrollHeight);
+            }
+            _box.Top(top);
         } else {
-            _Top = _box.Top(top);
+            r = top !== _box.Top(top);
             increase(deltay, true);
         }
-        return _Top;
-    };
-    var __speed = 0;
-    var smooth = function (useIncrease = true) {
-        var abs_speed = abs(__speed << 2) / time_splitter;
-        var abs_speed = abs(__speed << 2) / time_splitter;
-        if (abs_speed < 1) {
-            __speed = _speed(0);
-            decrease();
-            return;
-        }
-        onclick.preventClick = true;
-        smooth_timer = requestAnimationFrame(() => smooth(useIncrease));
-        scrollY.call(_box, -__speed, useIncrease);
-        __speed = __speed - sign(__speed) * (abs_speed - sqrt(abs_speed) * sqrt(abs_speed - 1));
+        return r;
     };
     var increaser_t = document.createElement("insert");
     addClass(increaser_t, 'y-insert');
     var increaser_b = increaser_t.cloneNode();
-    var decrease_timer = 0;
-    var time_splitter = 16;
-    var _speed = speed(time_splitter);
     var increase_height = calcPixel(100);
     var _decrease = function (increaser) {
         var height = parseInt(increaser.height);
@@ -100,16 +71,26 @@ function ybox(generator) {
             }
             increaser.height = height = height > 16 ? (height * 2 + 6) / 3 : height >> 1;
             increaser.style.height = fromOffset(height | 0);
+            return height;
+        }
+        if (increaser.height) {
+            increaser.height = 0;
+            increaser.style.height = 0;
             return 1;
         }
-        increaser.height = 0;
-        increaser.style.height = 0;
         remove(increaser);
         return 0;
     };
+    var stop = _box.stopY;
+    var stop2 = lazy(function () {
+        scrollY.smooth(stop);
+    }, 310);
     var decrease = function () {
-        if (_decrease(increaser_t) + _decrease(increaser_b)) decrease_timer = requestAnimationFrame(decrease);
-        else if (_box.stopY() - _box.Top()) decrease_timer = requestAnimationFrame(decrease);
+        var res = _decrease(increaser_t) + _decrease(increaser_b);
+        if (!res) {
+            scrollY.smooth(stop);
+        }
+        return true;
     };
     var increase = function (deltaY, minusOnly) {
         var t_height = increaser_t.height || 0;
@@ -127,15 +108,9 @@ function ybox(generator) {
                 increaser_b.height = 0;
                 increaser_b.style.height = 0;
                 appendChild(_box, increaser_b);
-                var deltaMargin = _box.scrollHeight - increaser_b.offsetTop;
+                var deltaMargin = _box.scrollHeight - increaser_b.offsetTop - parseFloat(getComputedStyle(_box).paddingBottom);
                 if (deltaMargin > 0) {
                     increaser_b.style.marginTop = fromOffset(deltaMargin);
-                    var paddingBottom = getComputedStyle(_box).paddingBottom;
-                    if (paddingBottom) {
-                        paddingBottom = "-" + paddingBottom;
-                        paddingBottom = paddingBottom.replace(/^\-{2}/, "");
-                    }
-                    increaser_b.style.marginBottom = paddingBottom;
                 }
             }
         }
@@ -145,14 +120,13 @@ function ybox(generator) {
         if (t_height < 0) t_height = 0;
         if (!minusOnly || b_height < increaser_b.height) increaser_b.height = b_height, increaser_b.style.height = fromOffset(b_height);
         if (!minusOnly || t_height < increaser_t.height) increaser_t.height = t_height, increaser_t.style.height = fromOffset(t_height);
+        return t_height < increase_height && b_height < increase_height;
     };
     if (/Edge|Trident/i.test(navigator.userAgent)) {
         // ie
         addClass(_box, "trident");
     } else {
         onmousewheel(_box, function (event) {
-            cancelAnimationFrame(smooth_timer);
-            cancelAnimationFrame(decrease_timer);
             var deltay = -event.deltaY;
             if (event.moveLocked) return;
             event.moveLocked = true;
@@ -165,33 +139,28 @@ function ybox(generator) {
             if (box === _box) {
                 event.preventDefault();
                 scrollY.call(_box, -deltay, false);
-                smooth(false);
+                stop2();
             }
         });
         bindtouch(_box, {
             start() {
-                cancelAnimationFrame(smooth_timer);
-                cancelAnimationFrame(decrease_timer);
-                _speed(0);
+                scrollY.reset();
             },
             move(scrolled) {
                 var y = -this.Top();
                 if (scrolled) {
                     var { deltay } = scrolled;
-                    __speed = _speed(deltay);
                     scrollY.call(this, -deltay);
                     y += deltay;
                 }
                 return { y };
             },
             end() {
-                __speed = _speed();
-                smooth();
+                scrollY.smooth(decrease);
             }
         }, 'y');
     }
 
-    var smooth_timer;
     var initScrollId = function () {
         var temp = this.parentNode;
         var scrollId = 0;
@@ -203,11 +172,8 @@ function ybox(generator) {
     }
     if (isMounted(_box)) initScrollId.call(_box);
     on("append")(_box, initScrollId);
-    _box.cancelFrame = function () {
-        cancelAnimationFrame(smooth_timer);
-        cancelAnimationFrame(decrease_timer);
-        __speed = _speed(0);
-    };
+    on("remove")(_box, scrollY.reset);
+    _box.cancelFrame = scrollY.reset;
     preventOverflowScrolling(_box);
     return _box;
 }

package/coms/zimoli/vscroll.js

@@ -2,8 +2,9 @@ var scroll = function () {
     var scrollY = function (deltay, useIncrease) {
         deltay = scrollOutside.call(this, deltay);
         if (isFunction(this.scrollY)) return this.scrollY(deltay, useIncrease);
-        else this.scrollTop += deltay;
-        return this.scrollTop;
+        var scrollTop = this.scrollTop;
+        this.scrollTop += deltay;
+        if (this.scrollTop === scrollTop) return false;
     };
 
     var Height = function () {

package/coms/zimoli/zIndex.js

@@ -1,4 +1,6 @@
-var count=0x10000000;//弹出式菜单或窗口的zIndex起点
-function zIndex(){
-    return count++;
+var count = 0x10000000;//弹出式菜单或窗口的zIndex起点
+function zIndex(inc = 1) {
+    inc |= 0;
+    if (inc > 0) count += inc;
+    return count;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "3.14.0",
+    "version": "3.14.8",
     "description": "一个开发工具，开放源代码，自带组件库和编译环境，可以用来开发web组件，web应用或nodejs模块，或做为已有代码的加密工具，也可以做为静态页面服务器或跨域中转服务器使用",
     "main": "public/efront.js",
     "directories": {