efront 3.10.3 → 3.11.0

package/apps/pivot/api.yml

@@ -9,3 +9,4 @@
   params: options ::params-:key
   invoke: options ::invoke-:key?:params
   version: options ::version
+  uptime: options ::uptime

package/apps/pivot/home/welcome.html

@@ -20,4 +20,9 @@
     <padding>
         服务器版本&nbsp;&nbsp;<span -text="String(version)"></span>
     </padding>
-</block>
+</block>
+<block>
+    <padding>
+        启动时间&nbsp;&nbsp;<span -text="filterTime(hrtime)"></span>
+    </padding>
+</block>

package/apps/pivot/home/welcome.js

@@ -4,6 +4,8 @@ function main() {
     renderWithDefaults(page, {
         status: [],
         version: data.from("version"),
+        hrtime: data.from("uptime", a => Date.now() - a * 1000),
+        filterTime,
         async run(id, target) {
             target.setAttribute('pending', '')
             try {

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/frame/route.js

@@ -33,7 +33,6 @@
     };
     var parseMenuList = function (items) {
         if (items instanceof Array) {
-            console.log(items)
             return items;
         }
         if (items instanceof Object) {

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

@@ -1,8 +1,12 @@
 // 激活 自定义的 active 事件
-function active(target, value, item) {
+function active(target, value, item, targetElement) {
     var activeEvent = createEvent("active");
     activeEvent.item = item;
     activeEvent.value = value;
+    if (targetElement) {
+        if (Object.defineProperty) Object.defineProperty(activeEvent, 'currentTarget', { value: targetElement });
+        else activeEvent.currentTarget = targetElement;
+    }
     activeEvent = dispatch(target, activeEvent);
     return activeEvent && !activeEvent.defaultPrevented;
 }

package/coms/zimoli/button.js

@@ -13,10 +13,9 @@ on("keydown")(window, function (event) {
             if (event.altKey) {
                 var key = String.fromCharCode(which);
                 var element = keyMap[key];
-
                 if (element) {
                     if (isMounted(element)) {
-                        dispatch(window, 'mousedown');
+                        event.preventDefault();
                         element.click();
                     } else {
                         delete keyMap[key];

package/coms/zimoli/color.js

@@ -254,13 +254,15 @@ function stringify(color) {
 	}
 }
 function doWith(manager, color, args) {
-	var c = parse(color);
+	var isparsed = color instanceof Array,
+		c = isparsed ? color : parse(color);
 	if (!c) {
 		console.warn(`颜色数据不正确:${color}`);
 		return color;
 	}
 	c = manager(c, args);
-	return stringify(c);
+	if (!isparsed) c = stringify(c);
+	return c;
 }
 
 function normal([r, g, b]) {

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

@@ -962,7 +962,7 @@ var data = {
             instanceDataMap[instanceId] = data;
         }
         setItem(instanceId, data, rememberWithStorage);
-        fireListener(instanceId);
+        fireListener(instanceId, data);
         return instanceDataMap[instanceId];
     },
     patchInstance(instanceId, data, rememberWithStorage = 0) {
@@ -999,7 +999,7 @@ var data = {
         if (!~listeners.indexOf(callback)) {
             listeners.push(callback);
         }
-        callback(this.getInstance(instanceId));
+        if (hasItem(instanceId)) callback(getItem(instanceId));
     },
     unbindInstance(instanceId, callback) {
         if (!instanceListenerMap[instanceId]) return;
@@ -1047,12 +1047,15 @@ function getItem(instanceId, onlyFromLocalStorage = false) {
     }
     return data;
 }
+function hasItem(instanceId) {
+    const storageId = userPrefix + instanceId + pagePathName;
+    return sessionStorage.getItem(storageId) || localStorage.getItem(storageId);
+}
 var instanceListenerMap = {};
-var fireListener = function (instanceId) {
+var fireListener = function (instanceId, data) {
     var listeners = instanceListenerMap[instanceId];
     if (!listeners) return;
-    var instance = instanceDataMap[instanceId];
-    listeners.forEach(a => a(instance));
+    listeners.forEach(a => a(data));
 };
 data.setItem = data.setInstance;
 data.getItem = data.getInstance;

package/coms/zimoli/menu.js

@@ -148,20 +148,22 @@ function main(elem, mode) {
             case "x":
             case "horizonal":
                 var direction = 'x';
+                mode = "horizonal";
             case "v":
             case "y":
             case "vertical":
-                var emit = function (item) {
-                    active(elem, item, item.value);
+                var emit = function (item, target) {
+                    active(elem, item, item.value, target);
                 };
                 if ("$src" in elem) {
                     getGenerator(elem);
                     care(elem, function (src) {
                         menuList(elem, getTreeFromData(src), emit, direction);
                     });
-                } else {
+                }
+                else {
                     var nodes = getArrayNodes(elem);
-                    elem = menuList(elem, nodes, emit);
+                    elem = menuList(elem, nodes, emit, direction);
                 }
                 break;
             default:

package/coms/zimoli/menu.less

@@ -94,10 +94,17 @@ body:active & {
     text-overflow: hidden;
     height: 40px;
     position: relative;
-    border: 1px solid #18333c;
-    background-color: #18333c;
-    box-shadow: inset 0 0 12px #51ddf6, inset 0px -120px 120px -120px #51ddf6;
-    border-right: none;
+    border-bottom: 1px solid #18333c;
+    padding: 0;
+
+    menu-item {
+        display: inline-block;
+
+        &.has-children:after {
+            padding-top: 3px;
+            content: "﹀";
+        }
+    }
 
     >div {
         vertical-align: top;

package/coms/zimoli/menuItem.html

@@ -1,3 +1,3 @@
-<i ng-class="menu.icon" ng-if='useIcon||hasIcon||menu.icon'></i>
-<span ng-model="menu.name"></span>
+<i ng-class="icon" ng-if='useIcon||hasIcon'></i>
+<span ng-html="name"></span>
 <s></s>

package/coms/zimoli/menuItem.js

@@ -1,11 +1,15 @@
 function main(elem, scope, hasIcon) {
     var item = elem || document.createElement('menu-item');
     item.innerHTML = menuItem;
-    if (isObject(scope) && scope !== elem.$scope) {
-        render(item, { menu: scope, useIcon: hasIcon, hasIcon })
+    if (isObject(scope) && scope !== item.$scope) {
     }
     else {
-        extendIfNeeded(elem.$scope, { useIcon: false, hasIcon: false })
+        var scope = item.$scope;
     }
+    if (scope.menu) scope = scope.menu;
+    var name = scope.name;
+    var icon = scope.icon;
+    if (hasIcon === undefined) hasIcon = !!icon;
+    render(item.children, { useIcon: hasIcon, hasIcon, name, icon });
     return item;
 }

package/coms/zimoli/menuList.html

@@ -1,4 +1,4 @@
-<menu-item ng-repeat="menu in menus" ng-if="!menu.hidden" ng-click="open(menu,event)"
-    ng-mouseleave="clearTimeout(popTimer)" ng-mouseenter="popTimer=popMenu(menu,event)"
+<menu-item ng-repeat="menu in menus" ng-if="!menu.hidden" ng-click="open(menu,this)"
+    ng-mouseleave="clearTimeout(popTimer)" ng-mouseenter="popTimer=popMenu(menu,this)"
     ng-class="{'has-children':menu.children&&menu.children.length,'warn':menu.type==='danger'||menu.type==='warn'||menu.type==='red'}">
 </menu-item>

package/coms/zimoli/menuList.js

@@ -8,38 +8,52 @@ var release = function () {
 var clear = function () {
     clearTimeout(releaseTimer);
 };
+var unfocus = function () {
+    remove(mounted_menus);
+    this.ispop = false;
+};
 function main(page, items, active, direction = 'y') {
     if (!isNode(page)) {
         var page = div();
     }
     var main = this;
-    function popMenu(item, event) {
+    if (direction !== 'x') page.ispop = true;
+    function popMenu(item, target) {
         if (page.active) {
             clear();
             remove(page.active);
         }
         if (!item.children || !item.children.length) return;
         var clone = template.cloneNode();
+        clone.$parentScopes = page.$parentScopes;
+        clone.$src = src;
         clone.innerHTML = template.innerHTML;
         var menu = main(clone, item.children, active);
         mounted_menus.push(menu);
-
         page.active = menu;
-        popup(menu, event.target);
-        var offleave0 = on("mouseleave")(event.target, release);
-        var offenter0 = on("mouseenter")(event.target, clear);
-        var offleave1 = on("mouseleave")(menu, release);
-        var offenter1 = on("mouseenter")(menu, clear);
+        menu.root = page.root || page;
+        popup(menu, target);
+        if (page.ispop === true) {
+            var offleave0 = on("mouseleave")(target, release);
+            var offleave1 = on("mouseleave")(menu, release);
+            var offenter0 = on("mouseenter")(target, clear);
+            var offenter1 = on("mouseenter")(menu, clear);
+        } else {
+            page.ispop = 1;
+            page.tabIndex = 0;
+            page.focus();
+        }
+        on("mousedown")(menu, e => e.preventDefault());
         once("remove")(menu, function () {
-            removeFromList(mounted_menus, page.active);
-            offleave0();
-            offenter0();
-            offleave1();
-            offenter1();
+            removeFromList(mounted_menus, this);
+            if (offleave0) offleave0();
+            if (offleave1) offleave1();
+            if (offenter0) offenter0();
+            if (offenter1) offenter1();
         });
     }
-
-    var template = page.tempalte || page.cloneNode();
+    if (!page.ispop) on("blur")(page, unfocus);
+    var template = page.tempalte || document.createElement("ylist");
     if (!page.tempalte) {
         template.className = '';
         template.removeAttribute('mode');
@@ -47,7 +61,6 @@ function main(page, items, active, direction = 'y') {
         page.tempalte = template;
     }
     if (!page.children.length || page.menutype === 1) {
-        page.innerHTML = menuList;
         page.menutype = 1;
         var hasIcon = function () {
             var menus = items;
@@ -58,26 +71,78 @@ function main(page, items, active, direction = 'y') {
             }
             return false;
         };
-        render(page, {
-            "menu-item": function () {
+        var $scope = {
+            "menu-item": function (e, s) {
                 return button(
-                    menuItem.apply(null, arguments)
+                    menuItem(e, s)
                 );
             },
             menus: items,
             hasIcon: hasIcon(),
-            open(menu, event) {
-                active(menu, event);
+            open(menu, elem) {
+                var pop = active(menu, elem);
+                if (pop === false) return;
+                var root = page.root || page;
+                if (root.ispop === 1) root.ispop = false;
+                if (!mounted_menus.length) {
+                    popMenu.apply(this, arguments);
+                }
+                else {
+                    unfocus.call(page);
+                }
             },
             popTimer: 0,
             popMenu() {
+                if (!page.ispop) return;
                 var args = arguments;
                 return setTimeout(function () {
                     popMenu.apply(null, args);
                 }, 60);
             },
-        });
-        vbox(page);
+        };
+        if (page.$src) {
+            var src = page.$src;
+            var parentScopes = page.$parentScopes;
+            var itemName = src.itemName;
+            var className = `{'has-children':${itemName}.children&&${itemName}.children.length,'warn':${itemName}.type==='danger'||${itemName}.type==='warn'||${itemName}.type==='red'}`;
+            var notHidden = `!${itemName}.hidden`;
+            list(page, function (index) {
+                var item = items[index];
+                if (!item) return;
+                var a = menuItem(null, item, $scope.hasIcon);
+                var scope = {};
+                if (item instanceof Item) item = item.value;
+                if (src.itemName) scope[src.itemName] = item;
+                else scope.$item = item;
+                if (src.keyName) scope[src.keyName] = index;
+                else scope.$key = index;
+                if (src.indexName) scope[src.indexName] = index;
+                else scope.$index = index;
+                if (src.srcName) scope[src.srcName] = items;
+                if (src.itemName) a.setAttribute("e-if", notHidden);
+                on("mouseleave")(a, function () {
+                    clearTimeout($scope.popTimer);
+                });
+                on("mouseenter")(a, function () {
+                    $scope.popTimer = $scope.popMenu(item, this);
+                });
+                on("click")(a, function () {
+                    $scope.open(items[index], this);
+                });
+                a.setAttribute("e-class", className);
+                a = button(a);
+                render(a, scope, parentScopes);
+                return a;
+            });
+            on("append")(page, function () {
+                this.go(0);
+            })
+        }
+        else {
+            page.innerHTML = menuList;
+            render(page, $scope);
+            vbox(page);
+        }
         page.renders.unshift(function () {
             this.$scope.hasIcon = hasIcon();
         });
@@ -86,11 +151,20 @@ function main(page, items, active, direction = 'y') {
         list(page, function (index) {
             var elem = generator(index);
             if (!elem) return;
-            on("mouseenter")(elem, function (event) {
-                popMenu(this.src[index], event);
+            on("mouseenter")(elem, function () {
+                if (page.ispop) popMenu(this.src[index], this);
             });
-            on("click")(elem, function (event) {
-                active(this.src[index], event);
+            on("click")(elem, function () {
+                var pop = active(this.src[index], this);
+                if (pop === false) return;
+                var root = page.root || page;
+                if (root.ispop === 1) root.ispop = false;
+                if (!mounted_menus.length) {
+                    popMenu(this.src[index], this);
+                }
+                else {
+                    unfocus.call(page);
+                }
             });
             return elem;
         }, direction);