efront 3.25.3 → 3.25.8

package/coms/zimoli/getName.js

@@ -1,9 +1,17 @@
 var hasOwnProperty = {}.hasOwnProperty;
 function getName(o) {
-    if (hasOwnProperty.call(o, 'toString')) return o.toString();
-    if ("name" in o) return o.name;
-    if ("label" in o) return o.label;
-    if ("value" in o) return o.value;
-    if (hasOwnProperty.call(o, 'valueOf')) return o.valueOf();
-    return o;
+    var name;
+    if (isEmpty(o)) return '';
+    if (!isObject(o)) return String(o);
+    if (hasOwnProperty.call(o, 'toString')) {
+        name = o.toString();
+        if (!isEmpty(name)) return String(name);
+    }
+    if (!isEmpty(o.name)) return String(o.name);
+    if (!isEmpty(o.title)) return String(o.title);
+    if (!isEmpty(o.label)) return String(o.label);
+    if (!isEmpty(o.value)) return String(o.value);
+    if (hasOwnProperty.call(o, 'valueOf')) name = o.valueOf();
+    if (!isEmpty(name)) return String(name);
+    return String(o);
 }

package/coms/zimoli/hexagon.js

@@ -0,0 +1,33 @@
+var hexagon = function (c = "#fff", lineWidth = devicePixelRatio) {
+    var image = document.createElement('canvas');
+    image.width = 9 * lineWidth;
+    image.height = 16 * lineWidth;
+    image.src = true;
+    var { width, height } = image;
+    var w = width;
+    var h = height;
+
+    var ctx = image.getContext("2d");
+    ctx.beginPath();
+    var cx = lineWidth / 2;
+    var cy = 0;
+    ctx.moveTo(cx, cy);
+    /* |   */ctx.lineTo(cx, cy + h / 6);
+    /*  \  */ctx.lineTo(cx + w / 2, cy + h / 3);
+    /*   | */ctx.lineTo(cx + w / 2, cy + h * 2 / 3);
+    /*  /  */ctx.lineTo(cx, cy + h * 5 / 6);
+    /* |   */ctx.lineTo(cx, cy + h);
+    ctx.moveTo(cx + w / 2, cy + h / 3);
+    /*   / */ctx.lineTo(cx + w, cy + h / 6);
+    ctx.moveTo(cx + w / 2, cy + h * 2 / 3);
+    /*   \ */ctx.lineTo(cx + w, cy + h * 5 / 6);
+    ctx.moveTo(cx, cy + h / 6);
+    ctx.lineTo(cx - w / 2, cy + h / 3);
+    ctx.moveTo(cx - w / 2, cy + h * 2 / 3);
+    ctx.lineTo(cx, cy + h * 5 / 6);
+    ctx.strokeStyle = c;
+    ctx.lineWidth = lineWidth;
+    ctx.stroke();
+    image.complete = true;
+    return image;
+}

package/coms/zimoli/list.js

@@ -365,7 +365,7 @@ function ylist(container, generator, $Y) {
         }
     };
     list.getLastVisibleElement = getLastVisibleElement;
