efront 3.11.1 → 3.12.0

package/coms/zimoli/model.js

@@ -91,15 +91,17 @@ var constructors = {
         }
         else if (t === 'a') {
             var { field, data } = _;
-            var pad = selectList(field.options, field.multi, true);
-            var e = document.createElement('select');
             var opt = null;
-            for (var o of field.options) {
+            for (var cx = 0, options = field.options, dx = options.length; cx < dx; cx++) {
+                var o = options[cx];
                 if (o.key === data[field.key]) {
                     opt = o;
+                    o.selected = true;
                     break;
                 }
             }
+            var pad = selectList(field.options, field.multi, true);
+            var e = document.createElement('select');
             e.innerHTML = `<option selected value="${opt ? opt.key : ''}">${opt ? opt.name : '请选择'}</option>`;
             e.value = opt ? opt.key : '';
             elem = select(e, pad);

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

@@ -1,12 +1,17 @@
 var singleClick = function () {
     var node = this.parentNode;
     if (node.activeNode === this) return;
-    if (node.activeNode) node.activeNode.removeAttribute("selected");
+    if (node.activeNode) {
+        if (node.activeNode.origin) node.activeNode.origin.selected = false;
+        node.activeNode.removeAttribute("selected");
+    }
     this.setAttribute("selected", "");
+
     node.activeNode = this;
     if (node.value === this.value) return;
     node.value = this.value;
     node.name = this.name;
+    if (this.origin) this.origin.selected = true;
     dispatch(node, "change");
 };
 var multipleClick = function () {
@@ -20,13 +25,13 @@ var multipleClick = function () {
         values.splice(index, 1);
         this.removeAttribute("selected");
     }
+    if (this.origin) this.origin.selected = true;
     dispatch(node, "change");
 };
 
 function main(children, multiple, addable) {
     var page = div();
     page.value = multiple ? [] : "";
-    var firstValue = false;
     var clicker = multiple ? multipleClick : singleClick;
     var itemMap = Object.create(null);
     function createItem(option) {
@@ -36,6 +41,7 @@ function main(children, multiple, addable) {
         item.setAttribute("item", '');
         item.innerHTML = option.innerHTML || option.name;
         item.name = option.name || option.innerHTML;
+        item.origin = option;
         var icon = option.getAttribute ? option.getAttribute("icon") : option.icon;
         if (icon) {
             if (!hasIcon) {
@@ -50,10 +56,10 @@ function main(children, multiple, addable) {
             if (multiple) {
                 item.setAttribute("selected", "");
                 page.value.push(option.value);
-            } else if (!firstValue) {
+            }
+            else {
                 item.setAttribute("selected", "");
                 page.activeNode = item;
-                firstValue = true;
                 page.value = option.value
             }
         }

package/coms/zimoli/selectList.less

@@ -15,7 +15,7 @@
         padding: 0 16px;
 
         &[selected] {
-            color: #26f;
+            color: #29e;
         }
 
         &:hover {

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