efront 3.10.3 → 3.11.0

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

@@ -38,6 +38,9 @@ function main(children, multiple, addable) {
         item.name = option.name || option.innerHTML;
         var icon = option.getAttribute ? option.getAttribute("icon") : option.icon;
         if (icon) {
+            if (!hasIcon) {
+                page.setAttribute('iconed', '');
+            }
             hasIcon = true;
             css(item, { backgroundImage: `url('${icon}')` });
         }
@@ -125,9 +128,6 @@ function main(children, multiple, addable) {
         });
         adder.setAttribute("adder", '');
     }
-    if (hasIcon) {
-        page.setAttribute('iconed', '');
-    }
     page.icon = iconed;
     on('mousedown')(page, e => e.preventDefault());
     return page;

package/coms/zimoli/selectList.less

@@ -36,10 +36,22 @@
 }
 
 &[iconed] {
-    border-left: 30px solid #f2f4f6;
+    padding-left: 30px;
+
+    &:before {
+        content: "";
+        display: block;
+        position: absolute;
+        height: 100%;
+        top: 0;
+        left: 0;
+        width: 30px;
+        background: #f2f4f6;
+    }
 
     >div {
         filter: grayscale(1);
+        position: relative;
 
         &:hover,
         &:active,

package/coms/zimoli/view.less

@@ -125,6 +125,6 @@ body>& {
     .button {
         min-width: 60px;
         padding: 0 20px;
-        margin-right: 10px;
+        margin-left: 10px;
     }
 }

package/package.json

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