efront 4.11.4 → 4.11.6

package/#/345/233/275/351/231/205/345/214/226.yml

@@ -1655,7 +1655,7 @@
   en:    "The commands that can be used are:"
 
 - zh-CN: 如要显示更具体的信息，请使用:$1
-  en:    "To show more messages, used"
+  en:    "To show more messages, use $1"
 
 - zh-CN: 是
   en:    is

package/apps/pivot/cert/list.js

@@ -1,9 +1,5 @@
 plist.bind(null, '接口管理', "cert", refilm`
 *域名/hostname input/253
-公钥/private gen/600 ${async function (data) {
-        var [private_key, public_key] = await acme2.createKeyPair();
-        data.private = private_key;
-        data.public = public_key;
-    }}
--私钥/public text
-$证书/cert text`, '/cert/edit');
+公钥/private text
+私钥/public text
+证书/cert text`, '/cert/edit');

package/apps/pivot/cert/main.xht

@@ -46,6 +46,11 @@
         border: none;
     }
 
+    [foot]>a.button {
+        float: left;
+    }
+
+
     loading {
         z-index: 3;
     }
@@ -64,6 +69,7 @@
     </div>
     <scrollbar y #bar></scrollbar>
     <div foot>
+        <a -repeat="(f,k) in actived.options" -click="f(actived)" -bind="k"></a>
         <span -bind="actived.message"></span>
         <button -repeat="(f,k) in actived.actions" -click="f(actived)"><span -bind="k"></span></button>
     </div>
@@ -166,6 +172,12 @@
             $账户/kid input
             *当前服务器的域名/domain/每行一个，不支持泛域名 text
             `,
