efront 3.13.2 → 3.13.3

package/apps/pivot/api.yml

@@ -11,4 +11,10 @@
   version: options ::version
   uptime: options ::uptime
   count: options ::count
-  bootlog: options ::similar
+  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/log/boot.js

@@ -1,20 +1,35 @@
 var fields = refilm`
 地址/ip
-端口/port
+地理位置/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
-时间/time date
-`;
+    `;
 function main() {
     var page = div();
     page.innerHTML = template;
-    var items = data.from("bootlog", item => {
-        item.forEach(a => {
+    var items = data.from("bootlog", datas => {
+        datas.forEach(a => {
             var [v, p] = a.ppid.split("/");
             a.version = v;
             a.pid = p;
-        })
-        return item;
+        });
+        datas.sort((a, b) => b.time - a.time);
+        return datas;
     });
     renderWithDefaults(page, {
         items,

package/apps/pivot/log/boot.less

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

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/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/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/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) {

package/package.json

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