efront 4.11.5 → 4.11.8

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/invoke.html

@@ -8,7 +8,7 @@
         <field -repeat="f in fields" -src="[f,data]"></field>
     </div>
     <div class="left">
-        <pre -text="task.code"></pre>
+        <jscode -value="task.code" type="js"></jscode>
     </div>
     <div class="right" :class="{error:error}">
         <pre -text="output"></pre>

package/apps/pivot/task/invoke.js

@@ -16,6 +16,7 @@ function main(a) {
         task: a,
         output: '',
         error: false,
+        jscode: 茨菰$编辑框,
         async run() {
             var id = ++taskid;
             this.output = "正在执行..";

package/apps/pivot/task/invoke.less

@@ -2,16 +2,19 @@
     position: absolute;
     width: 800px;
 }
->[body]{
-    border-top: 50px solid transparent;
-    border-bottom: 50px solid transparent;
-}
+
+
 >[body]>div {
     display: inline-block;
     vertical-align: top;
     overflow: auto;
     font-size: 12px;
 
+    >jscode,
+    >pre {
+        height: 100%;
+    }
+
     &.top {
         left: 0;
         top: 0;

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/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/compile/unstruct.js

@@ -403,7 +403,7 @@ var patchstep = function (r, nextindex, h) {
             x = rescan`if (${name}) return [${nextindex}, 0]`;
         }
         else if (o === RD) {
-            x = rescan`if (${name}!= null) return [${nextindex}, 0]`;
+            x = rescan`if (${name}!=null) return [${nextindex}, 0]`;
         }
         else continue;
         changed = true;
@@ -941,6 +941,13 @@ var _express = function (body, getname, ret) {
         q.name = cloneNode(body);
         return [q];
     }
+    if (isFunctionOnly(body)) {
+        result = [body];
+        return result;
+    }
+    else {
+        result = [];
+    }
     var result = [];
     var q = [];
     var bx = 0;
@@ -949,6 +956,7 @@ var _express = function (body, getname, ret) {
     var nameindex = 0;
     var maxindex = 0;
     var hasor = false;
+    var xorcount = 0;
     var getdeepname = function (deep = 0) {
         return getname(maxindex + deep);
     };
@@ -1007,12 +1015,20 @@ var _express = function (body, getname, ret) {
             q.name = cloneNode(name);
             if (isor) {
                 if (o.text === '||') {
+                    if (xorcount) {
+                        result.push(..._invoke(q, getdeepname));
+                        result[result.length - 1].ret_ = true;
+                        q = [];
+                        q.name = cloneNode(name);
+                    }
                     q.push(RE);
                 }
                 else if (o.text === '&&') {
                     q.push(RZ);
+                    xorcount++;
                 }
                 else if (o.text === '??') {
+                    xorcount++;
                     q.push(RD);
                 }
                 hasor = true;
@@ -1065,12 +1081,9 @@ var _express = function (body, getname, ret) {
         }
     }
     if (needname) q.name = [{ text: getname(nameindex), type: EXPRESS }];
-    relink(q);
-    if (isFunctionOnly(q, 2)) {
-        result = [q];
-    }
-    else {
-        result = _invoke(q, getdeepname);
+    if (q.length) {
+        relink(q);
+        result.push(..._invoke(q, getdeepname));
     }
     if (hasor) result[result.length - 1].ret_ = true;
     return result;

package/coms/compile/unstruct_test.js

@@ -158,4 +158,5 @@ unstruct.debug = true; r++;
 r++// test("if(a)else {}",'')
 test("if(a){if(b){c}d}else{e}", `if (!a) return [2, 0]; if (!b) return [1, 0]; c; return [1, 0];\r\n d; return [2, 0];\r\n e; return [1, 0]`)
 test("if(a){if(b){c}else{d}}else{e}", `if (!a) return [3, 0]; if (!b) return [1, 0]; c; return [2, 0];\r\n d; return [1, 0];\r\n return [2, 0];\r\n e; return [1, 0]`)
+test("if(a&&b||c){d}", `_ = a; if (!_) return [1, 0]; _ = b;\r\n if (_) return [1, 0]; _ = c;\r\n if (!_) return [1, 0]; d; return [1, 0]`, true);
 test("if(a)switch(b){case c:d;break;} else{h}", `if (!a) return [3, 0]; if (b === c) return [1, 0]; return [2, 0];\r\n d; return [1, 0];\r\n return [2, 0];\r\n h; return [1, 0]`)

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,68 @@
 & {
     height: auto;
     box-shadow: none !important;
+    display: block;
+    line-height: 22px;
+    padding: 8px 0;
+    border-bottom: 1px solid #0001;
+}
 
-    >model:first-child {
-        padding: 6px 10px;
-        display: block;
-    }
+>.head,
+>.foot {
+    padding: 2px 16px;
+    vertical-align: top;
+    display: inline-block;
+    position: absolute;
+}
 
-    model {
-        display: inline;
-    }
+>model:first-child {
+    padding: 6px 10px;
+    display: block;
+}
+
+model {
+    display: inline;
+}
 
-    >.head {
-        vertical-align: top;
+>.head {
+    font-weight: 600;
+    font-family: "宋体";
 
-        .image {
-            margin: 10px 0;
-        }
+    &:after {
+        content: ":";
     }
 
-    >.body {
-        .image {
-            margin: 10px 0;
-        }
-
-        text-align: left;
+    .image {
+        margin: 10px 0;
     }
+}
 
-    >.track {
-        display: none;
-        box-shadow: none;
+>.body {
+    .image {
+        margin: 10px 0;
     }
 
-    >.foot {
-        span {
-            vertical-align: middle;
-        }
+    min-height: 30px;
+    vertical-align: top;
+    padding: 2px 16px;
+    height: 100%;
+    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/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);

package/coms/zimoli/render.js

@@ -543,7 +543,7 @@ var directives = {
         var parsedSrc = this.$src;
         return src2.call(this, parsedSrc && /[\{\[\s]/.test(src) ? parsedSrc.srcName : src);
     },
-    model(search, target) {
+    model(search, target, change) {
         var getter = createGetter(this, search);
         var oldValue;
         var getstr = target.getValue instanceof Function ? "this.getValue()" : "";
@@ -561,12 +561,12 @@ var directives = {
             oldValue = value;
             this[key] = value;
         };
-        if (/^input$/i.test(target.tagName) && /^checkbox$/i.test(target.type) || /^checkbox$/i.test(target.tagName)) {
-            this.$renders.push(setter || setter2.bind(target, 'checked'));
-            var change = getstr || "this.checked";
-        } else if (("value" in target || target.getValue instanceof Function) && target.setValue instanceof Function) {
+        if (("value" in target || target.getValue instanceof Function) && target.setValue instanceof Function) {
             this.$renders.push(setter);
             var change = getstr || "this.value";
+        } else if (/^input$/i.test(target.tagName) && /^checkbox$/i.test(target.type) || /^checkbox$/i.test(target.tagName)) {
+            this.$renders.push(setter || setter2.bind(target, 'checked'));
+            var change = getstr || "this.checked";
         } else if (/^(select|input|textarea)$/i.test(target.tagName) || "value" in target) {
             this.$renders.push(setter || setter2.bind(target, 'value'));
             var change = getstr || "this.value";
@@ -580,6 +580,7 @@ var directives = {
             });
             var change = getstr || "'value' in this?this.value:this.innerHTML";
         }
+        if (change === false) return;
         setter2 = null;
         var changeme = $$eval.bind(this, search + "=" + change, getScopeList(this));
         var onchange = function () {
@@ -593,6 +594,9 @@ var directives = {
         };
         eventsBinders.forEach(on => on(target, onchange, true));
     },
+    value(search, target) {
+        directives.model.call(this, search, target, false);
+    },
 
 };
 // property binder
@@ -711,6 +715,11 @@ function getFromScopes(key, scope, parentScopes) {
 
 function renderRest(element, struct, replacer = element) {
     var renders = element.$renders;
+    if (element.renders) {
+        if (!renders) renders = [];
+        renders.push.apply(renders, element.renders);
+        delete element.renders;
+    }
     element.$renders = [];
     var { binds, attrs, props } = struct;
     for (var k in binds) {
@@ -988,7 +997,7 @@ function createStructure(element, useExists) {
         }
         // ng-html,ng-src,ng-text,ng-model,ng-style,ng-class,...
         var key = name.replace(/^(ng|v|[^\_\:\.]*?)\-|^[\:\_\.]|^v\-bind\:/i, "").toLowerCase();
-        if (directives.hasOwnProperty(key) || /^([\_\:\.]|v\-bind\:)/.test(name)) {
+        if (key.length !== name.length && directives.hasOwnProperty(key) || /^([\_\:\.]|v\-bind\:)/.test(name)) {
             if (value) binds[key] = value;
             element.removeAttribute(name);
         }

package/coms/zimoli/view.js

@@ -90,20 +90,14 @@ var init = function () {
         marginRight: -getScrollbarWidth() + "px"
     });
 };
-var isType = function (target, type) {
-    // 记得小时候，不论是苍蝇还是蚊子，飞起来都是有声音的。最近看到的一种像蚊子一样小的飞虫，喜欢像苍蝇一样趴在食物上，飞起来却听不到声音。
-    // 是我的听力下降了？还是外界太过嘈杂？还是飞虫拍打翅膀的频率超出了我的听觉范围？还是飞行可以不产生声音？
-    return target.hasAttribute(type) || hasClass(target, type);
-}
 var resize2 = function () {
-    var head, body, foot;
-    for (var c of this.children) {
-        if (isType(c, "head")) head = c;
-        else if (isType(c, "body")) body = c;
-        else if (isType(c, "foot")) foot = c;
-    }
-    if (head && body) {
+    var [head, body, foot] = getTypedChildren(this, ["head", "body", "foot"]);
+    var changed = false;
+    a: if (head && body) {
         var height = head.offsetHeight + head.offsetTop;
+        if (head.$height === height) break a;
+        head.$height = height;
+        changed = true;
         css(head, {
             marginBottom: fromOffset(-height),
         })
@@ -111,8 +105,11 @@ var resize2 = function () {
             paddingTop: fromOffset(height - body.clientTop)
         });
     }
-    if (foot && body) {
+    a: if (foot && body) {
         var height = foot.offsetHeight;
+        if (foot.$height === height) break a;
+        foot.$height = height;
+        changed = true;
         css(body, {
             paddingBottom: fromOffset(height)
         });
@@ -120,13 +117,11 @@ var resize2 = function () {
             marginTop: fromOffset(-height)
         })
     }
-    if (body) {
-        if (body.scrollHeight + body.offsetTop > this.clientHeight) {
+    if (changed) {
+        css(body, { height: '' });
+        if (body.scrollHeight + body.offsetTop > this.clientHeight + 1) {
             css(body, { height: fromOffset(this.clientHeight) });
         }
-        else {
-            css(body, { height: '' });
-        }
     }
 };
 function view(element) {

package/coms//350/214/250/350/217/260//344/270/212/350/211/262.xht

@@ -95,5 +95,5 @@
     }
 </style>
 <script>
-    茨菰$渲染;
+    渲染;
 </script>

package/coms//350/214/250/350/217/260//346/270/262/346/237/223.js

@@ -9,7 +9,7 @@ var rows = function (type, text) {
         console.log(text)
         return [];
     }
-    type = type.toLowerCase();
+    type = String(type).toLowerCase();
     if (type in 语言) {
         var c = 语言[type](text);
         标签化(c, encode);