efront 3.1.3 → 3.2.2

package/coms/basic/seek.js

@@ -23,7 +23,8 @@ var seek = function (object, seeker) {
     if (isObject(seeker)) {
         var dist = {};
         for (var k in seeker) {
-            var o = seek(object, seeker[k]);
+            var { k: v = k } = seeker;
+            var o = seek(object, v);
             if (o === undefined) return;
             dist[k] = o;
         }

package/coms/compile/scanner2.js

@@ -104,10 +104,10 @@ var skipAssignment = function (o) {
             }
             break;
         default:
+            console.log(o);
             throw new Error('代码结构异常！');
             o = o.next;
     }
-    if (o === o0) throw new Error("代码结构异常！");
     return o;
 };
 
@@ -302,7 +302,8 @@ var detour = function (o, ie) {
                             insertAfter(o, { text: ':', type: STAMP }, { text: o.text, type: EXPRESS, isExpress: true });
                             o.short = false;
                         }
-                        o.text = `[${strings.encode(strings.decode(o.text))}]`;
+                        var text = strings.encode(strings.decode(o.text));
+                        o.text = ie ? text : `[${text}]`;
                     }
                 }
                 break;
@@ -689,11 +690,6 @@ class Program extends Array {
         detour(this.first, true);
         return this;
     }
