efront 3.16.0 → 3.17.2

package/apps/pivot/log/boot.js

@@ -11,9 +11,9 @@ var fields = refilm`
                 appendChild(e, l);
             };
             if (e.data.address) setAddress(e.data.address);
-            else data.from("iplocation", { ip: m[0] }, function (a) {
-                e.data.address = a.address;
+            else e.data.address = data.from("iplocation", { ip: m[0] }, function (a) {
                 setAddress(a.address);
+                return a.address;
             });
         }
         return e;
@@ -24,8 +24,11 @@ var fields = refilm`
 端口/port ${async function (e) {
         var { data, field } = e;
         var ports = data[field.key].split(/,/);
-        var loaded = [];
-        for (var p of ports) {
+        var loaded = data.loaded || ports;
+        data.loaded = loaded;
+        e.innerHTML = loaded.join(' ');
+        if (data.loaded === ports) for (let cx = 0, dx = ports.length; cx < dx; cx++) {
+            var p = ports[cx];
             var p0 = p;
             var protocol = /^https/.test(p) ? "https://" : "http://";
             p = p.replace(/[^\d]+/g, '');
@@ -40,18 +43,18 @@ var fields = refilm`
                 }
                 var xhr = await cross("options", `${protocol}${ip}${p}/:version`);
                 if (xhr.responseText === 'efront ' + data.version) {
-                    loaded.push(`<span style="color:green">${p0}</span>`);
+                    loaded[cx] = (`<span style="color:green">${p0}</span>`);
                 } else {
-                    loaded.push(`<span style="color:red">${p0}</span>`);
+                    loaded[cx] = (`<span style="color:red">${p0}</span>`);
                 }
             } catch (e) {
-                loaded.push(`<span style="color:gray">${p0}</span>`);
+                loaded[cx] = (`<span style="color:gray">${p0}</span>`);
             }
-            e.innerHTML = loaded.join('');
+            e.innerHTML = loaded.join(' ');
         }
     }}
-版本 / version text
-进程 / pid
+版本/version input
+进程/pid
     `;
 function main() {
     var page = div();

package/apps/pivot/main.less

@@ -1,4 +1,5 @@
 >:not([layer]) {
     padding: 50px 10px 0;
     min-height: 100%;
+    display: block;
 }

package/coms/basic/JSAM.js

@@ -42,6 +42,11 @@ var join = function (o) {
     return s;
 };
 function stringify(memery, preload) {
+    if (!isEmpty(preload)) {
+        preload = [].concat(preload);
+        var i = preload.indexOf(memery) + 1;
+        if (i > 0) return i + ',';
+    }
     if (memery === undefined) return '';
     if (check(memery)) return String(memery);
     if (typeof memery === 'symbol') return symbol(memery);
@@ -57,17 +62,22 @@ function stringify(memery, preload) {
     var trimed = [memery instanceof Array ? [] : {}];
     var objects = [trimed[0]];
     if (!isEmpty(preload)) dist = dist.concat(preload);
+    var preload_used = false;
     while (rest.length) {
         var memery = rest.shift();
         var o = objects.shift();
         var inc = 0, arr = [];
         o[""] = arr;
         o._ = dist.indexOf(memery.constructor);
+        if (o._ > 0) preload_used = true;
         for (var k in memery) {
             var m = memery[k];
             f: if (typeof m === 'function') {
                 for (var k in m) break f;
-                if (dist.indexOf(m) >= 0) break f;
+                if (dist.indexOf(m) >= 0) {
+                    preload_used = true;
+                    break f;
+                }
                 continue;
             }
             if (inc === +k && k !== '') {
@@ -113,7 +123,7 @@ function stringify(memery, preload) {
         }
     }
     var result = trimed.map(join).join(',');
-    if (trimed.length === 1) result += ',';
+    if (trimed.length === 1 && preload_used) result += ',';
     return result;
 }
 var create = function (a, dst) {
@@ -181,7 +191,7 @@ function parse(string, preload) {
                     reg4.lastIndex = cx;
                     var m = reg4.exec(string);
                     o._ = typeid || string.slice(cx, m.index);
-                    cx = reg4.lastIndex;
+                    cx = m.index;
                 }
                 break;
             case "/":
@@ -212,12 +222,10 @@ function parse(string, preload) {
                 trimed.push(s);
                 break;
             default:
-                reg4.lastIndex = cx + 1;
+                reg4.lastIndex = cx;
                 var match = reg4.exec(string);
                 var index = match.index;
-
                 var s = string.slice(cx, index);
-                cx = index;
                 switch (s) {
                     case "null":
                         s = null;
@@ -244,8 +252,10 @@ function parse(string, preload) {
 
                 }
                 trimed.push(s);
+                cx = index;
         }
     }
+    if (string.charAt(string.length - 1) === ',') trimed.push(undefined);
     var dist = [trimed[0]];
     if (!isEmpty(preload)) dist = dist.concat(preload);
     var preloads_length = dist.length - 1;
@@ -264,7 +274,8 @@ function parse(string, preload) {
         var t = dist[index];
         var arr = o[""];
         delete o[""];
-        for (var k in arr) {
+        delete o._;
+        if (arr) for (var k in arr) {
             t[k] = dist[arr[k]];
         }
         for (var k in o) {
@@ -272,12 +283,15 @@ function parse(string, preload) {
             t[dist[k]] = dist[v];
         }
     }
+    if (trimed.length > 1 && typeof trimed[0] === 'number') {
+        return dist[trimed[0]];
+    }
     return dist[0];
 }
 module.exports = {
     stringify,
     parse(data, preload) {
-        if (!/^\s*([\[\{]|\[\s*\]|\{\s*\})/.test(data)) return parse(data, preload);
+        if (!/^\s*([\[\{]|\[\s*\]|\{\s*\})$/.test(data)) return parse(data, preload);
         if (/^\s*\{[\d\,\:\s]*\}\s*,/.test(data)) return parse(data, preload);
         if (/^\s*\[[\d\,\:\s]*\]\s*,/.test(data)) return parse(data, preload);
         return JSON.parse(data, preload);

package/coms/basic/Speed.js

@@ -22,12 +22,12 @@ function inertia(gun) {
     }
     var smooth = function () {
         var args = spd.read();
-        if (decrease && args.filter(a => Math.abs(a) > .5).length === 0) {
+        if (decrease && args.filter(a => Math.abs(a) > 2).length === 0) {
             spd.reset();
             _decrease();
             return;
         }
-        if (args.filter(a => Math.abs(a) > .1).length === 0) {
+        if (args.filter(a => Math.abs(a) > .5).length === 0) {
             spd.reset();
             return;
         }

package/coms/basic/lazy.js

@@ -8,9 +8,13 @@ function lazy(run, time = false) {
     var fire = function () {
         if (time >= 0) {
             if (ing === true) {
-                ing = wait(fire, +time);
+                ing = wait(fire, +time / 2);
             }
-            else if (isFinite(ing)) {
+            else if (isFinite(ing) && ing !== 0) {
+                wait(fire, +time);
+                ing = 0;
+            }
+            else if (ing === 0) {
                 ing = run.apply(that, args);
             }
             else {

package/coms/frame/left.html

@@ -9,5 +9,5 @@
         <span ng-bind="user.roles"></span>
     </span>
 </header>
-<ylist mode=inline ng-src="menu in menus" class="sidebar-menu" ng-active="menus.open(event.value)">
+<ylist mode=inline ng-src="menu in menus" class="sidebar-menu" ng-active="menus.open(menu)">
 </ylist>

package/coms/kugou/song.js

@@ -1,15 +1,14 @@
 function main(elem) {
     elem = elem || document.createElement("song");
-    if (!elem.innerHTML) elem.innerHTML = song;
     var $scope = {
         filterTime,
         png: img,
         playState: kugou$playState,
         song: {},
-        musicList:kugou$musicList,
+        musicList: kugou$musicList,
     };
-    render(elem, $scope);
     care(elem, function (item) {
+        if (!elem.innerHTML) elem.innerHTML = song;
         var songName = String(item.name || item.songName || item.songname_original || '');
         var singerName = String(item.singer || item.singerName || item.singername || '');
         if (~songName.indexOf(singerName)) {
@@ -24,6 +23,7 @@ function main(elem) {
             songMarked: mark(songName, elem.mark),
             singerMarked: mark(singerName, elem.mark)
         };
+        render(elem.children, $scope);
     });
     return block(elem);
 }

package/coms/zimoli/Item.js

@@ -1,32 +1,39 @@
 var id = 0;
 function Item(value) {
-    this.value = isObject(value) ? value : Object.create(value);
-    this.valueOf = function () {
-        return value;
-    };
-    this.toString = function () {
-        return String(value);
-    };
     this.children = this;
-    if (value.children instanceof Array) {
-        var children = value.children.map(item => new Item(item));
-        children.forEach(item => item.parent = item);
-        this.push.apply(this, children);
-    }
-    if (isObject(value)) {
-        this.name = value.name;
-        this.tab = value.tab;
-        this.icon = value.icon;
-        this.color = value.color;
-        this.test = value.test;
-        this.line = value.line;
-    }
     this.count = 0;//子项中的叶子节点数
     this.total = 0;//子项中的节点数
     this.crack = 0;
     this.id = ++id;
+    this.extends(value);
 }
 Item.prototype = extend([], {
+    extends(value) {
+        this.value = value;
+        if (value.children instanceof Array) {
+            var children = value.children.map(item => new Item(item));
+            children.forEach(item => item.parent = item);
+            this.push.apply(this, children);
+        }
+        if (isObject(value)) {
+            this.name = value.name;
+            this.tab = value.tab;
+            this.icon = value.icon;
+            this.color = value.color;
+            this.test = value.test;
+            this.line = value.line;
+        }
+        else {
+            this.name = value;
+        }
+    },
+
+    valueOf() {
+        return this.value;
+    },
+    toString() {
+        return String(this.value);
+    },
     isClosed() {
         return !!this.value.closed;
     },
@@ -34,14 +41,21 @@ Item.prototype = extend([], {
         this.value.closed = value;
     },
     isActive() {
-        return !!(this.value.active || this.value.actived);
+        if (isObject(this.value)) {
+            if ("active" in this.value) return this.value.active;
+            if ('actived' in this.value) return this.value.actived;
+        }
+        return !!this.actived;
     },
     setActive(value) {
-        if ('active' in this.value) {
-            this.value.active = value;
-        } else {
-            this.value.actived = value;
+        if (isObject(this.value)) {
+            if ('active' in this.value) {
+                this.value.active = value;
+            } else {
+                this.value.actived = value;
+            }
         }
+        this.actived = value;
     },
     isSelected() {
         return !!this.value.selected;
@@ -53,3 +67,4 @@ Item.prototype = extend([], {
         return !!this.value.class;
     }
 });
+Item.prototype.isActived = Item.prototype.isActive;

package/coms/zimoli/appendChild.js

@@ -11,26 +11,24 @@ function hasEnterStyle(e) {
     return e.initialStyle || e.enterStyle || e.leavingStyle || e.leaveStyle;
 }
 
-function _onappend(node, event) {
+function _onappend(node, append = createEvent("append"), mount = createEvent("mounted")) {
     if (node.isMounted) return;
     if (node.nodeType === 1 || node.nodeType === 8) node.isMounted = true;
-    if (!event) {
-        event = createEvent("append");
-    }
-    dispatch(node, event);
+    dispatch(node, append);
     var onappend = node.onappend;
     if (isArray(onappend)) {
         onappend.map(function (append_handler) {
-            append_handler.call(this, event);
+            append_handler.call(this, append);
         }, node);
     }
     if (isFunction(onappend)) {
-        onappend.call(node, event);
+        onappend.call(node, append);
     }
     var children = [].concat.apply([], node.childNodes);
     if (children) for (var cx = 0, dx = children.length; cx < dx; cx++) {
-        _onappend(children[cx], event);
+        _onappend(children[cx], append, mount);
     }
+    dispatch(node, mount);
 }
 function appendChild(parent, obj, transition) {
     if (transition === false) {

package/coms/zimoli/container.js

@@ -1,7 +1,17 @@
 var change = function (data) {
     zimoli.go(data, this.params, this);
 };
+var gosrc = function () {
+    if (this.hasAttribute('src')) {
+        var src = this.getAttribute('src');
+        if (src !== this.src) {
+            this.src = src;
+            if (src) cast(this, this.getAttribute('src'));
+        }
+    }
+};
 function container(element) {
     care(element, change);
+    element.renders = [gosrc];
     return element;
 }

package/coms/zimoli/createItemTarget.js

@@ -0,0 +1,7 @@
+function createItemTarget(item) {
+    var $scope = {};
+    var { itemName } = this.$src;
+    if (itemName) $scope[itemName] = item;
+    else $scope.$item = item;
+    return { $scope };
+}

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/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,7 +90,11 @@ var getTreeNodes = function (elem) {
     [].forEach.call(elem.children, run);
     return nodes;
 };
-
+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) {
@@ -99,14 +103,6 @@ function bindGlobalkey(elem, keymap, emit) {
     }
     if (!keymap) return;
     var keyoff = [];
-    var emitEvent = function (item, event) {
-        event.preventDefault(true);
-        var $scope = {};
-        var { itemName } = this.$src;
-        if (itemName) $scope[itemName] = item;
-        else $scope.menu = item, $scope.$item = item;
-        emit(item, { $scope });
-    }
     for (let k in keymap) {
         keyoff.push(bind("keydown." + k)(elem, emitEvent.bind(elem, keymap[k])));
     }
@@ -153,10 +149,10 @@ function main(elem, mode) {
                 mode = "inline";
                 if (elem) {
                     var generator = getGenerator(elem, 'menu-item');
-                    tree(elem, function (index, item) {
+                    tree(elem, function (index, item, menu) {
                         var e = generator(index, item);
                         if (!e || e.children.length) return e;
-                        var m = menuItem(e, item, elem.useIcon);
+                        var m = menuItem(e, menu, elem.useIcon);
                         return m;
                     });
                     care(elem, function (data) {
@@ -198,8 +194,8 @@ 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');
@@ -209,6 +205,13 @@ function main(elem, mode) {
                         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));

package/coms/zimoli/menuItem.js

@@ -4,7 +4,7 @@ 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;
@@ -17,7 +17,7 @@ function main(elem, scope, hasIcon) {
     else {
         item.removeAttribute("disabled");
     }
-    render(item.children, scope, hasIcon instanceof Array ? hasIcon : [{ useIcon: hasIcon, hasIcon, name, icon }]);
+    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/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

@@ -166,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;
@@ -188,7 +189,6 @@ function main(page, items, active, direction = 'y') {
         page.actived = menu;
         menu.root = page.root || page;
         popup(menu, target);
-        menu.setFocus(menu.firstMenu);
         if (page.ispop === true) {
         } else {
             page.ispop = 1;
@@ -234,18 +234,19 @@ function main(page, items, active, direction = 'y') {
         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;
@@ -253,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());
@@ -262,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();
             }
@@ -286,7 +287,7 @@ 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;
@@ -307,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/on.js

@@ -253,7 +253,7 @@ var checkroot = function (element, k) {
     if (!(k in element)) {
         if (element === window && k in document) {
             element = document;
-            if (!checkroot[k]) checkroot[k] = true, console.warn("use ", k, "on document instead of on window");
+            if (!checkroot[k]) checkroot[k] = true, console.warn("使用 document 的", k, "替代 window 的");
         }
     }
     return element;