efront 3.25.7 → 3.25.11

package/coms/zimoli/on.js

@@ -1,9 +1,28 @@
 // "use strict";
 if (document.efronton) return document.efronton;
 var is_addEventListener_enabled = "addEventListener" in window;
+// Edg 禁用passive原因：无滚动条的元素上纵向滚动时触发整个页面回弹
+// Chrome 禁用passive原因：无滚动条的元素上横向滚动触发浏览器导航
+var supportPassive = false, preventPassive = /Edg|Chrome/.test(navigator.userAgent);
+if (is_addEventListener_enabled) try {
+    window.addEventListener('test', null, { get passive() { return supportPassive = true } });
+} catch { }
+
+var listenerOptions = [];
+/**
+ * @param {EventNeed} eventtype
+ */
+var getListenerOption = function (eventtype, k) {
+    if (!supportPassive || preventPassive && /wheel$/.test(k)) return eventtype.capture;
+    var index = +eventtype.capture | +eventtype.passive << 1;
+    if (!listenerOptions[index]) listenerOptions[index] = { capture: eventtype.capture, passive: eventtype.passive };
+    return listenerOptions[index];
+};
+
 if ('attachEvent' in document) {
     is_addEventListener_enabled = false;
 }
+
 if (!is_addEventListener_enabled) var __call = function (target, context, handler, firstmost) {
     // use strict 无效的情况
     if (isEmpty(target)) {
@@ -16,7 +35,7 @@ if (!is_addEventListener_enabled) var __call = function (target, context, handle
 
 var handlersMap = {};
 var changes_key = 'changes';
-var eventtypereg = /(?:\.once|\.prevent|\.stop|\.capture|\.self|\.passive|\.[a-z0-9]+)+\.?$/i;
+var eventtypereg = /(?:\.once|\.prevent|\.stop|\.capture|\.self|\.passive|\.only|\.[!-~←↑→↓⇄↵⨉]+)+\.?$/i;
 var keyCodeMap = {
     backspace: 8,
     tab: 9,
@@ -134,24 +153,25 @@ var keyCodeMap = {
     "\"": 222,
     bright: 255,
 };
+class EventNeed {
+    once = false;
+    stop = false;
+    capture = false;
+    self = false;
+    prevent = false;
+    passive = false;
+    keyNeed = [];
+    keyCode = 0
+};
 var parseEventTypes = function (eventtypes) {
-    var types = {
-        once: false,
-        stop: false,
-        capture: false,
-        self: false,
-        prevent: false,
-        passive: false,
-        keyNeed: [],
-        keyCode: 0,
-    };
+    var types = new EventNeed;
     var keyneed = types.keyNeed;
     eventtypes = eventtypereg.exec(eventtypes);
     if (eventtypes) eventtypes = eventtypes[0].slice(1);
     if (eventtypes) {
         var etypes = eventtypes.split(".");
         etypes.forEach(t => {
-            if (t.length === 1) {
+            if (t.length === 1 && /^[0-9a-zA-Z]$/.test(t)) {
                 types.keyCode = t.toUpperCase().charCodeAt(0);
                 return;
             }
@@ -166,7 +186,9 @@ var parseEventTypes = function (eventtypes) {
                     keyneed.push(t);
                     break;
                 case "":
+                case "only":
                     if (!types.keyCode) types.keyCode = true;
+                    types.only = true;
                     break;
                 default:
                     if (isFinite(t)) {
@@ -175,6 +197,9 @@ var parseEventTypes = function (eventtypes) {
                     else if (keyCodeMap[t]) {
                         types.keyCode = keyCodeMap[t];
                     }
+                    else {
+                        throw new Error(`绑定事件参数无效${t}`);
+                    }
 
             }
 
@@ -182,14 +207,25 @@ var parseEventTypes = function (eventtypes) {
     }
     return types;
 }
+/**
+ * @param {EventNeed} eventtypes
+ * @param {Event} e;
+ */
 function checkKeyNeed(eventtypes, e) {
     var keyneed = eventtypes.keyNeed;
+    var keykeep = {}
     if (eventtypes.keyNeed) {
         for (var cx = 0, dx = keyneed.length; cx < dx; cx++) {
             var key = keyneed[cx];
+            keykeep[key] = true;
             if (!e[key + "Key"]) return false;
         }
     }
+    if (eventtypes.only) {
+        for (var key of ["meta", 'shift', 'ctrl', 'alt']) {
+            if (!keykeep[key] && e[key + "Key"]) return false;
+        }
+    }
     if (eventtypes.keyCode === true) {
         for (var cx = 0, dx = keyneed.length; cx < dx; cx++) {
             var key = keyneed[cx];
@@ -232,7 +268,7 @@ var remove = function (k, hk, [eventtypes, handler, context]) {
         if (!hs.length && hs.h) {
             element[hk] = null;
             if (is_addEventListener_enabled) {
-                element.removeEventListener(k, hs.h, /1$/.test(hk));
+                element.removeEventListener(k, hs.h, getListenerOption(eventtypes, k));
             } else {
                 if (element["on" + k] === hs.h) element["on" + k] = null;
             }
@@ -242,6 +278,7 @@ var remove = function (k, hk, [eventtypes, handler, context]) {
 var broadcast = function (k, hk, event) {
     var element = this;
     var handlers = element[hk];
+    if (!handlers) console.log(handlers, hk, event, element)
     if (handlers.length > 1) handlers = handlers.slice();
     if (event.which === 1 && event.buttons === 0) {
         // firefox 无按键
@@ -259,7 +296,7 @@ var broadcast = function (k, hk, event) {
         if (eventtypes.self && event.target !== element) continue;
         if (!checkKeyNeed(eventtypes, event)) continue;
         if (eventtypes.stop) event.stopPropagation();
-        if (eventtypes.passive) event.preventDefault = function () { };
+        if (eventtypes.passive && !preventPassive) event.preventDefault = function () { };
         if (eventtypes.prevent) event.preventDefault();
         if (handler instanceof Array) {
             for (var h of handler) {
@@ -305,6 +342,7 @@ var on = document.efronton = function (k) {
     k = k.replace(eventtypereg, '');
     var handler_path = k + "handlers";
     var hk = handler_path + +!!eventtypes.capture;
+    if (supportPassive) hk += +!!eventtypes.passive;
     if (is_addEventListener_enabled) var addhandler = function (context, handler, firstmost = false) {
         var target = this || context;
         target = checkroot(target, k);
@@ -313,7 +351,7 @@ var on = document.efronton = function (k) {
             var h = broadcast.bind(target, k, hk);
             target[hk] = [];
             target[hk].h = h;
-            target.addEventListener(k, h, eventtypes.capture);
+            target.addEventListener(k, h, getListenerOption(eventtypes, k));
         }
         var listener = [eventtypes, handler, context];
         append.call(target, k, hk, listener, firstmost);
@@ -459,7 +497,7 @@ var invoke = function (event, type, pointerType) {
             isClickWithPointer = false;
             var saved_time = lasttime_click;
             lasttime_click = event.timeStamp;
-            if (!need || lasttime_click - saved_time < 60 || onclick.preventClick || touchendFired && !event.touchend) {
+            if (!need || lasttime_click - saved_time < 120 || onclick.preventClick || touchendFired && !event.touchend) {
                 // 阻止非人为点击，防止误操作
                 event.preventDefault();
                 event.stopPropagation();

package/coms/zimoli/onmousewheel.js

@@ -1,4 +1,4 @@
-var _onmousewheel = "onmousewheel" in window || "onmousewheel" in document ? on("mousewheel") : on("DOMMouseScroll");
+var _onmousewheel = "onmousewheel" in window || "onmousewheel" in document ? on("mousewheel.passive") : on("DOMMouseScroll.passive");
 var addDeltaY = function (event) {
     if (isNumber(event.deltaY)) return;
     if (isNumber(event.wheelDeltaY)) {

package/coms/zimoli/popup.js

@@ -1,8 +1,9 @@
 /**
  * 弹出层
  */
-onkeydown(document, function (e) {
-    if (e.which === 27 && rootElements.length) {
+on("keydown.esc.only")(document, function (e) {
+    if (e.defaultPrevented) return;
+    if (rootElements.length) {
         var r = rootElements.pop();
         if (r) {
             r.blur();
@@ -235,19 +236,16 @@ var _as_yextra = function (global, innerWidth, innerHeight, element, target, poi
     var zindex = zIndex(0) + 1;
     css(element, `position:absolute;z-index:${zindex}`);
     css(_rhomb, { zIndex: zindex });
-    var release1 = onremove(target, function () {
-        remove(element);
-    });
-    var release2 = onremove(element, function () {
-        release1();
-        release2();
-        remove(_rhomb);
-        if (document.removeEventListener) {
-            document.removeEventListener("scroll", reshape, true);
-            window.removeEventListener("resize", reshape);
-        }
+    onmounted(element, function () {
+        var release1 = onremove(target, function () {
+            remove(element);
+        });
+        var release2 = onremove(element, function () {
+            release1();
+            release2();
+            remove(_rhomb);
+        });
     });
-    global(element, false);
     var reshape = function () {
         extend(element.style, element.origin);
         var position = getScreenPosition(target);
@@ -290,7 +288,6 @@ var _as_yextra = function (global, innerWidth, innerHeight, element, target, poi
         }
         var side;
         if (aimedWidth !== originWidth) {
-            console.log(originWidth,aimedWidth)
             css(element, { width: fromOffset(aimedWidth) });
         }
         if (position.top + element.offsetHeight + position.height > innerHeight) {
@@ -333,13 +330,11 @@ var _as_yextra = function (global, innerWidth, innerHeight, element, target, poi
         } else if (_rhomb && !_rhomb.parentNode) {
             appendChild.before(element, _rhomb)
         }
-    }
-    if (document.addEventListener) {
-        document.addEventListener("scroll", reshape, true);
-        window.addEventListener("resize", reshape);
-    }
-    reshape();
-    lazy(reshape)();
+    };
+    bind("resize")(element, reshape);
+    bind("scroll.capture.passive", document)(element, reshape);
+    onmounted(element, reshape);
+    global(element, false);
 };
 var _as_xextra = arriswise(_as_yextra, arguments);
 var popup_as_single = function (element) {

package/coms/zimoli/render.js

@@ -97,7 +97,8 @@ var createComment = function (renders, type, expression) {
         appendChild.after(this, comment);
         if (!/^if|^else/i.test(type)) remove(this);
     }
-    comment.template = this;
+    comment.$template = this;
+    this.$comment = comment;
     return comment;
 };
 
@@ -173,7 +174,7 @@ var createRepeat = function (search, id = 0) {
         var $parentScopes = element.$parentScopes || [];
         var $struct = element.$struct;
         if (element.$scope) {
-            $struct = extend({}, $struct, { context: $struct.context + `with(this.$parentScopes[${$parentScopes.length}])` }), $parentScopes = $parentScopes.concat(element.$scope);
+            $struct = extend({}, $struct, { context: $struct.context + `with(this.$parentScopes[${$parentScopes.length}])` }), $parentScopes = $parentScopes.slice(), $parentScopes.push(element.$scope);
         }
         var clonedElements1 = Object.create(null);
         var cloned = keys.map(function (key, cx) {
@@ -247,15 +248,16 @@ var createIf = function (search, id = 0) {
         for (var cx = 0, dx = elements.length; cx < dx; cx += 2) {
             var c = elements[cx];
             if (cx === shouldMount) {
-                var e = c.template;
+                var e = c.$template;
                 appendChild.after(c, e);
                 if (e.renderid < 0) {
                     e.renderid = id;
-                    c.template = render(e, this.$scope, this.$parentScopes);
+                    e = c.$template = render(e, this.$scope, this.$parentScopes);
+                    e.$comment = c;
                 }
             }
             else {
-                remove(c.template);
+                remove(c.$template);
             }
         }
 

package/coms/zimoli/resize.js

@@ -155,6 +155,7 @@ resize.on = function (elem, dragHandle) {
     if (elem) {
         elem.dragHandle = dragHandle;
     }
+    elem.resizable = true;
     onmounted(elem, function () {
         if (!offmousemove) offmousemove = onmousemove(window, getResizer);
         if (!~resizingElements.indexOf(elem)) {

package/coms/zimoli/slider.js

@@ -112,29 +112,40 @@ function slider(autoplay, circle = true) {
             left: round((indexRight - index) * width) + "px"
         });
     };
+    var savedtime = 0;
+    var animate0 = function () {
+        savedtime = Speed.now() - 1;
+        animate();
+    };
     var animate = function () {
         cancelAnimationFrame(timer_animate);
         var width = outter.clientWidth;
+        var now = +Speed.now();
         if (abs(current_index + negative_index) < 1.25 / width)
             return reshape(-negative_index, false);
         timer_animate = requestAnimationFrame(animate);
-        reshape((current_index * 3 - negative_index) / 4);
+        var temp_index = current_index;
+        while (savedtime < now) {
+            temp_index = (temp_index * 11 - negative_index) / 12;
+            savedtime += 6;
+        }
+        reshape(temp_index);
     };
     var park = function () {
         direction = 0;
         var singleTarget = getSingleTarget();
-        var spd = _speed();
+        var spd = _speed() * 40;
         if (singleTarget) {
             negative_index = round(negative_index);
         }
         else if (delta_negative_index > 0) {
-            if (negative_index - floor(negative_index) > 0.2 / (1 + abs(spd)))
+            if (negative_index - floor(negative_index) > .007 / (.07 + 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 + abs(spd)))
+            if (ceil(negative_index) - negative_index > .007 / (.07 + abs(spd)))
                 negative_index = floor(negative_index);
             else
                 negative_index = ceil(negative_index);
@@ -142,7 +153,8 @@ function slider(autoplay, circle = true) {
         else {
             negative_index = round(negative_index);
         }
-        animate();
+        savedtime = 0;
+        animate0();
         var event = createEvent("park");
         event.index = -negative_index;
         dispatch(outter, event);
@@ -176,7 +188,7 @@ function slider(autoplay, circle = true) {
             if (enabled) outter.go(outter.index + count);
         } else {
             if (enabled) negative_index -= count;
-            animate();
+            animate0();
         }
         return enabled;
     };
@@ -186,7 +198,7 @@ function slider(autoplay, circle = true) {
         var singleTarget = getSingleTarget();
         if (singleTarget) {
             var current_Left = singleTarget.offsetLeft;
-            var avail_deltaWidth = round(width >> 2);
+            var avail_deltaWidth = Math.min(round(width >> 2), 120);
             if (current_Left + deltax > avail_deltaWidth) {
                 deltax = avail_deltaWidth - current_Left;
                 saved_x += deltax;
@@ -274,8 +286,10 @@ function slider(autoplay, circle = true) {
         css(_imageMain, "z-index:0;transform:scale(.92);opacity:0;transition:none");
         setTimeout(() => css(_imageMain, "transform:scale(1);opacity:1;transition:.2s transform ease-out,.4s opacity"), 0);
         if (player.ing) play();
-        return outter;
-    }, 20);
+    }, 20, outter);
+    onmounted(outter, function () {
+        reshape(current_index);
+    });
     outter.play = function (schedule = player.schedule, _isMiss) {
         if (isDefined(_isMiss)) {
             isMiss = _isMiss;

package/coms/zimoli/slider_test.js

@@ -10,7 +10,7 @@ render(page, {
             return ele;
         });
         var _slider = slider(images, 0 !== +element.getAttribute("circle"));
-        _slider.go(0).play();
+        _slider.play();
         window.Slider = _slider;
         return _slider;
     }

package/coms/zimoli/table.js

@@ -424,10 +424,12 @@ function table(elem) {
         var $scope = {
             fields,
             isEmpty,
+            tbody0: null,
             tbody(e) {
                 var e = list.apply(null, arguments);
                 css(e, tbodyHeight(e));
                 css(e, { width: this.adapter.offsetWidth, display: 'block' });
+                this.tbody0 = e;
                 return e;
             },
             thead(t) {
@@ -440,7 +442,7 @@ function table(elem) {
                 return tr;
             },
             tbodyHeight,
-            data: Table.from(fields, await data),
+            data,
             adapter: null,
             resizeT,
             model,
@@ -455,6 +457,10 @@ function table(elem) {
             pagination
         };
         render(this, $scope, this.$parentScopes.concat(this.$scope));
+        $scope.data = Table.from(fields, await data);
+        $scope.data.callback = function () {
+            if ($scope.tbody0) $scope.tbody0.go($scope.tbody0.index());
+        };
     })
     autodragchildren(
         table,

package/coms/zimoli/touchList.js

@@ -24,7 +24,7 @@ var touchstart = function (event) {
     }
     if (!target) return;
     cancelAnimationFrame(target.scrollTimer);
-    saved_x = null;
+    saved_x = event.clientX, saved_y = event.clientY, moving = false, 0;
     currentTarget = target;
     if (!target.querySelector(".ylife-touch-delete")) {
         css(target, {
@@ -37,11 +37,10 @@ var touchstart = function (event) {
 };
 var moving = false;
 var touchmove = function (event) {
-    if (!saved_x) return saved_x = event.clientX, saved_y = event.clientY, moving = false, 0;
     var delta_x = event.clientX - saved_x;
     var delta_y = event.clientY - saved_y;
     if (!moving) {
-        if (Math.abs(delta_x) < 2 && Math.abs(delta_y) < 2) return;
+        if (Math.abs(delta_x) < MOVELOCK_DELTA && Math.abs(delta_y) < MOVELOCK_DELTA) return;
         if (Math.abs(delta_y) < Math.abs(delta_x)) {
             moving = 1;
         } else {
@@ -49,28 +48,35 @@ var touchmove = function (event) {
         }
     }
     if (moving !== 1) return;
-    event.preventDefault();
-    var marginLeft = -parseInt(currentTarget.scrollLeft) || 0;
-    if (delta_x + marginLeft > 0) {
-        delta_x = -marginLeft;
+    event.moveLocked = true;
+    var buttonWidth = currentTarget.scrollWidth - currentTarget.clientWidth;
+    var scrollLeft = -currentTarget.scrollLeft;
+    if (delta_x + scrollLeft > 0) {
+        delta_x = -scrollLeft;
     }
-    else if (delta_x + marginLeft < - calcPixel(85)) {
-        delta_x = -calcPixel(85) - marginLeft;
+    else if (delta_x + scrollLeft < - buttonWidth) {
+        delta_x = -buttonWidth - scrollLeft;
     }
-    marginLeft += delta_x;
+    scrollLeft += delta_x;
     saved_x += delta_x;
     direction = delta_x;
-    currentTarget.scrollLeft = -marginLeft;
+    currentTarget.scrollLeft = -scrollLeft;
 };
 var scrollTo = function (targetLeft) {
     if (!this) return;
     cancelAnimationFrame(this.scrollTimer);
     var that = this;
+    var scrollTime = +Speed.now();
     var reshape = function () {
-        var currentLeft = parseInt(that.scrollLeft) || 0;
+        var currentLeft = that.scrollLeft;
         if (0 === (0 | currentLeft - targetLeft)) return;
-        var thisTimeLeft = (targetLeft + currentLeft * 3) / 4 | 0;
-        if (Math.abs(thisTimeLeft - currentLeft) < 3) {
+        var now = +Speed.now();
+        var thisTimeLeft = currentLeft;
+        while (scrollTime < now) {
+            scrollTime += 6;
+            thisTimeLeft = (thisTimeLeft * 11 + targetLeft) / 12;
+        }
+        if (Math.abs(thisTimeLeft - currentLeft) < .5) {
             thisTimeLeft = targetLeft;
         } else {
             that.scrollTimer = requestAnimationFrame(reshape);
@@ -94,10 +100,10 @@ var scrollToRight = function () {
 var touchend = function () {
     var marginLeft = -parseInt(currentTarget.scrollLeft) || 0;
     moving = false;
-    if (direction < 0 && marginLeft < -calcPixel(20)) {
+    if (direction < 0 && marginLeft < -7) {
         scrollToLeft.call(currentTarget);
     }
-    else if (direction > 0 && marginLeft > -currentTarget.clientWidth + calcPixel(20)) {
+    else if (direction > 0 && marginLeft > -currentTarget.clientWidth + 7) {
         scrollToRight.call(currentTarget);
     }
     else if (marginLeft < currentTarget.clientWidth - currentTarget.scrollWidth >> 1) {
@@ -130,9 +136,5 @@ function touchList(listElement) {
         move: touchmove,
         end: touchend
     });
-    // ontouchstart(listElement, touchstart);
-    // ontouchmove(listElement, touchmove);
-    // ontouchend(listElement, touchend);
-    // ontouchcancel(listElement, touchend);
     return listElement;
 }

package/coms/zimoli/vbox.js

@@ -60,9 +60,11 @@ function ybox(generator) {
     var increaser_t = document.createElement("insert");
     addClass(increaser_t, 'y-insert');
     var increaser_b = increaser_t.cloneNode();
+    increaser_b.height = 0;
+    increaser_t.height = 0;
     var increase_height = calcPixel(100);
-    var _decrease = function (increaser) {
-        var height = parseInt(increaser.height);
+    var _decrease = function (increaser, t) {
+        var height = increaser.height;
         if (height > 1) {
             var scrollTop = _box.$Top();
             if (scrollTop > 0 && increaser_t === increaser) {
@@ -76,8 +78,9 @@ function ybox(generator) {
                 var deltaY = tH - bH - scrollTop > height ? height : tH - bH - scrollTop;
                 height -= deltaY;
             }
-            increaser.height = height = height > 16 ? (height * 2 + 6) / 3 : height >> 1;
-            increaser.style.height = fromOffset(height | 0);
+            height = height * Math.pow(.92, t / 6);
+            increaser.height = height
+            increaser.style.height = fromOffset(height);
             return height;
         }
         if (increaser.height) {
@@ -92,16 +95,16 @@ function ybox(generator) {
     var stop2 = lazy(function () {
         scrollY.smooth(stop);
     }, 40);
-    var decrease = function () {
-        var res = _decrease(increaser_t) + _decrease(increaser_b);
+    var decrease = function (t) {
+        var res = _decrease(increaser_t, t) + _decrease(increaser_b, t);
         if (!res) {
             scrollY.smooth(stop);
         }
         return true;
     };
     var increase = function (deltaY, minusOnly) {
-        var t_height = increaser_t.height || 0;
-        var b_height = increaser_b.height || 0;
+        var t_height = increaser_t.height;
+        var b_height = increaser_b.height;
         t_height -= deltaY;
         b_height += deltaY;
         if (!minusOnly && deltaY < 0 && t_height > 0) {

package/docs/main.js

@@ -11,4 +11,7 @@ contextmenu(document, function (event) {
             }
         }
     ]);
+})
+on("beforeunload")(window, function () {
+    zimoli.clearHistory();
 })

package/package.json

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