+            options: {
+                async 从证书列表同步() {
+                    var a = await plist.load('cert', 'hostname');
+                    formdata.domain = a.map(a => a.hostname).join('\r\n');
+                }
+            },
             actions: {
                 async 创建订单(actived) {
                     var params = submit(actived.fields, formdata);

package/apps/pivot/task/list.js

@@ -1,23 +1,30 @@
-plist.bind(null, '任务管理', "task", refilm`
+model.setEditor('jscode', function (element) {
+    element = 茨菰$编辑框(null);
+    element.contentEditable = !element.readonly;
+    element.type = 'js';
+    return element;
+});
+model.setReader('jscode', "text");
+return plist.bind(null, '任务管理', "task", refilm`
 *任务ID/key 100
 *任务名/name 100
 *是否启用/status radio 不启用,启用
-任务代码/code text
+任务代码/code jscode
 / $ ${[
-    {
-        when(o) {
-            return o.status === 1;
+        {
+            when(o) {
+                return o.status === 1;
+            },
+            name: "执行", do(o) {
+                popup("/task/invoke", o);
+            }
         },
-        name: "执行", do(o) {
-            popup("/task/invoke", o);
-        }
-    },
-    {
-        when(o) {
-            return o.status === 1;
+        {
+            when(o) {
+                return o.status === 1;
+            },
+            name: "同步", do(o) {
+                popup("/task/rsync", o);
+            }
         },
-        name: "同步", do(o) {
-            popup("/task/rsync", o);
-        }
-    },
-]}`, '/task/edit');
+    ]}`, '/task/edit');

package/coms/basic/#loader.js

@@ -96,9 +96,9 @@ var readFile = function (names, then) {
             }
         };
         if (!names.length) return then();
-        names.forEach(function (name) {
+        for (var name of names) {
             readFile(name, callback);
-        });
+        }
         return;
     }
     var name = names;
@@ -155,7 +155,8 @@ var readFile = function (names, then) {
         }
         if (loadingTree[key]) {
             loadingTree[key].error = e;
-            loadingTree[key].forEach(a => a(e));
+            var loading = loadingTree[key];
+            for (var a of loading) a(e);
         }
     };
     var tryload = function () {
@@ -183,7 +184,7 @@ var killCircle = function () {
             if (!(loadedModules[k] instanceof Array)) continue;
             var args = loadedModules[k].args;
             if (!(args instanceof Array)) continue;
-            args.forEach(arg => {
+            for (var arg of args) {
                 if (!penddings[arg]) {
                     penddings[arg] = [];
                 }
@@ -191,7 +192,7 @@ var killCircle = function () {
                     penddings[arg][k] = true;
                     penddings[arg].push(key);
                 }
-            })
+            }
             circle.push(key);
             module_keys.push(k);
         }
@@ -212,10 +213,10 @@ var killCircle = function () {
         if (savedLength === circle.length) {
             break;
         }
-        circle.forEach(function (c) {
+        for (var c of circle) {
             var args = penddings[c];
             penddings[c] = args.filter(a => !deleted[a]);
-        });
+        }
     }
     if (circle.length > 0) {
         circle = circle.sort((a, b) => {
@@ -235,13 +236,11 @@ var killCircle = function () {
         ));
     } else {
         var tree = {};
-        module_keys.forEach(function (k) {
+        for (var k of module_keys) {
             var loading = tree[k] = loadedModules[k];
             loadedModules[k] = loading.mod;
-        });
-        module_keys.forEach(function (k) {
-            flushTree(tree, k);
-        });
+        }
+        for (var k of module_keys) flushTree(tree, k);
     }
 };
 // -->
@@ -331,9 +330,9 @@ var loadModule = function (url, then, prebuilds = {}) {
             } else {
                 loadedModules[key].args = mod.args;
                 loadedModules[key].mod = mod;
-                args.forEach(function (moduleName) {
+                for (var moduleName of args) {
                     loadModule(moduleName, response, prebuilds);
-                });
+                }
             }
         };
         readFile(url, saveModule);

package/coms/basic/JSAM.js

@@ -132,7 +132,8 @@ var create = function (a, dst) {
     var arr = a.split(',');
     var rest = [];
     for (var cx = 0, dx = arr.length; cx < dx; cx++) {
-        var [k, v] = arr[cx].split(':');
+        var s = arr[cx].split(":");
+        var k = s[0], v = s[1];
         if (v === undefined) {
             rest.push(k);
         } else {

package/coms/basic/cookie.js

@@ -21,10 +21,10 @@ var parseCookieFromText = function (cookie) {
     return [pair, info];
 };
 
-class Cookie {
-    cookiesMap = {};
+function Cookie() {
+    this.cookiesMap = {};
 }
-var CookieProto = Cookie.prototype;
+var CookieProto = Cookie.prototype = new Cookie;
 CookieProto.addCookie = function addCookie(cookie_text, originDomain = "") {
     var { cookiesMap } = this;
     originDomain = getDomainPath(originDomain);
@@ -59,7 +59,7 @@ CookieProto.addCookie = function addCookie(cookie_text, originDomain = "") {
             }
         }
     }
-}
+};
 
 CookieProto.getCookies = function getCookies(domainPath) {
     var { cookiesMap } = this;
@@ -91,7 +91,7 @@ CookieProto.getCookies = function getCookies(domainPath) {
         splited[0] = domain;
     } while (domain.length);
     return serialize(cookieObject, ";");
-}
+};
 
 CookieProto.delCookies = function delCookies(domainPath) {
     var { cookiesMap } = this;
@@ -99,7 +99,7 @@ CookieProto.delCookies = function delCookies(domainPath) {
     var splited = domainPath.split("/");
     var domain = splited[0];
     delete cookiesMap[domain];
-}
+};
 function getDomainPath(url) {
     var { host, pathname } = parseURL(url);
     if (pathname) return host + pathname;
@@ -115,10 +115,10 @@ CookieProto.linkCookie = function linkCookie(from, to) {
     }
     cookiesMap[to] = cookiesMap[from] = extend({}, cookiesMap[to], cookiesMap[from]);
     return to;
-}
+};
 CookieProto.copyCookie = function copyCookie(from, to) {
     var { cookiesMap } = this;
-    from = getDomainPath(from).replace(/\/$,'/, '');
+    from = getDomainPath(from).replace(/\/$/, '');
     to = getDomainPath(to).replace(/\/$/, '');
     if (from in cookiesMap) {
         cookiesMap[to] = JSON.parse(JSON.stringify(cookiesMap[from]));
@@ -126,7 +126,7 @@ CookieProto.copyCookie = function copyCookie(from, to) {
     else {
         delete cookiesMap[to];
     }
-}
+};
 var defaultCookie = new Cookie;
 defaultCookie.new = () => new Cookie;
 return defaultCookie;

package/coms/basic/data.js

@@ -443,7 +443,7 @@ function createApiMap(data) {
     var items1 = data;
     for (var key in items1) {
         var keeys = key.split(/\s+/);
-        var [base] = keeys.filter(a => reg.test(a));
+        var base = keeys.filter(a => reg.test(a))[0];
         if (!base) {
             var headersIndex = 0;
         } else {

package/coms/basic/i18n.js

@@ -14,9 +14,11 @@ var getLanguageIndexFromName = function (language) {
     if (isFinite(language)) return language;
     if (language in languageMap) return languageMap[language];
     language = String(language).toLowerCase();
-    for (var l of language.split(",").slice(0, 12)) {
+    var ls = language.split(",").slice(0, 12);
+    for (var l of ls) {
         for (var k in languageMap) {
-            for (var kk of k.toLowerCase().split("-")) {
+            var ks = k.toLowerCase().split("-");
+            for (var kk of ks) {
                 if (l.indexOf(kk) >= 0) return languageMap[k];
             }
         }

package/coms/basic_/Array2.js

@@ -1,4 +1,7 @@
-var hasOwnProperty = Object.prototype.hasOwnProperty;
+var hasOwnProperty = {}.__proto__ === Object ? function (k) {
+    var proto = this.__proto__;
+    return k in this && (!proto || !(k in proto));
+} : Object.prototype.hasOwnProperty;
 var setPrototypeOf = Object.setPrototypeOf;
 a: if (!setPrototypeOf) {
     var getOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;

package/coms/compile/Javascript_test.js

@@ -133,4 +133,6 @@ testStar(`var a=class {a=1\r\nasync * a(){
     for(var n of names) {
         yield n;
     }
-}}`, {});
+}}`, {});
+
+assert(scanner2(`#`)[0].type, common.STAMP)

package/coms/compile/Program.js

@@ -94,6 +94,7 @@ class Program {
     scriptTags = [];
     ignoreTags = ["STYLE", "SCRIPT"];
     comments = [
+        ["#!", /(?=[\r\n\u2028\u2029])/],
         ["//", /(?=[\r\n\u2028\u2029])/],
         ["/*", "*/"],
         [/<!--/, /--!?>/],
@@ -808,7 +809,7 @@ class Program {
                 save(VALUE);
                 continue;
             }
-            if (express_reg.test(m)) {
+            if (!stamp_reg.test(m) && express_reg.test(m)) {
                 if (last && last.type === STRAP && funcstrap_reg.test(last.text));
                 else queue.inExpress = true;
                 save(EXPRESS);
@@ -942,7 +943,7 @@ class Program {
         this.comment_entry = this.createRegExp(this.comments.map(m => m[0]));
         var stamps = this.stamps.join("");
         stamps = this.compile(stamps);
-        this.stamp_reg = new RegExp(`^[${stamps}]+$`);
+        var stamp_reg = new RegExp(`^[${stamps}]+$`);
         var tokens = {};
         var quote_map = {};
         this.quote_map = quote_map;
@@ -1013,7 +1014,7 @@ class Program {
         this.space_reg = new RegExp(`^[${spaces}]+$`, flagUnicode);
         this.space_exp = new RegExp(`[${spaces}]+`, flagUnicode);
         var quotes_entries = this.createRegExp(this.comments.concat(this.quotes).map(q => q[0]), true).source;
-        var powers = Object.keys(this.powermap).filter(k => k.length > 1 && this.stamp_reg.test(k));
+        var powers = Object.keys(this.powermap).filter(k => k.length > 1 && stamp_reg.test(k));
         var powers_entries = this.createRegExp(this.tags.map(t => t[0]).concat(powers), true).source;
         var entries_reg = new RegExp(`^(${powers_entries}|${quotes_entries}|${scopes})$`, this.nocase ? 'iu' : '');
         stamps = this.compile(this.stamps.filter(s => !entries_reg.test(s)).join(''));
@@ -1021,6 +1022,10 @@ class Program {
         var numbers = number_reg.source.replace(/^\^|\$$/g, "");
         this.digit_reg = new RegExp(/^[+\-]?/.source + numbers, number_reg.flags);
         this.entry_reg = new RegExp([`[${spaces}]+|${quotes_entries}|[${scopes}]|${numbers}[^${tokens}]*|${express}|${powers_entries}|[${stamps}]`], "gi" + flagUnicode);
+        var stamps = this.stamps.slice();
+        for (var k in this.powermap) if (k.length === 1 && stamps.indexOf(k) < 0) stamps.push(k);
+        stamps.push.apply(stamps, powers);
+        this.stamp_reg = new RegExp(`^(${stamps.map(this.compile).join('|')})$`);
     }
 }
 module.exports = Program;

package/coms/compile/powermap.js

@@ -8,7 +8,7 @@ var powermap = {
     '>>,>>>,<<'/* 7 */, '+,-'/* 8 */, '*,/,%'/* 9 */, '**'/* 10 */,
     '++,--'/* 11 */,
     "typeof,await,yield,new,delete,void,..."/*12*/,
-    '!,~'/* 13 */,
+    '!,~,#'/* 13 */,
     "::,?.,->,."/*14*/,
 ].forEach((pp, i) => {
     pp.split(",").forEach(p => {

package/coms/pivot/pedit.less

@@ -1,3 +1,25 @@
-&{
+& {
     position: absolute;
+
+    .model {
+        font-family: 仿宋, 宋体, Consolas, "Courier New", monospace;
+
+        &[type=gen],
+        &[type=text] {
+            display: block;
+            font-size: 12px;
+            line-height: 12px;
+        }
+
+        textarea {
+            font-family: Consolas, 仿宋, sans-serif;
+        }
+    }
+
+    white-space: pre-wrap;
+
+    [body],
+    .body {
+        font-family: 宋体;
+    }
 }

package/coms/zimoli/cless.js

@@ -1,4 +1,5 @@
 "use strict";
+var hasOwnProperty = Object.prototype.hasOwnProperty;
 var _create = function (commFactory, className, _invoke) {
     if (!className) return commFactory;
     if (commFactory instanceof Promise) {
@@ -23,7 +24,7 @@ var _create = function (commFactory, className, _invoke) {
             if (release) release = _invoke(release, className, _invoke);
             return release;
         };
-        if ({}.hasOwnProperty.call(commFactory, 'toString')) {
+        if (hasOwnProperty.call(commFactory, 'toString')) {
             result.toString = function () {
                 return _invoke(commFactory.toString(), className, _invoke);
             };

package/coms/zimoli/field.js

@@ -1,21 +1,63 @@
-function main() {
-    var elem = optionbar.apply(null, arguments);
-    var scope = {};
-    if (!elem.childNodes.length) care(elem, function (p) {
-        var [f, data] = p;
-        elem.innerHTML = field;
-        render(elem, scope = {
-            model,
-            data,
-            error: null,
-            field: f,
-            container,
-            readonly: !!this.readonly
-        });
-        elem.oldValue = data[f.key];
-        elem.setAttribute("field", f.key);
-    }, false);
+var reshape = function () {
+    var [head, body, foot] = getTypedChildren(this, ['head', 'body', 'foot']);
+    var isInlineBlock = body && /^inline/i.test(getComputedStyle(body).display);
+    if (head && body) {
+        var left = head.offsetWidth + 1;
+        if (isInlineBlock && left < body.offsetWidth >> 2) {
+            css(head, {
+                marginRight: fromOffset(-left),
+                marginBottom: ''
+            });
+            css(body, {
+                paddingLeft: left,
+                paddingTop: ""
+            });
+        }
+        else {
+            var top = head.offsetHeight + 1;
+            css(head, {
+                marginRight: '',
+                marginBottom: fromOffset(-top),
+            });
+            css(body, {
+                paddingLeft: '',
+                paddingTop: top
+            })
+        }
+    }
+    if (!body) body = head;
+    if (foot && body) {
+        var right = foot.offsetWidth + 1;
+        if (isInlineBlock && right < body.offsetWidth >> 2) {
+            css(foot, {
+                marginTop: '',
+                marginLeft: fromOffset(-right)
+            });
+            css(body, {
+                paddingBottom: '',
+                paddingRight: fromOffset(right),
+            })
+        }
+        else {
+            var bottom = foot.offsetHeight + 1;
+            css(foot, {
+                marginTop: fromOffset(-bottom),
+                marginLeft: '',
+            });
+            css(body, {
+                paddingRight: '',
+                paddingBottom: fromOffset(bottom)
+            });
+        }
+    }
+};
+
+function main(elem) {
+    if (!isElement(elem)) elem = document.createElement('field');
+    elem.reshape = reshape;
+    resizingList.set(elem, () => elem.reshape());
     elem.setAttribute("field", '');
+    var scope = {};
     elem.$renders = [function () {
         if (!(this.src instanceof Array)) return;
         var [f, data] = this.src;
@@ -48,5 +90,28 @@ function main() {
         this.oldValue = data[f.key];
     }]
     elem.removeAttribute("tabindex");
+
+    if (!elem.childNodes.length) care(elem, function (p) {
+        var [f, data] = p;
+        elem.innerHTML = field;
+        render(elem, scope = {
+            model,
+            data,
+            error: null,
+            field: f,
+            container,
+            readonly: !!this.readonly
+        });
+        elem.oldValue = data[f.key];
+        elem.setAttribute("field", f.key);
+        elem.reshape();
+    }, false);
+    else {
+        var [head, body, foot] = getTypedChildren(elem, ["head", 'body', 'foot']);
+        if (head) addClass(head, "head");
+        if (body) addClass(body, "body");
+        if (foot) addClass(foot, "foot");
+        elem.$renders.push(reshape);
+    }
     return elem;
 }

package/coms/zimoli/field.less

@@ -1,44 +1,61 @@
 & {
     height: auto;
     box-shadow: none !important;
+    display: block;
+    line-height: 22px;
+    border-bottom: 1px;
+}
 
-    >model:first-child {
-        padding: 6px 10px;
-        display: block;
-    }
-
-    model {
-        display: inline;
-    }
+>.head,
+>.foot {
+    padding: 10px 16px;
+    vertical-align: top;
+    display: inline-block;
+    position: absolute;
+}
 
-    >.head {
-        vertical-align: top;
+>model:first-child {
+    padding: 6px 10px;
+    display: block;
+}
 
-        .image {
-            margin: 10px 0;
-        }
-    }
+model {
+    display: inline;
+}
 
-    >.body {
-        .image {
-            margin: 10px 0;
-        }
+>.head {
 
-        text-align: left;
+    .image {
+        margin: 10px 0;
     }
+}
 
-    >.track {
-        display: none;
-        box-shadow: none;
+>.body {
+    .image {
+        margin: 10px 0;
     }
 
-    >.foot {
-        span {
-            vertical-align: middle;
-        }
+    vertical-align: top;
+    padding: 10px 20px;
+    height: 100%;
+    border-bottom: 1px solid #0001;
+    display: inline-block;
+    width: 100%;
+    text-align: left;
+}
+
+>.track {
+    display: none;
+    box-shadow: none;
+}
+
+>.foot {
+    span {
+        vertical-align: middle;
     }
 }
 
+
 .input {
     width: 100%;
 }

package/coms/zimoli/forceUpdate.js

@@ -18,6 +18,6 @@ if (preventCache && navigator) {
         } else {
             search = "=" + mark_time.toString(36);
         }
-        if (!/Safari|Firefox|Sciter|Baiduspider|PetalBot|Googlebot|Odin/.test(navigator.userAgent)) location.replace(location.pathname + "?" + search);
+        if (navigator.userAgent && !/Safari|Firefox|Sciter|Baiduspider|PetalBot|Googlebot|Odin/.test(navigator.userAgent)) location.replace(location.pathname + "?" + search);
     }
 }

package/coms/zimoli/getTypedChildren.js

@@ -0,0 +1,26 @@
+function hasType(target, type) {
+    // 记得小时候，不论是苍蝇还是蚊子，飞起来都是有声音的。最近看到的一种像蚊子一样小的飞虫，喜欢像苍蝇一样趴在食物上，飞起来却听不到声音。
+    // 是我的听力下降了？还是外界太过嘈杂？还是飞虫拍打翅膀的频率超出了我的听觉范围？还是飞行可以不产生声音？
+    return target.hasAttribute(type) || hasClass(target, type);
+}
+
+return function (element, types) {
+    var marked = 0;
+    for (var k in types) {
+        for (var c of element.children) {
+            if (hasType(c, types[k])) {
+                types[k] = c;
+                marked++;
+            }
+        }
+    }
+    if (!marked && isArray(types)) {
+        var children = element.children;
+        if (children.length) {
+            for (var cx = 0, dx = types.length; cx < dx; cx++) {
+                types[cx] = children[cx];
+            }
+        }
+    }
+    return types;
+}

package/coms/zimoli/model.js

@@ -409,6 +409,14 @@ function main(elem) {
 }
 markEditer(constructors);
 markReader(readonly_types);
+var pick = function (constructors, f) {
+    var path = [];
+    while (typeof f === 'string' && path.indexOf(f) < 0) {
+        path.push(f);
+        f = constructors[f];
+    }
+    return f;
+};
 extend(main, {
     setEditors(map) {
         extend(constructors, map);
@@ -423,12 +431,14 @@ extend(main, {
         this.setReadors(map);
     },
     setEditor(key, func) {
+        if (typeof func === 'function') func.isediter = true;
+        else func = pick(constructors, func);
         constructors[key] = func;
-        func.isediter = true;
     },
     setReador(key, func) {
+        if (typeof func === 'function') func.isreader = true;
+        else func = pick(readonly_types, func);
         readonly_types[key] = func;
-        func.isreader = true;
     },
     setModel(key, func) {
         this.setEditor(key, func);