efront 4.21.3 → 4.22.0

package/apps/pivot/db/config.xht

@@ -4,40 +4,80 @@
         height: 100%;
         display: block;
         position: relative;
-        padding-right: 0 !important;
         overflow: hidden;
+        border-right: 10px solid transparent;
+        padding-right: 0 !important;
+        background: #f2f4f6;
     }
 
-    .design {
-        list {
-            height: 100%;
-        }
+    >[head] {
+        background: #fff;
+    }
 
-        list,
-        .options {
+    design {
+        height: 100%;
+    }
 
-            width: 600px;
-            margin: 0 auto;
+    btn {
+        padding: 0 20px;
+    }
+
+    [act] {
+        display: block;
+        border-radius: 6px;
+        border: 1px solid #999;
+        padding: 4px 10px;
+        height: 60px;
+        [a-key] {
+            font-family: 20px;
+            font-style: italic;
         }
     }
 </style>
-
-<div head>
-    数据配置 - <span -bind="db.name"></span>
-</div>
+<xmenu tag head -src="m in menus"></xmenu>
 <div body>
-    <field -repeat="f in fields" -src="[f,db]"></field>
+    <div config -if="menus[0].actived">
+        <field -repeat="f in fields" -src="[f,db]"></field>
+    </div>
+    <design fields -if="menus[1].actived" _avoid="db.actions" -src="db.fields"></design>
+    <lattice actions -src="a in db.actions" -if="menus[2].actived">
+        <padding>
+            <div act @click="editAction(a)">
+                <div a.key?></div>
+                <div a.name?></div>
+            </div>
+        </padding>
+        <a insert @click="editAction(null)">添加动作</a>
+    </lattice>
 </div>
 <div foot>
-    <button @click="save">保存</button>
+    <div style="float: left;">
+        ${i18n`数据配置`} - <span -bind="db.name"></span>
+    </div>
+    <button @click="save">${i18n`保存`}</button>
 </div>
 <script>
+    view(this);
+    var xmenu = menu;
+    var btn = button;
+    var a = button;
+    var menus = refilm`
+    权限管理
+    字段管理
+    动作管理
+    `;
     var fields = refilm`
     是否公开/open swap`;
     var [db] = arguments;
+    if (!db.fields) {
+        var [da1] = await data.from('dbfind', { dbid: db.name, size: 1 });
+        db.fields = da1 ? Object.keys(da1).map(k => ({ key: k })) : [];
+    }
+    var editAction = function (a) {
+        popup('#/db/act', [db, a]);
+    };
     var save = async function () {
         await data.from('dbset', db);
         history.back();
     };
-    console.log(db)
 </script>

package/apps/pivot/home/welcome.html

@@ -1,32 +1,31 @@
-<div>
-    已登录到服务器，您可以进行如下操作
-</div>
 <block>
-    <padding>
-        清理服务器缓存 <btn @click="run('clear-cache',this)">清理</btn>
-    </padding>
 </block>
 <block>
     <padding>
-        重启服务器 <btn @click="run('rehost',this)" type="danger">重启</btn>
+        服务器版本&nbsp;&nbsp;<span -text="String(version)"></span>
+    </padding>
+    <padding>
+        nodejs版本&nbsp;&nbsp;<span -text="String(nodeVersion)"></span>
     </padding>
-</block>
-<block>
     <padding>
-        退出登录 <btn @click="logout()">退出</btn>
+        操作系统&nbsp;&nbsp;<span -text="String(platform)"></span>
+    </padding>
+    <padding>
+        处理器&nbsp;&nbsp;<span -text="String(arch)"></span>
     </padding>
 </block>
 <block>
     <padding>
-        服务器版本&nbsp;&nbsp;<span -text="String(version)"></span>
+        清理服务器缓存 <btn @click="run('clear-cache',this)">清理</btn>
+    </padding>
+    <padding>
+        重启服务器 <btn @click="run('rehost',this)" confirm type="danger">重启</btn>
     </padding>
 </block>
 <block>
     <padding>
         启动时间&nbsp;&nbsp;<span -text="filterTime(hrtime)"></span>
     </padding>
-</block>
-<block>
     <padding>
         内存 <progbar danger:="memery[0]/memery[1]<.05" :current="memeryUsed" :total="memery[1]"></progbar>
         <span style="color: #999;">

package/apps/pivot/home/welcome.js

@@ -8,6 +8,9 @@ function main() {
         filterTime,
         memeryUsed: 0,
         memery: [0, 1],
+        platform: '未知',
+        arch: '未知',
+        nodeVersion: "未知",
         size,
         progbar,
         async run(id) {
@@ -16,12 +19,6 @@ function main() {
                 run: id
             }).loading_promise;
             if (info) alert(info, 'pass');
-        },
-        async logout() {
-            data.setSource({});
-            await user.Logout();
-            zimoli.switch();
-            zimoli();
         }
     };
     renderWithDefaults(page, scope);
@@ -29,6 +26,9 @@ function main() {
         var [mr, mt] = a.memery;
         scope.memeryUsed = mt - mr;
         scope.memery = a.memery;
+        scope.nodeVersion = a.nodeVersion;
+        scope.platform = a.platform;
+        scope.arch = a.arch;
         console.log('status')
     });
     return page;

