efront 3.12.6 → 3.13.4

package/apps/pivot/api.yml

@@ -10,3 +10,11 @@
   invoke: options ::invoke-:key?:params
   version: options ::version
   uptime: options ::uptime
+  count: options ::count
+  bootlog: options ::similar
+https://www.ip.cn/ :
+  iplocation: get https://www.ip.cn/api/index?ip=:ip&type=1
+# https://ipchaxun.com/ :
+#   iplocation: get:[].info%20label:nth-child(n+2)>span:nth-child(2) :ip/ 
+# https://www.ip138.com/:
+#   iplocation: get:head>script:nth-last-child(1) iplookup.asp?ip=:ip&action=2

package/apps/pivot/home/welcome.html

@@ -25,4 +25,4 @@
     <padding>
         启动时间&nbsp;&nbsp;<span -text="filterTime(hrtime)"></span>
     </padding>
-</block>
+</block>

package/apps/pivot/home/welcome.js

@@ -6,15 +6,12 @@ function main() {
         version: data.from("version"),
         hrtime: data.from("uptime", a => Date.now() - a * 1000),
         filterTime,
-        async run(id, target) {
-            target.setAttribute('pending', '')
-            try {
-                var info = await data.from("run", {
-                    run: id
-                }).loading_promise;
-                if (info) alert(info, 'pass');
-            } catch { }
-            target.removeAttribute('pending');
+        async run(id) {
+            await new Promise(ok => setTimeout(ok, 2000));
+            var info = await data.from("run", {
+                run: id
+            }).loading_promise;
+            if (info) alert(info, 'pass');
         },
         async logout() {
             data.setSource({});

package/apps/pivot/log/boot.html

@@ -0,0 +1,2 @@
+<table -src="[fields,items]">
+</talbe>

package/apps/pivot/log/boot.js

@@ -0,0 +1,39 @@
+var fields = refilm`
+地址/ip
+地理位置/ip ${function (e) {
+        var ip = e.data[e.field.key];
+        var m = /(\d+\.){3}\d+$/.exec(ip);
+        if (m) {
+            data.from("iplocation", { ip: m[0] }, function (a) {
+                var l = document.createElement('label');
+                l.innerText = a.address;
+                appendChild(e, l);
+            });
+        }
+        return e;
+    }}
+启动时间/time ${function (e) {
+        e.innerHTML = filterTime(e.data[e.field.key]);
+    }}
+端口/port input
+版本/version
+进程/pid
+    `;
+function main() {
+    var page = div();
+    page.innerHTML = template;
+    var items = data.from("bootlog", datas => {
+        datas.forEach(a => {
+            var [v, p] = a.ppid.split("/");
+            a.version = v;
+            a.pid = p;
+        });
+        datas.sort((a, b) => b.time - a.time);
+        return datas;
+    });
+    renderWithDefaults(page, {
+        items,
+        fields
+    });
+    return page;
+}

package/apps/pivot/log/boot.less

@@ -0,0 +1,11 @@
+& {
+    height: 100%;
+}
+
+model {
+    label {
+        display: inline-block;
+        color: #666;
+        font-size: 9px;
+    }
+}

package/apps/pivot/log/count.html

@@ -0,0 +1,5 @@
+<div class="searchbox">
+    <input @input="filter" -model="searchText" />
+</div>
+<table -src="[fields,items]">
+</talbe>

package/apps/pivot/log/count.js

@@ -0,0 +1,22 @@
+var fields = refilm`
+路径/path html
+访问量/count
+`;
+function main() {
+    var page = div();
+    page.innerHTML = template;
+    var items = data.from("count", a => {
+        return Object.keys(a).map(b => ({ path: b, count: a[b] }));
+    });
+    renderWithDefaults(page, {
+        items,
+        searchText: "",
+        filter() {
+            var text = this.searchText;
+            if (!text) return this.items = items;
+            this.items = search(text, items, 'path');
+        },
+        fields
+    });
+    return page;
+}

package/apps/pivot/log/count.less

@@ -0,0 +1,16 @@
+& {
+    height: 100%;
+
+}
+
+.searchbox {
+    position: absolute;
+    top: 0;
+    right: 0;
+    z-index: 2;
+    padding: 8px 16px;
+
+    >input {
+        background: #eee;
+    }
+}

package/apps/pivot/main.js

@@ -7,16 +7,15 @@ cross.addReform(async function ({ status, url, headers }, reform, reject) {
         var base1 = protocol + "//" + host + "/";
         if (base !== base1) {
             data.setSource(base1, null);
-            var page = await popup("/auth/login", base1);
-            care(page, "login", function (info) {
-                data.setSource(base1, info);
-                headers.authorization = info;
-                reform();
-            });
-            on("remove")(page, reject);
-            return false;
         }
-        location.reload();
+        var page = await popup("/auth/login", base1);
+        care(page, "login", function (info) {
+            data.setSource(base1, info);
+            headers.authorization = info;
+            reform();
+        });
+        on("remove")(page, reject);
+        return false;
     }
 })
 data.setReporter(function (m, t) {
@@ -27,7 +26,7 @@ data.bindInstance("base", async function (base) {
     cross.addDirect(base.base);
     var apimap = await data.getConfig();
     for (var k in apimap) {
-        apimap[k].base = base.base;
+        if (apimap[k].method === 'options') apimap[k].base = base.base;
     }
 });
 var base = data.getInstance('base').base;

package/apps/pivot/menu.yml

@@ -1,11 +1,17 @@
 首页: /home/welcome
 WEB:
   共享目录: /share/list
-  短链接: /home/short
+  短链接: /proxy/list
   文件管理: /wow/root
   长连接管理: /link/list
 任务:
   密钥管理: /token/list
   任务建立: /task/list
   定期执行: /tick/list
-# 用户列表: /user/list
+用户:
+  账号列表: /user/list
+  标签管理: /user/tag/list
+服务器日志:
+  访问计数: /log/count
+  启动记录: /log/boot
+  # 并发记忆: /log/lock

package/apps/pivot/proxy/edit.js

@@ -0,0 +1 @@
+pedit.bind(null, "短链接", "proxy");

package/apps/pivot/proxy/list.js

@@ -0,0 +1,12 @@
+var fields = refilm`
+*代理路径/url input/20
+真实路径/realpath url/2000
+/ - ${[{
+    name: "访问",
+    do(o) {
+        var url = o.url;
+        if (!/^\//.test(url)) url = "/" + url;
+        window.open(url,null);
+    }
+}]}`;
+return plist.bind(null, '短链接', "proxy", fields, "/proxy/edit");

package/apps/pivot/share/list.less

@@ -1,7 +1,3 @@
->table {
-    width: 100%;
-}
-
 & {
     height: 100%;
 }

package/apps/pivot/user/edit.js

@@ -0,0 +1 @@
+pedit.bind(null, "用户信息", "user");

package/apps/pivot/user/list.js

@@ -0,0 +1,4 @@
+plist.bind(null, '用户管理', "user", refilm`
+*用户ID/key 100
+用户名/name input/300
+`, "/user/edit");

package/apps/pivot/user/tag/edit.js

@@ -0,0 +1 @@
+pedit.bind(null, "标签", "tag");

package/apps/pivot/user/tag/list.js

@@ -0,0 +1,3 @@
+plist.bind(null, '标签', "tag", refilm`
+*标签/key 100
+`, "/user/tag/edit");

package/coms/basic/cross_.js

@@ -180,7 +180,14 @@ function cross_(jsonp, digest = noop, method, url, headers) {
         };
         xhr.form = function (data) {
             xhr.data(data);
-            if (FormData) {
+            var hasFile = false;
+            if (FormData) for (var k in jsondata) {
+                if (isFile(jsondata[k])) {
+                    hasFile = true;
+                    break;
+                }
+            }
+            if (hasFile) {
                 datas = new FormData;
                 for (var k in jsondata) {
                     datas.append(k, jsondata[k]);

package/coms/basic/encodePack.js

@@ -277,27 +277,20 @@ function pack2(buff) {
     var result = [];
     for (var cx = 0, dx = buff.length, bx = 32 * 1024 * 1024; cx < dx; cx += bx) {
         var b = buff.slice(cx, cx + bx);
-        var [l, p, b] = scan(b);
-        l = encodeRange(l);
-        p = encodeRange(p);
+        var b = scan(b);
         var e = encodeRange(b);
         var el = int(e.length);
         result.push(concatTypedArray([
             [
                 range_compress,
                 other_compress << 5 | el.length,
-                l.length >> 8,
-                l.length & 0xff,
-                p.length >> 8,
-                p.length & 0xff
             ],
-            el, l, p, e]));
+            el,  e]));
     }
     result = concatTypedArray(result);
     return pack0(buff, result);
 }
 module.exports = function (buff, type) {
-    type = 1;
     switch (type) {
         case 1:
             return pack(buff);

package/coms/basic/parseURL_test.js

@@ -12,6 +12,8 @@ test('http://yunxu1019@live.cn@github.com/?a', 'username', 'yunxu1019@live.cn')
 test('localhost', 'host', 'localhost')
 test('localhost:80', 'port', '80')
 test('localhost:80/', 'port', '80')
+test('efront.cc', 'host', 'efront.cc')
+test('127.0.0.1', 'host', '127.0.0.1')
 test(':80', 'port', '80')
 test('80', 'port', '80')
 test('/80', 'pathname', '/80')

package/coms/basic/parseYML.js

@@ -207,7 +207,7 @@ var scan = function (text) {
             }
         }
 
-        if (row === "|") {
+        if (row === "|" || row === ">") {
             rowtype = "|"
             continue;
         }

package/coms/basic/renderExpress.js

@@ -3,7 +3,7 @@ function createSeek(express) {
     express.forEach(function (search) {
         if (dist) {
             if (/[\=]/.test(dist)) dist = `(${dist})`;
-            dist = `${dist}!==void 0&&${dist}!==null?${dist}${search}:''`
+            dist = `typeof ${dist}!=='undefined'&&${dist}!==null?${dist}${search}:''`
         } else {
             dist = search;
         }

package/coms/frame/route.js

@@ -75,6 +75,7 @@
                 if (/,/.test(name)) {
 
                 }
+                item.closed = true;
                 return item;
             });
             return items;
@@ -114,6 +115,7 @@
             actived = mmap[opened.active] || actived;
             if (actived) {
                 if (actived_value === historys.length) {
+                    setActive(actived, true);
                     result.active = actived;
                 };
             }
@@ -123,6 +125,7 @@
     var setActive = function (p, active) {
         while (p) {
             p.active = active;
+            if (active) p.closed = false;
             p = p.parent;
         }
     };
@@ -195,6 +198,7 @@
         result.then = then;
         return result;
     };
+    result.parse = parseMenuList;
     var then = function (ok, oh) {
         if (this.loading_promise) {
             return this.loading_promise.then(ok, oh);

package/coms/pivot/plist.js

@@ -2,7 +2,7 @@
 function main(title, type, fields, edit_ref, options) {
     return frame$list(title, {
         load() {
-            return data.from("list", { type }, a => JSAM.parse(encode62.timedecode(a)));
+            return data.from("list", { type }, a => JSAM.parse(encode62.timedecode(a || '')));
         },
         remove(o) {
             return data.from("edit", { type, key: encode62.timeencode(o.key), value: encode62.timeencode("") }).loading_promise;

package/coms/zimoli/AudioContext_test.html

@@ -1,5 +1,5 @@
 <div ng-class="{even:i%2===1,odd:i%2===0}" v-for="(r,i) in rates" hz:='r[5]'>
-    <span ng-if="i%2===0" v-bind="i/2 -2"></span>
+    <span ng-if="i%2===0" v-bind="i/2 -8"></span>
     <button ng-repeat="o in r" _rate=o>
         <span ng-bind="format(o)"></span>
     </button>

package/coms/zimoli/AudioContext_test.js

@@ -2,8 +2,8 @@ function piano() {
     var res = [];
     var yin = [1, 3, 5, 7, 8, 10, 12].reverse();
     var yue = [2, 4, 6, 9, 11].reverse();
-    var c=a => 440 * Math.pow(2, cx + (3 - a) / 12);
-    for (var cx = -6, dx = 8; cx < dx; cx++) {
+    var c = a => 440 * Math.pow(2, cx + (3 - a) / 12);
+    for (var cx = -12, dx = 8; cx < dx; cx++) {
         var yinjie1 = yin.map(c);
         var yinjie2 = yue.map(c);
         res.push(yinjie1, yinjie2);
@@ -23,7 +23,7 @@ function main() {
             oscillator.connect(gainNode);
             gainNode.connect(audioCtx.destination);
             oscillator.type = 'sine';
-            oscillator.frequency.value = hz;
+            oscillator.frequency.value = -hz;
             gainNode.gain.setValueAtTime(0, audioCtx.currentTime);
             gainNode.gain.linearRampToValueAtTime(65536 / Math.log2(hz), audioCtx.currentTime + 0.01);
             oscillator.start(audioCtx.currentTime);

package/coms/zimoli/bind.js

@@ -1,10 +1,12 @@
 function bind(eventName, bindTo = window) {
     return function (target, eventListener) {
         var off;
-        var off1 = on("append")(target, function () {
+        var mount = function () {
             if (off) off();
             off = on(eventName).call(bindTo, target, eventListener);
-        });
+        };
+        if (isMounted(target)) mount();
+        var off1 = on("append")(target, mount);
         var off2 = on("remove")(target, function () {
             if (off) off();
             off = null;

package/coms/zimoli/cloneVisible.js

@@ -1,5 +1,5 @@
 var cloneProperties = "fontWeight,fontSize,fontFamily,color,textShadow,opacity,writingMode,blockSize,wordSpacing,letterSpacing,whiteSpace".split(",");
-var cloneProperties2 = "position,float,clear,margin,color,verticalAlign,textAlign,textShadow,opacity,boxShadow,overflow,writingMode,blockSize,wordSpacing,letterSpacing,textIndent,lineHeight,display,appearance,webkitAppearance,MozAppearance".split(",");
+var cloneProperties2 = "position,backdropFilter,float,clear,margin,color,verticalAlign,textAlign,textShadow,opacity,boxShadow,overflow,writingMode,blockSize,wordSpacing,letterSpacing,textIndent,lineHeight,display,appearance,webkitAppearance,MozAppearance".split(",");
 var pushProperty = function (key, props) {
     props.split(",").forEach(k => {
         cloneProperties2.push(key + k);
@@ -86,7 +86,13 @@ var isMaybeVisible = function (node) {
     if (style.overflow === "hidden") {
         if (node.offsetHeight === 0 || node.offsetWidth === 0) return;
     }
-    if (node.offsetParent && !overlap(node, node.offsetParent)) return;
+    if (node.offsetParent) {
+        var parent = node.offsetParent;
+        return !(node.offsetLeft + node.offsetWidth - parent.scrollLeft <= parent.clientLeft ||
+            node.offsetTop + node.offsetHeight - parent.scrollTop <= parent.clientTop ||
+            node.offsetLeft - parent.scrollLeft >= (parent.clientWidth || parent.offsetWidth) ||
+            node.offsetTop - parent.scrollTop >= (parent.clientHeight || parent.offsetHeight));
+    }
     return true;
 }
 var clonePseudo = function (node, pseudo) {
@@ -173,6 +179,7 @@ var cloneVisible = function (td) {
     };
     clone(td);
     extend(result.style, {
+        zIndex: getComputedStyle(td).zIndex,
         position: "absolute",
         left: _left + "px",
         top: _top + "px",

package/coms/zimoli/cross.js

@@ -17,9 +17,9 @@ if (cookiesData) {
     }
 }
 
-var digest = function () {
+var digest = lazy(function () {
     dispatch('render', window);
-};
+}, 0);
 
 var cross = cross_.bind(function (callback, onerror) {
     var xhr = new XMLHttpRequest;
@@ -32,7 +32,6 @@ var cross = cross_.bind(function (callback, onerror) {
 
     xhr.onreadystatechange = function () {
         if (xhr.readyState === 4) {
-            dispatch(window, 'render');
             switch (xhr.status) {
                 case 0:
                     if (!navigator.onLine) {

package/coms/zimoli/data.js

@@ -75,8 +75,24 @@ const formulaters = {
 var seekFromSource = function (obj, base) {
     var source = dataSourceMap;
     if (base && base in dataSourceMap) source = source[base];
-    obj = seek(source, obj);
-    if (isObject(obj)) for (var k in obj) if (obj[k] === dataSourceMap) delete obj[k];
+    if (isObject(obj)) {
+        var dist = {};
+        for (var k in obj) {
+            var v = obj[k];
+            if (/^\:/.test(k)) {
+                k = seek(source, k.slice(1));
+            }
+            if (v === '') {
+                if (source !== dataSourceMap) v = source;
+                else v = seek(source, k);
+            }
+            else if (/^\:/.test(v)) {
+                v = seek(source, v.slice(1));
+            }
+            dist[k] = v;
+        }
+        obj = dist;
+    }
     return obj;
 };
 function getErrorMessage(error = this) {
@@ -553,8 +569,10 @@ var privates = {
                     headers = seekFromSource(headers, api.base);
                 }
                 cross(realmethod, uri, headers).send(params).done(e => {
+                    updateLoadingCount();
                     ok(e.response || e.responseText);
                 }).error(xhr => {
+                    updateLoadingCount();
                     try {
                         var e = getErrorMessage(parseData(xhr.response || xhr.responseText || xhr.statusText || xhr.status));
                         oh({ status: xhr.status, api, params: params1, error: e, toString: getErrorMessage })
@@ -627,7 +645,6 @@ function responseCrash(e, data) {
         data.error = e;
     }
     error_report(e, e.status < 500 ? 'warn' : 'error');
-    updateLoadingCount();
 }
 var getData = function () { return this.data };
 var updateLoadingCount = function () {
@@ -643,7 +660,6 @@ var data = {
             response.is_loading = false;
             if (response.then === LoadingArray_then) delete response.then;
         }
-        updateLoadingCount();
     },
     responseCrash,
     responseLoading(response) {
@@ -865,10 +881,12 @@ var data = {
                     headers = seekFromSource(headers, api.base);
                 }
                 instance.loading = cross(method, uri, headers).send(params).done(xhr => {
+                    updateLoadingCount();
                     if (instance.loading !== xhr) return oh(aborted);
                     instance.loading = null;
                     ok(xhr.responseText || xhr.response);
                 }).error(xhr => {
+                    updateLoadingCount();
                     if (instance.loading !== xhr) return oh(aborted);
                     instance.loading = null;
                     try {

package/coms/zimoli/drag.js

@@ -61,8 +61,9 @@ function drag(target, initialEvent, preventOverflow, isMovingSource) {
             saved_delta.x += clone_left - target_left;
             saved_delta.y += clone_top - target_top;
             if (clone.style) {
-                clone.style.zIndex = zIndex();
-                extraClones.map(e => e.style.zIndex = clone.style.zIndex);
+                var z = zIndex();
+                clone.style.zIndex = z + (+clone.style.zIndex || 0);
+                extraClones.map(e => e.style.zIndex = z + (+e.style.zIndex || 0));
             }
         }
         drag.target = clone;

package/coms/zimoli/field.html

@@ -1,11 +1,16 @@
-<div class="head">
-    <span ng-bind=field.name></span>
-    <span class="required" ng-if="field.required">*</span>
-</div>
-<div class="body">
+<template v-if='field?.key'>
+    <div class="head">
+        <span ng-bind=field.name></span>
+        <span class="required" ng-if="field.required">*</span>
+    </div>
+    <div class="body">
+        <model _data=data _field=field></model>
+        <span class="error" ng-bind="error"></span>
+    </div>
+    <div class="foot" ng-if="field.msg">
+        <span ng-bind=field.msg></span>
+    </div>
+</template>
+<template v-else>
     <model _data=data _field=field></model>
-    <span class="error" ng-bind="error"></span>
-</div>
-<div class="foot" ng-if="field.msg">
-    <span ng-bind=field.msg></span>
-</div>
+</template>