efront 3.20.17 → 3.21.2

package/apps/pivot/main.js

@@ -1,20 +1,43 @@
 data.loadConfig("api.yml");
 user.loginPath = '/auth/login';
+var login_queue = [], reject_queue = [];
 cross.addReform(async function ({ status, url, headers }, reform, reject) {
     if (status === 401) {
+        var xhr = this;
+        var abort = xhr.abort;
+        xhr.abort = function () {
+            removeFromList(login_queue, reform);
+            removeFromList(reject_queue, reject);
+            if (!login_queue.length) remove(reject_queue.splice(0, 1)[0]);
+            abort.call(this);
+        };
+
+        if (login_queue.length) {
+            login_queue.push(reform);
+            reject_queue.push(reject);
+            return false;
+        }
         var base = data.getInstance("base").base;
         var { protocol, host } = parseURL(url);
         var base1 = protocol + "//" + host + "/";
         if (base !== base1) {
             data.setSource(base1, null);
         }
+        login_queue.push(reform);
         var page = await popup("/auth/login", base1);
+        if (!login_queue.length) return;
+        reject_queue.push(page, reject);
         care(page, "login", function (info) {
             data.setSource(base1, info);
             headers.authorization = info;
-            reform();
+            login_queue.splice(0, login_queue.length).forEach(q => q());
+            reject_queue.splice(0, reject_queue.length);
+        });
+        on("remove")(page, function () {
+            login_queue.splice(0, login_queue.length);
+            if (reject_queue[0] === this) reject_queue.shift();
+            reject_queue.splice(0, reject_queue.length).forEach(r => r());
         });
-        on("remove")(page, reject);
         return false;
     }
 })

package/coms/basic/JSAM.js

