efront 4.24.2 → 4.24.3

package/#/345/233/275/351/231/205/345/214/226.yml

@@ -40,6 +40,21 @@
 - zh-CN: 禁用
   en:    Disable
 
+- zh-CN: 商店
+  en:    Store
+
+- zh-CN: 订单
+  en:    Orders
+
+- zh-CN: 留言
+  en:    Messages
+
+- zh-CN: 手动输入
+  en:    Manual input
+
+- zh-CN: 请输入完整密钥对，以英文逗号分割
+  en:    "Please enter the complete key pair, separated by commas in English"
+
 - zh-CN: 拥有注册号的用户可查看商品
   en:    Users with registration numbers can view products
 

package/apps/pivot/auth/login.js

@@ -1,10 +1,10 @@
 var hosts = data.getItem("hosts");
 if (!hosts.length) hosts.push({ key: location.host, name: location.host });
-var fields = refilm`
-服务器地址/host* select?a ${hosts}
-密码/password* password
-`;
 function main(host) {
+    var fields = refilm`
+    服务器地址/host* select?a ${hosts}
+    密码/password* password
+    `;
     var page = view();
     page.innerHTML = login;
     drag.on(page);

package/apps/pivot/cert/edit.js

@@ -1 +1 @@
-pedit.bind(null, i18n`证书`, "cert");
+pedit.bind(null, () => i18n`证书`, "cert");

package/apps/pivot/cert/list.js

@@ -1,4 +1,4 @@
-plist.bind(null, i18n`接口管理`, "cert", refilm`
+return plist.bind(null, () => i18n`接口管理`, "cert", () => refilm`
 *域名/hostname input/253
 公钥/private text
 私钥/public text

package/apps/pivot/cert/main.xht

@@ -129,7 +129,7 @@
             fields: refilm`
             $公钥/public_key/单击生成 ${function (elem) {
                     var { data, field } = elem;
-                    elem.innerHTML = `<a @click=ipt()>手动输入</a>&ensp;&ensp;<a @click="gen()" -if="!data[field.key]">单击生成</a><span -else -bind="data[field.key]"></span>`;
+                    elem.innerHTML = `<a @click=ipt()>${i18n`手动输入`}</a>&ensp;&ensp;<a @click="gen()" -if="!data[field.key]">${i18n`单击生成`}</a><span -else -bind="data[field.key]"></span>`;
                     render(elem, {
                         data, field, async gen() {
                             await acme2.initUnique();
@@ -137,11 +137,10 @@
                             await saveUnique();
                         },
                         async ipt() {
-                            var data = await prompt('请输入完整密钥对，以英文逗号分割', {
+                            var data = await prompt(i18n`请输入完整密钥对，以英文逗号分割`, {
                                 value: acme2.pickUnique()
                             });
                             acme2.makeUnique(data);
-                            console.log(data);
                         },
                     })
                 }}

package/apps/pivot/dht/list.js

@@ -5,15 +5,14 @@ function hash(a) {
     }
     return r;
 }
-var fields = refilm`名称/name
-服务器/host
-端口/port
-`;
 return plist.bind({
-    fields,
+    fields: () => refilm`名称/name
+    服务器/host
+    端口/port
+    `,
     type: 'nodes',
-    title: i18n`DHT服务器管理`,
-    buttons: [{
+    title: () => i18n`DHT服务器管理`,
+    buttons: () => [{
         name: i18n`从文件读取`, async do() {
             var FileReader = window.FileReader;
             if (!FileReader) return alert(i18n`当前浏览器无法读取文件`, 'warn')

package/apps/pivot/dict/edit.js

@@ -1 +1 @@
-pedit.bind(null, i18n`字典`, "dict");
+pedit.bind(null, () => i18n`字典`, "dict");

package/apps/pivot/dict/list.js

@@ -1,11 +1,13 @@
-var types = refilm`
-数值/number
-文本/input
-`;
 model.setModels({
-    dict: frame$dict.bind(null, types),
+    dict() {
+        var types = refilm`
+        数值/number
+        文本/input
+        `;
+        return frame$dict(types, ...arguments);
+    }
 });
-return plist.bind(null, i18n`接口管理`, "dict", refilm`
+return plist.bind(null, () => i18n`接口管理`, "dict", () => refilm`
 *字典ID/key 100
 字典名/name 100
 字典数据/options dict

package/apps/pivot/link/room.js

@@ -1,10 +1,10 @@
-plist.bind(null, i18n`房间`, "room", refilm`
+return plist.bind(null, () => i18n`房间`, "room", () => refilm`
 *房间名/name 100
 / $ ${[{
-        name: i18n`连接`,
+        name: () => i18n`连接`,
         async do(o) {
             var linkid = await data.from("room", { id: encode62.packencode(o.name) });
             popup("/link/chat", { linkid, name: o.name });
         }
     }]}
-`);
+`);

package/apps/pivot/log/count.js

@@ -1,26 +1,26 @@
-var fields = refilm`
-访问量/count money/10
-路径/path html/20
-`;
-var fields2 = refilm`
-域名/host text/100
-路径/path text/80
-远程地址/remote text/100
-地理位置/address/查看 act/80 ${checkGeo}
-时间/time timestamp
-来源/referer text/100
-客户端/agent text/200
-`;
-var menus = [
-    {
-        name: i18n`计数`,
-    },
-    {
-        name: i18n`千次快照`,
-    }
-];
-menus[state().index || 0].actived = true;
 function main() {
+    var fields = refilm`
+    访问量/count money/10
+    路径/path html/20
+    `;
+    var fields2 = refilm`
+    域名/host text/100
+    路径/path text/80
+    远程地址/remote text/100
+    地理位置/address/查看 act/80 ${checkGeo}
+    时间/time timestamp
+    来源/referer text/100
+    客户端/agent text/200
+    `;
+    var menus = [
+        {
+            name: i18n`计数`,
+        },
+        {
+            name: i18n`千次快照`,
+        }
+    ];
+    menus[state().index || 0].actived = true;
     var page = div();
     page.innerHTML = template;
     var items = data.from("count", a => {

package/apps/pivot/main.js

@@ -1,5 +1,11 @@
-frame$route.update(await data.fromURL(i18n`menu.yml`));
-i18n.setReloader(zimoli.reload);
+var loadMenu = async function () {
+    frame$route.update(await data.fromURL(i18n`menu.yml`));
+};
+loadMenu();
+i18n.setReloader(function () {
+    loadMenu();
+    zimoli.reload(false);
+});
 data.loadConfig("api.yml");
 user.loginPath = '/auth/login';
 var login_queue = [], reject_queue = [];

package/apps/pivot/proxy/edit.js

@@ -1 +1 @@
-pedit.bind(null, i18n`短链接`, "proxy");
+pedit.bind(null, () => i18n`短链接`, "proxy");

package/apps/pivot/proxy/list.js

@@ -1,4 +1,4 @@
-var actions = [
+var gtActions = () => [
     {
         name: i18n`访问`,
         do(o) {
@@ -8,12 +8,11 @@ var actions = [
         }
     }
 ];
-
-var fields = refilm`
+var gtFields = () => refilm`
 *代理路径/url input/120
 &二维码/url ${qrcode}
 真实路径/realpath input/300
 动作/action select/100 [跳转,转发]
 状态/status select/100 [启用,禁用]
-/ $ ${actions}`;
-return plist.bind(null, i18n`短链接`, "proxy", fields, "/proxy/edit");
+/ $ ${gtActions()}`;
+return plist.bind(null, () => i18n`短链接`, "proxy", gtFields, "/proxy/edit");

package/apps/pivot/share/list.js

@@ -1,7 +1,7 @@
-var fields = refilm`
-路径/path
-`;
 function main() {
+    var fields = refilm`
+    路径/path
+    `;
     var options = [
         {
             name(e) {

package/apps/pivot/task/edit.js

@@ -1 +1 @@
-pedit.bind(null, i18n`任务`, "task");
+pedit.bind(null, () => i18n`任务`, "task");

package/apps/pivot/task/list.js

@@ -5,7 +5,7 @@ model.setEditor('jscode', function (element) {
     return element;
 });
 model.setReader('jscode', "text");
-return plist.bind(null, i18n`任务管理`, "task", refilm`
+return plist.bind(null, () => i18n`任务管理`, "task", () => refilm`
 *任务ID/key 100
 *任务名/name 100
 *是否启用/status radio 不启用#ccc,启用#396

package/apps/pivot/token/edit.js

@@ -1 +1 @@
-pedit.bind(null, i18n`密钥`, "private");
+pedit.bind(null, () => i18n`密钥`, "private");

package/apps/pivot/token/list.js

@@ -1,4 +1,4 @@
-plist.bind(null, i18n`密钥管理`, "private", refilm`
+plist.bind(null, () => i18n`密钥管理`, "private", () => refilm`
 *键名/key 100
 显示名/name input/300
 密钥/value text/100

package/apps/pivot/wow/root.js

@@ -1,6 +1,3 @@
-var fields = refilm`
-文件
-`;
 var passport = encode62.packencode(encode62.decode62(user._passport, user.session));
 var pending = [];
 async function upload(f, dist, token) {

package/coms/basic/i18n.js

@@ -1,11 +1,16 @@
 "use strict";
+// 中共命令或纵容腾讯、字节等公司控制中国人的言论，违反中国宪法，侵害中国人的言论自由，使得正义得不到及时申张，为恶之人逍遥法外。
+// 有人说，现在的学历含金量不及恢复高考初期，现在上个大学不如当时上个初中。
+// 在我看来，当时上了大学的人，也不及现在的初中生有文化。
+// 这些没有文化的人占据了要职要位后，执法而不知法守法，滥用职权黑箱操作，又觉得人言可畏，怕人们了解真象，才有意控制言论。
 var languageMap = {};
 var languageIndex = 0;
 function i18n() {
     var [arg] = arguments;
     if (typeof arg === 'string' || !isArrayLike(arg)) arg = arguments;
-    return arg[isFinite(this) ? this : languageIndex];
+    return isFinite(this) ? arg[this] : arg[languageIndex];
 };
+
 i18n.lang = function (type) {
     var id = getLanguageIndexFromName(type) || 0;
     return i18n.bind(id);
@@ -38,14 +43,22 @@ i18n.setIndex = function (index) {
     i18n.supports = supports;
     i18n.reload();
 };
-var relaods = [];
+var reloads = [];
 i18n.reload = function () {
-    relaods.forEach(a => a());
+    reloads.forEach(a => a());
 };
 i18n.setReloader = function () {
-    relaods = [];
+    reloads = [];
+    addReloader(...arguments);
+};
+var addReloader = i18n.addReloader = function () {
+    for (var callback of arguments) {
+        if (isFunction(callback)) reloads.push(callback);
+    }
+}
+i18n.removeReloader = function () {
     for (var callback of arguments) {
-        if (isFunction(callback)) relaods.push(callback);
+        removeFromList(reloads, callback)
     }
 };
 if (this.navigator) i18n.setLanguage(this.navigator.language);

package/coms/basic/migrate.js

@@ -0,0 +1,43 @@
+// 将数据复制到目标对象，保持目标节点对应节点的对象不变
+var allsrc, alldst;
+var migrate = function (dst, src) {
+    var cap;
+    var i = allsrc.indexOf(src);
+    if (i >= 0) dst = alldst[i];
+    else if (isArray(src)) {
+        if (!isArray(dst)) dst = [];
+        alldst.push(dst);
+        allsrc.push(src);
+        cap = dst.splice(0, dst.length);
+        for (var cx = 0, dx = src.length; cx < dx; cx++) {
+            var s = src[cx];
+            var d = cap[cx];
+            dst[cx] = migrate(d, s);
+        }
+    }
+    else if (isObject(src)) {
+        if (!isObject(dst)) dst = {};
+        alldst.push(dst);
+        allsrc.push(src);
+        cap = {};
+        for (var k in dst) {
+            cap[k] = dst[k];
+        }
+        for (var k in cap) delete dst[k];
+        for (var k in src) {
+            var s = src[k];
+            var d = cap[k];
+            dst[k] = migrate(d, s);
+        }
+    }
+    else dst = src;
+    return dst;
+}
+return function (dst, src) {
+    allsrc = [];
+    alldst = [];
+    dst = migrate(dst, src);
+    allsrc = null;
+    alldst = null;
+    return dst;
+}

package/coms/explorer/context.js

@@ -58,7 +58,7 @@ var popupEdit = function ($scope, active) {
     })
 
 };
-return extend([
+return () => [
     {
         name: i18n`返回` + `(O)`,
         hotkey: "backspace",
@@ -213,4 +213,4 @@ return extend([
             $scope.open();
         }
     }
-])
+];

package/coms/explorer/main.js

@@ -220,7 +220,7 @@ function main() {
     renderWithDefaults(page, scope);
     bind('drop')(scope.listview, ondrop);
     bindkey(scope.listview);
-    contextmenu(scope.listview, explorer$context);
+    contextmenu(scope.listview, explorer$context());
     on("pointerdown")(scope.listview, function () {
         if (document.activeElement !== scope.listview) scope.listview.focus();
     })

package/coms/frame/edit.html

@@ -1,5 +1,5 @@
 <div head>
-    <span v-text="origin?'${i18n`修改`}':'${i18n`添加`}'"></span><span -text="title"></span>
+    <span -text="title"></span>
 </div>
 <div body>
     <field v-if="!f.hidden" -repeat="f in fields" ng-src="[f,data]"></field>

package/coms/frame/edit.js

@@ -1,22 +1,29 @@
 function main(title, { submit }, { data: origin, fields, }) {
     var page = view();
     var item = Object.assign({}, origin);
-    page.innerHTML = edit;
-    drag.on(page.firstChild, page);
-    resize.on(page);
     page.onback = function () {
         if (page.querySelector('[dirty]')) return false;
     };
-    renderWithDefaults(page, {
+    var page_scope = {
         fields,
-        title,
+        get title() {
+            var t = title;
+            if (isFunction(t)) t = t();
+            t = (origin ? i18n`修改` : i18n`添加`) + t;
+            return t;
+        },
         origin,
         scrollbar,
         data: item,
         remove() {
             remove(page);
         },
-    });
+    };
+    page.innerHTML = template;
+    renderWithDefaults(page, page_scope);
+    drag.on(page.firstChild, page);
+    resize.on(page);
+
     on('submit')(page, async function (e) {
         e.preventDefault();
         var res = await submit(item, fields, origin);

package/coms/frame/list.js

@@ -1,6 +1,68 @@
-function main(title, { fields, options: options0, load, remove, buttons }, edit_ref) {
+function main(gtTitle, { fields: gtFields, options: gtOptions, load, remove, buttons: gtButtons }, edit_ref) {
+    var title, fields, fieldsL, options, options, buttons;
+    var gt = function (gt, o) {
+        if (isFunction(gt)) gt = gt();
+        if (isArray(o)) {
+            o.splice(0, o.length);
+            o.push.apply(o, gt);
+        }
+        else o = gt;
+        return o;
+    }
+    var update = function () {
+        title = gt(gtTitle, title);
+        var options0 = gt(gtOptions);
+        var options1 = [
+            {
+                name: i18n`修改`,
+                async do(o) {
+                    await edit(o);
+                },
+            },
+            {
+                type: "danger",
+                name(o) {
+                    return this.confirm === o ? i18n`确认删除` : i18n`删除`;
+                },
+                type(o) {
+                    return this.confirm === o ? "dark" : "danger";
+                },
+                confirm: false,
+                timer: 0,
+                async do(o) {
+                    if (this.confirm !== o) {
+                        this.confirm = o;
+                        clearTimeout(this.timer);
+                        var that = this;
+                        this.timer = setTimeout(function () {
+                            that.confirm = null;
+                            render.refresh();
+                        }, 2000);
+                        return;
+                    }
+                    await remove(o);
+                    page_scope.load();
+                }
+            }
+        ];
+        if (options1) options1.push.apply(options1, options0);
+        options = gt(options1, options);
+        buttons = gt(gtButtons, buttons);
+        fields = gt(gtFields, fields);
+        var fields1 = fields.filter(f => !f.hidden && f.inlist !== false).concat({
+            name: i18n`操作`,
+            options
+        })
+        fieldsL = gt(fields1, fieldsL);
+    };
     if (isString(edit_ref)) prepare(edit_ref);
     var page = document.createElement("div");
+    on('append')(page, function () {
+        i18n.addReloader(update);
+    });
+    on('remove')(page, function () {
+        i18n.removeReloader(update);
+    });
     var edit = async function (o) {
         if (!edit_ref) {
             return;
@@ -24,58 +86,29 @@ function main(title, { fields, options: options0, load, remove, buttons }, edit_
             on("submited")(p, callback);
         })
     };
-    page.innerHTML = template;
-    var options = [
-        {
-            name: i18n`修改`,
-            async do(o) {
-                await edit(o);
-            },
-        },
-        {
-            type: "danger",
-            name(o) {
-                return this.confirm === o ? i18n`确认删除` : i18n`删除`;
-            },
-            type(o) {
-                return this.confirm === o ? "dark" : "danger";
-            },
-            confirm: false,
-            timer: 0,
-            async do(o) {
-                if (this.confirm !== o) {
-                    this.confirm = o;
-                    clearTimeout(this.timer);
-                    var that = this;
-                    this.timer = setTimeout(function () {
-                        that.confirm = null;
-                        render.refresh();
-                    }, 2000);
-                    return;
-                }
-                await remove(o);
-                page_scope.load();
-            }
-        }
-    ];
-    if (options0) options = options.concat(options0);
+    update();
     var page_scope = {
-        title,
+        get title() {
+            return title
+        },
         load() {
             this.data = load();
         },
-        fields: fields.filter(f => !f.hidden && f.inlist !== false).concat({
-            name: i18n`操作`,
-            options
-        }),
+        fields,
         buttons,
         hasedit: !!edit_ref,
         data: [],
         async add() {
             await edit();
         },
-    }
+    };
+    page.innerHTML = template;
     renderWithDefaults(page, page_scope);
+    page.reload = function () {
+        update();
+        page.innerHTML = template;
+        renderWithDefaults(page, page_scope);
+    };
     on("append")(page, function () {
         page_scope.load();
     });

package/coms/frame/route.js

@@ -138,17 +138,22 @@
         idmap = Object.create(null);
         firstMenu = null;
         items = result.parse(items);
-        items.map(getChildren);
+        migrate(result, items);
+        result.map(getChildren);
         var opened = data.getInstance("menu-opened");
         var historys = zimoli.getCurrentHistory();
         var map = {}, mmap = {};
         historys.forEach((a, i) => map[a] = i + 1);
-        result.splice(0, result.length);
         var actived, actived_value = 0;
-        var a = function (menu) {
+        var a = function (menu, i, arr) {
             var res = checkroles(user.roles, menu.roles);
-            if (res) {
-                if (savedChildren[menu.id] instanceof Array) menu.children = savedChildren[menu.id].filter(a);
+            if (!res) arr.splice(i, 1);
+            else {
+                if (savedChildren[menu.id] instanceof Array) {
+                    var children = savedChildren[menu.id];
+                    backEach(children, a);
+                    menu.children = children;
+                }
                 if (menu.path) {
                     if (!firstMenu) firstMenu = menu;
                     if (map[menu.path] > actived_value) {
@@ -161,7 +166,7 @@
             }
             return res;
         };
-        result.push.apply(result, items.filter(a));
+        backEach(result, a);
         result.opened = opened.map(a => mmap[a]).filter(a => !!a);
         var active = result.active;
         if (!active || result.indexOf(active) < 0) {

package/coms/pivot/plist.js

@@ -9,8 +9,7 @@ function plist() {
     var parse = function (a) {
         switch (typeof a) {
             case "string":
-                if (!title) title = a;
-                else if (!type) type = a;
+                if (!type) type = a;
                 else if (!edit_ref) edit_ref = a;
                 else idkey = a;
                 break;
@@ -31,11 +30,16 @@ function plist() {
                     } = a);
                 }
                 break;
+            case "function":
+                if (!title) title = a;
+                else if (!fields) fields = a;
+                else if (!options) options = a;
+                else if (!buttons) buttons = a;
         }
     }
     for (var a of arguments) parse(a);
     if (!fields) parse(this);
-    if (!idkey) idkey = fields[0].key;
+    if (!idkey) idkey = (isFunction(fields) ? fields() : fields)[0].key;
     return frame$list(title, {
         load() {
             return load(type, idkey);
@@ -49,8 +53,7 @@ function plist() {
     }, edit_ref ? edit_ref : function (o) {
         var p = pedit(title, type, o);
         p.initialStyle = popup.style;
-        popup(p, true);
-        move.setPosition(p, [.5, .5]);
+        popup(p, [.5, .5]);
         return p;
     });
 }

package/coms/zimoli/autodragchildren.js

@@ -353,7 +353,11 @@ var hooka = function (matcher, move, event, targetChild, isMovingSource) {
             var copyZIndex = function (e) {
                 e.style.zIndex = zIndex;
                 var z = zIndex - 1;
-                if (e.with) for (var w of e.with) w.style.zIndex = z;
+                var ws = e.with;
+                if (ws){
+                    if (isNode(ws)) ws = [ws];
+                    for (var w of ws) w.style.zIndex = z;
+                } 
             };
             if (zIndex > 2) {
                 previousElements.forEach(copyZIndex);

package/coms/zimoli/render.js

@@ -435,6 +435,7 @@ var ifset = function (shouldMount) {
                 e = c.$template = render(e);
                 e.$comment = c;
             }
+            c.with = [e];
         }
         else {
             remove(c.$template);