efront 3.15.7 → 3.17.1

package/coms/zimoli/dispatch.js

@@ -8,6 +8,18 @@ var dispatch = "dispatchEvent" in document ? function dispatchEvent(target, even
         return target[fire] && target[fire](event);
     }
 };
+/**
+ * @param {Event} e 
+ */
+function dispatch2(t, e) {
+    var on = 'on' + e.type;
+    var f = t[on];
+    var res = dispatch(t, e);
+    if (f && (t.nodeType !== 1 || t.constructor === window.HTMLUnknownElement)) {
+        return f.call(t, e) !== false;
+    }
+    return res;
+}
 function main() {
     var target, event, value;
     for (var cx = 0, dx = arguments.length; cx < dx; cx++) {
@@ -27,7 +39,7 @@ function main() {
             event.value = arg;
         }
     }
-    if (dispatch(target || window, event)) {
+    if (dispatch2(target || window, event)) {
         return event;
     };
     return false;

package/coms/zimoli/drag.js

@@ -22,12 +22,15 @@ var setZIndex = function () {
     if (!isElement(target)) return;
     var computed = getComputedStyle(target);
     var z0 = zIndex(0);
-    if (!z || computed.zIndex < z0) {
+    if (!z || +computed.zIndex < z0) {
         z = zIndex();
         if (/^(absolute|fixed)$/i.test(computed.position)) {
             css(target, { zIndex: z });
         }
     }
+    else if (z < +computed.zIndex) {
+        z = +computed.zIndex;
+    }
 };
 function drag(target, initialEvent, preventOverflow, isMovingSource) {
     if (/^(?:select|input|textarea)$/i.test(initialEvent.target.tagName)) return;
@@ -39,7 +42,6 @@ function drag(target, initialEvent, preventOverflow, isMovingSource) {
     } else {
         var extraTargets = target.with ? [].concat(target.with) : [];
     }
-
     var target_offset = getOffset(target);
     var saved_delta = { x: target_offset[0] - initialEvent.screenX, y: target_offset[1] - initialEvent.screenY };
     var clone;

package/coms/zimoli/getGenerator.js

@@ -47,8 +47,8 @@ var getGenerator = function (container, tagName = 'item') {
                 [itemName || '$item']: com,
                 [indexName || '$index']: index
             };
-            var newItem = render(element, newScope, scopes);
-            if (element.with) newItem.with = render(element.with, newScope, scopes);
+            var newItem = render(element, newScope, scopes, false);
+            if (element.with) newItem.with = render(element.with, newScope, scopes, false);
         } else {
             var newScope = container.src[index];
             if (!isObject(newScope)) newScope = {
@@ -68,8 +68,8 @@ var getGenerator = function (container, tagName = 'item') {
                     return this.$item;
                 }
             }
-            var newItem = render(element, newScope, scopes);
-            if (element.with) newItem.with = render(newItem.with = element.with, newScope, scopes);
+            var newItem = render(element, newScope, scopes, false);
+            if (element.with) newItem.with = render(newItem.with = element.with, newScope, scopes, false);
         }
         return newItem;
     };

package/coms/zimoli/getTreeFromData.js

@@ -5,8 +5,10 @@ function getTreeFromData(array) {
     root.count = 0;
     var map = {};
     array = array.filter(a => !!a);
+    var active_item = null;
     array.forEach(function (data) {
         var item = new Item(data);
+        if (!active_item && item.isActived()) active_item = item;
         if (data.id) {
             map[data.id] = item;
         } else {
@@ -46,5 +48,6 @@ function getTreeFromData(array) {
         return item.count = count;
     };
     run(root);
+    root.actived = active_item;
     return root;
 }

package/coms/zimoli/getValue.js

@@ -1,6 +1,6 @@
 var hasOwnProperty = {}.hasOwnProperty;
 function getValue(o = this) {
-    if (!o) return o;
+    if (!isObject(o) && !isFunction(o)) return o;
     if (isFunction(o.getValue)) return o.getValue();
     if (hasOwnProperty.call(o, 'valueOf')) return o.valueOf();
     if ("key" in o) return o.key;

package/coms/zimoli/list.js

@@ -381,7 +381,7 @@ function ylist(container, generator, $Y) {
         }
         if (deltay < 1) y = target_y;
         else if (deltay > count || deltay > 3) {
-            y = last_y + (target_y > last_y ? .8 : -.8);
+            y = last_y + Math.max(2 * (target_y > last_y ? .8 : -.8));
         }
         else {
             y = (target_y + last_y) / 2;

package/coms/zimoli/menu.js

@@ -90,6 +90,31 @@ var getTreeNodes = function (elem) {
     [].forEach.call(elem.children, run);
     return nodes;
 };
+function createItemTarget(item) {
+    var $scope = {};
+    var { itemName } = this.$src;
+    if (itemName) $scope[itemName] = item;
+    else $scope.menu = item, $scope.$item = item;
+    return { $scope };
+}
+var emitEvent = function (item, event) {
+    event.preventDefault(true);
+    if (item.disabled) return;
+    active(this, item, item, createItemTarget.call(this, item));
+}
+function bindGlobalkey(elem, keymap, emit) {
+    if (elem.keymap) {
+        for (var off of elem.keyoff) {
+            off();
+        }
+    }
+    if (!keymap) return;
+    var keyoff = [];
+    for (let k in keymap) {
+        keyoff.push(bind("keydown." + k)(elem, emitEvent.bind(elem, keymap[k])));
+    }
+    elem.keyoff = keyoff;
+}
 
 function main(elem, mode) {
     if (isElement(elem)) {
@@ -176,16 +201,24 @@ function main(elem, mode) {
             case "y":
             case "vertical":
                 if (!direction) mode = "vertical", direction = 'y';
-                var emit = function (item, target) {
-                    active(elem, item.value, item, target);
+                var emit = function (item) {
+                    active(elem, item.value, item, createItemTarget.call(elem, item.value));
                 };
                 if ("$src" in elem) {
                     getGenerator(elem, 'menu-item');
                     var src0 = [];
                     menuList(elem, src0, emit, direction);
                     care(elem, function (src) {
+                        bindGlobalkey(elem, src.keymap, emit);
                         src0.splice(0, src0.length);
                         var s = getTreeFromData(src);
+                        if (s.actived) {
+                            elem.selected = s.actived;
+                        }
+                        else if (direction === 't') {
+                            elem.selected = s[0];
+                            if (elem.selected) elem.selected.setActive(true);
+                        }
                         var i = 0;
                         while (i < s.length) {
                             src0.push.apply(src0, s.slice(i, i += 1000));
@@ -208,6 +241,7 @@ function main(elem, mode) {
     }
     if (!elem.hasAttribute('mode')) elem.setAttribute('mode', mode);
     if (!elem.hasAttribute(mode)) elem.setAttribute(mode, '');
+
     return elem;
 
 }

package/coms/zimoli/menuItem.html

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

package/coms/zimoli/menuItem.js

@@ -4,14 +4,21 @@ function main(elem, scope, hasIcon) {
     item.innerHTML = menuItem;
     if (isObject(scope) && scope !== item.$scope) {
     }
-    else {
+    else if (item.$scope) {
         var scope = item.$scope;
     }
     if (scope.menu) scope = scope.menu;
     var name = scope.name;
     var icon = scope.icon;
     if (hasIcon === undefined) hasIcon = !!icon;
-    render(item.children, scope, hasIcon instanceof Array ? hasIcon : [{ useIcon: hasIcon, hasIcon, name, icon }]);
+    if (scope.disabled || scope.enabled === false) {
+        item.setAttribute('disabled', '');
+    }
+    else {
+        item.removeAttribute("disabled");
+    }
+    render(item.children, scope, hasIcon instanceof Array ? hasIcon : [{ useIcon: hasIcon, hasIcon, name, icon }], false);
     if (scope.line) item.setAttribute("line", ''), on("click")(item, preventDefault);
+    if (scope.hotkey) bindAccesskey(item, scope.hotkey);
     return item;
 }

package/coms/zimoli/menuItem.less

@@ -1,15 +1,36 @@
-i{
+i {
     display: inline-block;
     width: 1em;
 }
+
+.hotkey {
+    margin-left: 12px;
+    font-size: 12px;
+    float: right;
+}
+
+&[disabled] {
+    background: #0000;
+
+    &>.track {
+        opacity: 0;
+    }
+
+    border-radius: 0;
+    color: #999;
+}
+
 &.line,
 &[line] {
     box-shadow: none;
-    >.track{
+
+    >.track {
         display: none;
     }
+
     line-height: 0;
     font-size: 0;
+
     &:after {
         content: "";
         display: block;

package/coms/zimoli/menuList.html

@@ -1,6 +1,6 @@
 <menu-item ng-repeat="menu in menus" ng-if="!menu.hidden" ng-click="open.call(this)" ng-mouseleave="cancel()"
     ng-mouseenter="popMenu.call(this)" ng-mousedown="popMenu1.call(this,event)" ng-class="{'has-children':menu.children&&menu.children.length,
     'warn':menu.type==='danger'||menu.type==='warn'||menu.type==='red',
-    'selected':menu.selected
+    'actived':menu.isActived()
 }">
 </menu-item>

package/coms/zimoli/menuList.js

@@ -14,6 +14,7 @@ var unfocus = function () {
     this.setFocus(null);
 };
 var setFocus = function (focused) {
+    if (focused && focused.hasAttribute("disabled")) return;
     var page = this;
     if (focused) {
         if (page.focused !== focused) {
@@ -40,16 +41,17 @@ var moveFocus = function (delta) {
     else {
         var newIndex = focused.index + delta;
         var total = page.total;
-        if (page !== root_menu) {
-            total++;
-        }
         if (newIndex < 0) newIndex = total + newIndex;
         if (newIndex > total - 1) newIndex = newIndex - total;
     }
-
-    var e = page.getIndexedElement(newIndex);
+    do {
+        var e = page.getIndexedElement(newIndex);
+        if (newIndex < 0) newIndex = total + newIndex;
+        newIndex += delta;
+    } while (e && (e.hasAttribute("disabled") || e.hasAttribute("line")));
     if (!e) page.setFocus(null);
-    else page.open(e);
+    else if (page.ispop !== true) page.setFocus(e), page.open(e);
+    else page.setFocus(e);
 };
 var openFocus = function () {
     var menu = mounted_menus[mounted_menus.length - 1] || root_menu;
@@ -68,15 +70,20 @@ var keyAction = function (deltax, deltay) {
 
     if (menu.direction === 'y') {
         if (deltax === 1) {
-            if (menu.focused) openFocus();
+            // right
+            if (menu.focused) var fmenu = menu.focused.menu;
+            if (fmenu && fmenu.children && fmenu.children.length) {
+                openFocus();
+            }
             else if (parent && parent.direction !== 'y') {
                 parent.moveFocus(deltax);
             }
         }
         else if (deltax === -1) {
+            // left
             if (parent) {
                 if (parent.direction === 'y') remove(mounted_menus.pop());
-                else if (!menu.focused) parent.moveFocus(deltax);
+                else parent.moveFocus(deltax);
             }
         }
         else {
@@ -85,15 +92,18 @@ var keyAction = function (deltax, deltay) {
     }
     else {
         if (deltay === 1) {
-            if (menu.focused) openFocus();
+            // down
+            if (menu.focused) var fmenu = menu.focused.menu;
+            if (fmenu && fmenu.children && fmenu.children.length) openFocus();
             else if (parent && parent.direction === 'y') {
                 parent.moveFocus(deltay);
             }
         }
         else if (deltay === -1) {
+            // up
             if (parent) {
                 if (parent.direction !== 'y') remove(mounted_menus.pop());
-                else if (!menu.focused) parent.moveFocus(deltay);
+                else parent.moveFocus(deltay);
             }
         }
         else {
@@ -156,18 +166,19 @@ function register() {
 }
 function main(page, items, active, direction = 'y') {
     if (!isNode(page)) {
-        var page = div();
+        var page = document.createElement("menu-list");
     }
     var main = this;
     if (direction == 'y') page.ispop = true;
     var istoolbar = direction === 't';
-    function popMenu(item, target) {
+    function popMenu(item, target, emptyFocus) {
         if (page.actived) {
             clear();
             remove(page.actived);
         }
+        if (emptyFocus !== false) page.setFocus(target);
+        if (!item.length) return;
         page.setFocus(target);
-        if (!item.children || !item.children.length) return;
         var clone = template.cloneNode();
         clone.$parentScopes = page.$parentScopes;
         clone.$scope = page.$scope;
@@ -179,10 +190,6 @@ function main(page, items, active, direction = 'y') {
         menu.root = page.root || page;
         popup(menu, target);
         if (page.ispop === true) {
-            var offleave0 = on("mouseleave")(target, release);
-            var offleave1 = on("mouseleave")(menu, release);
-            var offenter0 = on("mouseenter")(target, clear);
-            var offenter1 = on("mouseenter")(menu, clear);
         } else {
             page.ispop = 1;
             page.tabIndex = 0;
@@ -191,10 +198,6 @@ function main(page, items, active, direction = 'y') {
         on("mousedown")(menu, e => e.preventDefault());
         once("remove")(menu, function () {
             removeFromList(mounted_menus, this);
-            if (offleave0) offleave0();
-            if (offleave1) offleave1();
-            if (offenter0) offenter0();
-            if (offenter1) offenter1();
         });
     }
     on("blur")(page, unfocus);
@@ -220,27 +223,30 @@ function main(page, items, active, direction = 'y') {
         }, time || 60);
     };
     var cancel = function () {
+        clear();
         clearTimeout(popTimer);
     }
     var fire = function () {
         cancel();
         if (this.menu.line) return;
         if (byMousedown) return;
+        if (this.hasAttribute("disabled") || this.hasAttribute('line')) return;
         var pop = active(this.menu, this);
         if (pop === false) return;
         var root = page.root || page;
-        if (root.direction === 't') {
+        if (root.direction === 't' || root.selected) {
             var menu = this.menu;
+            if (root.selected) root.selected.setActive(false);
             if (root !== page) {
-                delete menu.children;
                 var target = root.actived.target;
-                menu = extend(target.menu, menu);
+                if (isObject(menu.value)) delete menu.value.children;
+                target.menu.extends(menu.value);
+                menu = target.menu;
             }
             else {
                 target = this;
             }
-            if (root.selected) root.selected.selected = false;
-            menu.selected = true;
+            menu.setActive(true);
             root.selected = target.menu;
         }
         if (root.ispop === 1) root.ispop = false;
@@ -248,7 +254,7 @@ function main(page, items, active, direction = 'y') {
             while (mounted_menus.length && mounted_menus[mounted_menus.length - 1] !== page.actived) remove(mounted_menus.pop());
             if (!mounted_menus.length) {
                 if (byMousedown === false) return;
-                popMenu(this.menu, this);
+                popMenu(this.menu, this, false);
             }
             else {
                 remove(mounted_menus.pop());
@@ -257,7 +263,7 @@ function main(page, items, active, direction = 'y') {
         else {
             while (mounted_menus.length && mounted_menus[mounted_menus.length - 1] !== page) remove(mounted_menus.pop());
             if (byMousedown === false) return;
-            popMenu(this.menu, this);
+            popMenu(this.menu, this, false);
             if (!page.actived) {
                 (page.root || page).blur();
             }
@@ -281,10 +287,11 @@ function main(page, items, active, direction = 'y') {
         var $scope = {
             "menu-item"(e, s) {
                 var a = button(
-                    menuItem(e, s, this.hasIcon)
+                    menuItem(e, s.value, this.hasIcon)
                 );
                 if (!page.firstMenu) {
                     page.firstMenu = a;
+                    page.total = items.length;
                 }
                 a.menu = s.menu;
                 return a;
@@ -301,14 +308,13 @@ function main(page, items, active, direction = 'y') {
             var itemName = src.itemName;
             var className = `{'has-children':${itemName}.children&&${itemName}.children.length,
             'warn':${itemName}.type==='danger'||${itemName}.type==='warn'||${itemName}.type==='red',
-            'selected':${itemName}.selected
+            actived:${itemName}.isActived()
         }`;
             var notHidden = `!${itemName}.hidden`;
             var generator = getGenerator(page, 'menu-item');
             list(page, function (index) {
                 var item = items[index];
                 if (!item) return;
-                if (item instanceof Item) item = item.value;
                 var a = $scope["menu-item"](null, item);
                 if (src.itemName) a.setAttribute("e-if", notHidden);
                 a.setAttribute("e-class", className);

package/coms/zimoli/menuList.less

@@ -29,7 +29,7 @@
             color: #29c;
         }
 
-        &.selected {
+        &.actived {
             background: #29c;
             color: #fff;
         }

package/coms/zimoli/moveupon.js

@@ -3,13 +3,15 @@ function mousemove(event) {
     moveListeners.forEach(a => a(event));
 }
 function addHookListener(on, hook, isroot) {
-    var index = moveListeners.indexOf(hook);
-    if (~index) {
-        moveListeners.splice(index, 1);
-    }
     if (!moveListeners.length) {
         offhook = on(window, mousemove);
     }
+    else {
+        var index = moveListeners.indexOf(hook);
+        if (~index) {
+            moveListeners.splice(index, 1);
+        }
+    }
     if (isroot) {
         moveListeners.unshift(hook);
     } else {