@@ -291,9 +291,9 @@ function parse(string, preload) {
 module.exports = {
     stringify,
     parse(data, preload) {
-        if (!/^\s*([\[\{]|\[\s*\]|\{\s*\})$/.test(data)) return parse(data, preload);
+        if (/^\s*[^\{\[\s]|^\s*(?:\[\s*\]|\{\s*\}|)\s*$/.test(data)) return parse(data, preload);
         if (/^\s*\{[\d\,\:\s]*\}\s*,/.test(data)) return parse(data, preload);
         if (/^\s*\[[\d\,\:\s]*\]\s*,/.test(data)) return parse(data, preload);
-        return JSON.parse(data, preload);
+        return JSON.parse(data);
     }
 };

package/coms/basic/cookie.js

@@ -100,9 +100,31 @@ function getDomainPath(url) {
     return host;
 }
 
+function linkCookie(from, to) {
+    from = getDomainPath(from).replace(/\/$/, '');
+    to = getDomainPath(to).replace(/\/$/, '');
+    if (cookiesMap[from]) {
+        cookiesMap[to] = cookiesMap[from];
+    }
+    cookiesMap[to] = cookiesMap[from] = extend({}, cookiesMap[to], cookiesMap[from]);
+    return to;
+}
+function copyCookie(from, to) {
+    from = getDomainPath(from).replace(/\/$,'/, '');
+    to = getDomainPath(to).replace(/\/$/, '');
+    if (from in cookiesMap) {
+        cookiesMap[to] = JSON.parse(JSON.stringify(cookiesMap[from]));
+    }
+    else {
+        delete cookiesMap[to];
+    }
+}
+
 return {
     cookiesMap,
     addCookie,
     getCookies,
     delCookies,
+    linkCookie,
+    copyCookie
 }

package/coms/basic/cross_.js

@@ -75,6 +75,8 @@ function cross_(jsonp, digest = noop, method, url, headers) {
     }
     var loaded, errored;
     var onload = function (data) {
+        if (!~requests.indexOf(_xhr)) return;
+        removeFromList(requests, _xhr);
         if (xhr.decoder) {
             data = xhr.decoder(data);
         }
@@ -83,18 +85,21 @@ function cross_(jsonp, digest = noop, method, url, headers) {
         digest();
     };
     var onerror1 = function (e) {
+        if (!~requests.indexOf(_xhr)) return;
+        removeFromList(requests, _xhr);
         errored = e || "未知错误！";
         flush();
         digest();
     };
     var onerror = async function (e) {
         if (e.type === 'error') {
-            removeFromList(requests, e.target);
             e = { response: "无法访问服务器", toString: toResponse };
         }
         for (var r of reforms) {
-            var r = await reform(r, { method, url, status: xhr.status, headers: _headers }, fire, onerror1, e);
-            if (r === false) return;
+            var r = await reform.call(xhr, r, { method, url, status: xhr.status, headers: _headers }, fire, onerror1, e);
+            if (r === false) {
+                return;
+            }
         }
         onerror1(e);
     };
@@ -129,11 +134,10 @@ function cross_(jsonp, digest = noop, method, url, headers) {
         var nocross = notCross(url, isencrypt);
         if (nocross) isencrypt = false;
         var callback = async function () {
-            removeFromList(requests, xhr);
-            var exposeHeaders = !nocross && xhr.getResponseHeader("access-control-expose-headers");
-            var exposeMap = {};
-            if (exposeHeaders) exposeHeaders.split(",").forEach(h => exposeMap[h.toLowerCase()] = true);
             if (xhr.getResponseHeader) {
+                var exposeHeaders = (!nocross || !location_href) && xhr.getResponseHeader("access-control-expose-headers");
+                var exposeMap = {};
+                if (exposeHeaders) exposeHeaders.split(",").forEach(h => exposeMap[h.toLowerCase()] = true);
                 var exposekey = nocross ? "set-cookie" : "efront-cookie";
                 if (exposeMap[exposekey]) {
                     var cookie = xhr.getResponseHeader(exposekey);
@@ -149,12 +153,16 @@ function cross_(jsonp, digest = noop, method, url, headers) {
                     }
 
                 }
+                if (exposeMap["strict-transport-security"] || exposeMap["efront-transport-security"]) {
+                    if (!/^https\:\/\/|^s\/\//.test(url)) console.warn("请使用https访问如下路径:" + url);
+                }
             }
             if (isencrypt && xhr.response) {
                 try {
                     xhr = {
                         status: xhr.status,
                         response: encode62.safedecode(xhr.response || xhr.responseText, xhr.encrypt),
+                        getResponseHeader: xhr.getResponseHeader && xhr.getResponseHeader.bind(xhr)
                     };
                     xhr.responseText = xhr.response;
                 }
@@ -243,7 +251,9 @@ function cross_(jsonp, digest = noop, method, url, headers) {
             }
         };
         var fire = async function () {
+            if (!~requests.indexOf(xhr)) return;
             var code = await xhr.encrypt;
+            if (!~requests.indexOf(xhr)) return;
             xhr.encrypt = code;
             var isform = /^f/i.test(method);
             if (isform) {
@@ -280,7 +290,7 @@ function cross_(jsonp, digest = noop, method, url, headers) {
                 xhr.open(method, getCrossUrl(url, _headers, isencrypt && code));
             }
             if (is_gb2312) xhr.overrideMimeType("text/plain; charset=gb2312");
-            delete realHeaders.Cookie;
+            if (location_href) delete realHeaders.Cookie;
             Object.keys(realHeaders).forEach(key => setRequestHeader.call(xhr, key, realHeaders[key]));
             if (!isEmpty(datas)) send.call(xhr, !isencrypt ? datas : encode62.safeencode(datas, code));
             else send.call(xhr);
@@ -330,6 +340,7 @@ function cross_(jsonp, digest = noop, method, url, headers) {
         return getCookies(originDomain);
     };
     requests.push(xhr);
+    var _xhr = xhr;
     return xhr;
 }
 function addDirect(a) {
@@ -356,7 +367,7 @@ var requests = [];
 var reforms = [];
 function reform(r, info, fire, cancel, e) {
     var fired = false;
-    return r(info, function () {
+    return r.call(this, info, function () {
         if (fired) return;
         fired = true;
         fire();

package/coms/zimoli/chooseFile.js

@@ -1,9 +1,16 @@
 function chooseFile(accept, multiple, extra) {
     var form = document.createElement("form");
-    form.innerHTML = `<input ${extra ? extra + " " : ''}type='file'${accept ? ` accept="${accept}"` : ''}${multiple ? ' multiple' : ''} />`;
+    form.innerHTML = `<input tabindex=0 ${extra ? extra + " " : ''}type='file'${accept ? ` accept="${accept}"` : ''}${multiple ? ' multiple' : ''} />`;
     var [input] = form.children;
-    var result = new Promise(function (ok) {
+    var result = new Promise(function (ok, oh) {
         if (/msie\s+[2-9]/i.test(navigator.userAgent)) return alert("无法在当前浏览器操作！");
+        input.onfocus = function () {
+            // focus 事件比change事件早40-80毫秒
+            if (opened && document.hasFocus()) {
+                remove(input);
+                setTimeout(oh, 210);
+            }
+        };
         on("change")(input, function () {
             if (!this.files) {
                 var value = this.value;
@@ -27,8 +34,14 @@ function chooseFile(accept, multiple, extra) {
             }
         });
     });
-    setTimeout(function(){
+    var opened = false;
+    input.tabIndex = 0;
+    css(input, 'opacity:0;pointer-events:none;position:absolute;position:fixed;top:-200px;left:0;')
+    appendChild(document.body, input);
+    requestAnimationFrame(function () {
+        input.focus();
         input.click();
+        opened = true;
     });
     return result;
 }

package/coms/zimoli/cross.js

@@ -1,6 +1,6 @@
 var { cookiesMap, saveCookie } = cookie;
 var saveCookie = lazy(function () {
-    sessionStorage.setItem(cookieItemsInSessionStorageKey, JSON.stringify(cookiesMap));
+    sessionStorage.setItem(cookieItemsInSessionStorageKey, JSAM.stringify(cookiesMap));
 }, 20);
 var { efrontURI, cross_host = efrontURI } = this;
 var location_href = parseURL(location.href);
@@ -11,7 +11,7 @@ var cookieItemsInSessionStorageKey = "--zimoli-coms-cross";
 var cookiesData = sessionStorage.getItem(cookieItemsInSessionStorageKey);
 if (cookiesData) {
     try {
-        extend(cookiesMap, JSON.parse(cookiesData));
+        extend(cookiesMap, JSAM.parse(cookiesData));
     } catch (e) {
         console.warn("加载cookie出错！");
     }

package/coms/zimoli/input.js

@@ -5,15 +5,25 @@ var number = function (event) {
     var { value, type } = ipt;
     if (keyCode === 13 || keyCode === 18 || keyCode === 37 || keyCode === 38 || keyCode === 39 || keyCode === 40 || keyCode === 8 || keyCode === 46 || keyCode === 9) {
     }
-    else if (keyCode >= 49 && keyCode <= 57 || keyCode >= 96 && keyCode <= 105) {
-    } else if (keyCode === 110 || keyCode === 190) {
+    else if (keyCode >= 48 && keyCode <= 57 || keyCode >= 96 && keyCode <= 105) {
+        if (this.value) {
+            if (this.fixed && this.value.replace(/^[^\.]+/, '').length > this.fixed ||
+                this.limit && this.value.length >= this.limit && !/\./.test(this.value)) {
+                event.preventDefault();
+            }
+            if(/^[+-]?0$/.test(this.value)){
+                event.preventDefault();
+            }
+        }
+    }
+    else if (keyCode === 110 || keyCode === 190) {
         if (/^int/i.test(type)) {
             event.preventDefault();
         } else if (/\./i.test(value) || !value || /^[\-\+]$/.test(value)) {
             event.preventDefault();
         }
     } else if (keyCode === 189 || keyCode === 187) {// 负号 正号
-        if (value || /^natural|positive/i.test(type)) {
+        if (value || this.positive) {
             event.preventDefault();
         }
     } else {
@@ -31,11 +41,32 @@ var number = function (event) {
         }
     }
 };
+var positiveReg = /^\+|^positive\-?|\-?positive$|\+$/i;
+var negativeReg = /^\-|^negative\-?|\-?negative$|\-$/i;
+var numberLimit = /\:(\d+)?(?:\.(\d+))?$/;
+/**
+ * @param {HTMLInputElement} element
+ */
 function input(element) {
     if (element && /input/i.test(element.tagName)) {
         var type = element.getAttribute("type");
         if (type) {
             var format;
+            var m = numberLimit.exec(type);
+            if (m) {
+                type = type.replace(numberLimit, '');
+                var [, limit, fixed] = m;
+                if (limit) element.limit = +limit;
+                if (fixed) element.fixed = +fixed;
+            }
+            if (positiveReg.test(type)) {
+                type = type.replace(positiveReg, '');
+                this.positive = true;
+            }
+            if (negativeReg.test(type)) {
+                type = type.replace(negativeReg, '');
+                this.negative = true;
+            }
             switch (type.toLowerCase()) {
                 case "date":
                     format = "年月日";
@@ -56,15 +87,22 @@ function input(element) {
                         this.value = new Date(value).toLocaleString(undefined, { hour12: false });
                     };
                     break;
+                case "price":
+                    if (!+element.positive) element.positive = true;
                 case "money":
+                    if (!element.fixed) element.fixed = 2;
+                    on("keydown")(element, number);
+                    break;
+                case "natural":
+                    if (!+element.positive) element.positive = true;
                 case "int":
                 case "integer":
-                case "integer":
                 case "number":
                 case "num":
-                case "natural":
                     on("keydown")(element, number);
                     break;
+                default:
+                    if (element.limit && !(element.maxLength > 0)) element.maxLength = element.limit;
             }
         }
         return element;

package/coms/zimoli/model.js

@@ -36,8 +36,6 @@ var renderModel = function (field, data) {
     });
 };
 var constructors = {
-    input,
-    raw: input,
     swap(e) {
         var { field } = e;
         e = swap(e);
@@ -58,6 +56,12 @@ var constructors = {
     row: textarea,
     password,
     text: textarea,
+    number(e) {
+        var ipt = document.createElement('input');
+        ipt.setAttribute('type', e.field.type);
+        input(ipt);
+        return ipt;
+    },
     date() {
         var elem = document.createElement("input");
         elem.type = "date";
@@ -140,6 +144,7 @@ var constructors = {
 
     }
 };
+constructors.price = constructors.money = constructors.number;
 var readonly_types = {
     "date"({ field }, data) {
         var string = data[field.key];
@@ -204,6 +209,7 @@ function main(elem) {
                 elem.setAttribute("type", field_type);
             }
             remove(elem.children);
+            if (isString(field_type)) field_type = field_type.replace(/\:[\d+\.]+$/, '');
             if (readonly || field.readonly) {
                 if (field_type === "function") {
                     field_editor(elem);
@@ -244,8 +250,11 @@ function main(elem) {
                 }
             } else {
                 var create = field_type === "function" ? field_editor : constructors[field_type];
-                var ipt = create ? create(elem, field_ref) : field.key ? input() : null;
-
+                var ipt = create ? create(elem, field_ref) : field.key ? input(function () {
+                    var input = document.createElement('input');
+                    input.setAttribute('type', field.type);
+                    return input;
+                }()) : null;
                 if (ipt) {
                     if (ipt !== elem) appendChild(elem, ipt);
                     if (!ipt.$scope) {

package/coms/zimoli/render.js

@@ -867,9 +867,9 @@ function render(element, scope, parentScopes, lazy = true) {
 var digest = lazy(refresh, -{});
 render.digest = render.apply = render.refresh = digest;
 render.parseRepeat = parseRepeat;
-var eventsBinders = "fullscreenchange,load,change,click,paste,resize,keydown,keypress,keyup,input,drop".split(",").map(k => on(k));
+var eventsBinders = "fullscreenchange,resize,load,change,click,paste,resize,keydown,keypress,keyup,input,drop".split(",").map(k => on(k));
 var userChanged = false;
-eventsBinders.splice(0, 2).forEach(on => on(window, digest));
+eventsBinders.splice(0, 3).forEach(on => on(window, digest));
 var changeListener = function () {
     if (userChanged) {
         userChanged = false;

package/coms/zimoli/select.js

@@ -112,6 +112,7 @@ function select(target, list, removeOnSelect, direction) {
     if (isNode(list)) {
         var initList = function () {
             bindEvent();
+            list.value = target.value;
             initList = function () { };
         };
         var setIcon = function () {
@@ -123,8 +124,10 @@ function select(target, list, removeOnSelect, direction) {
         var initList2 = function (src) {
             src.forEach(s => {
                 optionsMap[s.key] = s;
+                s.selected = s.key === target.value;
             });
             list = selectList(generator, src, !!target.multiple, !!target.editable);
+            list.value = target.value;
             if (!target.multiple) {
                 onclick(list, onlistclick);
             }
@@ -137,6 +140,8 @@ function select(target, list, removeOnSelect, direction) {
             var s = optionsMap[v];
             this.innerHTML = `<option selected value="${v}">${s ? s.name : ''}</option>`;
             this.value = v;
+            if (s) s.selected = true;
+            if (list) list.value = v;
         };
         care(target, initList2);
         var initList = function () {

package/coms/zimoli/selectList.js

@@ -74,17 +74,15 @@ function main() {
             css(item, { backgroundImage: `url('${icon}')` });
         }
         item.value = key;
-        if (option.selected) {
+        if (item.value === page.value) {
             iconed = icon;
-            if (multiple) {
-                item.setAttribute("selected", "");
-                page.value.push(key);
-            }
-            else {
-                item.setAttribute("selected", "");
-                page.activeNode = item;
-                page.value = key
-            }
+            item.setAttribute("selected", "");
+            page.activeNode = item;
+            page.value = key
+        }
+        else if (multiple && option.selected) {
+            item.setAttribute("selected", "");
+            page.value.push(key);
         }
         if (option.disabled) {
             item.setAttribute('disabled', '');
@@ -107,7 +105,7 @@ function main() {
         if (i < 0 || i >= children.length) return;
         return createItem(generator ? generator(i) : children[i]);
     });
-    once("append")(page, function () {
+    once("mounted")(page, function () {
         var index = 0;
         for (var cx = 0, dx = children.length; cx < dx; cx++)if (children[cx].selected) index = cx;
         page.clean();