efront 3.18.1 → 3.18.2

package/coms/zimoli/Item.js

@@ -22,6 +22,11 @@ Item.prototype = extend([], {
             this.color = value.color;
             this.test = value.test;
             this.line = value.line;
+            if (value.path) this.path = value.path;
+            if (value.id) this.id = value.id;
+            if (value.url) this.url = value.url;
+            if (value.href) this.href = value.href;
+            if (value.src) this.src = value.src;
         }
         else {
             this.name = value;

package/coms/zimoli/container.js

@@ -2,17 +2,22 @@ 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'));
-        }
+    var { src } = this;
+    if (this.hasAttribute && this.hasAttribute('src')) {
+        src = this.getAttribute('src');
+    }
+    if (src !== this._src) {
+        change.call(this, src);
+        this._src = src;
     }
 };
 function container(element) {
+    var src;
+    if (element && element.hasAttribute('src')) {
+        src = element.getAttribute('src');
+    }
     element = document.createComment('container');
-    care(element, change);
+    element.src = src;
     element.renders = [gosrc];
     return element;
 }

package/coms/zimoli/menuList.js

@@ -286,7 +286,7 @@ function main(page, items, active, direction = 'y') {
         };
         var $scope = {
             "menu-item"(e, s) {
-                if (s === e.$scope) s = itemName ? s[itemName] : s.menu;
+                if (e && s === e.$scope) s = itemName ? s[itemName] : s.menu;
                 var a = button(
                     menuItem(e, s.value, this.hasIcon)
                 );

package/coms/zimoli/render.js

@@ -691,7 +691,9 @@ function renderElement(element, scope = element.$scope, parentScopes = element.$
                     }
                 });
                 replacer.renderid = element.renderid;
-                replacer.renders = element.renders;
+                var renders = element.renders;
+                if (replacer.renders) renders = renders.concat(replacer.renders);
+                replacer.renders = renders;
                 if (binds.src) replacer.$src = element.$src;
                 element = replacer;
                 element.$scope = scope;
@@ -701,6 +703,8 @@ function renderElement(element, scope = element.$scope, parentScopes = element.$
     }
     if (element.children && element.children.length) renderElement(element.children, scope, parentScopes, once);
     if (!isFirstRender) return element;
+    var renders = element.renders;
+    element.renders = [];
     for (var k in binds) {
         if (directives.hasOwnProperty(k)) {
             directives[k].call(element, [withContext, binds[k]])
@@ -718,6 +722,7 @@ function renderElement(element, scope = element.$scope, parentScopes = element.$
         } catch (e) { }
     }
     ons.forEach(([on, key, value]) => on.call(element, key, [withContext, value]));
+    if (renders.length) element.renders.push.apply(element.renders, renders);
     if (element.renders.length) {
         if (element.renderid !== 9) {
             onmounted(element, addRenderElement);

package/coms/zimoli/zimoli.js

@@ -127,7 +127,13 @@ function go(pagepath, args, history_name, oldpagepath) {
     } else {
         var { roles, options, id } = getZimoliParams(pagepath);
     }
-    if (!pagepath) return true;
+    if (!pagepath) {
+        if (isNode(history_name)) {
+            remove(history_name.activateNode);
+            history_name.activate = pagepath;
+        }
+        return true;
+    }
     setZimoliParams(pagepath, { data: args, from: oldpagepath, options, roles, id });
     prepare(pagepath, function (res) {
         if (!res.roles || res.roles === true) res.roles = !!roles;
@@ -594,7 +600,11 @@ function addGlobal(element, name = null, isDestroy) {
         }
         global[name] = element;
     } else if (isNode(name)) {
-        if (isDestroy || name.nodeType !== 1) appendChild.insert(name, element);
+        if (name.nodeType !== 1) {
+            appendChild.after(name, element);
+            name.with = [element];
+        }
+        else if (isDestroy) appendChild.insert(name, element);
         else appendChild(name, element);
     } else if (isFunction(name)) {
         name(element);

package/package.json

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