efront 3.12.4 → 3.13.2

package/coms/zimoli/menuList.js

@@ -102,23 +102,23 @@ var keyAction = function (deltax, deltay) {
     }
 };
 function keyalt() {
-    if (root_menu === document.activeElement) root_menu.blur();
-    else {
+    if (this === document.activeElement) this.blur();
+    else if (root_menu === this && root_menu !== document.activeElement) {
         root_menu.tabIndex = 0;
         root_menu.focus();
-        root_menu.setFocus(this.firstMenu);
+        root_menu.setFocus(root_menu.firstMenu);
     }
 }
 function keytab(event) {
-    if (root_menu !== document.activeElement) return;
     var menu = mounted_menus[mounted_menus.length - 1] || root_menu;
     event.preventDefault();
     menu.moveFocus(event.shiftKey ? -1 : 1);
 }
 function keyesc() {
-    if (root_menu === document.activeElement && !mounted_menus.length) {
-        if (!root_menu.ispop) root_menu.blur();
-        else root_menu.ispop = false;
+    if (this !== document.activeElement) return;
+    if (!mounted_menus.length) {
+        if (!this.ispop) this.blur();
+        else this.ispop = false;
     }
 }
 function keyup() {
@@ -134,7 +134,6 @@ function keyright() {
     keyAction(1, 0);
 }
 function keyspace() {
-    if (root_menu !== document.activeElement) return;
     var menu = mounted_menus[mounted_menus.length - 1];
     if (!menu || !menu.focused) menu = mounted_menus[mounted_menus.length - 2] || root_menu;
     if (menu.focused) {
@@ -142,23 +141,26 @@ function keyspace() {
     }
 }
 function register() {
-    root_menu = this;
-    bind('keydown.tab')(root_menu, keytab);
-    bind('keydown.alt.')(root_menu, keyalt);
-    bind('keydown.esc')(root_menu, keyesc);
-    bind('keydown.left')(root_menu, keyleft);
-    bind('keydown.right')(root_menu, keyright);
-    bind('keydown.up')(root_menu, keyup);
-    bind('keydown.down')(root_menu, keydown);
-    bind('keydown.enter')(root_menu, keyspace);
-    bind('keydown.space')(root_menu, keyspace);
+    var menu = this;
+    // if (!root_menu) root_menu = this;
+    bind('keydown.alt.')(menu, keyalt);
+    bind('keydown.esc')(menu, keyesc);
+    on('keydown.tab')(menu, keytab);
+    on('keydown.left')(menu, keyleft);
+    on('keydown.right')(menu, keyright);
+    on('keydown.up')(menu, keyup);
+    on('keydown.down')(menu, keydown);
+    on('keydown.enter')(menu, keyspace);
+    on('keydown.space')(menu, keyspace);
+    on("contextmenu")(menu, e => e.preventDefault());
 }
 function main(page, items, active, direction = 'y') {
     if (!isNode(page)) {
         var page = div();
     }
     var main = this;
-    if (direction !== 'x') page.ispop = true;
+    if (direction == 'y') page.ispop = true;
+    var istoolbar = direction === 't';
     function popMenu(item, target) {
         if (page.actived) {
             clear();
@@ -195,7 +197,7 @@ function main(page, items, active, direction = 'y') {
             if (offenter1) offenter1();
         });
     }
-    if (!page.ispop) on("blur")(page, unfocus);
+    on("blur")(page, unfocus);
     var template = page.tempalte || document.createElement("ylist");
     if (!page.tempalte) {
         template.className = '';
@@ -203,14 +205,19 @@ function main(page, items, active, direction = 'y') {
         template.innerHTML = page.innerHTML;
         page.tempalte = template;
     }
-    var popTimer = 0;
-    var open = function () {
+    var popTimer = 0, byMousedown;
+    var open = function (time) {
         cancel();
         var elem = this;
-        if (page.ispop) popTimer = setTimeout(function () {
+        time = +time;
+        if (byMousedown && !time) return;
+        if (time) byMousedown = false;
+
+        if (page.ispop || time) popTimer = setTimeout(function () {
+            if (time) byMousedown = elem;
             page.setFocus(elem);
             popMenu(elem.menu, elem);
-        }, 60);
+        }, time || 60);
     };
     var cancel = function () {
         clearTimeout(popTimer);
@@ -218,13 +225,29 @@ function main(page, items, active, direction = 'y') {
     var fire = function () {
         cancel();
         if (this.menu.line) return;
+        if (byMousedown) return;
         var pop = active(this.menu, this);
         if (pop === false) return;
         var root = page.root || page;
+        if (root.direction === 't') {
+            var menu = this.menu;
+            if (root !== page) {
+                delete menu.children;
+                var target = root.actived.target;
+                menu = extend(target.menu, menu);
+            }
+            else {
+                target = this;
+            }
+            if (root.selected) root.selected.selected = false;
+            menu.selected = true;
+            root.selected = target.menu;
+        }
         if (root.ispop === 1) root.ispop = false;
         if (page.actived && page.actived.target === this) {
             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);
             }
             else {
@@ -233,14 +256,17 @@ 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);
             if (!page.actived) {
                 (page.root || page).blur();
             }
         }
     };
-
-
+    var open1 = function (event) {
+        if (event.which === 3) event.preventDefault();
+        if (istoolbar) open.call(this, event.button ? 20 : 600);
+    };
     if (!page.children.length || page.menutype === 1) {
         page.menutype = 1;
         var hasIcon = function () {
@@ -268,11 +294,15 @@ function main(page, items, active, direction = 'y') {
             open: fire,
             cancel,
             popMenu: open,
+            popMenu1: open1
         };
         if (page.$src) {
             var src = page.$src;
             var itemName = src.itemName;
-            var className = `{'has-children':${itemName}.children&&${itemName}.children.length,'warn':${itemName}.type==='danger'||${itemName}.type==='warn'||${itemName}.type==='red'}`;
+            var className = `{'has-children':${itemName}.children&&${itemName}.children.length,
+            'warn':${itemName}.type==='danger'||${itemName}.type==='warn'||${itemName}.type==='red',
+            'selected':${itemName}.selected
+        }`;
             var notHidden = `!${itemName}.hidden`;
             var generator = getGenerator(page, 'menu-item');
             list(page, function (index) {
@@ -286,6 +316,7 @@ function main(page, items, active, direction = 'y') {
                 a.menu = item;
                 on("mouseleave")(a, cancel);
                 on("mouseenter")(a, open);
+                if (istoolbar) on("mousedown")(a, open1);
                 on("click")(a, fire);
                 return a;
             });
@@ -316,6 +347,7 @@ function main(page, items, active, direction = 'y') {
             elem.menu = this.src[index];
             on("mouseleave")(elem, cancel);
             on("mouseenter")(elem, open);
+            if (istoolbar) on("mousedown")(elem, open1);
             on("click")(elem, fire);
             return elem;
         }, direction);
@@ -326,11 +358,14 @@ function main(page, items, active, direction = 'y') {
     page.active = function (a) {
         fire.call(a);
     };
-    page.registerAsRoot = register;
     page.setFocus = setFocus;
     page.moveFocus = moveFocus;
     page.openFocus = openFocus;
     page.closeFocus = closeFocus;
     page.direction = direction;
+    register.call(page);
+    page.registerAsRoot = function () {
+        root_menu = this;
+    };
     return page;
 }

package/coms/zimoli/menuList.less

@@ -29,6 +29,11 @@
             color: #29c;
         }
 
+        &.selected {
+            background: #29c;
+            color: #fff;
+        }
+
         &.has-children {
             padding-right: 24px;
             padding-left: 16px;

package/coms/zimoli/model.js

@@ -48,6 +48,12 @@ var constructors = {
         }
         return e;
     },
+    success(e) {
+        success(e);
+        e.innerHTML = `<span ng-html="field.comment"></span>`;
+        render(e.children, e.$scope, e.$parentScopes);
+        return e;
+    },
     switch: swap,
     row: textarea,
     password,
@@ -100,7 +106,7 @@ var constructors = {
                     break;
                 }
             }
-            var pad = selectList(field.options, field.multi, true);
+            var pad = selectList(field.options, !!field.multi, true);
             var e = document.createElement('select');
             e.innerHTML = `<option selected value="${opt ? opt.key : ''}">${opt ? opt.name : '请选择'}</option>`;
             e.value = opt ? opt.key : '';
@@ -149,16 +155,30 @@ var readonly_types = {
         var f = data[field.key];
         return size(f);
     },
+    html(a, data) {
+        var t = document.createElement("span");
+        t.innerHTML = seek(data, a.field.key);
+        return t;
+    },
     swap(e, data) {
         var { field } = e;
         var v = data[field.key];
         if (field.options) {
-            var o = field.options[v];
+            if (!field.optionsMap) field.optionsMap = createOptionsMap(field.options);
+            var o = field.optionsMap[v];
             if (o) return o.name;
         }
+        if (isEmpty(v)) v = '';
         return v;
     },
 };
+var createOptionsMap = function (options) {
+    var map = Object.create(null);
+    for (var o of options) {
+        map[o.key] = o;
+    }
+    return map;
+}
 readonly_types.select = readonly_types.swap;
 function main(elem) {
     var build = function () {

package/coms/zimoli/on.js

@@ -155,14 +155,16 @@ function checkKeyNeed(eventtypes, e) {
     }
     return true;
 }
+var pendingid = 0;
 function wrapHandler(h) {
     if (h instanceof Function) {
         return function () {
             var res = h.apply(this, arguments);
             if (res && isFunction(res.then)) {
-                this.setAttribute('pending', '');
+                var id = ++pendingid & 0x1fffffffffffff;
+                this.setAttribute('pending', id);
                 var removePending = () => {
-                    this.removeAttribute('pending');
+                    if (+this.getAttribute('pending') === id) this.removeAttribute('pending');
                 };
                 res.then(removePending, removePending);
             }
@@ -273,7 +275,7 @@ if (is_addEventListener_enabled) {
                     }
                     if (e.button) {
                         if (e.buttons === undefined) e.buttons = e.button;
-                        if (e.which === undefined) e.which = e.button;
+                        if (e.which === undefined) e.which = e.button + 1;
                     }
                     if (e.keyCode) {
                         if (e.which === undefined) e.which = e.keyCode;