efront 3.11.2 → 3.11.3

package/coms/basic/parseYML.js

@@ -118,7 +118,7 @@ var scan = function (text) {
         }
 
         if (/^\-(\s|$)/.test(row)) {
-            if (data || span > spacesize) push();
+            if (data || span >= spacesize) push();
             if (!parents[spacesize]) {
                 var obj = [];
                 push(obj);

package/coms/frame/route.js

@@ -33,10 +33,23 @@
     };
     var parseMenuList = function (items) {
         if (items instanceof Array) {
+            if (!items[0] || !items[0].name) {
+                var items1 = [];
+                for (var cx = 0, dx = items.length; cx < dx; cx++) {
+                    var item = items[cx];
+                    if (!item) continue;
+                    item = parseMenuList(item);
+                    items1.push.apply(items1, item);
+                    items1.push({ line: true });
+                }
+                items1.pop();
+                items = items1;
+            }
             return items;
         }
         if (items instanceof Object) {
             var keys = Object.keys(items);
+
             items = keys.map(k => {
                 var c = items[k];
                 var item = {};
@@ -54,7 +67,8 @@
                 if (/,/.test(name)) {
                     var [name, ...roles] = name.split(',');
                 }
-                item.name = name;
+                if (/^\-+$/.test(name)) item.line = true;
+                else item.name = name;
                 if (roles) item.roles = roles;
                 if (path) item.path = path;
                 if (data) item.params = parseKV(data);
@@ -68,6 +82,8 @@
         return [];
     };
     result.update = function (items) {
+        delete result.loading_promise;
+        delete result.then;
         items = parseMenuList(items);
         items.map(getChildren);
         var opened = data.getInstance("menu-opened");
@@ -174,10 +190,19 @@
         result.load(result.active);
         return result;
     };
-    result.fetch = function (url) {
-        data.from(url).loading_promise.then(result.update);
+    result.from = result.fetch = function (url) {
+        result.loading_promise = data.from(url).loading_promise.then(result.update);
+        result.then = then;
         return result;
     };
+    var then = function (ok, oh) {
+        if (this.loading_promise) {
+            return this.loading_promise.then(ok, oh);
+        }
+        delete result.then;
+        ok(result);
+        result.then = then;
+    };
     result.update(items);
     return result;
 });

package/coms/zimoli/Item.js

@@ -19,6 +19,7 @@ function Item(value) {
         this.icon = value.icon;
         this.color = value.color;
         this.test = value.test;
+        this.line = value.line;
     }
     this.count = 0;//子项中的叶子节点数
     this.total = 0;//子项中的节点数

package/coms/zimoli/button.less

@@ -18,7 +18,8 @@
     outline: none;
     user-select: none;
 }
->.label{
+
+>.label {
     position: relative;
 }
 
@@ -91,7 +92,7 @@
 
     >.track {
         background: #0001;
-        box-shadow: inset 0 0 6px 6px #6fc3;
+        box-shadow: inset 0 0 6px 6px #00000006;
     }
 }
 

package/coms/zimoli/getGenerator.js

@@ -1,13 +1,9 @@
 
 var _slider = createElement(div);
-var empty = function (index, item) {
-    if (!item) return;
-    return document.createElement('empty');
-};
-var getGenerator = function (container) {
+var getGenerator = function (container, tagName = 'item') {
     if (!container) return;
-    if (!container.childNodes.length) return container.$generator || empty;
-    var template = document.createElement("div");
+    if (!container.childNodes.length && container.$generator) return container.$generator;
+    var template = document.createElement(tagName);
     var templates = [].concat.apply([], container.childNodes).filter(a => {
         if (a.hasAttribute('insert')) {
             return false;
@@ -25,17 +21,24 @@ var getGenerator = function (container) {
     appendChild(template, templates);
     container.insertBefore = _slider.insertBefore;
     container.appendChild = _slider.appendChild;
-    var scopes = container.$parentScopes.concat(container.$scope);
-    return container.$generator = function (index, com) {
+    var scopes = container.$parentScopes || [];
+    if (container.$scope) scopes = scopes.concat(container.$scope);
+    return container.$generator = function (index, com, element) {
         if (!com) {
             if (!container.src || index >= container.src.length) return;
             com = container.src[index];
         }
         if (!com) return;
-        var template1 = template.cloneNode(true);
-        if (!template1.childNodes.length) return template1;
-        var item = template1.childNodes[0];
-        item.with = [].concat.apply([], template1.childNodes).slice(1);
+        if (!element) {
+            var template1 = template.cloneNode(true);
+            if (!template1.childNodes.length) {
+                element = template1;
+            }
+            else {
+                element = template1.childNodes[0];
+                if (template1.childNodes.length > 1) element.with = [].concat.apply([], template1.childNodes).slice(1);
+            }
+        }
         var parsedSrc = container.$src;
         if (parsedSrc) {
             var { keyName, itemName, indexName } = parsedSrc;
@@ -44,8 +47,8 @@ var getGenerator = function (container) {
                 [itemName || '$item']: com,
                 [indexName || '$index']: index
             };
-            var newItem = render(item, newScope, scopes);
-            if (item.with.length) newItem.with = render(item.with, newScope, scopes);
+            var newItem = render(element, newScope, scopes);
+            if (element.with) newItem.with = render(element.with, newScope, scopes);
         } else {
             var newScope = container.src[index];
             if (!isObject(newScope)) newScope = {
@@ -65,8 +68,8 @@ var getGenerator = function (container) {
                     return this.$item;
                 }
             }
-            var newItem = render(item, newScope, scopes);
-            newItem.with = render(newItem.with = item.with, newScope, scopes);
+            var newItem = render(element, newScope, scopes);
+            if (element.with) newItem.with = render(newItem.with = element.with, newScope, scopes);
         }
         return newItem;
     };

package/coms/zimoli/menu.js

@@ -117,8 +117,9 @@ function main(elem, mode) {
             case "inline":
             case "t":
             case "tree":
+                mode = "tree";
                 if (elem) {
-                    var generator = getGenerator(elem);
+                    var generator = getGenerator(elem, 'menu-item');
                     tree(elem, function (index, item) {
                         var e = generator(index, item);
                         if (!e || e.children.length) return e;
@@ -156,7 +157,7 @@ function main(elem, mode) {
                     active(elem, item, item.value, target);
                 };
                 if ("$src" in elem) {
-                    getGenerator(elem);
+                    getGenerator(elem, 'menu-item');
                     care(elem, function (src) {
                         menuList(elem, getTreeFromData(src), emit, direction);
                         elem.registerAsRoot();

package/coms/zimoli/menu.less

@@ -92,12 +92,15 @@ body:active & {
     display: block;
     overflow: hidden;
     text-overflow: hidden;
-    line-height: 40px;
     position: relative;
     border-bottom: 1px solid #18333c;
+    border-top: none;
+    border-left: none;
+    border-right: none;
     padding: 0;
 
     menu-item {
+        line-height: 24px;
         display: inline-block;
 
         &.has-children:after {
@@ -110,11 +113,9 @@ body:active & {
         vertical-align: top;
     }
 
-    .button {
-        line-height: 40px;
-    }
 }
 
+&[mode=tree],
 &[mode=tree],
 &[type=tree],
 &[mode=inline],
@@ -122,46 +123,46 @@ body:active & {
     height: auto;
     box-shadow: none;
     padding: 0;
-    margin: 0;
-
-    // &[browser=samsung] {
-    //     .tab1 {
-    //         &.open s {
-    //             overflow   : visible;
-    //             text-indent: -6.6pt;
-    //         }
-    //         &.closed s{
-    //             overflow   : visible;
-    //             text-indent: 3.1pt;
-    //         }
-    //     }
-    // }
-
-    // &[browser=firefox] {
-    //     .tab1 {
-    //         &.open s {
-    //             text-indent: -8.6px;
-    //         }
-
-    //         &.closed s {
-    //             text-indent: -4.1px;
-    //         }
-    //     }
-    // }
-
-    // &[browser=safari] {
-    //     .tab1 {
-    //         &.open s {
-    //             text-indent: -5.6px;
-    //         }
-
-    //         &.closed s {
-    //             text-indent: -1.1px;
-    //         }
-    //     }
-    // }
-
-    .tab1 {
+
+    >.button {
+        box-shadow: none;
+        padding-top: 6px;
+        padding-bottom: 6px;
+        line-height: 20px;
+        font-size: 14px;
+
+        >b {
+            font-weight: normal;
+        }
+
+        &:not(.tab1) {
+            display: block;
+            background: #2c3b41;
+            color: #8aa4af;
+
+            &.checked,
+            &.actived,
+            &.selected {
+                color: #fff;
+            }
+        }
+
+        i {
+            margin-right: 10px;
+        }
+
+
+        &.hover {
+            text-shadow: none;
+            color: #fff;
+        }
+
+    }
+
+    >.tab1 {
+        font-size: 16px;
+        line-height: 28px;
+
         &.open {
             color: #fff;
             background: #1e282c;
@@ -218,45 +219,13 @@ body:active & {
 
         border-left: 3px solid transparent;
         display : block;
-        height : 44px;
-        line-height: 44px;
         font-size : 14px;
         color : #b8c7ce;
     }
 
-    >.button {
-        box-shadow: none;
-
-
-        >b {
-            font-weight: normal;
-        }
-
-        &:not(.tab1) {
-            display: block;
-            height: 36px;
-            line-height: 36px;
-            font-size: 14px;
-            background: #2c3b41;
-            color: #8aa4af;
-
-            &.checked,
-            &.actived,
-            &.selected {
-                color: #fff;
-            }
-        }
-
-        i {
-            margin-right: 10px;
-        }
-
-
-        &.hover {
-            text-shadow: none;
-            color: #fff;
-        }
-
+    >[line],
+    >.line {
+        line-height: 0;
+        font-size: 0;
     }
-
 }

package/coms/zimoli/menuItem.js

@@ -1,3 +1,4 @@
+var preventDefault = function (e) { e.preventDefault() };
 function main(elem, scope, hasIcon) {
     var item = elem || document.createElement('menu-item');
     item.innerHTML = menuItem;
@@ -11,5 +12,6 @@ function main(elem, scope, hasIcon) {
     var icon = scope.icon;
     if (hasIcon === undefined) hasIcon = !!icon;
     render(item.children, { useIcon: hasIcon, hasIcon, name, icon });
+    if (scope.line) item.setAttribute("line", ''), on("click")(item, preventDefault);
     return item;
 }

package/coms/zimoli/menuItem.less

@@ -1,4 +1,20 @@
 i{
     display: inline-block;
     width: 1em;
+}
+&.line,
+&[line] {
+    box-shadow: none;
+    >.track{
+        display: none;
+    }
+    line-height: 0;
+    font-size: 0;
+    &:after {
+        content: "";
+        display: block;
+        border-bottom: 1px solid;
+        opacity: .36;
+        margin: 0 -20px;
+    }
 }

package/coms/zimoli/menuList.js

@@ -11,11 +11,11 @@ var clear = function () {
 var unfocus = function () {
     remove(mounted_menus);
     this.ispop = false;
-    this.setFocus();
+    this.setFocus(null);
 };
-var setFocus = function (focused = this.firstMenu) {
+var setFocus = function (focused) {
     var page = this;
-    if (page.ispop || page === document.activeElement) {
+    if (focused) {
         if (page.focused !== focused) {
             if (page.focused) removeClass(page.focused, 'focus');
             if (focused) addClass(focused, "focus");
@@ -106,12 +106,18 @@ function keyalt() {
     else {
         root_menu.tabIndex = 0;
         root_menu.focus();
+        root_menu.setFocus(this.firstMenu);
     }
-    root_menu.setFocus();
+}
+function keytab(event) {
+    if (root_menu !== document.activeElement) return;
+    var menu = mounted_menus[mounted_menus.length - 1] || root_menu;
+    event.preventDefault();
+    menu.moveFocus(1);
 }
 function keyesc() {
     if (root_menu === document.activeElement && !mounted_menus.length) {
-        if (!root_menu.ispop) root_menu.blur(), root_menu.setFocus();
+        if (!root_menu.ispop) root_menu.blur();
         else root_menu.ispop = false;
     }
 }
@@ -137,6 +143,7 @@ function keyspace() {
 }
 function register() {
     // on('keydown.alt')(window, e => e.preventDefault());
+    on('keydown.tab')(window, keytab);
     on('keydown.alt.')(window, keyalt);
     on('keydown.esc')(window, keyesc);
     on('keydown.left')(window, keyleft);
@@ -162,6 +169,7 @@ function main(page, items, active, direction = 'y') {
         if (!item.children || !item.children.length) return;
         var clone = template.cloneNode();
         clone.$parentScopes = page.$parentScopes;
+        clone.$scope = page.$scope;
         clone.$src = src;
         clone.innerHTML = template.innerHTML;
         var menu = main(clone, item.children, active);
@@ -210,16 +218,18 @@ function main(page, items, active, direction = 'y') {
     }
     var fire = function () {
         cancel();
+        if (this.menu.line) return;
         var pop = active(this.menu, this);
         if (pop === false) return;
         var root = page.root || page;
         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) {
                 popMenu(this.menu, this);
             }
             else {
-                unfocus.call(page);
+                remove(mounted_menus.pop());
             }
         }
         else {
@@ -244,8 +254,8 @@ function main(page, items, active, direction = 'y') {
             return false;
         };
         var $scope = {
-            "menu-item": function (e, s) {
-                var a = bindAccesskey(
+            "menu-item"(e, s) {
+                var a = button(
                     menuItem(e, s, this.hasIcon)
                 );
                 if (!page.firstMenu) {
@@ -261,31 +271,23 @@ function main(page, items, active, direction = 'y') {
         };
         if (page.$src) {
             var src = page.$src;
-            var parentScopes = page.$parentScopes;
             var itemName = src.itemName;
             var className = `{'has-children':${itemName}.children&&${itemName}.children.length,'warn':${itemName}.type==='danger'||${itemName}.type==='warn'||${itemName}.type==='red'}`;
             var notHidden = `!${itemName}.hidden`;
+            var generator = getGenerator(page, 'menu-item');
 
             list(page, function (index) {
                 var item = items[index];
                 if (!item) return;
-                var a = $scope["menu-item"](null, item);
-                var scope = {};
                 if (item instanceof Item) item = item.value;
-                if (src.itemName) scope[src.itemName] = item;
-                else scope.$item = item;
-                if (src.keyName) scope[src.keyName] = index;
-                else scope.$key = index;
-                if (src.indexName) scope[src.indexName] = index;
-                else scope.$index = index;
-                if (src.srcName) scope[src.srcName] = items;
+                var a = $scope["menu-item"](null, item);
                 if (src.itemName) a.setAttribute("e-if", notHidden);
+                a.setAttribute("e-class", className);
+                a = generator(index, item, a);
                 a.menu = item;
                 on("mouseleave")(a, cancel);
                 on("mouseenter")(a, open);
                 on("click")(a, fire);
-                a.setAttribute("e-class", className);
-                render(a, scope, parentScopes);
                 return a;
             });
             on("append")(page, function () {
@@ -303,7 +305,7 @@ function main(page, items, active, direction = 'y') {
         });
     }
     else {
-        var generator = getGenerator(page);
+        var generator = getGenerator(page, 'menu-item');
 
         list(page, function (index) {
             var elem = generator(index);

package/coms/zimoli/menuList.less

@@ -5,7 +5,6 @@
     background-color: #fff;
     box-shadow: 0 0 20px -6px rgba(0, 0, 0, .1);
     border: 1px solid #0003;
-    line-height: 28px;
     padding: 6px 0;
 
     >menu-item {
@@ -17,6 +16,10 @@
         color: inherit;
         box-shadow: none;
         text-align: inherit;
+        vertical-align: top;
+        line-height: 20px;
+        padding-top: 4px;
+        padding-bottom: 4px;
 
         &.warn {
             color: #c28;
@@ -27,7 +30,8 @@
         }
 
         &.has-children {
-            padding: 0 24px 0 16px;
+            padding-right: 24px;
+            padding-left: 16px;
 
             &:after {
                 content: ">";

package/coms/zimoli/render.js

@@ -529,14 +529,14 @@ var binders = {
 };
 var createEmiter = function (on) {
     return function (key, search) {
-        if (this.$src) {
-            var parsedSrc = this.$src;
+        var parsedSrc = this.$src;
+        var getter0 = createGetter(search, false), getter1;
+        if (parsedSrc) {
             var scopes = this.$parentScopes;
             search = search.slice();
             search[0] += `with(this.$parentScopes[${scopes.length}])`;
-            this.$parentScopes = scopes.concat(this.$scope);
+            getter1 = createGetter(search, false);
         }
-        var getter = createGetter(search, false);
         on(key)(this, function (e) {
             if (parsedSrc) {
                 var target = e.currentTarget || e.target;
@@ -556,12 +556,14 @@ var createEmiter = function (on) {
             var res;
             if (scope) {
                 var temp = this.$scope;
+                this.$parentScopes.push(temp);
                 this.$scope = scope;
-                res = getter.call(this, e);
+                res = getter1.call(this, e);
+                this.$parentScopes.pop();
                 this.$scope = temp;
             }
             else {
-                res = getter.call(this, e);
+                res = getter0.call(this, e);
             }
             if (res && isFunction(res.then)) res.then(digest, digest);
             digest();
@@ -581,7 +583,7 @@ function getFromScopes(key, scope, parentScopes) {
     }
     if (parentScopes) for (var cx = parentScopes.length - 1; cx >= 0; cx--) {
         var o = parentScopes[cx];
-        if (key in o) {
+        if (o && key in o) {
             return o[key];
         }
     }
@@ -614,13 +616,13 @@ function renderElement(element, scope = element.$scope, parentScopes = element.$
         return element;
     }
     var isFirstRender = !element.renderid;
-    element.renderid = 1;
-    var parentNode = element.parentNode;
-    if (parentNode) {
-        if (parentNode.renderid > 1 || parentNode.isMounted) element.renderid = 2;
-    }
 
     if (isFirstRender) {
+        element.renderid = 1;
+        var parentNode = element.parentNode;
+        if (parentNode) {
+            if (parentNode.renderid > 1 || parentNode.isMounted) element.renderid = 2;
+        }
         element.renders = element.renders ? [].concat(element.renders) : [];
         var { ons, copys, attrs, props, binds, context: withContext } = element.$struct;
         delete element.$struct;

package/coms/zimoli/tree.js

@@ -132,16 +132,18 @@ function tree() {
         }
         var tabs = new Array(com.tab + 1).join("<t></t>");
         if (isFunction(generator)) {
-            var elem = generator(index, com);
+            var elem = generator(index, com instanceof Item ? com.value : com);
             if (!elem) return;
-            span = document.createElement('div');
+            span = document.createElement('span');
             span.innerHTML = tabs;
-            span.appendChild(elem);
+            elem.insertBefore(span, elem.firstChild);
+            span = elem;
         } else {
-            span = div();
+            span = document.createElement("node");
             html(span, `${tabs}<c>${com.name}</c>${com.test ? "<i>_test</i>" : ""}<a class=count>${com.count}</a>`);
         }
         var _div = button(span);
+        _div.setAttribute("node", '');
         _div.index = index;
 
         if (!com.saved) {
@@ -222,7 +224,7 @@ function tree() {
         _div.refresh();
         onclick(_div, function () {
             var isClosed = com.isClosed();
-            if (!active(banner, com.value, com)) {
+            if (!active(banner, com.value, com, _div)) {
                 return;
             }
             if (isClosed === com.isClosed() && com.length) {

package/coms/zimoli/tree.less

@@ -3,13 +3,26 @@
     background: #222d32;
     color: #fff;
 
-    >div {
+    >[node] {
         display: block;
         text-align: left;
         height: auto;
         background-color: inherit;
         color: inherit;
         padding-right: 10px;
+        padding-top: 4px;
+        padding-bottom: 4px;
+        box-shadow: none;
+
+        &.line,
+        &[line] {
+            box-shadow: none;
+            line-height: 0;
+
+            >.track {
+                display: none;
+            }
+        }
     }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "3.11.2",
+    "version": "3.11.3",
     "description": "一个开发工具，开放源代码，自带组件库和编译环境，可以用来开发web组件，web应用或nodejs模块，或做为已有代码的加密工具，也可以做为静态页面服务器或跨域中转服务器使用",
     "main": "public/efront.js",
     "directories": {