efront 3.14.2 → 3.14.11

package/coms/zimoli/list.js

@@ -1,5 +1,5 @@
 // 中文编码 utf8
-function ylist(container, generator, $Y, group) {
+function ylist(container, generator, $Y) {
     const cache_height = 2000;
     var restHeight = cache_height;
     var list = container || div();
@@ -54,7 +54,7 @@ function ylist(container, generator, $Y, group) {
         scrollTop += deltaY;
         for (var cx = 0, dx = children.length; cx < dx; cx++) {
             var child = children[cx];
-            if (isFinite(child.index) && child.offsetTop + child.offsetHeight >= scrollTop) {
+            if (isFinite(child.index) && child.offsetTop + child.offsetHeight > scrollTop) {
                 return child;
             }
         }
@@ -174,7 +174,7 @@ function ylist(container, generator, $Y, group) {
         }
         var indexed_item = getIndexedElement(index) || bottom_item;
         if (indexed_item) {
-            list.scrollTop = -getFirstElement().offsetTop + indexed_item.offsetTop + indexed_item.offsetHeight * ratio;
+            list.scrollTop = -getFirstElement(1).offsetTop + indexed_item.offsetTop + indexed_item.offsetHeight * ratio;
         }
     };
     var runbuild = lazy(function () {
@@ -229,7 +229,7 @@ function ylist(container, generator, $Y, group) {
         var cache_height = list.offsetHeight;
 
         var childrenMap = getChildrenMap();
-        var last_element = getLastElement();
+        var last_element = getLastElement(1);
         if (!last_element || !last_element.offsetHeight) return;
         let { scrollTop } = list;
         scrollTop += deltaY;
@@ -264,7 +264,14 @@ function ylist(container, generator, $Y, group) {
             }
         }
         if (collection.length) {
-            var { paddingCount, paddingMax } = list;
+            var item = collection[collection.length - 1];
+            var { paddingCount = 0, paddingMax } = list;
+            if (item) item = item.nextSibling;
+            if (!paddingMax) while (item && item.index % list.group) {
+                item = collection.pop();
+            }
+            var item = collection[collection.length - 1];
+            if (item) scrollTop -= item.offsetTop + getOffsetHeight(item) - collection[0].offsetTop;
             if (paddingCount > 0 && paddingMax > 0 && paddingCount < paddingMax) {
                 let item = collection[collection.length - 1];
                 while (paddingCount > 0) {
@@ -274,13 +281,6 @@ function ylist(container, generator, $Y, group) {
                     item = item.nextSibling;
                 }
             }
-            var item = collection[collection.length - 1];
-            if (item) item = item.nextSibling;
-            while (item && item.index % group) {
-                item = collection.pop();
-            }
-            var item = collection[collection.length - 1];
-            if (item) scrollTop -= item.offsetTop + getOffsetHeight(item) - collection[0].offsetTop;
             remove(collection);
         }
         //滚动到相应的位置
@@ -302,7 +302,7 @@ function ylist(container, generator, $Y, group) {
         if (!(paddingCount > 0 && paddingMax > 0 && paddingCount < paddingMax) || !(scrollTop < targetHeight)) {
             paddingCount = 0;
         }
-        while (scrollTop < targetHeight || paddingCount > 0 || offset % group) {
+        while (scrollTop < targetHeight || paddingCount > 0 || offset % list.group) {
             offset--;
             if (!(scrollTop < targetHeight)) {
                 paddingCount--;
@@ -352,36 +352,45 @@ function ylist(container, generator, $Y, group) {
         }
     };
 
-    list.stopY = function () {
+    list.stopY = function (count, spd) {
         var firstElement = getFirstVisibleElement();
-        if (!firstElement) return;
-        var paddingTop = getFirstElement().offsetTop;
+        var lastElement = getLastVisibleElement();
+        if (!firstElement || !lastElement || !list.clientHeight) return false;
+        var paddingTop = getFirstElement(1).offsetTop;
         var paddingBottom = parseFloat(getComputedStyle(list).paddingBottom);
-
-        var scrolled_t = (list.scrollTop + paddingTop - firstElement.offsetTop) / firstElement.offsetHeight;
+        var scrolled_t = (list.scrollTop - firstElement.offsetTop + paddingTop) / firstElement.offsetHeight;
+        if (scrolled_t > 1) scrolled_t -= scrolled_t | 0;
         var last_y = currentY();
-        if (scrolled_t > .5) {
+        if (spd[0] > 0) {
             var target_ty = last_y + (1 - scrolled_t) * firstElement.offsetHeight;
         } else {
             var target_ty = last_y - scrolled_t * firstElement.offsetHeight;
         }
-        var lastElement = getLastVisibleElement();
         var scrolled_b = (list.scrollTop + list.clientHeight - lastElement.offsetTop - paddingBottom) / lastElement.offsetHeight;
-        if (scrolled_b > .5) {
+        if (scrolled_b < 0) scrolled_b -= scrolled_b - 1 | 0;
+        if (spd[0] > 0) {
             var target_by = last_y + (1 - scrolled_b) * lastElement.offsetHeight;
         } else {
             var target_by = last_y - scrolled_b * lastElement.offsetHeight;
         }
         var target_y = Math.abs(target_ty - last_y) > Math.abs(target_by - last_y) ? target_by : target_ty;
         var delta = Math.min(calcPixel(60), list.clientHeight >> 2);
-        if (lastElement.offsetHeight >= delta && firstElement.offsetHeight >= delta) {
-            return last_y;
+        var deltay = Math.abs(target_y - last_y), y;
+        if (deltay >= delta) {
+            return false;
+        }
+        if (deltay < 1) y = target_y;
+        else if (deltay > count || deltay > 3) {
+            y = last_y + (target_y > last_y ? .8 : -.8);
+        }
+        else {
+            y = (target_y + last_y) / 2;
         }
-        var resultY = this.Top(Math.abs(target_y - last_y) > 1 ? (target_y + last_y) >> 1 : target_y);
-        if (resultY === last_y) {
-            target_y = resultY;
+        list.Top(y);
+        if (target_y === y) {
+            return false;
         }
-        return target_y;
+        return true;
     };
     //导出方法
     list.go = scrollTo;
@@ -406,7 +415,7 @@ function ylist(container, generator, $Y, group) {
         var firstVisible = getFirstVisibleElement();
         if (!firstVisible) return saved_itemIndex;
         var index = firstVisible.index;
-        var firstElement = getFirstElement();
+        var firstElement = getFirstElement(1);
         var scrolled = (list.scrollTop - firstVisible.offsetTop + firstElement.offsetTop + .5 | 0) / firstVisible.offsetHeight;
         return index + scrolled;
     };
@@ -486,7 +495,8 @@ function list() {
     var groupCount = /\d+/.exec($Y);
     if (groupCount) groupCount = +groupCount[0];
     $Y = /^[xh]|[xh]$/i.test($Y) ? "X" : "Y";
-    var list = ($Y === "X" ? xlist : ylist)(container, generator, $Y, groupCount || 2);
+    var list = ($Y === "X" ? xlist : ylist)(container, generator, $Y);
+    if (!list.group) list.group = groupCount || 2;
     if (bindSrc instanceof Array) {
         list.src = bindSrc;
         container.go(container.index() || 0);

package/coms/zimoli/matrix_test.js

@@ -0,0 +1,10 @@
+var test_2d = function () {
+    var m = matrix.create2d();
+    assert(m.transform([0, 1]), [0, 1])
+    m.rotate(Math.PI);
+    assert(m.transform([0, 1]), [0, -1])
+    m.rotate(Math.PI / 2);
+    assert(m.transform([1, 0]), [0, -1]);
+    assert(m.transform([0, 1]), [1, 0]);
+}
+test_2d();

package/coms/zimoli/menu.less

@@ -1,5 +1,6 @@
 & {
     white-space: nowrap;
+    outline: none;
 }
 
 &>div.lack+div.more {
@@ -114,11 +115,12 @@ body:active & {
 }
 
 &[toolbar] {
-    >menu-item{
+    >menu-item {
         padding-left: 6px;
         padding-right: 6px;
         text-align: center;
     }
+
     >menu-item.has-children {
         &::after {
             display: block;

package/coms/zimoli/oncemount.js

@@ -0,0 +1,7 @@
+function oncemount(target, handle) {
+    if (isMounted(target)) {
+        handle.call(target);
+        return;
+    }
+    once("append")(target, handle);
+}

package/coms/zimoli/onmounted.js

@@ -8,7 +8,6 @@
 function onmounted(target, handle) {
     if (isMounted(target)) {
         handle.call(target);
-        return;
     }
     onappend(target, handle);
 }

package/coms/zimoli/picture_.js

@@ -19,40 +19,33 @@ var isequal = (a, b) => a === b || Math.abs((a - b) / (a + b)) < 1e-12;
 function picture_(image = document.createElement("div")) {
     var image_width, image_height;
     var scaled, x, y, min_scale, loaded_scale, locked_scale, click_scale, loaded_x, loaded_y;
-    var origin_width, origin_height;
+    var loaded_width, loaded_height;
     var max_scale = 10 * devicePixelRatio;
     var shape = function () {
-        image.shape(x, y, scaled / devicePixelRatio, origin_rotate);
+        image.shape(x, y, scaled / devicePixelRatio, rotated);
+        loaded_rotate = rotated; loaded_scale = scaled;
     };
     image.reshape = shape;
     var park = function () {
-        if (image.park) image.park(x, y, scaled / devicePixelRatio, origin_rotate);
+        if (image.park) image.park(x, y, scaled / devicePixelRatio, loaded_rotate);
     };
-    var setInitParams = function () {
+    var loadParams = function () {
         if (!image.width) return;
         image_width = image.width / devicePixelRatio;
         image_height = image.height / devicePixelRatio;
-        origin_width = image.clientWidth;
-        origin_height = image.clientHeight;
-        origin_rotate = 0;
-        locked_scale = loaded_scale = Math.min(image.clientHeight / image_height, image.clientWidth / image_width);
-        if (loaded_scale >= 0.9) {
-            if (loaded_scale < 1.2) {
-                click_scale = 1;
-                loaded_scale = .8;
-            } else if (loaded_scale < max_scale) {
-                click_scale = loaded_scale;
-                loaded_scale = 1;
-            } else {
-                click_scale = max_scale;
-                loaded_scale = 1;
-            }
+        loaded_width = image.clientWidth;
+        loaded_height = image.clientHeight;
+        loaded_rotate = 0;
+        locked_scale = loaded_scale = Math.min(loaded_height / image_height, loaded_width / image_width);
+        if (loaded_scale >= 1) {
+            click_scale = 4;
+            loaded_scale = 1;
         } else {
             click_scale = 1;
         }
-        loaded_x = (image.clientWidth - image_width * loaded_scale) / 2;
-        loaded_y = (image.clientHeight - image_height * loaded_scale) / 2;
-        min_scale = loaded_scale * .75;
+        loaded_x = (loaded_width - image_width * loaded_scale) / 2;
+        loaded_y = (loaded_height - image_height * loaded_scale) / 2;
+        min_scale = loaded_scale * .25;
         scaled = loaded_scale;
         x = loaded_x;
         y = loaded_y;
@@ -65,7 +58,7 @@ function picture_(image = document.createElement("div")) {
         shape();
     };
 
-    on("append")(image, setInitParams);
+    on("append")(image, loadParams);
 
     on("append")(image, function () {
         mountedPictures.push(image);
@@ -73,19 +66,15 @@ function picture_(image = document.createElement("div")) {
     on("remove")(image, function () {
         removeFromList(mountedPictures, image);
     });
-    image.init = setInitParams;
+    image.init = loadParams;
     image.locked = false;
-    var last_click_time = 0;
 
-    on("click")(image, function (event) {
-        var time = +new Date;
-        var delta_time = time - last_click_time;
-        last_click_time = time;
-        if (delta_time > 300) return;
+    on("dblclick")(image, function (event) {
+        if (event.defaultPrevented) return;
+        event.preventDefault();
         var image = this;
-        var __scaled = scaled, _x = x, _y = y;
-        setInitParams();
-        image.locked = isequal(__scaled, loaded_scale) && isequal(loaded_x, x) && isequal(loaded_y, y);
+        loadParams();
+        image.locked = isequal(scaled, loaded_scale) && isequal(loaded_x, x) && isequal(loaded_y, y);
         var layerx = event.offsetX || 0;
         var layery = event.offsetY || 0;
         if (layerx)
@@ -99,23 +88,24 @@ function picture_(image = document.createElement("div")) {
                 }
                 scale(layerx, layery, click_scale / loaded_scale);
             } else {
+                click_scale = scaled;
                 set_unlock();
             }
     });
     image.getScale = function () {
         if (!this.locked && !loaded_scale) {
-            setInitParams();
+            loadParams();
         }
         return +String(+scaled + 0.00005).slice(0, 6);
     };
     var fixpos = function () {
         var width = image_width * scaled;
         var height = image_height * scaled;
-        var r = image.rotate | 0;
+        var r = rotated;
         var [, , w, h] = getrotatedltwh(r);
         var x0 = x + (width - w) / 2;
         var y0 = y + (height - h) / 2;
-        var [x1, y1] = trimCoord([image.clientWidth, image.clientHeight], [x0, y0, w, h], -1);
+        var [x1, y1] = trimCoord([loaded_width, loaded_height], [x0, y0, w, h], -1);
         x += x1 - x0;
         y += y1 - y0;
     };
@@ -139,6 +129,21 @@ function picture_(image = document.createElement("div")) {
         var centern = (n1 + n2) / 2;
         x = (x - centerx) * scale + centerm;
         y = (y - centery) * scale + centern;
+        var theta = Math.atan2(n2 - n1, m2 - m1) - Math.atan2(y2 - y1, x2 - x1);
+        var r = rotated;
+        r += (theta * 180 / Math.PI);
+        image.rotateBy(theta * 180 / Math.PI);
+        // var cosa = Math.cos(theta);
+        // var sina = Math.sin(theta);
+        // var hw = image.clientWidth / 2;
+        // var hh = image.clientHeight / 2;
+        // console.log(x, y);
+        // x -= hw;
+        // y -= hh;
+        // var x0 = x * cosa - y * sina;
+        // var y0 = x * sina + y * cosa;
+        // x = x0 + hw;
+        // y = y0 + hh;
         shape();
     };
     var recover = function (change) {
@@ -165,7 +170,9 @@ function picture_(image = document.createElement("div")) {
         fixpos();
         if (change || saved_x !== x || saved_y !== y) {
             park();
+            return;
         }
+        if (image.clientHeight && image.clientWidth) return true;
     };
     var move = inertia(function (deltax, deltay) {
         var saved_x = x, saved_y = y;
@@ -174,12 +181,12 @@ function picture_(image = document.createElement("div")) {
         shape();
         if (saved_x === x && saved_y === y) return false;
     });
-    var saved_event, wheeltime;
+    var saved_event;
     onmousewheel(image, function (event) {
         var { offsetX: layerX, offsetY: layerY, deltaY } = event;
         if (this.locked) event.preventDefault();
         if (!deltaY) return;
-        if (!this.locked) setInitParams();
+        if (!this.locked) loadParams();
         this.locked = true;
         var ratio = Math.pow(0.99, 20 * Math.atan(deltaY / 20));
         var __scaled = scaled;
@@ -199,7 +206,7 @@ function picture_(image = document.createElement("div")) {
             saved_event = event;
             event.moveLocked = scaled > locked_scale;
             if (!this.locked) {
-                setInitParams();
+                loadParams();
             }
             move.reset();
         },
@@ -215,7 +222,6 @@ function picture_(image = document.createElement("div")) {
 
                 switch (event.touches.length) {
                     case 1:
-                        if (!this.locked) return;
                         break;
                     case 2:
                         this.locked = true;
@@ -253,13 +259,13 @@ function picture_(image = document.createElement("div")) {
             }
             saved_event = null;
             event.moveLocked = scaled >= locked_scale;
-
-            if (this.locked && onclick.preventClick) move.smooth(recover);
+            if (this.locked && onclick.preventClick) move.smooth();
         }
     });
-    var origin_rotate = 0;
+    var loaded_rotate = 0, rotated = 0;
     var rotatexy = function (x1, y1, x2, y2) {
-        var centerx = image.clientWidth / 2, centery = image.clientHeight / 2;
+        var { left, top } = getScreenPosition(image);
+        var centerx = left + image.clientLeft + image.clientWidth / 2, centery = top + image.clientTop + image.clientHeight / 2;
         var deltax = x2 - x1, deltay = y2 - y1;
         var rx = x1 - centerx, ry = y1 - centery;
         var sign = -ry * deltax + rx * deltay;
@@ -268,22 +274,22 @@ function picture_(image = document.createElement("div")) {
         if (sign) image.rotateBy(sign > 0 ? delta : -delta);
     }
     var updatexy = function () {
-        var deg = image.rotate - origin_rotate;
+        var deg = rotated - loaded_rotate;
         if (isFinite(deg)) {
-            origin_rotate = image.rotate;
+            loaded_rotate = rotated;
             [x, y] = getrotatedltwh(deg, scaled);
         }
     };
     var getrotatedltwh = function (a, s = scaled) {
         var w = image_width * s;
         var h = image_height * s;
-        var c = [image.clientWidth / 2, image.clientHeight / 2];
+        var c = [loaded_width / 2, loaded_height / 2];
         var m = x + w / 2;
         var n = y + h / 2;
         var [c1, c2] = rotate([m, n], -a, c);
         c1 -= w / 2;
         c2 -= h / 2;
-        var a = origin_rotate;
+        var a = loaded_rotate;
         var l = c[0] - w / 2;
         var r = l + w;
         var t = c[1] - h / 2;
@@ -301,29 +307,28 @@ function picture_(image = document.createElement("div")) {
     image.update = function (animate) {
         if (image.locked) {
             updatexy();
-            x += (image.clientWidth - origin_width) / 2;
-            y += (image.clientHeight - origin_height) / 2;
-            origin_height = image.clientHeight;
-            origin_width = image.clientWidth;
+            x += (image.clientWidth - loaded_width) / 2;
+            y += (image.clientHeight - loaded_height) / 2;
+            loaded_height = image.clientHeight;
+            loaded_width = image.clientWidth;
             if (animate !== false) fixpos();
             shape();
             return;
         }
-        setInitParams();
+        loadParams();
         if (animate !== false) {
-            recover();
+            move.smooth(recover);
         } else {
-            if (animate !== false) fixpos();
             shape();
         }
 
     };
     image.rotateTo = function (deg) {
-        this.rotate = deg;
+        rotated = deg;
         this.update();
     };
     image.rotateBy = function (deg) {
-        var r = this.rotate | 0;
+        var r = rotated;
         if (deg === 90 || deg === -90) {
             r += deg;
             if (deg > 0) {
@@ -346,9 +351,10 @@ function picture_(image = document.createElement("div")) {
         } else {
             r += deg;
         }
-        this.rotate = r;
+        rotated = r;
         this.update(deg === 90 || deg === -90);
     };
+    on('remove')(image, move.reset);
     on("contextmenu")(image, function (e) {
         if (onclick.preventClick) e.preventDefault();
     });

package/coms/zimoli/popup.js

@@ -233,7 +233,7 @@ var _as_yextra = function (global, innerWidth, innerHeight, element, target, poi
             display: element.style.display
         };
     }
-    var zindex = zIndex();
+    var zindex = zIndex(0) + 1;
     css(element, `position:absolute;z-index:${zindex}`);
     css(_rhomb, { zIndex: zindex });
     var release1 = onremove(target, function () {

package/coms/zimoli/render.js

@@ -3,11 +3,13 @@ var renderElements = Object.create(null);
 var presets = Object.create(null);
 presets.template = function (t) {
     var comment = document.createComment('template');
+    comment.$scope = t.$scope;
+    comment.$parentScopes = t.$parentScopes;
     once("append")(comment, function () {
         var node = document.createElement(comment.parentNode.tagName || "div");
         node.innerHTML = t.innerHTML;
         comment.with = [].slice.call(node.childNodes, 0);
-        appendChild.after(comment,comment.with);
+        appendChild.after(comment, comment.with);
         renderElement(comment.with, comment.$scope, comment.$parentScopes);
     });
     return comment;
@@ -692,7 +694,7 @@ function renderElement(element, scope = element.$scope, parentScopes = element.$
     }
     for (var k in props) {
         try {
-            element[k] = props[k];
+            if (element[k] !== props[k]) element[k] = props[k];
         } catch (e) { }
     }
     ons.forEach(([on, key, value]) => on.call(element, key, [withContext, value]));
@@ -782,6 +784,9 @@ function renderStructure(element, scope, parentScopes = []) {
             element.removeAttribute(name);
         }
         else {
+            if (!/\-/.test(name) || value === '') {
+                copys.push(attr);
+            }
             props[name.replace(/\-(\w)/g, (_, w) => w.toUpperCase())] = value === "" ? true : value;
         }
     }

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/tree.less

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