efront 3.10.3 → 3.10.4

package/coms/basic/_cross.js

@@ -42,10 +42,13 @@ var getCrossUrl = function (domain, headers) {
         .replace(domainReg, base + `*${/^(https\:|s\/\/)/i.test(domain) ? "*" : ""}$2${_headers}/$3$4`);
 };
 function noop() { }
-
+function toResponse() {
+    if (this.responseType === 'json') return JSON.stringify(this.response);
+    return this.response;
+}
 function _cross(jsonp, digest = noop, method, url, headers) {
     var originDomain = getDomainPath(url);
-    if (!originDomain) throw new Error("Unsupposed url format!");
+    if (!originDomain) throw new Error("路径格式错误！");
     var _cookies = getCookies(originDomain);
     var _headers = {};
     if (_cookies) {
@@ -59,24 +62,24 @@ function _cross(jsonp, digest = noop, method, url, headers) {
         method = method.slice(1);
     }
     var loaded, errored;
-    var onload = function (xhr) {
+    var onload = function (data) {
         removeFromList(requests, xhr);
         if (xhr.decoder) {
-            xhr = xhr.decoder(xhr);
+            data = xhr.decoder(data);
         }
-        loaded = xhr;
+        loaded = data;
         flush();
         digest();
     };
     var onerror1 = function (e) {
-        removeFromList(requests, e);
+        removeFromList(requests, xhr);
         errored = e || "未知错误！";
         flush();
         digest();
     };
     var onerror = async function (e) {
         if (e.type === 'error') {
-            e = { status: "无法访问服务器" };
+            e = { response: "无法访问服务器", toString: toResponse };
         }
         for (var r of reforms) {
             var r = await reform(r, { method, url, status: xhr.status, headers: _headers }, fire, onerror1, e);
@@ -103,23 +106,28 @@ function _cross(jsonp, digest = noop, method, url, headers) {
         });
         var xhr = jsonp(url, {
             [cb](a) {
-                xhr.response = xhr.responseText = JSON.stringify(a);
-                onload(xhr);
+                onload({ status: 200, response: JSON.stringify(a), toString: toResponse });
             }
         });
         xhr.onerror = onerror;
     }
     else {
         var nocross = notCross(url);
-        var callback = function (status, response) {
-            if (xhr.getResponseHeader && !nocross) {
-                var cookie = xhr.getResponseHeader("efront-cookie");
-                addCookie(cookie, originDomain);
+        var callback = function () {
+            var exposeHeaders = xhr.getResponseHeader("access-control-expose-headers");
+            var exposeMap = {};
+            if (exposeHeaders) exposeHeaders.split(",").forEach(h => exposeMap[h.toLowerCase()] = true);
+            if (xhr.getResponseHeader) {
+                var exposekey = nocross ? "set-cookie" : "efront-cookie";
+                if (exposeMap[exposekey]) {
+                    var cookie = xhr.getResponseHeader(exposekey);
+                    addCookie(cookie, originDomain);
+                }
             }
-            switch (status) {
+            switch (xhr.status) {
                 case 0:
-                    if (!response) {
-                        onerror({ status: "无法访问服务器" });
+                    if (!xhr.response) {
+                        onerror({ status: 0, response: "无法访问服务器", toString: toResponse });
                         break;
                     }
                 case 200:
@@ -130,8 +138,9 @@ function _cross(jsonp, digest = noop, method, url, headers) {
                 case 307:
                 case 302:
                 case 301:
-                    if (xhr.isRedirected > 2 || nocross) break;
-                    var location = xhr.getResponseHeader("efront-location");
+                    if (xhr.isRedirected > 2) break;
+                    var exposekey = nocross ? "location" : "efront-location";
+                    var location = exposeMap[exposekey] && xhr.getResponseHeader(exposekey);
                     if (!domainReg.test(location)) {
                         if (/^\//.test(location)) {
                             location = originDomain.replace(/\/.*$/, location);
@@ -152,6 +161,7 @@ function _cross(jsonp, digest = noop, method, url, headers) {
         var cross = this;
         var xhr = cross(callback, onerror);
         var send = xhr.send;
+        xhr.toString = toResponse;
         xhr.json = xhr.data = xhr.send = function (data, value) {
             if (!jsondata && !(isEmpty(data) && isEmpty(value))) jsondata = data instanceof Array ? [] : {};
             if (FormData && data instanceof FormData) {

package/coms/basic/cookie.js

@@ -24,6 +24,7 @@ var parseCookieFromText = function (cookie) {
 
 function addCookie(cookie_text, originDomain = "") {
     if (!cookie_text) return;
+    if (cookie_text instanceof Array) cookie_text = cookie_text.join(",");
     var cookies = cookie_text.replace(/(^|;|,)\s*(expires)=(\w*),([^=]*)(;|$)/ig, "$1$2=$3.$4$5")
         .split(/,\s*/).map(parseCookieFromText);
     for (var cookie of cookies) {

package/coms/compile/common.js

@@ -167,6 +167,9 @@ var createScoped = function (parsed) {
                 case STRAP:
                     var s = o.text;
                     switch (s) {
+                        case "return":
+                            funcbody.return = true;
+                            break;
                         case "await":
                             funcbody.async = funcbody.await = true;
                             break;

package/coms/compile/scanner2.js

@@ -374,6 +374,9 @@ class Program extends Array {
     get await() {
         return this.scoped.await;
     }
+    get return() {
+        return this.scoped.return;
+    }
     get scoped() {
         if (this._scoped) return this._scoped;
         return this._scoped = createScoped(this);

package/coms/reptile/cross.js

@@ -1,17 +1,45 @@
 return _cross.bind(function (callback, onerror) {
-    var response;
+    var response, responseObject, responseType = "", error;
     var xhr = {
         status: 0,
+        readyState: 0,
         method: null,
         url: null,
         http: null,
         headers: {},
-        response: null,
+        responseHeaders: {},
+        get response() {
+            if (responseType === "" || responseType === "text") {
+                if (this.readyState !== 4) return '';
+                return String(response);
+            }
+            else if (error) return null;
+            if (responseObject !== null) return responseObject;
+            switch (responseType) {
+                case "arraybuffer":
+                    return response.buffer;
+                case "json":
+                    if (!response) return null;
+                    responseObject = JSON.parse(String(response));
+                    return responseObject;
+            }
+            return responseObject;
+
+        },
+        set response(v) {
+            response = v;
+        },
         getResponseHeader(key) {
-            return response.headers[key];
+            key = String(key).toLowerCase();
+            if (this.responseHeaders[key]) return this.responseHeaders[key];
+            if (key === "access-control-expose-headers") {
+                return 'set-cookie,location';
+            }
+            return null;
         },
         send(data) {
             var { hostname, port, path, auth } = parseURL(this.url);
+            if (data instanceof FormData) data = String(data);
             if (data) {
                 data = Buffer.from(data);
                 this.headers["Content-Length"] = data.length;
@@ -25,24 +53,25 @@ return _cross.bind(function (callback, onerror) {
                 headers: this.headers,
             }, function (res) {
                 var data = [];
-                var session_text = res.headers["set-cookie"];
-                if (session_text instanceof Array) session_text.forEach(t => cookie.addCookie(t));
-                else if (typeof session_text === "string") cookie.addCookie(session_text);
                 xhr.status = res.statusCode;
-                xhr.response = res;
+                xhr.responseHeaders = res.headers;
                 res.on("data", function (chunk) {
+                    xhr.readyState = 4;
                     data.push(chunk);
                 });
                 res.on("end", function () {
-                    data = Buffer.concat(data);
-                    xhr.response = data;
-                    callback(res.statusCode, data);
-                    console.log(String(data), res.statusCode);
+                    response = Buffer.concat(data);
+                    xhr.readyState = 4;
+                    callback();
                 });
                 res.on("error", function (e) {
+                    xhr.readyState = 4;
+                    error = e;
                     onerror(e);
                 });
+                this.readyState = 2;
             });
+            this.readyState = 1;
             if (data) req.end(data);
             else req.end();
         },
@@ -50,6 +79,10 @@ return _cross.bind(function (callback, onerror) {
             this.method = method;
             this.url = url;
             this.status = 0;
+            this.readyState = 0;
+            response = null;
+            responseObject = null;
+            error = null;
             var http;
             if (/^https?\:/i.test(url)) {
                 http = require("http");
@@ -59,6 +92,14 @@ return _cross.bind(function (callback, onerror) {
             }
             this.http = http;
         },
+        get responseType() {
+            return responseType;
+        },
+        set responseType(v) {
+            if (v === "document") return;
+            if (this.status !== 0) throw new Error("状态错误");
+            responseType = v;
+        },
         setRequestHeader(key, value) {
             this.headers[key] = value;
         },

package/coms/zimoli/cross.js

@@ -41,7 +41,7 @@ var cross = _cross.bind(function (callback, onerror) {
                     }
                     break;
                 default:
-                    callback(xhr.status, xhr.response);
+                    callback();
             }
             saveCookie();
         }

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