efront 3.10.7 → 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,11 +33,23 @@
     };
     var parseMenuList = function (items) {
         if (items instanceof Array) {
-            console.log(items)
+            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 = {};
@@ -55,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);
@@ -69,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");
@@ -175,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/active.js

@@ -1,8 +1,12 @@
 // 激活 自定义的 active 事件
-function active(target, value, item) {
+function active(target, value, item, targetElement) {
     var activeEvent = createEvent("active");
     activeEvent.item = item;
     activeEvent.value = value;
+    if (targetElement) {
+        if (Object.defineProperty) Object.defineProperty(activeEvent, 'currentTarget', { value: targetElement });
+        else activeEvent.currentTarget = targetElement;
+    }
     activeEvent = dispatch(target, activeEvent);
     return activeEvent && !activeEvent.defaultPrevented;
 }

package/coms/zimoli/bindAccesskey.js

@@ -0,0 +1,47 @@
+var keyMap = {};
+on("keydown")(window, function (event) {
+    var { which } = event;
+    switch (event.which) {
+        case 18:
+            event.preventDefault();
+            break;
+        default:
+            var key = String.fromCharCode(which);
+            var elems = keyMap[key];
+            if (elems) while (elems.length) {
+                var elem = elems[elems.length - 1];
+                if (isMounted(elem)) break;
+                else elems.pop();
+            }
+            if (elem) {
+                var parent = elem.parentNode;
+                if (event.altKey || parent === document.activeElement || parent.ispop) {
+                    event.preventDefault();
+                    elem.click();
+                }
+            }
+    }
+});
+var bindAccesskey = function (btn, k) {
+    if (!keyMap[k]) keyMap[k] = [];
+    removeFromList(keyMap[k], btn);
+    keyMap[k].push(btn);
+    once("remove")(btn, function () {
+        removeFromList(keyMap[k], btn);
+    });
+};
+var getKeyFromText = function (btn) {
+    var { innerText } = btn;
+    var match = /\(\s*\_?\w\s*\)|\[\s*\_?\w\s*\]|\{\s*\_?\w\s*\}/.exec(innerText);
+    if (match) {
+        var accesskey = match[0].replace(/^\W*(\w)\W*$/g, '$1');
+    } else {
+        var accesskey = btn.getAttribute("accesskey");
+    }
+    if (!accesskey) return;
+    return accesskey.toUpperCase();
+}
+function main(elem, key = getKeyFromText(elem)) {
+    bindAccesskey(elem, key);
+    return elem;
+}

package/coms/zimoli/button.js

@@ -2,29 +2,6 @@ var _label = createElement("span");
 var track = createElement(div);
 track.className = "track";
 _label.className = "label";
-var keyMap = {};
-on("keydown")(window, function (event) {
-    var { which } = event;
-    switch (event.which) {
-        case 18:
-            event.preventDefault();
-            break;
-        default:
-            if (event.altKey) {
-                var key = String.fromCharCode(which);
-                var element = keyMap[key];
-
-                if (element) {
-                    if (isMounted(element)) {
-                        dispatch(window, 'mousedown');
-                        element.click();
-                    } else {
-                        delete keyMap[key];
-                    }
-                }
-            }
-    }
-});
 
 var btn = document.createElement("button");
 btn.tabIndex = 0;
@@ -76,17 +53,6 @@ var touchstart = function () {
     var canceltouchend = ontouchend(this, cancel);
     active.call(this);
 };
-var bindAccesskey = function (btn) {
-    var { innerText } = btn;
-    var match = /\(\s*\_?\w\s*\)|\[\s*\_?\w\s*\]|\{\s*\_?\w\s*\}/.exec(innerText);
-    if (match) {
-        var accesskey = match[0].replace(/^\W*(\w)\W*$/g, '$1');
-    } else {
-        var accesskey = btn.getAttribute("accesskey");
-    }
-    if (!accesskey) return;
-    keyMap[accesskey.toUpperCase()] = btn;
-};
 function button(texter, type) {
     var tracker = createElement(track);
     var _texter;

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;
@@ -148,20 +149,24 @@ function main(elem, mode) {
             case "x":
             case "horizonal":
                 var direction = 'x';
+                mode = "horizonal";
             case "v":
             case "y":
             case "vertical":
-                var emit = function (item) {
-                    active(elem, item, item.value);
+                var emit = function (item, target) {
+                    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();
                     });
-                } else {
+                }
+                else {
                     var nodes = getArrayNodes(elem);
-                    elem = menuList(elem, nodes, emit);
+                    elem = menuList(elem, nodes, emit, direction);
+                    elem.registerAsRoot();
                 }
                 break;
             default:

package/coms/zimoli/menu.less

@@ -92,22 +92,30 @@ body:active & {
     display: block;
     overflow: hidden;
     text-overflow: hidden;
-    height: 40px;
     position: relative;
-    border: 1px solid #18333c;
-    background-color: #18333c;
-    box-shadow: inset 0 0 12px #51ddf6, inset 0px -120px 120px -120px #51ddf6;
+    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 {
+            padding-top: 3px;
+            content: "﹀";
+        }
+    }
 
     >div {
         vertical-align: top;
     }
 
-    .button {
-        line-height: 40px;
-    }
 }
 
+&[mode=tree],
 &[mode=tree],
 &[type=tree],
 &[mode=inline],
@@ -115,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;
@@ -211,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.html

@@ -1,3 +1,3 @@
-<i ng-class="menu.icon" ng-if='useIcon||hasIcon||menu.icon'></i>
-<span ng-model="menu.name"></span>
+<i ng-class="icon" ng-if='useIcon||hasIcon'></i>
+<span ng-html="name"></span>
 <s></s>

package/coms/zimoli/menuItem.js

@@ -1,11 +1,17 @@
+var preventDefault = function (e) { e.preventDefault() };
 function main(elem, scope, hasIcon) {
     var item = elem || document.createElement('menu-item');
     item.innerHTML = menuItem;
-    if (isObject(scope) && scope !== elem.$scope) {
-        render(item, { menu: scope, useIcon: hasIcon, hasIcon })
+    if (isObject(scope) && scope !== item.$scope) {
     }
     else {
-        extendIfNeeded(elem.$scope, { useIcon: false, hasIcon: false })
+        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, { 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.html

@@ -1,4 +1,4 @@
-<menu-item ng-repeat="menu in menus" ng-if="!menu.hidden" ng-click="open(menu,event)"
-    ng-mouseleave="clearTimeout(popTimer)" ng-mouseenter="popTimer=popMenu(menu,event)"
+<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>