efront 3.20.16 → 3.21.1

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*$/.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

@@ -149,12 +149,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;
                 }

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

@@ -6,14 +6,21 @@ var number = function (event) {
     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) {
+        if (this.value) {
+            if (this.fixed && this.value.replace(/^[^\.]+/, '').length > this.fixed ||
+                this.limit && this.value.length >= this.limit && !/\./.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 +38,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 +84,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,11 @@ var constructors = {
     row: textarea,
     password,
     text: textarea,
+    number(e) {
+        e.innerHTML = `<input type="${e.field.type}" ng-model="data[field.key]" />`;
+        render(e.children, e.$scope, e.$parentScopes);
+        return e;
+    },
     date() {
         var elem = document.createElement("input");
         elem.type = "date";
@@ -140,6 +143,7 @@ var constructors = {
 
     }
 };
+constructors.price = constructors.money = constructors.number;
 var readonly_types = {
     "date"({ field }, data) {
         var string = data[field.key];
@@ -204,6 +208,7 @@ function main(elem) {
                 elem.setAttribute("type", field_type);
             }
             remove(elem.children);
+            field_type = field_type.replace(/\:[\d+\.]+$/, '');
             if (readonly || field.readonly) {
                 if (field_type === "function") {
                     field_editor(elem);
@@ -244,8 +249,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/package.json

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