efront 3.12.6 → 3.13.1

package/apps/pivot/api.yml

@@ -10,3 +10,4 @@
   invoke: options ::invoke-:key?:params
   version: options ::version
   uptime: options ::uptime
+  count: options ::count

package/apps/pivot/home/welcome.html

@@ -25,4 +25,4 @@
     <padding>
         启动时间&nbsp;&nbsp;<span -text="filterTime(hrtime)"></span>
     </padding>
-</block>
+</block>

package/apps/pivot/home/welcome.js

@@ -6,15 +6,12 @@ function main() {
         version: data.from("version"),
         hrtime: data.from("uptime", a => Date.now() - a * 1000),
         filterTime,
-        async run(id, target) {
-            target.setAttribute('pending', '')
-            try {
-                var info = await data.from("run", {
-                    run: id
-                }).loading_promise;
-                if (info) alert(info, 'pass');
-            } catch { }
-            target.removeAttribute('pending');
+        async run(id) {
+            await new Promise(ok => setTimeout(ok, 2000));
+            var info = await data.from("run", {
+                run: id
+            }).loading_promise;
+            if (info) alert(info, 'pass');
         },
         async logout() {
             data.setSource({});

package/apps/pivot/log/count.html

@@ -0,0 +1 @@
+<table -src="[fields,items]"></talbe>

package/apps/pivot/log/count.js

@@ -0,0 +1,15 @@
+var fields = refilm`
+路径/path
+访问量/count
+`;
+function main() {
+    var page = div();
+    page.innerHTML = template;
+    renderWithDefaults(page, {
+        items: data.from("count", a => {
+            return Object.keys(a).map(b => ({ path: b, count: a[b] }));
+        }),
+        fields
+    });
+    return page;
+}

package/apps/pivot/log/count.less

@@ -0,0 +1,8 @@
+& {
+    height: 100%;
+
+}
+
+
+tbody {
+}

package/apps/pivot/menu.yml

@@ -8,4 +8,6 @@ WEB:
   密钥管理: /token/list
   任务建立: /task/list
   定期执行: /tick/list
-# 用户列表: /user/list
+# 用户列表: /user/list
+服务器日志:
+  访问计数: /log/count

package/apps/pivot/share/list.less

@@ -1,7 +1,3 @@
->table {
-    width: 100%;
-}
-
 & {
     height: 100%;
 }

package/coms/basic/parseYML.js

@@ -207,7 +207,7 @@ var scan = function (text) {
             }
         }
 
-        if (row === "|") {
+        if (row === "|" || row === ">") {
             rowtype = "|"
             continue;
         }

package/coms/frame/route.js

@@ -195,6 +195,7 @@
         result.then = then;
         return result;
     };
+    result.parse = parseMenuList;
     var then = function (ok, oh) {
         if (this.loading_promise) {
             return this.loading_promise.then(ok, oh);

package/coms/zimoli/AudioContext_test.html

@@ -1,5 +1,5 @@
 <div ng-class="{even:i%2===1,odd:i%2===0}" v-for="(r,i) in rates" hz:='r[5]'>
-    <span ng-if="i%2===0" v-bind="i/2 -2"></span>
+    <span ng-if="i%2===0" v-bind="i/2 -8"></span>
     <button ng-repeat="o in r" _rate=o>
         <span ng-bind="format(o)"></span>
     </button>

package/coms/zimoli/AudioContext_test.js

@@ -2,8 +2,8 @@ function piano() {
     var res = [];
     var yin = [1, 3, 5, 7, 8, 10, 12].reverse();
     var yue = [2, 4, 6, 9, 11].reverse();
-    var c=a => 440 * Math.pow(2, cx + (3 - a) / 12);
-    for (var cx = -6, dx = 8; cx < dx; cx++) {
+    var c = a => 440 * Math.pow(2, cx + (3 - a) / 12);
+    for (var cx = -12, dx = 8; cx < dx; cx++) {
         var yinjie1 = yin.map(c);
         var yinjie2 = yue.map(c);
         res.push(yinjie1, yinjie2);
@@ -23,7 +23,7 @@ function main() {
             oscillator.connect(gainNode);
             gainNode.connect(audioCtx.destination);
             oscillator.type = 'sine';
-            oscillator.frequency.value = hz;
+            oscillator.frequency.value = -hz;
             gainNode.gain.setValueAtTime(0, audioCtx.currentTime);
             gainNode.gain.linearRampToValueAtTime(65536 / Math.log2(hz), audioCtx.currentTime + 0.01);
             oscillator.start(audioCtx.currentTime);

package/coms/zimoli/bind.js

@@ -1,10 +1,12 @@
 function bind(eventName, bindTo = window) {
     return function (target, eventListener) {
         var off;
-        var off1 = on("append")(target, function () {
+        var mount = function () {
             if (off) off();
             off = on(eventName).call(bindTo, target, eventListener);
-        });
+        };
+        if (isMounted(target)) mount();
+        var off1 = on("append")(target, mount);
         var off2 = on("remove")(target, function () {
             if (off) off();
             off = null;

package/coms/zimoli/cloneVisible.js

@@ -1,5 +1,5 @@
 var cloneProperties = "fontWeight,fontSize,fontFamily,color,textShadow,opacity,writingMode,blockSize,wordSpacing,letterSpacing,whiteSpace".split(",");
-var cloneProperties2 = "position,float,clear,margin,color,verticalAlign,textAlign,textShadow,opacity,boxShadow,overflow,writingMode,blockSize,wordSpacing,letterSpacing,textIndent,lineHeight,display,appearance,webkitAppearance,MozAppearance".split(",");
+var cloneProperties2 = "position,backdropFilter,float,clear,margin,color,verticalAlign,textAlign,textShadow,opacity,boxShadow,overflow,writingMode,blockSize,wordSpacing,letterSpacing,textIndent,lineHeight,display,appearance,webkitAppearance,MozAppearance".split(",");
 var pushProperty = function (key, props) {
     props.split(",").forEach(k => {
         cloneProperties2.push(key + k);
@@ -86,7 +86,13 @@ var isMaybeVisible = function (node) {
     if (style.overflow === "hidden") {
         if (node.offsetHeight === 0 || node.offsetWidth === 0) return;
     }
-    if (node.offsetParent && !overlap(node, node.offsetParent)) return;
+    if (node.offsetParent) {
+        var parent = node.offsetParent;
+        return !(node.offsetLeft + node.offsetWidth - parent.scrollLeft <= parent.clientLeft ||
+            node.offsetTop + node.offsetHeight - parent.scrollTop <= parent.clientTop ||
+            node.offsetLeft - parent.scrollLeft >= (parent.clientWidth || parent.offsetWidth) ||
+            node.offsetTop - parent.scrollTop >= (parent.clientHeight || parent.offsetHeight));
+    }
     return true;
 }
 var clonePseudo = function (node, pseudo) {
@@ -173,6 +179,7 @@ var cloneVisible = function (td) {
     };
     clone(td);
     extend(result.style, {
+        zIndex: getComputedStyle(td).zIndex,
         position: "absolute",
         left: _left + "px",
         top: _top + "px",

package/coms/zimoli/drag.js

@@ -61,8 +61,9 @@ function drag(target, initialEvent, preventOverflow, isMovingSource) {
             saved_delta.x += clone_left - target_left;
             saved_delta.y += clone_top - target_top;
             if (clone.style) {
-                clone.style.zIndex = zIndex();
-                extraClones.map(e => e.style.zIndex = clone.style.zIndex);
+                var z = zIndex();
+                clone.style.zIndex = z + (+clone.style.zIndex || 0);
+                extraClones.map(e => e.style.zIndex = z + (+e.style.zIndex || 0));
             }
         }
         drag.target = clone;

package/coms/zimoli/menu.js

@@ -101,23 +101,34 @@ function main(elem, mode) {
         // }
         // elem.setAttribute('browser', os);
         var mode = elem.getAttribute('mode') || elem.getAttribute('type');
+        if (!mode) {
+            if (elem.hasAttribute("inline")) mode = 'inline';
+            else if (elem.hasAttribute("vertical")) mode = "vertical";
+            else if (elem.hasAttribute("horizonal")) mode = "horizonal";
+            else if (
+                elem.hasAttribute("toolbar")
+                || elem.hasAttribute('tool')
+                || elem.hasAttribute('tools')
+                || elem.hasAttribute('bar')
+            ) mode = "toolbar";
+        }
         if (!mode) {
             if (/^[xyhvtci]/i.test(elem.tagName)) {
                 mode = elem.tagName.slice(0, 1);
+                if (/^t$/i.test(mode)) mode = elem.tagName.slice(0, 2);
             }
-            else if (/[xyhvtci]$/i.test(elem.tagName)) {
-                mode = elem.tagName.slice(0, 1);
+            else if (/[xyhvci]$/i.test(elem.tagName)) {
+                mode = elem.tagName.slice(elem.tagName.length - 1);
             }
         }
         mode = mode ? mode.toLowerCase() : "horizonal";
-
+        var direction;
         switch (mode) {
+            case "tr":
             case "i":
             case "c":
             case "inline":
-            case "t":
-            case "tree":
-                mode = "tree";
+                mode = "inline";
                 if (elem) {
                     var generator = getGenerator(elem, 'menu-item');
                     tree(elem, function (index, item) {
@@ -145,22 +156,31 @@ function main(elem, mode) {
                     elem = inlineMenu.call(elem, nodes);
                 }
                 break;
+            case "to":
+            case "t":
+            case "b":
+            case "tool":
+            case "tools":
+            case "bar":
+            case "toolbar":
+                direction = 't';
+                mode = "toolbar";
             case "h":
             case "x":
             case "horizonal":
-                var direction = 'x';
-                mode = "horizonal";
+                if (!direction) {
+                    direction = 'x';
+                    mode = "horizonal";
+                }
             case "v":
             case "y":
             case "vertical":
+                if (!direction) mode = "vertical", direction = 'y';
                 var emit = function (item, target) {
                     active(elem, item.value, item, target);
                 };
                 if ("$src" in elem) {
                     getGenerator(elem, 'menu-item');
-                    on("append")(elem, function () {
-                        elem.registerAsRoot();
-                    });
                     var src0 = [];
                     menuList(elem, src0, emit, direction);
                     care(elem, function (src) {
@@ -177,7 +197,6 @@ function main(elem, mode) {
                     var nodes = getArrayNodes(elem);
                     remove(elem.children);
                     elem = menuList(elem, nodes, emit, direction);
-                    elem.registerAsRoot();
                 }
                 break;
             default:
@@ -187,7 +206,8 @@ function main(elem, mode) {
         mode = mode || "horizonal";
         elem = menu.apply(null, arguments);
     }
-    elem.setAttribute('mode', mode);
+    if (!elem.hasAttribute('mode')) elem.setAttribute('mode', mode);
+    if (!elem.hasAttribute(mode)) elem.setAttribute(mode, '');
     return elem;
 
 }

package/coms/zimoli/menu.less

@@ -82,13 +82,11 @@ body:active & {
     width: 100%;
 }
 
-&[mode=vertical],
-&[type=vertical] {
+&[vertical] {
     display: block;
 }
 
-&[mode=horizonal],
-&[type=horizonal] {
+&[horizonal] {
     display: block;
     overflow: hidden;
     text-overflow: hidden;
@@ -115,11 +113,35 @@ body:active & {
 
 }
 
-&[mode=tree],
-&[mode=tree],
-&[type=tree],
-&[mode=inline],
-&[type=inline] {
+&[toolbar] {
+    >menu-item{
+        padding-left: 6px;
+        padding-right: 6px;
+        text-align: center;
+    }
+    >menu-item.has-children {
+        &::after {
+            display: block;
+            content: "";
+            width: 0;
+            height: 0;
+            font-size: 0;
+            transform: none;
+            border: 2px solid;
+            border-top-color: transparent;
+            border-left-color: transparent;
+            position: absolute;
+            right: 3px;
+            bottom: 3px;
+            box-sizing: border-box;
+            line-height: 0;
+            top: auto;
+            margin: 0;
+        }
+    }
+}
+
+&[inline] {
     height: auto;
     box-shadow: none;
     padding: 0;

package/coms/zimoli/menuItem.js

@@ -11,7 +11,7 @@ function main(elem, scope, hasIcon) {
     var name = scope.name;
     var icon = scope.icon;
     if (hasIcon === undefined) hasIcon = !!icon;
-    render(item.children, { useIcon: hasIcon, hasIcon, name, icon });
+    render(item.children, scope, hasIcon instanceof Array ? hasIcon : [{ useIcon: hasIcon, hasIcon, name, icon }]);
     if (scope.line) item.setAttribute("line", ''), on("click")(item, preventDefault);
     return item;
 }

package/coms/zimoli/menuList.html

@@ -1,4 +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-class="{'has-children':menu.children&&menu.children.length,'warn':menu.type==='danger'||menu.type==='warn'||menu.type==='red'}">
+<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
+}">
 </menu-item>

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/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;