efront 3.17.1 → 3.17.2

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

@@ -90,13 +90,6 @@ var getTreeNodes = function (elem) {
     [].forEach.call(elem.children, run);
     return nodes;
 };
-function createItemTarget(item) {
-    var $scope = {};
-    var { itemName } = this.$src;
-    if (itemName) $scope[itemName] = item;
-    else $scope.menu = item, $scope.$item = item;
-    return { $scope };
-}
 var emitEvent = function (item, event) {
     event.preventDefault(true);
     if (item.disabled) return;
@@ -156,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) {

package/coms/zimoli/tree.js

@@ -132,7 +132,7 @@ function tree() {
         }
         var tabs = new Array(com.tab + 1).join("<t></t>");
         if (isFunction(generator)) {
-            var elem = generator(index, com instanceof Item ? com.value : com);
+            var elem = generator(index, com instanceof Item ? com.value : com, com);
             if (!elem) return;
             span = document.createElement('span');
             span.innerHTML = tabs;
@@ -222,9 +222,9 @@ function tree() {
         };
         com.target = _div;
         _div.refresh();
-        onclick(_div, function () {
+        onclick(_div, function (event) {
             var isClosed = com.isClosed();
-            if (!active(banner, com.value, com, _div)) {
+            if (!active(banner, com.value, com, element.$src ? createItemTarget.call(element, com.value) : _div)) {
                 return;
             }
             if (isClosed === com.isClosed() && com.length) {

package/package.json

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