efront 4.24.2 → 4.25.0

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

@@ -1,20 +1,23 @@
-- zh-CN: 英文
-  en:    English
+- zh-CN: "不能有特殊符号\"$1\""
+  en:    "Cannot have special symbol '$1'"
 
-- zh-CN: 英语
-  en:    English
+- zh-CN: 不启用
+  en:    Disable
 
-- zh-CN: 中文繁体
-  en:    Traditional Chinese
+- zh-CN: 禁用
+  en:    Disable
 
-- zh-CN: 繁体中文
-  en:    Traditional Chinese
+- zh-CN: 无法在当前浏览器操作！
+  en:    Cannot operate in the current browser!
 
-- zh-CN: 返回
-  en:    Return
+- zh-CN: 无法在当前浏览器操作!
+  en:    Cannot operate in the current browser!
 
-- zh-CN: 返回
-  en:    Back
+- zh-CN: 确定
+  en:    Confirm
+
+- zh-CN: 确认
+  en:    Confirm
 
 - zh-CN: "参数异常: $1"
   en:    "Parameter exception: $1"
@@ -22,23 +25,38 @@
 - zh-CN: 参数异常:$1
   en:    "Parameter exception: $1"
 
-- zh-CN: 确定
-  en:    Confirm
+- zh-CN: 返回
+  en:    Return
 
-- zh-CN: 确认
-  en:    Confirm
+- zh-CN: 返回
+  en:    Back
 
-- zh-CN: 无法在当前浏览器操作！
-  en:    Cannot operate in the current browser!
+- zh-CN: 中文繁体
+  en:    Traditional Chinese
 
-- zh-CN: 无法在当前浏览器操作!
-  en:    Cannot operate in the current browser!
+- zh-CN: 繁体中文
+  en:    Traditional Chinese
 
-- zh-CN: 不启用
-  en:    Disable
+- zh-CN: 英文
+  en:    English
 
-- zh-CN: 禁用
-  en:    Disable
+- zh-CN: 英语
+  en:    English
+
+- 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/db/list.xht

@@ -46,6 +46,11 @@
     load();
     var adddb = async function () {
         var a = await prompt(i18n`请输入名称`, {
+            check(a) {
+                if (a = /[\*\?\|\/\\\>\<"\:\.]/.exec(a)) {
+                    return i18n`不能有特殊符号"${a[0]}"`;
+                }
+            },
             async submit(a) {
                 await data.from('dbadd', { id: a, name: a });
             }

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/home/welcome.html

@@ -62,8 +62,8 @@
         <span>
             <progbar danger:="memery[0]/memery[1]<.05" :current="memeryUsed" :total="memery[1]"></progbar>
             <div>
+                <span -bind="size(memery[1])"></span> \
                 <span -bind="size(memery[0])"></span>
-                / <span -bind="size(memery[1])"></span>
             </div>
         </span>
     </padding>

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;
+}