efront 3.10.4 → 3.11.1

package/coms/zimoli/on.js

@@ -2,7 +2,7 @@
 var is_addEventListener_enabled = "addEventListener" in window;
 var handlersMap = {};
 var changes_key = 'changes';
-var eventtypereg = /(?:\.once|\.prevent|\.stop|\.capture|\.self|\.passive|\.[a-z0-9]+)+$/i;
+var eventtypereg = /(?:\.once|\.prevent|\.stop|\.capture|\.self|\.passive|\.[a-z0-9]+)+\.?$/i;
 var keyCodeMap = {
     backspace: 8,
     tab: 9,
@@ -118,6 +118,9 @@ var parseEventTypes = function (eventtypes) {
                 case "ctrl":
                     keyneed.push(t);
                     break;
+                case "":
+                    if (!types.keyCode) types.keyCode = true;
+                    break;
                 default:
                     if (isFinite(t)) {
                         types.keyCode = +t;
@@ -133,12 +136,20 @@ var parseEventTypes = function (eventtypes) {
     return types;
 }
 function checkKeyNeed(eventtypes, e) {
+    var keyneed = eventtypes.keyNeed;
     if (eventtypes.keyNeed) {
-        for (var cx = 0, dx = eventtypes.keyNeed.length; cx < dx; cx++) {
-            var key = eventtypes.keyNeed[cx];
+        for (var cx = 0, dx = keyneed.length; cx < dx; cx++) {
+            var key = keyneed[cx];
             if (!e[key + "Key"]) return false;
         }
     }
+    if (eventtypes.keyCode === true) {
+        for (var cx = 0, dx = keyneed.length; cx < dx; cx++) {
+            var key = keyneed[cx];
+            if (e.keyCode === keyCodeMap[key]) return true;
+        }
+        return false;
+    }
     if (eventtypes.keyCode) {
         return e.keyCode === eventtypes.keyCode;
     }

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