package/apps/pivot/home/welcome.less

@@ -1,11 +1,20 @@
-&{
+& {
     line-height: 28px;
 }
-progbar{
+
+progbar {
     width: 120px;
 }
-btn{
+
+btn {
     padding: 0 16px;
     vertical-align: top;
     margin-left: 20px;
+}
+
+padding {
+    >span {
+        color: #999;
+        margin-right: 10px;
+    }
 }

package/apps/pivot/link/room.js

@@ -3,7 +3,7 @@ plist.bind(null, '房间', "room", refilm`
 / $ ${[{
         name: "连接",
         async do(o) {
-            var linkid = await data.from("room", { id: encode62.timeencode(o.name) });
+            var linkid = await data.from("room", { id: encode62.packencode(o.name) });
             popup("/link/chat", { linkid, name: o.name });
         }
     }]}

package/apps/pivot/main.js

@@ -65,14 +65,15 @@ setInterval(function () {
     if (!base.base) return user.token = null;
     var auth = data.getSource(base.base);
     if (!auth) return user.token = null;
-    var auth1 = encode62.timeupdate(auth);
+    var auth1 = encode62.packupdate(auth);
     if (auth1 !== auth) data.setSource(base.base, auth1);
     user.token = auth1;
 }, 2000);
 login();
 var layer = layer$glance({
     left: frame$left.bind({
-        head: await init("left-header")
+        head: await init("left-header"),
+        foot: await init('left-footer')
     }),
     top: frame$top
 });

package/apps/pivot/task/invoke.js

@@ -4,7 +4,7 @@ function main(a) {
     drag.on(page.firstChild, page);
     resize.on(page);
     var fields = data.from("params", { key: a.key }, function (a) {
-        return a ? JSON.parse(encode62.timedecode(a)) : [];
+        return a ? JSON.parse(encode62.packdecode(a)) : [];
     });
     var taskid = 0;
     renderWithDefaults(page, {
@@ -23,8 +23,8 @@ function main(a) {
             this.error = false;
             var params = JSON.stringify(this.data);
             try {
-                var res = await data.from("invoke", { key: a.key, params: encode62.timeencode(params) }, function (a) {
-                    return a ? encode62.timedecode(a) : '完成！';
+                var res = await data.from("invoke", { key: a.key, params: encode62.packencode(params) }, function (a) {
+                    return a ? encode62.packdecode(a) : '完成！';
                 });
                 if (id !== taskid) return;
                 this.output = res;

package/apps/pivot/task/rsync.js

@@ -24,8 +24,8 @@ function main(task) {
                 cross.addDirect(api.base);
                 await data.from(api, {
                     type: "task",
-                    key: encode62.timeencode(task.key),
-                    value: encode62.timeencode(JSON.stringify(task))
+                    key: encode62.packencode(task.key),
+                    value: encode62.packencode(JSON.stringify(task))
                 });
                 finished[h.key] = true;
             }

package/apps/pivot/wow/root.js

@@ -1,7 +1,7 @@
 var fields = refilm`
 文件
 `;
-var passport = encode62.timeencode(encode62.decode62(user._passport, user.session));
+var passport = encode62.packencode(encode62.decode62(user._passport, user.session));
 var pending = [];
 async function upload(f, dist, token) {
     var api = await data.getApi("upload");
@@ -94,7 +94,7 @@ function main(path) {
             var p = this.pathlist.join('/').replace(/^\/+|\/+$/g, '');
             var bp = p ? base + p + "/" : base;
             p = p + '/';
-            return data.from("folder", { opt: 'list', path: encode62.timeencode(p) }, files => {
+            return data.from("folder", { opt: 'list', path: encode62.packencode(p) }, files => {
                 if (files) return files.map(f => {
                     var file = new File(f);
                     file.host = base;
@@ -112,22 +112,22 @@ function main(path) {
         },
         upload,
         async delete(path) {
-            return data.from("folder", { opt: 'del', path: encode62.timeencode(path) })
+            return data.from("folder", { opt: 'del', path: encode62.packencode(path) })
         },
         async rename(from, to) {
-            from = encode62.timeencode(from);
-            to = encode62.timeencode(to);
+            from = encode62.packencode(from);
+            to = encode62.packencode(to);
             await data.from("folder", { opt: 'mov', path: from, to }).loading_promise;
         },
         async add(name) {
-            name = encode62.timeencode(name);
+            name = encode62.packencode(name);
             await data.from("folder", { opt: 'add', path: name }).loading_promise;
         },
         async mov(from, distpath) {
             var currentHost = data.getInstance("base").base;
             if (from.host !== currentHost) return alert("暂不支持跨服务器操作！");
-            from = encode62.timeencode(from.fullpath);
-            distpath = encode62.timeencode(distpath);
+            from = encode62.packencode(from.fullpath);
+            distpath = encode62.packencode(distpath);
             await data.from("folder", { opt: 'mov', path: from, to: distpath }).loading_promise;
         }
     });

package/coms/basic/#loader.js

@@ -29,6 +29,7 @@ var {
     startPath: efrontPath,
     pixelDecoder // = d => d / 16 + "rem"
 } = window;
+
 if (PREVENT_FRAMEWORK_MODE !== false) {
     var message = '请关闭后重新打开..';
     try {
@@ -42,6 +43,7 @@ if (PREVENT_FRAMEWORK_MODE !== false) {
         return;
     }
 }
+
 var efront_time = +new Date;
 var _devicePixelRatio = devicePixelRatio;
 var request = window.request || function (url, onload, onerror, version) {
@@ -202,7 +204,7 @@ var killCircle = function () {
     };
     if (!circle.length) return;
     while (circle.length) {
-        var deleted = Object.create(null);
+        var deleted = {};
         var savedLength = circle.length;
         for (var cx = circle.length - 1; cx >= 0; cx--) {
             var arg = circle[cx];
@@ -246,7 +248,7 @@ var killCircle = function () {
         for (var k of module_keys) flushTree(tree, k);
     }
 };
-var multiModules = Object.create(null);
+var multiModules = {};
 // -->
 var hasOwnProperty = {}.hasOwnProperty;
 "use ./#decrypt.js";
@@ -436,6 +438,7 @@ function Meta(url) {
 Meta.prototype.resolve = function (url) {
     return resolve(url, this.url);
 }
+
 var createModule = function (exec, originNames, compiledNames, prebuilds = {}) {
     var module = {};
     var exports = module.exports = {};
@@ -487,7 +490,7 @@ var createModule = function (exec, originNames, compiledNames, prebuilds = {}) {
         };
         var result, created;
         if (prebuilds.init) {
-            var prebuilds2 = Object.create(null);
+            var prebuilds2 = {};
             for (var k in prebuilds) if (hasOwnProperty.call(prebuilds, k)) prebuilds2[k] = prebuilds[k];
             prebuilds = prebuilds2;
         }
@@ -577,11 +580,11 @@ var init = function (url, then, prebuilds, keeppage) {
         var length = 0;
         var deep = 0;
         // <!--
-        var map = Object.create(null);
+        var map = {};
         map[url] = true;
         do {
             deep++;
-            var rest2 = Object.create(null);
+            var rest2 = {};
             while (rest.length) {
                 var n = rest.pop();
                 var e = loadedModules[n] && loadedModules[n].error;
@@ -869,9 +872,7 @@ var loadResponseTreeFromStorage = preventCodeStorage ? function () { } : functio
         var version = preLoadVersionTree[responseName];
         if (!version) return;
         var responseText = preLoadResponseTree[responseName];
-        var sum = [];
-        for (var i in responseText) sum[i] = responseText.charCodeAt(i);
-        var sum = crc(sum).toString(36);
+        var sum = crc.string(responseText).toString(36);
         if (sum + version.slice(sum.length) === versionTree[responseName])
             responseTree[responseName] = responseText;
         // else window.console.log(responseName, sum, version, versionTree[responseName]);

package/coms/basic/Item.js

@@ -10,15 +10,15 @@ function pathTo(find, item, path) {
         if (pathTo(find, m, path)) return path;
     }
 }
-var id = 0;
 class Item extends Array {
     extended = false;
+    static id = 0;
     constructor(value) {
         super();
         this.count = 0;//子项中的叶子节点数
         this.total = 0;//子项中的节点数
         this.crack = 0;
-        this.id = ++id;
+        this.id = ++Item.id;
         this.extends(value, false);
     }
     extends(value, mark) {

package/coms/basic/Tree.js

@@ -19,7 +19,7 @@ class Tree extends Array {
         super();
         this.root = this;
     }
-    static fromData(array) {
+    static fromData(array, activeId) {
         if (array && array.coustructor === Tree) return array;
         var root = new Tree;
         root.tab = -Infinity;
@@ -28,15 +28,26 @@ class Tree extends Array {
         array = array.filter(a => !!a);
         var active_item = null;
         var hasIcon = [];
+        var actived_item = null;
+        Item.id = 0;
         array.forEach(function (data) {
             var item = new Item(data);
-            if (!active_item && item.isActived()) active_item = item;
+            if (!active_item) {
+                if (item.isActived()) active_item = item;
+            }
+            if (!actived_item) {
+                if (item.id === activeId) actived_item = item;
+            }
             if (data.id) {
                 map[data.id] = item;
             } else {
                 root.push(item);
             }
         });
+        if (!active_item && actived_item) {
+            actived_item.setActive(true);
+            active_item = actived_item;
+        }
         array.forEach(function (data) {
             if (!data) return;
             var parent = map[data.parentId];
@@ -87,6 +98,7 @@ class Tree extends Array {
         root.tab = -Infinity;
         root.count = 0;
         root.total = 0;
+        Item.id = 0;
         var path = [root];
         for (var cx = 0, dx = array.length; cx < dx; cx++) {
             var arg = array[cx];

package/coms/basic/crc.js

@@ -26,7 +26,11 @@ function crc(bstr, seed) {
     if (i === L) C = C >>> 8 ^ T[(C ^ bstr[i]) & 0xFF];
     return C ^ -1;
 }
-
+crc.string = function (str) {
+    var sum = [];
+    for (var i in str) sum[i] = str.charCodeAt(i);
+    return crc(sum);
+}
 var sign = parseInt("-52l3vk", 36);
 var T = table(sign);
 module.exports = crc;

package/coms/basic/cross_.js

@@ -58,7 +58,7 @@ var getCrossUrl = function (domain, headers, encrypt) {
             });
     }
     if (ishttps) domain = b + domain;
-    if (encrypt) domain = encode62.timeencode(encode62.safeencode(domain, encrypt));
+    if (encrypt) domain = encode62.packencode(encode62.safeencode(domain, encrypt));
     return base + b + domain;
 };
 function noop() { }
@@ -506,7 +506,7 @@ function addReform(r) {
 }
 function getCode() {
     return new Promise((ok, oh) => {
-        this('get', base + "!").then((xhr) => { return ok(encode62.timedecode(xhr.response || xhr.responseText)) }, () => {
+        this('get', base + "!").then((xhr) => { return ok(encode62.packdecode(xhr.response || xhr.responseText)) }, () => {
             return oh(i18n`无法连接可加密的服务器！`);
         });
     });

package/coms/basic/decode62S.js

@@ -0,0 +1,44 @@
+var a = 97;
+var z = 122;
+var A = 65;
+var Z = 90;
+var _0 = 48;
+var _9 = 57;
+
+var push = function (dist, c) {
+    if (c > 0xffff) {
+        c -= 0x10000;
+        dist.push(String.fromCharCode(0b110110 << 10 | c >> 10 & 0x3ff, 0b110111 << 10 | c & 0x3ff));
+    }
+    else {
+        dist.push(String.fromCharCode(c));
+    }
+};
+function decode62S(string) {
+    var dist = [];
+    var s = 0, i = 1;
+    for (var cx = 0, dx = string.length; cx < dx; cx++) {
+        var c = string.charCodeAt(cx);
+        if (c >= a) {
+            if (i > 1) {
+                s += (c - a) * i;
+                if (s <= z) s -= 26;
+                push(dist, s);
+                s = 0;
+                i = 1;
+            }
+            else {
+                push(dist, c);
+            }
+            continue;
+        }
+        if (c >= A) {
+            s += (c - A) * i;
+            i *= 36;
+            continue;
+        }
+        s += (c - _0 + 26) * i;
+        i *= 36;
+    }
+    return dist.join('');
+}

package/coms/basic/encode62S.js

@@ -0,0 +1,40 @@
+var a_z = 'abcdefghijklmnopqrstuvwxyz';
+var A_0 = a_z.toUpperCase() + '0123456789';
+a_z = a_z.split('');
+A_0 = A_0.split('');
+var a = 97;
+var z = 122;
+var push = function (dist, c) {
+    if (c >= a) {
+        if (c <= z) return dist.push(a_z[c - a]);
+    }
+    else {
+        c += 26;
+    }
+    while (c >= 26) {
+        var r = c % 36;
+        dist.push(A_0[r]);
+        c = (c - r) / 36;
+    }
+    dist.push(a_z[c]);
+}
+function encode62S(string) {
+    var dist = [];
+    for (var cx = 0, dx = string.length; cx < dx; cx++) {
+        var code = string.charCodeAt(cx);
+        if (code >> 10 === 0b110110) {
+            var code1 = string.charCodeAt(++cx);
+            if (code1 >> 10 === 0b110111) {
+                push(dist, ((code & 0x3ff) << 10 | (code1 & 0x3ff)) + 0x10000);
+            }
+            else {
+                push(dist, code);
+                push(dist, code1);
+            }
+        }
+        else {
+            push(dist, code);
+        }
+    }
+    return dist.join('');
+}

package/coms/basic/encode62S_test.js

@@ -0,0 +1,18 @@
+var test = function (string) {
+    var encoded = encode62S(string);
+    var decoded = decode62S(encoded);
+    var res = assert(decoded, string);
+    if (!res) throw new Error("string:" + string + " code:" + string.codePointAt(0) + " packed:" + encoded);
+};
+test('aa')
+test('abc')
+test('aabc')
+test('zaabc')
+test('Azaabc')
+test('aZ')
+test('您好');
+test('😊✔️🛡️⬇️');
+for (var cx = 0, dx = 0x10ffff; cx < dx; cx++) {
+    test(String.fromCodePoint(cx))
+    test(String.fromCodePoint(cx) + String.fromCodePoint(cx))
+}

package/coms/basic/enrich.js

@@ -17,8 +17,13 @@ var bindObjK = function (obj, k, resolve, _object) {
     });
 };
 var enrich = function enrich(obj) {
-    var _promise = Promise.resolve();
     var _object = Object.create(null);
+    try {
+        Object.defineProperty({}, 'a', { value: null })
+    } catch (e) {
+        _object = document.createComment('');
+    }
+    var _promise = Promise.resolve();
     var _then = _promise.then;
     var pthen = function () {
         var promise = _then.apply(this, arguments);

package/coms/basic/parseNumber.js

@@ -8,8 +8,13 @@ function xto0(x) {
 
 function parseNumber(str) {
     var s = 10;
+    str = str.replace(/\_/g, '');
     if (!isString(str)) return str;
-    switch (str.slice(0, 2).toLowerCase()) {
+    var num = str.replace(/^[\+\-]+/, '');
+    var neg = str.slice(0, str.length - num.length).replace(/\+/g, '').length & 1;
+    if (neg) neg = "-";
+    else neg = '';
+    switch (num.slice(0, 2).toLowerCase()) {
         case "0x":
             s = 16;
             break;
@@ -20,15 +25,15 @@ function parseNumber(str) {
             s = 2;
             break;
         default:
-            return parseFloat(str);
+            return parseFloat(neg + num);
     }
-    str = str.slice(2);
-    if (/x/i.test(str)) {
+    num = num.slice(2).replace(/\_/g, '');
+    if (/x/i.test(num)) {
         return bitTest.bind(null,
-            parseInt(str.replace(/[\s\S]/g, xto0), 2),
-            parseInt(str.replace(/x/g, '0'), 2)
+            parseInt(neg + num.replace(/[\s\S]/g, xto0), 2),
+            parseInt(neg + num.replace(/x/g, '0'), 2)
         );
     }
-    return parseInt(str, s);
+    return parseInt(neg + num, s);
 }
 module.exports = parseNumber

package/coms/basic/percent.js

@@ -0,0 +1,28 @@
+function percent(value, compare_value) {
+    if (!isFinite(value)) return value;
+    value *= 100;
+    var fix = 1000000;
+    var flag = value;
+    if (flag < 0) flag = -flag;
+    if (flag > 100);
+    else if (flag > 50) flag = 100 - flag;
+    if (isFinite(compare_value) && 100 * compare_value !== value) Math.min(Math.abs(value - compare_value), flag);
+    switch (Math.log(flag) | 0) {
+        case -Infinity:
+        case 2:
+        case 3:
+        case 4:
+            fix = 1; break;
+        case 1:
+            fix = 10; break;
+        case 0:
+            fix = 100; break;
+        case -1:
+            fix = 1000; break;
+        case -2:
+            fix = 10000; break;
+        case -3:
+            fix = 100000; break;
+    }
+    return (value * fix | 0) / fix + "%";
+}