-    // 标记要保留的代码
-    ahchor() { }
-    // 清理无效的代码
-    clean() {
-    }
     // 压缩
     press() {
         this.pressed = true;

package/coms/zimoli/button.js

@@ -39,7 +39,7 @@ var active = function () {
     __addClass(this, "hover active");
 };
 var checkclick = function () {
-    if (this.hasAttribute("disabled") || this.disabled || this.hasAttribute("loading") || this.loading) onclick.preventClick = true;
+    if (this.hasAttribute("disabled") || this.disabled || this.hasAttribute("loading") || this.loading || this.hasAttribute("pending") || this.pending) onclick.preventClick = true;
 };
 var resetactive = function () {
     removeClass(this, "active");

package/coms/zimoli/button.less

@@ -94,6 +94,7 @@
 }
 
 &.active,
+&[pending],
 &[loading] {
     >.track {
         background: #0003;
@@ -102,6 +103,7 @@
     box-shadow: 0 0 2px rgba(0, 0, 0, 0.3) inset;
 }
 
+&[pending],
 &[loading] {
     @keyframes ltr {
         0% {

package/coms/zimoli/cross.js

@@ -102,7 +102,7 @@ function isChildPath(relative, path) {
     return relative.replace(/^(.*\/)[^\/]*$/, path);
 }
 var digest = function () {
-    if (cross.digest instanceof Function) cross.digest();
+    dispatch('render', window);
 };
 
 var getCrossUrl = function (domain, headers) {
@@ -117,7 +117,7 @@ var getCrossUrl = function (domain, headers) {
     _headers = serialize(_headers);
     if (_headers) _headers = "," + _headers;
     return domain
-        .replace(/^s?\/\//i, "http$&")
+        .replace(/^(s?)(\/\/)/i, "http$1:$2")
         .replace(domainReg, base + `*${/^(https\:|s\/\/)/i.test(domain) ? "*" : ""}$2${_headers}/$3$4`);
 };
 function cross(method, url, headers) {
@@ -212,6 +212,11 @@ function cross(method, url, headers) {
         xhr.setRequestHeader = function (key, value) {
             realHeaders[key] = value;
         };
+        xhr.then = function (ok, oh) {
+            onloads.push(ok);
+            onerrors.push(oh);
+            flush();
+        };
         setTimeout(function () {
             var isform = /^f/i.test(method);
             if (isform) {
@@ -244,24 +249,32 @@ function cross(method, url, headers) {
             send.call(xhr, datas);
         }, 0);
     }
+    var loaded, errored;
     var onload = function (xhr) {
         if (xhr.decoder) {
             xhr = xhr.decoder(xhr);
         }
-        onloads.map(e => e instanceof Function && e(xhr));
+        loaded = xhr;
+        flush();
         digest();
     };
     var onerror = function (xhr) {
-        onerrors.map(e => e instanceof Function && e(xhr));
+        errored = xhr;
+        flush();
         digest();
     };
+    var flush = function () {
+        var then = xhr.then;
+        delete xhr.then;
+        if (loaded) onloads.splice(0, onloads.length).map(e => e instanceof Function && e(xhr));
+        if (errored) onerrors.splice(0, onerrors.length).map(e => e instanceof Function && e(xhr));
+        xhr.then = then;
+    };
     var onloads = [], onerrors = [];
     xhr.done = xhr.success = function (on, asqueue = true) {
-        if (asqueue) {
-            onloads.push(on);
-        } else {
-            onload = on;
-        }
+        if (!asqueue) onloads.splice(0, onloads.length);
+        onloads.push(on);
+        flush();
         return xhr;
     };
     var send = xhr.send;
@@ -296,12 +309,11 @@ function cross(method, url, headers) {
         }
     };
     xhr.fail = xhr.error = function (on, asqueue = true) {
-        if (asqueue) {
-            onerrors.push(on);
-        } else {
-            onerror = on;
+        if (!asqueue) {
+            onerrors.splice(0, onerrors.length);
         }
-        onerror = on;
+        onerrors.push(on);
+        flush();
         return xhr;
     };
     return xhr;

package/coms/zimoli/grid.js

@@ -112,8 +112,8 @@ var getXYFromMouseEvent = function (event) {
     var grid = this;
     var position = getScreenPosition(grid);
     var computed = getComputedStyle(grid);
-    var clientX = event.clientX - position.left;
-    var clientY = event.clientY - position.top;
+    var clientX = event.clientX - position.left - grid.clientLeft;
+    var clientY = event.clientY - position.top - grid.clientTop;
     var [padLeft, padTop, padRight, padBottom] = [
         computed.paddingLeft,
         computed.paddingTop,
@@ -302,7 +302,7 @@ function grid(breakpoints) {
 }
 class Point extends Array {
     constructor(value, range) {
-        if (!this) return new Point(value);
+        super();
         var solid = false;
         if (isObject(value)) {
             this.value = value.value;
@@ -324,7 +324,7 @@ class Point extends Array {
         return this.value;
     }
 }
-var createPoints = function (values, direction = "x", result = Point(0)) {
+var createPoints = function (values, direction = "x", result = new Point(0)) {
     if (!(values instanceof Array)) values = arguments;
     for (var cx = 0, dx = values.length; cx < dx; cx++) {
         var value = values[cx];
@@ -332,7 +332,7 @@ var createPoints = function (values, direction = "x", result = Point(0)) {
             if (!result.length) throw new Error("数据转换为grid失败！");
             createPoints(value, direction === "x" ? "y" : "x", result[result.length - 1]);
         } else {
-            var breakpoint = Point(value);
+            var breakpoint = new Point(value);
             breakpoint.direction = direction;
             breakpoint.parent = result;
             result.push(breakpoint);
@@ -412,7 +412,7 @@ var grid_prototype = {
     _reshape() {
         var grid = this;
         var bounds = this.bounds;
-        var current_l, current_t, current_w, current_h, current_d = this.breakpoints.direction, current_r = Point(grid.width), current_b = Point(grid.height);
+        var current_l, current_t, current_w, current_h, current_d = this.breakpoints.direction, current_r = new Point(grid.width), current_b = new Point(grid.height);
         // var xPoints = [];
         // var yPoints = [];
         var getDivSize = function (top, height, bounds_top, bounds_bottom, grid_height, grid_padding_top, grid_padding_bottom) {
@@ -569,14 +569,14 @@ var grid_prototype = {
         }
     },
     seprate(x) {
-        saveToOrderedArray(this.breakpoints, Point(x));
+        saveToOrderedArray(this.breakpoints, new Point(x));
     },
     nearby(x, y) {
         var breakpoints = this.breakpoints;
         var breakpath = [];
-        var maxXStart = Point(0), maxYStart = Point(0);
-        var minXEnd = Point(this.width);
-        var minYEnd = Point(this.height);
+        var maxXStart = new Point(0), maxYStart = new Point(0);
+        var minXEnd = new Point(this.width);
+        var minYEnd = new Point(this.height);
         var isX = true;
         do {
             var value = isX ? x : y;// 先 y 后 x

package/coms/zimoli/render.js

@@ -577,14 +577,16 @@ var emiters = {
     on(key, search) {
         var getter = createGetter(search, false);
         on(key)(this, function (e) {
-            getter.call(this, e);
+            var res = getter.call(this, e);
+            if (res && isFunction(res.then)) res.then(digest, digest);
             digest();
         });
     },
     once(key, search) {
         var getter = createGetter(search, false);
         once(key)(this, function (e) {
-            getter.call(this, e);
+            var res = getter.call(this, e);
+            if (res && isFunction(res.then)) res.then(digest, digest);
             digest();
         });
     }
@@ -786,7 +788,7 @@ function render(element, scope, parentScopes) {
     return e;
 }
 
-var digest = lazy(refresh, +{});
+var digest = lazy(refresh, -{});
 render.digest = render.apply = render.refresh = digest;
 render.parseRepeat = parseRepeat;
 var eventsHandlers = "fullscreenchange,change,click,paste,resize,keydown,keypress,keyup,input,drop".split(",").map(k => on(k));
@@ -805,19 +807,3 @@ render.register = function (key, name) {
         register(key, name);
     }
 };
-
-var promisePrototype = Promise.prototype;
-var __then = promisePrototype.then;
-var __wrap = function (f) {
-    if (f instanceof Function) {
-        return function () {
-            var res = f.apply(this, arguments);
-            digest();
-            return res;
-        };
-    }
-    return f;
-};
-promisePrototype.then = function () {
-    return __then.apply(this, [].map.call(arguments, __wrap));
-};

package/package.json

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