-    list.$stopY = function (count, spd) {
+    list.$stopY = function (t, spd) {
         var firstElement = getFirstVisibleElement();
         var lastElement = getLastVisibleElement();
         if (!firstElement || !lastElement || !list.clientHeight) return false;
@@ -388,15 +388,15 @@ function ylist(container, generator, $Y) {
         }
         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);
-        var deltay = Math.abs(target_y - last_y), y;
-        if (deltay >= delta) {
+        var absy = Math.abs(target_y - last_y), y;
+        if (absy >= delta) {
             return false;
         }
-        if (deltay < 2) y = target_y;
+        if (absy <= 1) y = target_y;
         else {
             var speed = Math.abs(spd.read()[0]);
             if (speed < 1) speed = 1;
-            if (deltay < 3) speed = .5;
+            if (absy < 3) speed = .5;
             y = last_y + (target_y > last_y ? speed : -speed);
         }
         list.$Top(y);

package/coms/zimoli/menuItem.html

@@ -1,6 +1,9 @@
-<i ng-class="icon?" ng-if='useIcon||hasIcon'></i>
+<template -if='useIcon||hasIcon||icon'>
+    <i ng-class="icon?"></i>
+    &nbsp;&nbsp;
+</template>
 <span ng-html="name?"></span>
-<template -if="hotkey?">
+<template -if="hotkey?.length">
     &nbsp;&nbsp; <span ng-repeat="k of hotkey" class="hotkey" ng-html="k"></span>
 </template>
 <s></s>

package/coms/zimoli/menuItem.less

@@ -1,6 +1,6 @@
 i {
     display: inline-block;
-    width: 1em;
+    vertical-align: middle;
 }
 
 .hotkey {

package/coms/zimoli/menuList.js

@@ -1,3 +1,4 @@
+var _active = action;
 var mounted_menus = [], releaseTimer = 0, root_menu;
 var release = function () {
     clear();
@@ -164,9 +165,16 @@ function register() {
     on('keydown.space')(menu, keyspace);
     on("contextmenu")(menu, e => e.preventDefault());
 }
-function main(page, items, active, direction = 'y') {
+function main() {
+    var page, items, active = _active, direction = 'y';
+    for (var a of arguments) {
+        if (isNode(a)) page = a;
+        else if (a instanceof Function) active = a;
+        else if (a instanceof Array) items = a;
+        else if (typeof a === 'string') direction = a;
+    }
     if (!isNode(page)) {
-        var page = document.createElement("menu-list");
+        page = document.createElement("menu-list");
     }
     var main = this;
     if (direction == 'y') page.ispop = true;
@@ -188,6 +196,7 @@ function main(page, items, active, direction = 'y') {
         mounted_menus.push(menu);
         page.actived = menu;
         menu.root = page.root || page;
+        menu.go(0);
         popup(menu, target);
         if (page.ispop === true) {
         } else {
@@ -199,10 +208,9 @@ function main(page, items, active, direction = 'y') {
         once("remove")(menu, function () {
             removeFromList(mounted_menus, this);
         });
-        menu.go(0);
     }
     on("blur")(page, unfocus);
-    var template = page.tempalte || document.createElement("ylist");
+    var template = page.tempalte || document.createElement(page.tagName);
     if (!page.tempalte) {
         template.className = '';
         template.removeAttribute('mode');
@@ -216,7 +224,6 @@ function main(page, items, active, direction = 'y') {
         time = +time;
         if (byMousedown && !time) return;
         if (time) byMousedown = false;
-        
         if (page.ispop || time) popTimer = setTimeout(function () {
             if (time) byMousedown = elem;
             page.setFocus(elem);
@@ -272,7 +279,7 @@ function main(page, items, active, direction = 'y') {
     };
     var open1 = function (event) {
         if (event.which === 3) event.preventDefault();
-        if (istoolbar) open.call(this, event.which === 3 ? 20 : 600);
+        if (istoolbar) open.call(this, event.which === 3 ? 20 : 300);
     };
     if (!page.children.length || page.menutype === 1) {
         page.menutype = 1;
@@ -289,7 +296,7 @@ function main(page, items, active, direction = 'y') {
             "menu-item"(e, s) {
                 if (e && s === e.$scope) s = itemName ? s[itemName] : s.menu;
                 var a = button(
-                    menuItem(e, s.value, this.hasIcon)
+                    menuItem(e, s, this.hasIcon)
                 );
                 if (!page.firstMenu) {
                     page.firstMenu = a;
@@ -317,23 +324,27 @@ function main(page, items, active, direction = 'y') {
             list(page, function (index) {
                 var item = items[index];
                 if (!item) return;
-                if (!(item instanceof Item)) item = new Item(item);
+                if (item.constructor !== Item) item = new Item(item);
                 var a = $scope["menu-item"](null, item);
                 if (src.itemName) a.setAttribute("e-if", notHidden);
                 a.setAttribute("e-class", className);
                 a.setAttribute("on-mouseleave", "cancel.call(this)");
                 a.setAttribute("on-mouseenter", "popMenu.call(this)");
-                a.setAttribute("on-pointermove", "popMenu.call(this)");
                 a.setAttribute("on-click", "open.call(this)");
                 a.setAttribute("_menu", src.itemName);
-                if (istoolbar) a.setAttribute("on-pointerdown", "popMenu1");
+                if (istoolbar) {
+                    a.setAttribute("on-pointerdown", "popMenu1.call(this,event)");
+                    if (item.constructor === Item && item.length && !item.extended) {
+                        item.extends(item[0]);
+                    }
+                }
                 a = generator(index, item, a);
                 return a;
-            });
+            }, direction);
         }
         else {
             page.innerHTML = menuList;
-            $scope.menus = items.map(i => i instanceof Item ? i : new Item(i));
+            $scope.menus = items.map(i => i.constructor === Item ? i : new Item(i));
             render(page, $scope);
             vbox(page);
         }
@@ -351,11 +362,15 @@ function main(page, items, active, direction = 'y') {
                 page.firstMenu = elem;
                 page.total = this.src.length;
             }
-            elem.menu = this.src[index];
+            var menu = elem.menu = this.src[index];
             on("mouseleave")(elem, cancel);
             on("mouseenter")(elem, open);
-            on("pointermove")(elem, cancel);
-            if (istoolbar) on("pointerdown")(elem, open1);
+            if (istoolbar) {
+                on("pointerdown")(elem, open1);
+                if (menu.constructor === Item && menu.length && !menu.extended) {
+                    menu.extends(menu[0]);
+                }
+            }
             on("click")(elem, fire);
             return elem;
         }, direction);

package/coms/zimoli/menuList.less

@@ -64,5 +64,4 @@
 
 i {
     display: inline-block;
-    width: 20px;
 }

package/coms/zimoli/moveupon.js

@@ -30,6 +30,7 @@ if (/Firefox/.test(navigator.userAgent)) on('dragstart')(document, function (e)
     }
 });
 var locktouch = function (target) {
+    if (target.resizable) return false;
     if (/(input|textarea|select)/i.test(target.tagName) || getTargetIn(a => String(a.contentEditable) === 'true' || a.draggable, target)) {
         return true;
     } else {

package/coms/zimoli/picture_.js

@@ -15,7 +15,7 @@ var isequal = (a, b) => a === b || Math.abs(a - b) < .1;
 var aimed = (from, to) => (from + from + from + to) / 4;
 function picture_(image = document.createElement("div")) {
     var image_width, image_height;
-    var scaled = 1, x = 0, y = 0, min_scale, cover_scale, isxrelex, contain_scale, loaded_scale, click_scale, loaded_x, loaded_y;
+    var scaled = 1, x = 0, y = 0, min_scale, cover_scale, isxthin, contain_scale, loaded_scale, click_scale, loaded_x, loaded_y;
     var loaded_width, loaded_height;
     var max_scale = 10 * devicePixelRatio;
     var istouching = false;
@@ -38,14 +38,14 @@ function picture_(image = document.createElement("div")) {
             deltay = y + image_height * scaled / 2 - loaded_height / 2;
         }
         else if (scaled <= cover_scale) {
-            if (isxrelex) {
-                if (x > 0) deltax = x;
-                else if (x + image_width * scaled < loaded_width) deltax = loaded_width - x + image_width * scaled;
-                deltay = y + image_height * scaled / 2 - loaded_height / 2;
-            } else {
-                if (y > 0) deltay = y;
+            if (isxthin) {
+                if (y >= 0) deltay = y;
                 else if (y + image_height * scaled < loaded_height) deltay = y + image_height * scaled - loaded_height;
                 deltax = x + image_width * scaled / 2 - loaded_width / 2;
+            } else {
+                if (x >= 0) deltax = x;
+                else if (x + image_width * scaled < loaded_width) deltax = loaded_width - x + image_width * scaled;
+                deltay = y + image_height * scaled / 2 - loaded_height / 2;
             }
         }
         else {
@@ -81,9 +81,9 @@ function picture_(image = document.createElement("div")) {
         shaped_rotate = 0;
         var y_scale = loaded_height / image_height;
         var x_scale = loaded_width / image_width;
-        isxrelex = x_scale > y_scale;
-        cover_scale = isxrelex ? x_scale : y_scale;
-        loaded_scale = contain_scale = isxrelex ? y_scale : x_scale;
+        isxthin = x_scale > y_scale;
+        cover_scale = isxthin ? x_scale : y_scale;
+        loaded_scale = contain_scale = isxthin ? y_scale : x_scale;
         if (loaded_scale >= 1) {
             if (loaded_scale > devicePixelRatio) {
                 loaded_scale = devicePixelRatio;

package/coms/zimoli/popup.js

@@ -278,6 +278,7 @@ var _as_yextra = function (global, innerWidth, innerHeight, element, target, poi
 
         css(element, `min-width:auto;`);
         var aimedWidth = getScreenPosition(element).width;
+        var originWidth = aimedWidth;
         //如果宽度不足其附着元素的宽度
         if (aimedWidth < position.width) {
             aimedWidth = position.width;
@@ -288,7 +289,8 @@ var _as_yextra = function (global, innerWidth, innerHeight, element, target, poi
             aimedWidth = maxWidth;
         }
         var side;
-        if (aimedWidth !== element.offsetWidth) {
+        if (aimedWidth !== originWidth) {
+            console.log(originWidth,aimedWidth)
             css(element, { width: fromOffset(aimedWidth) });
         }
         if (position.top + element.offsetHeight + position.height > innerHeight) {
@@ -303,7 +305,7 @@ var _as_yextra = function (global, innerWidth, innerHeight, element, target, poi
             css(_rhomb, temp);
             _rhomb.setSide(side);
         }
-        var targetX = position.left + (position.width - element.offsetWidth) / 2;
+        var targetX = position.left - parseFloat(getComputedStyle(element).paddingLeft);
         if (targetX < 0) {
             css(element, `left:0;right:auto`);
             if (_rhomb) css(_rhomb, `left:${fromOffset(position.left + position.width / 2)};right:auto`);

package/coms/zimoli/render.js

@@ -173,7 +173,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) {

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/search.js

@@ -1,77 +1,8 @@
 function search(seartext, options, path = "name") {
-    var a = new SearchResult;
-    a.searchPath = path;
+    var a = new Table;
+    a.searchFields = [{ key: path }];
     a.searchText = seartext;
     a.source = options;
-    if (a.searchText) a.start();
+    if (a.searchText) a.update();
     return a;
-}
-function minusPower(a, b) {
-    return a.power - b.power >= 0;
-}
-function returnName() {
-    return this.name;
-}
-class SearchResult extends Array {
-    searchPath = 'name';
-    searchText = null;
-    source = null;
-    complete = true;
-    searched = 0;
-    searchid = 0;
-    hasFullmatch = false;
-    callback = null;
-    addItem(o) {
-        var path = this.searchPath;
-        var seartext = this.searchText;
-        if (isEmpty(o)) return;
-        var name = seek(o, path);
-        if (name === seartext) this.hasFullmatch = true;
-        var [power, m] = mark.power(name, seartext);
-        if (isNode(o)) {
-            o = extend({
-                name: o.name,
-                title: o.title,
-                value: o.value,
-                key: o.key,
-                nodeType: o.nodeType,
-                tagName: o.tagName,
-                nodeValue: o.nodeValue,
-            }, o);
-        }
-        else o = isObject(o) ? Object.create(o) : new o.constructor(o);
-        o.power = power;
-        if (isString(path)) o[path] = m;
-        else o.name = m, o.toString = returnName, o.valueOf = returnName;
-        if (o.power > 0) {
-            saveToOrderedArray(this, o, minusPower);
-        }
-    }
-    search(text, callback) {
-        if (isFunction(callback)) this.callback = callback;
-        if (text === this.searchText) return;
-        this.searchText = text;
-        this.start();
-    }
-    async start() {
-        this.searched = 0;
-        this.splice(0, this.length);
-        var searchid = ++this.searchid;
-        this.complete = false;
-        if (this.searchText) for (var o of this.source) {
-            this.addItem(o);
-            if (++this.searched % 6000 === 0) {
-                if (isFunction(this.callback)) this.callback();
-                await new Promise(function (ok) {
-                    setTimeout(ok, 20)
-                });
-                if (this.searchid !== searchid) break;
-            }
-        }
-        this.complete = true;
-        if (isFunction(this.callback)) this.callback();
-    }
-    abort() {
-        this.searchid++;
-    }
 }

package/coms/zimoli/selectList.js

@@ -243,7 +243,8 @@ function main() {
         moveFocus(-focus);
     });
     bind("keydown.end")(page, function (e) {
-        moveFocus(children.length - 1 - focus);
+        var coverIndex = children.coverCount > focus + 1 ? children.coverCount - 1 : children.length - 1;
+        moveFocus(coverIndex - focus);
     });
     bind("keydown.pagedown")(page, function (e) {
         page.scrollBy(page.clientHeight);

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;
@@ -256,7 +268,7 @@ function slider(autoplay, circle = true) {
         }
     })
 
-    outter.go = function (index, cache) {
+    outter.go = lazy(function (index, cache) {
         if (outter.index === index && cache !== false) return;
         negative_index = -index;
         var _removingMain = _imageMain;
@@ -275,7 +287,7 @@ function slider(autoplay, circle = true) {
         setTimeout(() => css(_imageMain, "transform:scale(1);opacity:1;transition:.2s transform ease-out,.4s opacity"), 0);
         if (player.ing) play();
         return outter;
-    };
+    }, 20);
     outter.play = function (schedule = player.schedule, _isMiss) {
         if (isDefined(_isMiss)) {
             isMiss = _isMiss;

package/coms/zimoli/table.js

@@ -407,21 +407,29 @@ function table(elem) {
         };
         vbox(table, 'x');
     };
-    care(table, function ([fields, data]) {
+    care(table, async function ([fields, data]) {
         if (_vbox) _vbox(), _vbox = null;
+        watch(table, {
+            find(text) {
+                $scope.data.searchText = text;
+                $scope.data.update();
+            }
+        })
         thead = null;
         fields.forEach(enrichField);
         remove(this.children);
         this.innerHTML = template;
         markedRows = false;
         this.style.display = 'block';
-        render(this, {
+        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) {
@@ -439,14 +447,7 @@ function table(elem) {
             resizeT,
             model,
             sort(f) {
-                f.sign = f.sign > 0 ? -1 : 1;
-                data.sort(function (a, b) {
-                    a = seek(a, f.key);
-                    b = seek(b, f.key);
-                    if (a > b) return f.sign;
-                    if (a < b) return -f.sign;
-                    return 0;
-                });
+                this.data.sort(f);
             },
             setWidth(target, f) {
                 css(target, { width: f.width });
@@ -454,7 +455,12 @@ function table(elem) {
             a: button,
             setFixedColumn,
             pagination
-        }, this.$parentScopes.concat(this.$scope));
+        };
+        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,
@@ -505,7 +511,7 @@ function table(elem) {
             }
             markThead();
             markedRows = true;
-            requestAnimationFrame(function(){
+            requestAnimationFrame(function () {
                 setFixedColumn.call(table)
             })
         }

package/coms/zimoli/table.less

@@ -62,6 +62,15 @@ td {
     }
 }
 
+thead {
+
+    .y-ing,
+    .x-ing {
+        &:before {
+            background-color: rgba(0, 60, 69, .3);
+        }
+    }
+}
 
 & {
     // text-align: center;