efront 4.5.8 → 4.5.10

package/apps/pivot/log/boot.js

@@ -1,63 +1,50 @@
 cross.addDirect(/^https?\:\/\/([[a-z\.\d\:\/%]+\]|[\d\.]+)(\:\d+)?\//);
+var checkPort = async function (p, ip) {
+    if (!p.host) {
+        if (/^::ffff:\d+\.\d+\.\d+\.\d+$/i.test(ip)) {
+            ip = ip.slice(7);
+        }
+        else {
+            ip = `[${ip}]`;
+        }
+        p.locate(ip);
+    }
+    try {
+        p.locate("/:version");
+        var { response } = await cross("options", p.href);
+        if (/^efront/.test(response)) {
+            p.ok = true;
+        }
+    } catch (e) {
+        p.error = e;
+    }
+
+}
 var fields = refilm`
-地址/ip
-地理位置/ip ${function (e) {
-        var ip = e.data[e.field.key];
+IP地址/ip text/120
+地理位置/address/查看 act/80 ${async function (a) {
+        var ip = a.ip;
         var m = /(\d+\.){3}\d+$/.exec(ip);
-        if (m) {
-            var l = document.createElement('label');
-            appendChild(e, l);
-            l.innerHTML = ' ';
-            var setAddress = function (a) {
-                l.innerText = a;
-            };
-            if (e.data.address) setAddress(e.data.address);
-            else e.data.address = data.from("iplocation", { ip: m[0] }, function (a) {
-                setAddress(a.address);
-                return a.address;
-            });
-        }
-        return e;
+        var { address } = await data.from("iplocation", { ip: m ? m[0] : ip });
+        a.address = address;
     }}
 启动时间/time ${function (e) {
         e.innerHTML = filterTime(e.data[e.field.key]);
     }}
-端口/port ${async function (e) {
+绑定地址/port 120/${async function (e) {
         var { data, field } = e;
-        var ports = data[field.key].split(/,/);
-        var loaded = data.loaded || ports;
-        data.loaded = loaded;
-        e.innerHTML = loaded.join(' ');
-        if (data.loaded === ports) for (let cx = 0, dx = ports.length; cx < dx; cx++) {
-            var p = ports[cx];
-            var p0 = p;
-            var protocol = /^https/.test(p) ? "https://" : "http://";
-            p = p.replace(/[^\d]+/g, '');
-            if (p) p = ":" + p;
-            try {
-                var ip = data.ip;
-                if (!ip) return;
-                if (/^::ffff:\d+\.\d+\.\d+\.\d+$/i.test(ip)) {
-                    ip = ip.slice(7);
-                }
-                else {
-                    ip = `[${ip}]`;
-                }
-                var xhr = await cross("options", `${protocol}${ip}${p}/:version`);
-                if (xhr.responseText === 'efront ' + data.version) {
-                    loaded[cx] = (`<span style="color:green">${p0}</span>`);
-                } else {
-                    loaded[cx] = (`<span style="color:red">${p0}</span>`);
-                }
-            } catch (e) {
-                loaded[cx] = (`<span style="color:gray">${p0}</span>`);
-            }
-            e.innerHTML = loaded.join(' ');
-        }
+        var ports = data[field.key].split(/,/).map(p => parseURL(p));
+        e.innerHTML = `<a -repeat="p in ports" @click="checkPort(p,ip)" -class="{ok:p.ok,error:p.error}"><span -bind=p></span></a>`;
+        render(e, {
+            ports,
+            ip: data.ip,
+            checkPort,
+        })
     }}
 版本/version input
 进程/pid
-    `;
+`;
+
 function main() {
     var page = div();
     page.innerHTML = template;

package/apps/pivot/log/boot.less

@@ -8,4 +8,35 @@ model {
         color: #666;
         font-size: 9px;
     }
+}
+
+model[type=function] {
+    display: inline-block;
+    
+    a {
+        text-align: left;
+        &.ok {
+            color: green;
+            
+            &:after {
+                content: "(接通)";
+            }
+        }
+        
+        &.error {
+            &:after {
+                content: "(出错)";
+            }
+            
+            color: red;
+        }
+
+        &:nth-child(2),
+        &:nth-last-child(2) {
+            padding: 0;
+            line-height: 1.2;
+            font-size: 14px;
+            display: block;
+        }
+    }
 }

package/coms/compile/Javascript.js

@@ -610,7 +610,7 @@ function detour(o, ie) {
                         collectProperty(o, text);
                     }
                     if (o.short) {
-                        unshort(o);
+                        unshort(o, text);
                     }
                     else {
                         o.text = text;

package/coms/compile/common.js

@@ -1478,8 +1478,8 @@ var insertAfter = function (o) {
     if (next) next.prev = o;
     else queue.last = o;
 };
-var unshort = function (o) {
-    insertBefore.call(o.queue, o, { text: o.text, short: false, isprop: true, type: PROPERTY }, { text: ':', type: STAMP });
+var unshort = function (o, text) {
+    insertBefore.call(o.queue, o, { text: text || o.text, short: false, isprop: true, type: PROPERTY }, { text: ':', type: STAMP });
     o.isprop = false;
     o.type = EXPRESS;
     delete o.short;

package/coms/pivot/acme2.js

@@ -363,7 +363,7 @@ var acme2 = new class {
         }
         if (o.status === 'ready') {
             await this.finalizeOrder(o, upload);
-            o = await this.waitStatus();
+            o = await this.waitStatus(o);
         }
         if (o.status === 'valid') {
             var cert = await data.fromURL(o.certificate);

package/coms/zimoli/cless.js

@@ -18,7 +18,7 @@ var _create = function (commFactory, className, _invoke) {
         commFactory.className = className;
         keys(commFactory).map(k => result[k] = commFactory[k]);
         result.call = function (context, ...args) {
-            if (!isEmpty(context)) var release = commFactory.apply(context, args);
+            if (isHandled(context)) var release = commFactory.apply(context, args);
             else release = commFactory.apply(result, args);
             if (release) release = _invoke(release, className, _invoke);
             return release;

package/coms/zimoli/field.less

@@ -7,6 +7,10 @@
         display: block;
     }
 
+    model {
+        display: inline;
+    }
+
     >.head {
         vertical-align: top;
 

package/coms/zimoli/model.js

@@ -257,6 +257,7 @@ var readonly_types = {
     },
 };
 readonly_types.anchor = readonly_types.url;
+readonly_types.do = readonly_types.act = readonly_types.action = constructors.generator;
 readonly_types.gen = readonly_types.generator = readonly_types.text;
 var createOptionsMap = function (options) {
     if (!isObject(options[0])) return options;

package/coms/zimoli/model.less

@@ -1,5 +1,6 @@
 & {
     word-break: break-all;
+    display: inline-block;
 }
 
 &[type=date] {
@@ -9,6 +10,10 @@
     }
 }
 
+&[type=gen] {
+    font-size: 14px;
+}
+
 &[type=datetime] {
     >input {
         width: 10em;

package/coms/zimoli/table.html

@@ -13,7 +13,7 @@
         <td fixed row-index -bind="i+1" :style="adapter.firstChild.getAttribute('style')">
         </td>
         <td fixed:="f.fixed" -repeat="(f,i) in fields" :style="adapter.children[i+1].getAttribute('style')">
-            <model -if="!isEmpty(f.key)&&!isEmpty(d[f.key])" :field=f :data=d readonly></model>
+            <model -if="!isEmpty(f.key)" :field=f :data=d readonly></model>
             <template -else>&nbsp;</template>
             <a on-click="o.do(d)" -if="isEmpty(f.key)&&f.options&&(!o.when||o.when(d))"
                 _type="o.type instanceof Function?o.type(d):o.type" -repeat="o in f.options">

package/docs//347/273/204/344/273/266.xht

@@ -13,8 +13,8 @@
     [body] {
         border-top: 42px solid transparent;
         padding-top: 40px;
+        overflow: auto;
         padding-bottom: 0 !important;
-        border-bottom: 46px solid transparent;
     }
 
 
@@ -53,6 +53,11 @@
         color: #29c;
     }
 
+    h2[head] {
+        font-size: 18px;
+        padding: 6px 14px;
+    }
+
     h2 b {
         font-size: 14px;
         display: inline-block;
@@ -62,21 +67,21 @@
     }
 
     [codearea] {
-        width: 100%;
         height: 100%;
     }
 
     [codearea]>code {
         overflow: auto;
-        width: 100%;
-        height: 100%;
-        padding: 10px 20px 60px 20px;
+        display: block;
+        height: auto;
+        min-height: 100%;
+        padding: 10px 20px 40px 20px;
         white-space: nowrap;
         outline: none;
     }
 
     markdown {
-        margin: -6px -20px 0 -10px;
+        margin: 20px auto;
     }
 
     [foot]>button {
@@ -85,52 +90,55 @@
 
     .result {
         position: absolute;
-        bottom: 0;
+        bottom: 40px;
         right: 0;
         left: 0;
-        padding: 10px 20px;
         border-top: 1px solid #333;
         background: #fff;
         display: block;
         z-index: 1;
     }
 </style>
-<xmenu -src="(t,i) in tags" @active="saveTagIndex(i)"></xmenu>
-<h2 head>
-    <span -bind="name"></span>
-    <b -if="doc?.less" l>${i18n`有样式表`}</b>
-    <b -if="doc?.mark" w>${i18n`有文档`}</b>
-    <b -if="doc?.test" t>${i18n`有测试代码`}</b>
-</h2>
-<div body -if="tags[0].actived">
-    <container -if="doc?.url" .src="doc.url">
-    </container>
-    <p4 envs>
-        <span -if="envs?.length">
-            ${i18n`环境依赖项:`}&nbsp; <m -repeat="c in envs" -bind="c"> </m>
-        </span>
-        <span -else> ${i18n`无环境依赖项`} </span>
-    </p4>
-    <p4 imported>
-        <span -if="required?.length">
-            ${i18n`导入项:`}&nbsp;<m -repeat="c in required" -bind="c"></m>
-        </span>
-        <span -else>
-            ${i18n`无导入项`}
-        </span>
-    </p4>
-</div>
-<div body -elseif="tags[1].actived">
-    <div codearea #coder onkeyup="!event.isComposing&&updatecode()" onkeydown.tab="keytab(event)"></div>
-    <resultpad .result #coderesult></resultpad>
-</div>
-<div foot -if="tags[1].actived">
-    <a -if="doc?.test" @click="clearpad()">${i18n`清理`}</a>
-    <a -if="doc?.test" @click="loadcode()">${i18n`载入测试代码`}</a>
-    <btn @click="execute()">${i18n`运行`}</btn>
-</div>
+<form onclick="event.preventDefault()">
+    <xmenu -src="(t,i) in tags" @active="saveTagIndex(i)"></xmenu>
+    <h2 head>
+        <span -bind="name"></span>
+        <b -if="doc?.less" l>${i18n`有样式表`}</b>
+        <b -if="doc?.mark" w>${i18n`有文档`}</b>
+        <b -if="doc?.test" t>${i18n`有测试代码`}</b>
+    </h2>
+    <div body -if="tags[0].actived">
+        <container -if="doc?.url" .src="doc.url">
+        </container>
+        <p4 envs>
+            <span -if="envs?.length">
+                ${i18n`环境依赖项:`}&nbsp; <m -repeat="c in envs" -bind="c"> </m>
+            </span>
+            <span -else> ${i18n`无环境依赖项`} </span>
+        </p4>
+        <p4 imported>
+            <span -if="required?.length">
+                ${i18n`导入项:`}&nbsp;<m -repeat="c in required" -bind="c"></m>
+            </span>
+            <span -else>
+                ${i18n`无导入项`}
+            </span>
+        </p4>
+    </div>
+    <div body onkeyup="!event.isComposing&&updatecode()" onkeydown.tab="keytab(event)" #coder codearea
+        -elseif="tags[1].actived">
+    </div>
+    <resultpad -if="tags[1].actived" .result #coderesult></resultpad>
+    <div foot -if="tags[1].actived">
+        <a -if="doc?.test" @click="clearpad()">${i18n`清理`}</a>
+        <a -if="doc?.test" @click="loadcode()">${i18n`载入测试代码`}</a>
+        <btn @click="execute()">${i18n`运行`}</btn>
+    </div>
+</form>
 <script>
+    var required, doc, envs;
     var commaps = Object.create(null);
+    var form = view;
     var initCommap = function (live) {
         var commap = commaps[live];
         if (!commap) {
@@ -164,14 +172,14 @@
     });
     var 分析 = lazy(async function (com, props) {
         if (props.mark) props.url = '/mark/coms/' + com.replace(/\.js$/i, '.md');
-        scope.doc = props;
-        scope.name = com;
+        doc = props;
+        name = com;
         var xhr = await cross("get", "./components:" + com);
         var code = compile$scanner2(xhr.response);
         code.fix();
-        var envs = code.envs;
+        envs = code.envs;
         if (props.less) envs.cless = true;
-        var required = [];
+        required = [];
         if (envs.require) code.used.require.forEach(r => {
             var next = r.next;
             if (!next) return;
@@ -181,27 +189,27 @@
             var req = code.program.createString([first]);
             required.push(req);
         });
-        scope.required = required;
-        scope.envs = Object.keys(envs);
+        envs = Object.keys(envs);
         render.refresh();
         if (tags[1].actived) loadcode();
     });
     var loadcode = async function () {
-        var modName = scope.name.replace(/\.js$/, '_test');
-        if (scope.doc.test) {
+        jschanged = false;
+        var modName = name.replace(/\.js$/, '_test');
+        if (doc.test) {
             var xhr = await cross('get', "./components:" + modName + '.js');
-            var codetext = xhr.responseText;
-            var code = compile$scanner2(codetext);
+            jstext = xhr.responseText;
+            var code = compile$scanner2(jstext);
             var envs = code.envs;
             var vars = code.vars;
             var commName = modName.replace(/^[\s\S]*\//, '');
             var lessName = commName + ".less", lessData;
             var cssWrap = `css-` + +new Date;
-            if (scope.doc.test.indexOf(lessName) >= 0) {
+            if (doc.test.indexOf(lessName) >= 0) {
                 lessData = await cross("get", "./components:" + modName + ".less");
                 lessData = compile$素馨(lessData.responseText, "." + cssWrap);
                 if (code.isExpressQueue()) {
-                    codetext = `return cless(${codetext},\`${lessData}\`,"${cssWrap}")`;
+                    jstext = `return cless(${jstext},\`${lessData}\`,"${cssWrap}")`;
                 }
                 else {
                     var entryName;
@@ -209,36 +217,36 @@
                     else if (vars.Main) entryName = 'Main';
                     else if (vars.MAIN) entryName = "MAIN";
                     else if (vars[commName]) entryName = commName;
-                    if (entryName) codetext += `\r\nreturn cless(${entryName},\`${lessData}\`,"${cssWrap}")`;
+                    if (entryName) jstext += `\r\nreturn cless(${entryName},\`${lessData}\`,"${cssWrap}")`;
                 }
             }
             else {
-                if (code.isExpressQueue()) codetext = "return " + codetext.trim();
-                else if (vars.main) codetext += '\r\nreturn main';
-                else if (vars.Main) codetext += '\r\nreturn Main';
-                else if (vars.MAIN) codetext += "\r\nreturn MAIN";
-                else if (vars[modName]) codetext += "\r\nreturn " + modName;
+                if (code.isExpressQueue()) jstext = "return " + jstext.trim();
+                else if (vars.main) jstext += '\r\nreturn main';
+                else if (vars.Main) jstext += '\r\nreturn Main';
+                else if (vars.MAIN) jstext += "\r\nreturn MAIN";
+                else if (vars[modName]) jstext += "\r\nreturn " + modName;
             }
             var templateName = commName;
             if (envs.template) templateName = 'template';
             if (envs[templateName]) {
                 delete envs[templateName];
                 var template = await cross("get", './components:' + modName + ".html");
-                codetext = `var ${templateName}={toString(){return \`${template.responseText.replace(/>\s+</g, '><')}\`}};\r\n` + codetext;
+                jstext = `var ${templateName}={toString(){return \`${template.responseText.replace(/>\s+</g, '><')}\`}};\r\n` + jstext;
             }
