efront 3.14.2 → 3.14.11

package/coms/zimoli/vbox.js

@@ -1,10 +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 scrollY = inertia(vscroll.Y);
     var _box;
     if (isNode(generator)) {
         _box = generator;
@@ -30,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 smooth(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);
@@ -99,31 +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_timer = 0, stop_id = 0, cancel_id = 0;
-    var stop = lazy(function stop() {
-        if (cancel_id !== stop_id) return;
-        if (Math.abs(_box.stopY() - _box.Top() )> 0.0001) stop_timer = setTimeout(stop, 16);
+    var stop = _box.stopY;
+    var stop2 = lazy(function () {
+        scrollY.smooth(stop);
     }, 310);
-    var cancelFrame = function () {
-        __speed = _speed(0);
-        clearTimeout(stop_timer);
-        cancelAnimationFrame(smooth_timer);
-        cancelAnimationFrame(decrease_timer);
-        return ++cancel_id;
-    };
     var decrease = function () {
-        if (_decrease(increaser_t) + _decrease(increaser_b)) decrease_timer = requestAnimationFrame(decrease);
-        else {
-            stop_id = cancel_id;
-            stop();
+        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;
@@ -141,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;
                 }
             }
         }
@@ -159,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;
@@ -179,31 +139,28 @@ function ybox(generator) {
             if (box === _box) {
                 event.preventDefault();
                 scrollY.call(_box, -deltay, false);
-                smooth(false);
+                stop2();
             }
         });
         bindtouch(_box, {
             start() {
-                cancelFrame();
+                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;
@@ -215,7 +172,8 @@ function ybox(generator) {
     }
     if (isMounted(_box)) initScrollId.call(_box);
     on("append")(_box, initScrollId);
-    _box.cancelFrame = cancelFrame;
+    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.2",
+    "version": "3.14.11",
     "description": "一个开发工具，开放源代码，自带组件库和编译环境，可以用来开发web组件，web应用或nodejs模块，或做为已有代码的加密工具，也可以做为静态页面服务器或跨域中转服务器使用",
     "main": "public/efront.js",
     "directories": {