efront 3.10.7 → 3.11.0

package/coms/frame/route.js

@@ -33,7 +33,6 @@
     };
     var parseMenuList = function (items) {
         if (items instanceof Array) {
-            console.log(items)
             return items;
         }
         if (items instanceof Object) {

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/button.js

@@ -13,10 +13,9 @@ on("keydown")(window, function (event) {
             if (event.altKey) {
                 var key = String.fromCharCode(which);
                 var element = keyMap[key];
-
                 if (element) {
                     if (isMounted(element)) {
-                        dispatch(window, 'mousedown');
+                        event.preventDefault();
                         element.click();
                     } else {
                         delete keyMap[key];

package/coms/zimoli/menu.js

@@ -148,20 +148,22 @@ 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);
                     care(elem, function (src) {
                         menuList(elem, getTreeFromData(src), emit, direction);
                     });
-                } else {
+                }
+                else {
                     var nodes = getArrayNodes(elem);
-                    elem = menuList(elem, nodes, emit);
+                    elem = menuList(elem, nodes, emit, direction);
                 }
                 break;
             default:

package/coms/zimoli/menu.less

@@ -94,10 +94,17 @@ body:active & {
     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-right: none;
+    border-bottom: 1px solid #18333c;
+    padding: 0;
+
+    menu-item {
+        display: inline-block;
+
+        &.has-children:after {
+            padding-top: 3px;
+            content: "﹀";
+        }
+    }
 
     >div {
         vertical-align: top;

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,15 @@
 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 });
     return item;
 }

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(menu,this)"
+    ng-mouseleave="clearTimeout(popTimer)" ng-mouseenter="popTimer=popMenu(menu,this)"
     ng-class="{'has-children':menu.children&&menu.children.length,'warn':menu.type==='danger'||menu.type==='warn'||menu.type==='red'}">
 </menu-item>

package/coms/zimoli/menuList.js

@@ -8,38 +8,52 @@ var release = function () {
 var clear = function () {
     clearTimeout(releaseTimer);
 };
+var unfocus = function () {
+    remove(mounted_menus);
+    this.ispop = false;
+};
 function main(page, items, active, direction = 'y') {
     if (!isNode(page)) {
         var page = div();
     }
     var main = this;
-    function popMenu(item, event) {
+    if (direction !== 'x') page.ispop = true;
+    function popMenu(item, target) {
         if (page.active) {
             clear();
             remove(page.active);
         }
         if (!item.children || !item.children.length) return;
         var clone = template.cloneNode();
+        clone.$parentScopes = page.$parentScopes;
+        clone.$src = src;
         clone.innerHTML = template.innerHTML;
         var menu = main(clone, item.children, active);
         mounted_menus.push(menu);
-
         page.active = menu;
-        popup(menu, event.target);
-        var offleave0 = on("mouseleave")(event.target, release);
-        var offenter0 = on("mouseenter")(event.target, clear);
-        var offleave1 = on("mouseleave")(menu, release);
-        var offenter1 = on("mouseenter")(menu, clear);
+        menu.root = page.root || page;
+        popup(menu, target);
+        if (page.ispop === true) {
+            var offleave0 = on("mouseleave")(target, release);
+            var offleave1 = on("mouseleave")(menu, release);
+            var offenter0 = on("mouseenter")(target, clear);
+            var offenter1 = on("mouseenter")(menu, clear);
+        } else {
+            page.ispop = 1;
+            page.tabIndex = 0;
+            page.focus();
+        }
+        on("mousedown")(menu, e => e.preventDefault());
         once("remove")(menu, function () {
-            removeFromList(mounted_menus, page.active);
-            offleave0();
-            offenter0();
-            offleave1();
-            offenter1();
+            removeFromList(mounted_menus, this);
+            if (offleave0) offleave0();
+            if (offleave1) offleave1();
+            if (offenter0) offenter0();
+            if (offenter1) offenter1();
         });
     }
-
-    var template = page.tempalte || page.cloneNode();
+    if (!page.ispop) on("blur")(page, unfocus);
+    var template = page.tempalte || document.createElement("ylist");
     if (!page.tempalte) {
         template.className = '';
         template.removeAttribute('mode');
@@ -47,7 +61,6 @@ function main(page, items, active, direction = 'y') {
         page.tempalte = template;
     }
     if (!page.children.length || page.menutype === 1) {
-        page.innerHTML = menuList;
         page.menutype = 1;
         var hasIcon = function () {
             var menus = items;
@@ -58,26 +71,78 @@ function main(page, items, active, direction = 'y') {
             }
             return false;
         };
-        render(page, {
-            "menu-item": function () {
+        var $scope = {
+            "menu-item": function (e, s) {
                 return button(
-                    menuItem.apply(null, arguments)
+                    menuItem(e, s)
                 );
             },
             menus: items,
             hasIcon: hasIcon(),
-            open(menu, event) {
-                active(menu, event);
+            open(menu, elem) {
+                var pop = active(menu, elem);
+                if (pop === false) return;
+                var root = page.root || page;
+                if (root.ispop === 1) root.ispop = false;
+                if (!mounted_menus.length) {
+                    popMenu.apply(this, arguments);
+                }
+                else {
+                    unfocus.call(page);
+                }
             },
             popTimer: 0,
             popMenu() {
+                if (!page.ispop) return;
                 var args = arguments;
                 return setTimeout(function () {
                     popMenu.apply(null, args);
                 }, 60);
             },
-        });
-        vbox(page);
+        };
+        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`;
+            list(page, function (index) {
+                var item = items[index];
+                if (!item) return;
+                var a = menuItem(null, item, $scope.hasIcon);
+                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;
+                if (src.itemName) a.setAttribute("e-if", notHidden);
+                on("mouseleave")(a, function () {
+                    clearTimeout($scope.popTimer);
+                });
+                on("mouseenter")(a, function () {
+                    $scope.popTimer = $scope.popMenu(item, this);
+                });
+                on("click")(a, function () {
+                    $scope.open(items[index], this);
+                });
+                a.setAttribute("e-class", className);
+                a = button(a);
+                render(a, scope, parentScopes);
+                return a;
+            });
+            on("append")(page, function () {
+                this.go(0);
+            })
+        }
+        else {
+            page.innerHTML = menuList;
+            render(page, $scope);
+            vbox(page);
+        }
         page.renders.unshift(function () {
             this.$scope.hasIcon = hasIcon();
         });
@@ -86,11 +151,20 @@ function main(page, items, active, direction = 'y') {
         list(page, function (index) {
             var elem = generator(index);
             if (!elem) return;
-            on("mouseenter")(elem, function (event) {
-                popMenu(this.src[index], event);
+            on("mouseenter")(elem, function () {
+                if (page.ispop) popMenu(this.src[index], this);
             });
-            on("click")(elem, function (event) {
-                active(this.src[index], event);
+            on("click")(elem, function () {
+                var pop = active(this.src[index], this);
+                if (pop === false) return;
+                var root = page.root || page;
+                if (root.ispop === 1) root.ispop = false;
+                if (!mounted_menus.length) {
+                    popMenu(this.src[index], this);
+                }
+                else {
+                    unfocus.call(page);
+                }
             });
             return elem;
         }, direction);

package/coms/zimoli/render.js

@@ -527,25 +527,51 @@ var binders = {
         });
     }
 };
-var emiters = {
-    on(key, search) {
+var createEmiter = function (on) {
+    return function (key, search) {
+        if (this.$src) {
+            var parsedSrc = this.$src;
+            var scopes = this.$parentScopes;
+            search = search.slice();
+            search[0] += `with(this.$parentScopes[${scopes.length}])`;
+            this.$parentScopes = scopes.concat(this.$scope);
+        }
         var getter = createGetter(search, false);
         on(key)(this, function (e) {
-            var res = getter.call(this, e);
-            if (res && isFunction(res.then)) res.then(digest, digest);
-            digest();
-            return res;
-        });
-    },
-    once(key, search) {
-        var getter = createGetter(search, false);
-        once(key)(this, function (e) {
-            var res = getter.call(this, e);
+            if (parsedSrc) {
+                var target = e.currentTarget || e.target;
+                var scopes = target && target.$parentScopes;
+                if (scopes) {
+                    var scope = null;
+                    for (var cx = scopes.length - 1; cx >= 0; cx--) {
+                        var s = scopes[cx];
+                        if (s === this.$scope) {
+                            scope = scopes[cx + 1];
+                            break;
+                        }
+                    }
+                }
+                if (!scope && target.$scope !== this.$scope) scope = target.$scope;
+            }
+            var res;
+            if (scope) {
+                var temp = this.$scope;
+                this.$scope = scope;
+                res = getter.call(this, e);
+                this.$scope = temp;
+            }
+            else {
+                res = getter.call(this, e);
+            }
             if (res && isFunction(res.then)) res.then(digest, digest);
             digest();
             return res;
         });
-    }
+    };
+};
+var emiters = {
+    on: createEmiter(on),
+    once: createEmiter(once),
 };
 emiters.v = emiters.ng = emiters.on;
 

package/package.json

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