efront 3.19.0 → 3.20.0

package/coms/basic/cross_.js

@@ -6,10 +6,12 @@ function isFile(a) {
     }
 }
 var base = null, location_href = null;
+var encrypt = null;
 //               /////  1   ////////// 2 /////// 3 ////    4  //
 var domainReg = /^(?:(https?)\:)?\/\/(.*?)(?:\/(.*?))?([\?#].*)?$/i;
 var setHost = function (host) {
     base = host;
+    if (encrypt) encrypt = getCode.call(this);
 };
 var HeadersKeys = ["Content-Type"];
 var cors_hosts = [];
@@ -26,7 +28,7 @@ function isChildPath(relative, path) {
     return relative.replace(/^(.*\/)[^\/]*$/, path);
 }
 
-var getCrossUrl = function (domain, headers) {
+var getCrossUrl = function (domain, headers, encrypt) {
     if (notCross(domain)) return domain;
     var originDomain = getDomainPath(domain);
     var _cookies = getCookies(originDomain);
@@ -37,9 +39,13 @@ var getCrossUrl = function (domain, headers) {
     extend(_headers, headers);
     _headers = serialize(_headers);
     if (_headers) _headers = "," + _headers;
-    return domain
+    var b = encrypt ? "!" : `*`;
+    domain = domain
         .replace(/^(s?)(\/\/)/i, "http$1:$2")
-        .replace(domainReg, base + `*${/^(https\:|s\/\/)/i.test(domain) ? "*" : ""}$2${_headers}/$3$4`);
+        .replace(domainReg, `$2${_headers}/$3$4`)
+    if (/^(https\:|s\/\/)/i.test(domain)) domain = b + domain;
+    if (encrypt) domain = encode62.timeencode(domain);
+    return base + b + domain;
 };
 function noop() { }
 function toResponse() {
@@ -113,7 +119,7 @@ function cross_(jsonp, digest = noop, method, url, headers) {
     }
     else {
         var nocross = notCross(url);
-        var callback = function () {
+        var callback = async function () {
             var exposeHeaders = !nocross && xhr.getResponseHeader("access-control-expose-headers");
             var exposeMap = {};
             if (exposeHeaders) exposeHeaders.split(",").forEach(h => exposeMap[h.toLowerCase()] = true);
@@ -124,6 +130,13 @@ function cross_(jsonp, digest = noop, method, url, headers) {
                     addCookie(cookie, originDomain);
                 }
             }
+            if (isencrypt && xhr.response) {
+                xhr = {
+                    status: xhr.status,
+                    response: encode62.safedecode(xhr.response || xhr.responseText, xhr.encrypt),
+                };
+                xhr.responseText = xhr.response;
+            };
             switch (xhr.status) {
                 case 0:
                     if (!xhr.response) {
@@ -167,6 +180,10 @@ function cross_(jsonp, digest = noop, method, url, headers) {
         var xhr = cross(callback, onerror);
         var send = xhr.send;
         xhr.toString = toResponse;
+        var isencrypt = /^[夏商周秦xszq]/i.test(method);
+        if (isencrypt) method = method.slice(1);
+        if (isencrypt && !encrypt) encrypt = cross.getCode();
+        xhr.encrypt = encrypt;
         xhr.json = xhr.data = xhr.send = function (data, value) {
             if (!jsondata && !(isEmpty(data) && isEmpty(value))) jsondata = data instanceof Array ? [] : {};
             if (FormData && data instanceof FormData) {
@@ -202,8 +219,9 @@ function cross_(jsonp, digest = noop, method, url, headers) {
                 datas = serialize(jsondata, "&", "=");
             }
         };
-
-        var fire = function () {
+        var fire = async function () {
+            var code = await xhr.encrypt;
+            xhr.encrypt = code;
             var isform = /^f/i.test(method);
             if (isform) {
                 if (method === 'form') method = 'post';
@@ -236,12 +254,12 @@ function cross_(jsonp, digest = noop, method, url, headers) {
                 extend(realHeaders, _headers);
                 xhr.open(method, url);
             } else {
-                xhr.open(method, getCrossUrl(url, _headers));
+                xhr.open(method, getCrossUrl(url, _headers, isencrypt));
             }
             if (is_gb2312) xhr.overrideMimeType("text/plain; charset=gb2312");
 
             Object.keys(realHeaders).forEach(key => setRequestHeader.call(xhr, key, realHeaders[key]));
-            if (!isEmpty(datas)) send.call(xhr, datas);
+            if (!isEmpty(datas)) send.call(xhr, nocross || !isencrypt ? datas : encode62.safeencode(datas, code));
             else send.call(xhr);
             digest();
         };
@@ -323,9 +341,17 @@ function reform(r, info, fire, cancel, e) {
 function addReform(r) {
     if (isFunction(r)) reforms.push(r);
 }
+function getCode() {
+    return new Promise((ok, oh) => {
+        this('get', base + "!").then((xhr) => { return ok(encode62.timedecode(xhr.response || xhr.responseText)) }, () => {
+            return oh('未连接到可加密的服务器！');
+        });
+    });
+}
 var bind = cross_.bind;
 cross_.bind = function () {
     var cross_ = bind.apply(this, arguments);
+    arguments[0].getCode = getCode.bind(cross_);
     extend(cross_, {
         requests,
         abortAll() {

package/coms/basic/submit_.js

@@ -0,0 +1,40 @@
+function submit(fields, data) {
+    var params = {};
+    var inputs = [];
+    var select = [];
+    var checks = [];
+    var id = 0;
+    for (var f of fields) {
+        var error = valid(f, data);
+        if (error === "empty") {
+            if (f.options instanceof Array || /date|time|range|switch|swap|radio/i.test(f.type)) {
+                if (!select.id) select.id = ++id;
+                select.push(f);
+            }
+            else {
+                if (!inputs.id) inputs.id = ++id;
+                inputs.push(f);
+            }
+        }
+        else if (error) {
+            checks.push(f);
+        }
+        else {
+            params[f.key] = data[f.key];
+        }
+    }
+    if (checks.length + select.length + inputs.length) {
+        var errors = [];
+        if (inputs.length) errors.push("请输入" + inputs.map(f => f.name).join("、"));
+        if (select.length) errors.push("请选择" + select.map(f => f.name).join("、"));
+        if (select.id < inputs.id) {
+            errors = errors.reverse();
+        }
+        if (checks.length) {
+            errors.push(checks.map(f => f.name).join("、") + "格式错误");
+        }
+        errors = errors.join("，") + "！";
+        throw errors;
+    }
+    return params;
+}

package/coms/basic/valid.js

@@ -6,5 +6,13 @@ function valid(field, data) {
         }
         return;
     }
+    if (field.valid instanceof Function) {
+        var e = field.valid(data[field.key]);
+        if (e) return e;
+    }
+    if (field.options instanceof Function) {
+        var e = field.options(data[field.key]);
+        if (e) return e;
+    }
     return error;
 }

package/coms/crypt/encode62.js

@@ -28,13 +28,20 @@ Object.assign(encode62, {
     src,
     map,
     time_delta: parseInt("zzzzz", 36),
+    safeencode(string, sign, offset) {
+        string = encodeURIComponent(string).replace(/\./g, '..').replace(/[\!'\(\)~]/g, a => escape(a)).replace(/%/g, '.');
+        return this.encode62(string, sign, offset);
+    },
+    safedecode(string, sign, offset) {
+        string = this.decode62(string, sign, offset).replace(/\.\.?/g, a => a === '.' ? "%" : ".");
+        return decodeURIComponent(string);
+    },
     timedecode(string) {
         var { time_delta } = this;
         var time_rest = string.slice(string.length - time_delta.toString(36).length, string.length);
         var time_start = parseInt((new Date() - parseInt(time_rest, 36)) / time_delta) * time_delta;
         var time_stamp = time_start + parseInt(time_rest, 36);
-        string = this.decode62(string.slice(0, string.length - time_delta.toString(36).length), time_stamp.toString(36)).replace(/\.\.?/g, a => a === '.' ? "%" : ".");
-        return decodeURIComponent(string);
+        return this.safedecode(string.slice(0, string.length - time_delta.toString(36).length), time_stamp.toString(36));
     },
     timeencode(string) {
         var { time_delta } = this;
@@ -43,8 +50,7 @@ Object.assign(encode62, {
         var time_rest = time_stamp % time_delta;
         var time_rest_str = time_rest.toString(36);
         var time_delta_str = time_delta.toString(36);
-        string = encodeURIComponent(string).replace(/\./g, '..').replace(/[\!'\(\)~]/g, a => escape(a)).replace(/%/g, '.');
-        return this.encode62(string, time_stamp.toString(36)) + repeat("0", time_delta_str.length - time_rest_str.length) + time_rest_str;
+        return this.safeencode(string, time_stamp.toString(36)) + repeat("0", time_delta_str.length - time_rest_str.length) + time_rest_str;
     },
     timeupdate(string) {
         var { time_delta } = this;
@@ -57,7 +63,7 @@ Object.assign(encode62, {
             return this.timeencode(this.timedecode(string));
         }
     },
-    encode62(data, sign) {
+    encode62(data, sign, offset = 0) {
         if (!sign) return data;
         var result = String(data);
         sign = String(sign);
@@ -65,7 +71,7 @@ Object.assign(encode62, {
         var result = result.replace(/\w/g, function (w, cx) {
             var code = map[w];
             if (typeof code !== "number") return w;
-            var s = code ^ (sign.charCodeAt(cx % sign.length) % src.length);
+            var s = code ^ (sign.charCodeAt((offset + cx) % sign.length) % src.length);
             if (s >= src.length) return w;
             return src[s];
         });

package/coms/zimoli/drag.js

@@ -146,5 +146,4 @@ drag.on = function (target, actionTarget = target.dragTarget) {
     on("drop")(actionTarget || target, setZIndex);
     onmousedown(target, _mousedrag);
     ontouchstart(target, _touchdrag);
-    move.bindPosition(actionTarget || target);
 };

package/coms/zimoli/encode62.js

@@ -18,13 +18,20 @@ var encode62 = {
         }
         return buff.join('');
     },
+    safeencode(string, sign, offset) {
+        string = encodeURIComponent(string).replace(/\./g, '..').replace(/[\!'\(\)~]/g, a => escape(a)).replace(/%/g, '.');
+        return this.encode(string, sign, offset);
+    },
+    safedecode(string, sign, offset) {
+        string = this.encode(string, sign, offset).replace(/\.\.?/g, a => a === '.' ? "%" : ".");
+        return decodeURIComponent(string);
+    },
     timedecode(string) {
         var { time_delta } = this;
         var time_rest = string.slice(string.length - time_delta.toString(36).length, string.length);
         var time_start = parseInt((new Date() - parseInt(time_rest, 36)) / time_delta) * time_delta;
         var time_stamp = time_start + parseInt(time_rest, 36);
-        string = this.encode(string.slice(0, string.length - time_delta.toString(36).length), time_stamp.toString(36)).replace(/\.\.?/g, a => a === '.' ? "%" : ".");
-        return decodeURIComponent(string);
+        return this.safedecode(string.slice(0, string.length - time_delta.toString(36).length), time_stamp.toString(36));
     },
     timeencode(string) {
         var { time_delta } = this;
@@ -35,8 +42,7 @@ var encode62 = {
         var time_rest = time_stamp % time_delta;
         var time_rest_str = time_rest.toString(36);
         var time_delta_str = time_delta.toString(36);
-        string = encodeURIComponent(string).replace(/\./g, '..').replace(/[\!'\(\)~]/g, a => escape(a)).replace(/%/g, '.');
-        return this.encode(string, time_stamp.toString(36)) + repeat("0", time_delta_str.length - time_rest_str.length) + time_rest_str;
+        return this.safeencode(string, time_stamp.toString(36)) + repeat("0", time_delta_str.length - time_rest_str.length) + time_rest_str;
     },
     timeupdate(string) {
         var { time_delta } = this;
@@ -50,7 +56,7 @@ var encode62 = {
             return this.timeencode(this.timedecode(string));
         }
     },
-    encode(data, sign) {
+    encode(data, sign, offset = 0) {
         if (!sign) return data;
         var result = String(data);
         sign = String(sign);
@@ -58,7 +64,7 @@ var encode62 = {
         var result = result.replace(/\w/g, function (w, cx) {
             var code = map[w];
             if (!isNumber(code)) return w;
-            var s = code ^ (sign.charCodeAt(cx % sign.length) % src.length);
+            var s = code ^ (sign.charCodeAt((offset + cx) % sign.length) % src.length);
             if (s >= src.length) return w;
             return src[s];
         });

package/coms/zimoli/field.js

@@ -30,6 +30,8 @@ function main(elem) {
                 case "empty":
                     scope.error = `${f.name}是必填字段！`;
                     break;
+                default:
+                    scope.error = (f.name) + error;
             }
         }
         else {

package/coms/zimoli/move.js

@@ -152,30 +152,12 @@ var fixPosition = move.fixPosition = function (target) {
 };
 move.coordIn = coordIn;
 move.trimCoord = trimCoord;
-var resizingTargets = [];
-on('resize')(window, function () {
-    resizingTargets.forEach(fixPosition);
-});
-var off;
-var resizeTarget = function () {
-    var target = this;
-    var index = resizingTargets.indexOf(target);
-    if (index < 0) index = resizingTargets.push(target);
-    return index;
+var fixTarget = function () {
+    fixPosition(this);
 };
-var removeResize = function () {
-    removeFromList(resizingTargets, this);
-};
-
 move.bindPosition = function (target, position) {
-    if (position) {
+    oncemount(target, function () {
         setPosition(target, position);
-    }
-    var index = resizingTargets.indexOf(target);
-    if (index >= 0) return;
-    on("append")(target, resizeTarget);
-    on("remove")(target, removeResize);
-    if (isMounted(target)) {
-        resizeTarget.call(target);
-    }
+    });
+    on("resize")(target, fixTarget);
 }

package/coms/zimoli/oncemount.js

@@ -3,5 +3,5 @@ function oncemount(target, handle) {
         handle.call(target);
         return;
     }
-    once("append")(target, handle);
+    once("mounted")(target, handle);
 }

package/coms/zimoli/render.js

@@ -213,27 +213,40 @@ var createRepeat = function (search, id = 0) {
         once("append")(this, initialComment.bind(this, renders, "repeat", expression));
     }
 };
+var comment = function (elements) {
+    for (var cx = elements.length - 2; cx > 1; cx -= 2) {
+        var e = elements[cx];
+        if (e.previousSibling === this) var c = this;
+        else {
+            var c = document.createComment('else' + (cx < elements.length - 2 ? "if .." : ''));
+            e.parentNode.insertBefore(c, e);
+        }
+        elements.splice(cx, 0, c);
+        remove(e);
+    }
+};
+var initIf = function (ifs) {
+    for (var s of ifs) {
+        comment(s);
+        if (s.parent) {
+            initialComment.call(s[0], s.renders, "if", s.comment);
+        } else {
+            once("append")(s[0], initialComment.bind(s[0], s.renders, "if", s.comment));
+        }
+    }
+};
 var createIf = function (search, id = 0) {
     // 懒渲染
     var getter = createGetter(search).bind(this);
     var element = this;
-    var p = element;
-    if (p.parentNode) {
-        p = p.parentNode;
-        for (var cx = 0, dx = if_top.length; cx < dx; cx++) {
-            if (if_top[cx].parent === p) {
-                break;
-            }
-        }
-    }
-    cx++;
-    if (cx > 0) if_top.splice(cx, if_top.length - cx);
     var elements = [element, getter];
     if_top.push(elements);
     var savedValue;
-    var renders = [function () {
+    elements.parent = this.parentNode;
+    elements.comment = search[1];
+    elements.renders = [function () {
         var shouldMount = -1;
-        for (var cx = 0, dx = elements.length; cx < dx; cx += 2) {
+        for (var cx = 0, dx = elements.length; cx < dx; cx += 3) {
             var getter = elements[cx + 1];
             if (!getter || getter()) {
                 shouldMount = cx;
@@ -242,10 +255,10 @@ var createIf = function (search, id = 0) {
         }
         if (savedValue === shouldMount) return;
         savedValue = shouldMount;
-        for (var cx = 0, dx = elements.length; cx < dx; cx += 2) {
+        for (var cx = 0, dx = elements.length; cx < dx; cx += 3) {
             var element = elements[cx];
             if (cx === shouldMount) {
-                appendChild.before(this, element);
+                appendChild.after(cx > 0 ? elements[cx - 1] : this, element);
                 if (element.renderid < 0) {
                     element.renderid = id;
                     elements[cx] = render(element, this.$scope, this.$parentScopes);
@@ -257,12 +270,6 @@ var createIf = function (search, id = 0) {
         }
 
     }];
-    if (this.parentNode) {
-        elements.parent = this.parentNode;
-        initialComment.call(this, renders, "if", search[1]);
-    } else {
-        once("append")(this, initialComment.bind(this, renders, "if", search[1]));
-    }
 };
 var parseIfWithRepeat = function (ifExpression, repeatExpression) {
     var repeater = parseRepeat(repeatExpression);
@@ -356,15 +363,18 @@ var structures = {
         createIf.call(this, search);
     },
     "else"(search) {
-        var top = if_top[if_top.length - 1];
-        if (!top || top.parent !== this.parentNode) {
+        for (var cx = if_top.length - 1; cx >= 0; cx--) {
+            if (if_top[cx].parent === this.parentNode) break;
+        }
+        if (cx < 0) {
             throw new Error("else/elseif前缺少同级if！");
         }
+        initIf(if_top.splice(cx + 1, if_top.length - cx - 1));
+        var top = if_top[cx];
         if (search && search[1]) {
             var getter = createGetter(search).bind(this);
         }
         top.push(this, getter);
-        remove(this);
     },
     repeat(search) {
         createRepeat.call(this, search);
@@ -853,7 +863,7 @@ function render(element, scope, parentScopes, lazy = true) {
         renderlock = false;
         eagermount = false;
     }
-    if (if_top_length < if_top.length) if_top.splice(if_top_length, if_top.length - if_top_length);
+    if (if_top_length < if_top.length) initIf(if_top.splice(if_top_length, if_top.length - if_top_length));
     return e;
 }
 var digest = lazy(refresh, -{});

package/coms/zimoli/resize.js

@@ -121,11 +121,8 @@ var handle = {
             }
         });
         var rect = dragging.rect;
-        move.call(rect, isFinite(style.left) ? style.left : rect.offsetLeft, isFinite(style.top) ? style.top : rect.offsetTop);
-        delete style.left;
-        delete style.top;
-        Object.keys(style).forEach(k => style[k] = fromOffset(style[k]));
         css(dragging.rect, style);
+        move.call(rect, isFinite(style.left) ? style.left : rect.offsetLeft, isFinite(style.top) ? style.top : rect.offsetTop);
         dispatch(dragging.rect, 'resize');
         resizingList.forEach(a => {
             if (getTargetIn(dragging.rect, a)) {

package/coms/zimoli/submit.js

@@ -1,41 +1,8 @@
-function submit(fields, data) {
-    var params = {};
-    var inputs = [];
-    var select = [];
-    var checks = [];
-    var id = 0;
-    for (var f of fields) {
-        var error = valid(f, data);
-        if (error === "empty") {
-            if (f.options || /date|time|range|switch|swap|radio/i.test(f.type)) {
-                if (!select.id) select.id = ++id;
-                select.push(f);
-            }
-            else {
-                if (!inputs.id) inputs.id = ++id;
-                inputs.push(f);
-            }
-        }
-        else if (error) {
-            checks.push(f);
-        }
-        else {
-            params[f.key] = data[f.key];
-        }
+function submit() {
+    try {
+        return submit_.apply(this, arguments);
+    } catch (e) {
+        alert(String(e), 'warn');
+        throw e;
     }
-    if (checks.length + select.length + inputs.length) {
-        var errors = [];
-        if (inputs.length) errors.push("请输入" + inputs.map(f => f.name).join("、"));
-        if (select.length) errors.push("请选择" + select.map(f => f.name).join("、"));
-        if (select.id < inputs.id) {
-            errors = errors.reverse();
-        }
-        if (checks.length) {
-            errors.push(checks.map(f => f.name).join("、") + "格式错误");
-        }
-        errors = errors.join("，") + "！";
-        alert(errors, 'error');
-        throw new Error(errors);
-    }
-    return params;
 }

package/package.json

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