-            initcode(codetext);
+            initcode(jstext);
         }
         else {
             initcode('');
         }
-        scope.codetext = scope.coder.innerText;
+        jstext = coder.innerText;
         execute();
     };
     var blink = "\u0080";
     var markAnchorOffset = function () {
         var { anchorNode, anchorOffset } = document.getSelection();
-        if (!anchorNode || !scope.coder) return;
-        var [c] = scope.coder.children;
+        if (!anchorNode || !coder) return;
+        var [c] = coder.children;
         if (anchorNode.nodeType === 1) {
             var node = document.createTextNode(blink);
             anchorNode.insertBefore(node, anchorNode.childNodes[anchorOffset])
@@ -248,7 +256,7 @@
         }
     };
     var unmarkAnchorOffset = function () {
-        var [c] = scope.coder.children;
+        var [c] = coder.children;
         var node = c.firstChild;
         while (node) {
             if (node.nodeType === 1) {
@@ -273,7 +281,7 @@
     }
     var getAnchorOffset = function () {
         var { anchorNode, anchorOffset } = document.getSelection();
-        var [c] = scope.coder.children;
+        var [c] = coder.children;
         if (anchorNode === c || !anchorNode) return -anchorOffset;
         var sibling = anchorNode.previousSibling ? anchorNode.previousSibling : anchorNode.parentNode.previousSibling;
         while (sibling && sibling !== c) {
@@ -290,7 +298,7 @@
         return anchorOffset;
     };
     var setAnchorOffset = function (anchorOffset) {
-        var [c] = scope.coder.children;
+        var [c] = coder.children;
         if (anchorOffset < 0) {
             anchorOffset = -anchorOffset;
             if (anchorOffset > c.childNodes.length) anchorOffset = c.childNodes.length;
@@ -330,48 +338,51 @@
         try {
             var colored = codetext("js", innerText, blink);
         } catch { return; }
-        var innerHTML = scope.coder.innerHTML.replace(/\s*contenteditable\=[^\s\>]+/i, '');
+        var innerHTML = coder.innerHTML.replace(/\s*contenteditable\=[^\s\>]+/i, '');
         if (innerHTML === colored) return;
-        var [c0] = scope.coder.children;
+        var [c0] = coder.children;
         var contentLength = c0 ? innerText.length : 0;
         var scrollTop = c0 ? c0.scrollTop : 0;
         var scrollLeft = c0 ? c0.scrollLeft : 0;
-        scope.coder.innerHTML = colored;
-        var [c] = scope.coder.children;
+        coder.innerHTML = colored;
+        var [c] = coder.children;
         c.scrollTop = scrollTop;
         c.scrollLeft = scrollLeft;
         c.contentEditable = true;
     };
     var updatecode = lazy(function () {
+        var trimreg = /[\s\u00a0\u2002\u0080]+([\}\{\;\[\]\(\)\,\>\<\+\-\*\&\^\/%!~:?])*/g;
+        var innerText = coder.innerText;
+        if (jstext.replace(trimreg, trimspace).trim() === innerText.replace(trimreg, trimspace).trim()) return;
         markAnchorOffset();
-        var innerText = scope.coder.innerText;
+        var innerText = coder.innerText;
         var trimspace = (_, a) => a ? "" : " ";
-        var trimreg = /[\s\u00a0\u2002\u0080]+([\}\{\;\[\]\(\)\,\>\<\+\-\*\&\^\/%!~:?])*/g;
         unmarkAnchorOffset();
-        if (scope.codetext.replace(trimreg, trimspace).trim() === innerText.replace(trimreg, trimspace).trim()) return;
         initcode(innerText);
         unmarkAnchorOffset();
-        scope.codetext = scope.coder.innerText;
+        jstext = coder.innerText;
+        jschanged = true;
     });
+    var jschanged = false;
     var execute = async function () {
         try {
-            var live = /^([\s\S]+)\//.exec(scope.name);
+            var live = /^([\s\S]+)\//.exec(name);
             if (live) live = live[1];
             var commap = initCommap(live);
-            remove(scope.coderesult.childNodes);
-            var codetext = scope.codetext.replace(/[\u2002\u00a0]/g, ' ');
-            data.patchInstance("docscode", { codetext: codetext })
-            var code = compile$scanner2(codetext);
+            remove(coderesult.childNodes);
+            jstext = jstext.replace(/[\u2002\u00a0]/g, ' ');
+            data.patchInstance("docscode", { codetext: jstext })
+            var code = compile$scanner2(jstext);
             var envs = code.envs;
             var argNames = Object.keys(envs);
             var args = await Promise.all(argNames.map(a => init(a + "*" + live, null, { ["init*" + live]: init, ["put*" + live]: put, ["zimoli*" + live]: zimoli, ["appendChild*" + live]: appendChild, ["remove*" + live]: remove, ["render*" + live]: render })));
-            var func = createFunction("", codetext, argNames, code.async, code.yield);
+            var func = createFunction("", jstext, argNames, code.async, code.yield);
             var res = func.apply(window, args);
             if (isFunction(res)) {
                 res = res.call(res);
             }
             if (isElement(res) || isArray(res)) {
-                appendChild(scope.coderesult, res);
+                appendChild(coderesult, res);
             }
         } catch (e) {
             alert(String(e), 'error');
@@ -384,35 +395,22 @@
     ];
     tags[data.getInstance("docscode").tagIndex | 0].actived = true;
     var actived = tags.map(t => t.actived);
+    // page.innerHTML = template;
+    var btn = button;
+    var a = button;
+    var jstext = '';
     var xmenu = menu;
-    var page = view();
-    on("submit")(page, e => e.preventDefault());
-    page.innerHTML = template;
-    var scope = {
-        btn: button,
-        container,
-        view,
-        tags,
-        a: button,
-        codetext: "",
-        xmenu: menu,
-        loadcode,
-        clearpad() {
-            remove(this.coderesult.childNodes);
-        },
-        execute,
-        updatecode,
-        saveTagIndex(i) {
-            data.setInstance("docscode", { tagIndex: i });
-            if (i === 1 && !scope.codetext) requestAnimationFrame(loadcode);
-        },
-        keytab(event) {
-            event.preventDefault();
-        }
+    var clearpad = function () {
+        remove(this.coderesult.childNodes);
     };
-    render(page, scope);
-    function main(name) {
-        分析(name, this.data);
-        return page;
-    }
+    var keytab = function (event) {
+        event.preventDefault();
+    };
+
+    var saveTagIndex = function (i) {
+        data.setInstance("docscode", { tagIndex: i });
+        if (i === 1 && !jschanged) requestAnimationFrame(loadcode);
+    };
+    var [name] = arguments;
+    分析(name, state.data);
 </script>

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "4.5.8",
+    "version": "4.5.10",
     "description": "简化前端开发，优化web性能",
     "main": "public/efront.js",
     "directories": {