efront 4.0.11 → 4.0.15

package/coms/compile/unstruct.js

@@ -21,7 +21,8 @@ var _break = function (body, cx, result, iscontinue) {
         var s;
         for (var cx = labels.length - 1; cx >= 0; cx--) {
             var b = labels[cx];
-            if (b.type === LABEL && b.text === label) {
+            if (b.type === LABEL && b.text === label + ":") {
+                if (!s) s = b;
                 if (!b.breaks) b.breaks = [];
                 var _b = scanner2('return []');
                 _b.ret_ = -1;
@@ -440,7 +441,14 @@ var isEvalScope = function (o) {
         return o === h;
     }
     return false;
-}
+};
+var ispropcall = function (o) {
+    var n = o.next;
+    if (!n || n.type !== SCOPED && n.entry !== '(') return false;
+    if (o.type === EXPRESS && snapExpressHead(o) !== o) return true;
+    if (o.type === SCOPED && o.entry === '[' && snapExpressHead(o) !== o) return true;
+    return false;
+};
 var _invoke = function (t, getname) {
     var nameindex = 0;
     var getdeepname = function (deep = 0) {
@@ -454,6 +462,12 @@ var _invoke = function (t, getname) {
     var bx = 0;
     for (var cx = 0; cx < t.length; cx++) {
         var o = t[cx];
+        if (o.type === STRAP && o.text === 'function') {
+            while (o && o.entry !== "{") o = o.next;
+            cx = t.indexOf(o, cx);
+            continue;
+        }
+
         if (needbreak(o)) {
             var s = splice(t, bx, cx + 1 - bx);
             if (cx > 0) s.name = s[0].text;
@@ -510,12 +524,12 @@ var _invoke = function (t, getname) {
                 nameindex++;
             }
             nameindex = _nameindex;
-            if (!cache.length) continue;
+            // if (!cache.length) continue;
             if (queue.length) flushqueue(result, queue), queue = [];
             for (var c of cache) pushstep(result, c);
             cache = [];
             var n = o.next;
-            if (n && !needbreak(n)) {
+            if (n && !needbreak(n) && !ispropcall(o)) {
                 var h = snapExpressHead(o);
                 var hx = t.lastIndexOf(h, cx);
                 var fs = splice(t, hx, cx + 1 - hx, { type: EXPRESS, text: getname(nameindex) });
@@ -579,8 +593,28 @@ var patchname = function (d, getname) {
     }
 };
 var clone = function (o) {
-    return Object.assign({}, o, { prev: null, next: null });
+    return Object.assign(o instanceof Array ? [] : {}, o, { prev: null, next: null });
 };
+var popass = function (explist) {
+    var asn = explist.pop();
+    var n;
+    if (!asn.ret_ && asn.length) {
+        asn = createExpressList(asn);
+        if (asn.length > 1) {
+            explist.push(...asn.slice(0, asn.length - 1));
+            asn = asn.pop();
+        }
+        else {
+            n = true;
+            asn = asn.pop();
+        }
+    }
+    else {
+        n = asn.name;
+        asn = [{ type: EXPRESS, text: n }];
+    }
+    return [asn, n];
+}
 var popexp = function (explist) {
     var asn = explist[explist.length - 1];
     var n;
@@ -605,15 +639,19 @@ var popexp = function (explist) {
     return [asn, n];
 }
 var ternary = function (body, getname, ret) {
+    var eqused = 0;
     var getnextname = function (i) {
-        return getname(i + 1);
+        return getname(i + eqused);
     };
     var question = [];
-    var res = [];
+    var exphead = [];
     var equalsend = 0;
     var skip = 0;
     var equcount = 0;
     var hascalcequ = false;
+    var equals = [];
+    var explist = [];
+    var hasquestion = false;
     for (var cx = 0, dx = body.length; cx < dx; cx++) {
         var o = body[cx];
         if (o.type === STRAP && /^(var|let|const)$/.test(o.text)) {
@@ -630,53 +668,59 @@ var ternary = function (body, getname, ret) {
             if (!question.length) {
                 var b = body.slice(equalsend, bx);
                 relink(b);
-                var c = toqueue(body.slice(bx + 1, cx), getname, true);
-                var d = toqueue(body.slice(cx + 1), getname, true);
-                patchname(c, getname);
-                patchname(d, getname);
+                var c = toqueue(body.slice(bx + 1, cx), getnextname, true);
+                var d = toqueue(body.slice(cx + 1), getnextname, true);
+                patchname(c, getnextname);
+                patchname(d, getnextname);
                 pushstep(d, stepReturn(1, 0, d));
                 pushstep(c, stepReturn(d.length + 1, 0, c));
-                pushstep(res, scanner2(`if(${getCondition(b, function (b) {
-                    b = ternary(b, getname, true);
-                    for (var b of b) pushstep(res, b);
+                pushstep(explist, scanner2(`if(${getCondition(b, function (b) {
+                    b = ternary(b, getnextname, true);
+                    for (var b of b) pushstep(explist, b);
                     return b;
                 }, true)})return [1,0]`));
-                var q = res[res.length - 1];
-                var qi = res.length - 1;
+                var q = explist[explist.length - 1];
+                var qi = explist.length - 1;
                 var qe = q[q.length - 1];
                 if (c.length) {
-                    pushstep(res, c[0]);
-                    res.push(...c.slice(1));
+                    pushstep(explist, c[0]);
+                    explist.push(...c.slice(1));
                 }
-                qe.text = String(res.length - qi);
-                res.push(...d);
+                qe.text = String(explist.length - qi);
+                explist.push(...d);
+                hasquestion = true;
+                break;
             }
         }
         else if (powermap[o.text] === powermap["="]) {
+            var ass = toqueue(body.slice(equalsend, cx), getnextname, false);
+            var [ass1, n = ++eqused] = popass(ass);
+            exphead.push(...ass);
+            equals.push(...ass1, o);
             if (!question.length) equalsend = cx + 1, equcount++;
             if (o.text.length > 1) hascalcequ = true;
         }
     }
-    if (!res.length) {
+    if (!hasquestion) {
         var bd = equalsend ? body.slice(equalsend) : body;
         if (!ret && equcount === 1 && !hascalcequ && canbeOnce(bd)) {
-            res = [bd];
+            explist = [bd];
         }
         else if (ret === 1 && !equcount && canbeOnce(bd)) {
-            var name = getname(0);
+            var name = getnextname(0);
             var r = [{ type: EXPRESS, text: name }, { type: STAMP, text: '=' }, ...bd]
             r.name = name;
-            res = [r];
+            explist = [r];
         }
         else {
-            res = _express(bd, getname, equalsend > skip || ret);
+            explist = _express(bd, getnextname, equalsend > skip || ret);
         }
     }
     if (equalsend === skip) {
-        return res;
+        return explist;
     }
-    var equals = body.slice(skip, equalsend);
-    var explist = res;
+    relink(equals);
+    explist.unshift(...exphead);
     var q = explist[explist.length - 1];
     // if (!q) throw `语法错误: <red>${createString(body)}</red> \r\n行列位置: ${equals[0].row}:${equals[0].col}`
     var n = q.name;
@@ -703,26 +747,12 @@ var ternary = function (body, getname, ret) {
         }
         else if (n) var asn = [{ type: EXPRESS, text: n }];
         else asn = explist.pop();
-        for (var a of ass) {
-            if (a.type === SCOPED) {
-                if (a.entry === '[') {
-                    var q = ternary(a, getnextname, true);
-                    for (var q of q) {
-                        if (q.length) pushstep(explist, q);
-                    }
-                    splice(a, 0, a.length, { type: EXPRESS, text: q.name });
-                }
-                else if (a.entry === '(') {
-                    _invoke(a);
-                }
-            }
-        }
         var an = '';
         if (eq.text.length > 1) {
             var punc = eq.text.slice(0, eq.text.length - 1);
             var bdtmp = [...ass.map(clone), { type: STAMP, text: punc }, ...asn];
             relink(bdtmp);
-            var explist2 = _express(bdtmp, getname, true);
+            var explist2 = _express(bdtmp, getnextname, true);
             if (isSimpleAssign) {
                 [asn, an = createString(ass)] = popexp(explist2);
             }
@@ -737,7 +767,7 @@ var ternary = function (body, getname, ret) {
         else an = n;
         ass.push(equals[i], ...asn);
         relink(ass);
-        if (evals.length) ass[0].set = getname(0);
+        if (evals.length) ass[0].set = getnextname(0);
         ass.name = an;
         patchstep(ass, ass.length, 0);
         pushstep(explist, ass);
@@ -953,7 +983,7 @@ var getblock = function (body, cx) {
     return b;
 };
 var labels = [];
-var scopes = [];
+var scopes = [null];
 var isbreak = function (o) {
     if (o.type !== STRAP) return false;
     return /^(break|continue)$/.test(o.text) ||
@@ -971,6 +1001,24 @@ var ifpatch = function (result, autoskip) {
     re.ifbrk = autoskip !== undefined;
     pushstep(result, re);
 };
+var poplabel = function (result) {
+    if (!labels.length) return;
+    var e = labels.pop();
+    if (e.breaks) {
+        while (e.breaks.length) {
+            var b = e.breaks.pop();
+            var end = b;
+            for (var cx = result.length - 1; cx >= 0; cx--) {
+                var r = result[cx];
+                if (r.indexOf(b) >= 0) { break }
+            }
+            if (cx < 0) throw console.log(result.map(r => createString(r)), e.text, createString([b.prev, b])), "break语句异常";
+            end.push({ type: VALUE, text: b.continue ? b.continue.contat - cx : result.length - cx }, { type: STAMP, text: "," }, { type: VALUE, text: "0" });
+            relink(end);
+        }
+    }
+};
+
 function toqueue(body, getname, ret = false, result = []) {
     var retn = false;
     var uniftop = function () {
@@ -1000,23 +1048,9 @@ function toqueue(body, getname, ret = false, result = []) {
         toqueue(block, getname, true, result);
         return result[result.length - 1];
     };
-    var poplabel = function () {
-        if (!labels.length) return;
-        var e = labels.pop();
-        if (e.breaks) {
-            while (e.breaks.length) {
-                var b = e.breaks.pop();
-                var end = b;
-                for (var cx = result.length - 1; cx >= 0; cx--) {
-                    var r = result[cx];
-                    if (r.indexOf(b) >= 0) { break }
-                }
-                if (cx < 0) throw console.log(result.map(r => createString(r)), e.text, createString([b.prev, b])), "break语句异常";
-                end.push({ type: VALUE, text: b.continue ? b.continue.contat - cx : result.length - cx }, { type: STAMP, text: "," }, { type: VALUE, text: "0" });
-                relink(end);
-            }
-        }
-    };
+    var _poplabel = function () {
+        poplabel(result);
+    }
     var cx = 0, bx = 0;
     var iftop = null;
     var brk = function (text, YIELD) {
@@ -1040,12 +1074,17 @@ function toqueue(body, getname, ret = false, result = []) {
             var e = labels[labels.length - 1];
             if (e.type !== LABEL) break;
             if (scopes.lastIndexOf(e.scope) >= 0) break;
-            poplabel();
+            _poplabel();
         }
 
         if (o.type === LABEL) {
             o.scope = scopes[scopes.length - 1];
             labels.push(o);
+            var next = o.next;
+            if (next && next.type === SCOPED && next.entry === '{') {
+                ifpatch(result);
+                o.contat = result.length;
+            }
             bx = ++cx;
             continue;
         }
@@ -1089,28 +1128,28 @@ function toqueue(body, getname, ret = false, result = []) {
             if (o.text === 'for') {
                 labels.push(o);
                 cx = _for(body, cx, unblock, result);
-                poplabel();
+                _poplabel();
                 bx = cx;
                 continue;
             }
             if (o.text === 'while') {
                 labels.push(o);
                 cx = _while(body, cx, unblock, result);
-                poplabel();
+                _poplabel();
                 bx = cx;
                 continue;
             }
             if (o.text === 'do') {
                 labels.push(o);
                 cx = _do(body, cx, unblock, result);
-                poplabel();
+                _poplabel();
                 bx = cx;
                 continue;
             }
             if (o.text === 'switch') {
                 labels.push(o);
                 cx = _switch(body, cx, unblock, result, getname);
-                poplabel();
+                _poplabel();
                 bx = cx;
                 continue;
             }
@@ -1208,6 +1247,7 @@ module.exports = function (body, newname, ret) {
         return tmpnames[i];
     };
     var res = toqueue(body, getname, false);
+    while (labels.length) poplabel(res);
     ret_ = ret0;
     return res;
 };

package/coms/compile/unstruct_test.js

@@ -86,7 +86,7 @@ test("await new Promise(function(){})", '_ = function () {}; _ = new Promise(_);
 test(`onerror({ status: xhr.status, response: "Cookie解析异常!", toString: toResponse })`, '_ = { status: xhr.status, response: "Cookie解析异常!", toString: toResponse }; onerror(_)', true);
 test(`if (!/^https\\:\\/\\/|^s\\/\\//.test(url)) console.warn("请使用https访问如下路径:" + url)`, '_ = /^https\\:\\/\\/|^s\\/\\//.test(url); if (_) return [1, 0]; _ = "请使用https访问如下路径:" + url; _ = console.warn(_); return [1, 0]', true);
 test(`url += (/\\?/.test(url) ? "&" : "?") + datas;`, '_ = /\\?/.test(url); if (!_) return [1, 0]; _ = "&"; return [2, 0];\r\n _ = "?"; return [1, 0];\r\n _ = (_); _ = _ + datas; url = url + _', true);
-test(`a = newname.querySelector("input,textarea").value = c.name.replace(/\\/$/, '')`, `_ = c.name.replace(/\\/$/, ''); newname.querySelector("input,textarea").value = _; a = _`, true);
+test(`a = newname.querySelector("input,textarea").value = c.name.replace(/\\/$/, '')`, `_ = newname.querySelector("input,textarea"); _0 = c.name.replace(/\\/$/, ''); _.value = _0; a = _0`, true);
 test(`if (selected[f.url]) f.selected = true;`, `_ = f.url; _ = selected[_]; if (!_) return [1, 0]; f.selected = true; return [1, 0]`, true);
 test(`location.protocol  + parseURL(a.b).host `, `_ = a.b; _ = parseURL(_); location.protocol + _.host`, true);
 test(`var base = location.protocol + "//" + parseURL(this.$scope.data.host).host + "/";`, `_ = location.protocol + "//", _0 = this.$scope.data.host; _0 = parseURL(_0); _ = _ + _0.host, base = _ + "/"`, true);
@@ -98,4 +98,8 @@ test("debugger", 'debugger', true);
 test("a(b,b+=1)", '_ = b; _0 = b + 1; b = _0; a(_, _0)', true);
 test("while(a){if(b){if(c);else d;continue;}}", 'if (!a) return [4, 0]; if (!b) return [3, 0]; if (!c) return [1, 0]; return [2, 0];\r\n d; return [1, 0];\r\n return [-2, 0];\r\n return [-3, 0]', true);
 test("/*abc*/", '/*abc*/', true);
-test("//aaa", '//aaa', true);
+test("//aaa", '//aaa', true);
+test("menus[0].name+='aaa'", "_ = menus[0]; _0 = _.name + 'aaa'; _.name = _0", true);
+test("menus[a+b].name+='aaa'", "_ = a + b; _ = menus[_]; _0 = _.name + 'aaa'; _.name = _0", true);
+test("menus[a+b]()", "_ = a + b; menus[_]()", true);
+test("loop:{a=b;if(a) continue loop}", "a = b; if (a) return [0, 0]", true);

package/coms/docs/helps.js

@@ -1,71 +1,75 @@
-
+// <!--
+if (typeof i18n === "undefined") i18n = a => a;
+// -->
 var helps = [
-    "f显示版本号,version,-v,--version",
-    "f显示efront的安装路径,path,--path",
-    "f显示帮助信息,help,-h,--help,help COMMAND,-h COMMAND,--help COMMAND",
-    "f启动文档服务器,docs",
-    "f查看efront自身占用的内存,memery,memory,-m,--memery,--memory",
-    "m启动示例项目服务器,demo,demo SRCNAME",
-    "m创建应用，项目目录允许创建第二个应用,init,from SRCNAME,init APPNAME,init APPNAME from SRCNAME,from SRCNAME init APPNAME",
-    "m创建简单应用，独占项目目录的单应用,create,simple,create|simple from SRCNAME,create|simple APPNAME,create|simple APPNAME from APPNAME",
-    "m创建空应用,blank,simple,from blank,simple from blank",
-    "q自动识别环境并启动开发环境服务器,live,lives,live HTTP_PORT,live HTTP_PORT HTTPS_PORT,lives HTTPS_PORT,lives HTTPS_PORT HTTP_PORT",
-    "a在项目文件夹启动生产环境服务器,start,starts,start HTTP_PORT,start HTTP_PORT HTTPS_PORT,starts HTTPS_PORT,starts HTTPS_PORT HTTP_PORT",
-    "a在项目文件夹启动开发环境服务器,dev,devs,test,dev|test HTTP_PORT,dev|test HTTP_PORT HTTPS_PORT,devs|tests HTTPS_PORT,devs|tests HTTPS_PORT HTTP_PORT",
-    "a在当前文件夹启动服务器,server,serve|serv|http HTTP_PORT HTTPS_PORT,serve|serv|http HTTP_PORT,https HTTPS_PORT HTTP_PORT,https HTTPS_PORT,HTTP_PORT HTTPS_PORT,HTTP_PORT,",
-    "a显示本机ip地址,ip,-ip,--ip",
-    "q编译项目,public,publish,build,release",
-    "a监测文件变化，自动编译更新的部分并输出到指定目录,watch",
-    "a关闭efront服务器,kill HTTP_PORT|HTTPS_PORT,close HTTP_PORT|HTTPS_PORT",
-    "a连接一台efront服务器，取得连接号,link ADDRESS",
-    "a用一个连接号登录本机的efront服务器，接收并打印消息,care ADDRESS,care ADDRESS LINKID",
-    "a向一个连接号发送消息,cast ADDRESS LINKID MESSAGE",
-    "z检查文件或文件夹中的外部变量,check FILEPATH",
-    "q执行按efront方式加载的代码,run CODEFILE,CODEFILE",
-    "z查找含有指定的外部变量的文件,find VARIABLE,find VARIABLE FILEPATH",
-    "-从指定路径创建压缩文件,pack PUBLIC_PATH PACKAGE_PATH",
-    "a对json数据进行签名,sign JSON_PATH SIGNNAME",
-    "z根据模块的搜索路径查找真实路径,detect MODULE_PATH",
-    "z格式化代码,format MODULE_PATH TARGET_PATH TABSIZE",
-    "z导出与指定的对象路径关联的代码,pick MODULE_PATH TARGET_PATH KEYPATH",
-    "z清理代码，删除已声明未使用的代码,wash MODULE_PATH TARGET_PATH",
-    "k设置环境变量,setenv --NAME1=VALUE1 --NAME2=VALUE2,setenv NAME VALUE,set --NAME1=VALUE1,set --NAME=",
-    "k列出已配置的环境变量,listenv,env",
-    "-创建国际化文案表,translate APPNAME",
-    "-将指定的路径添加到可执行文件的扫描路径,pathx PATHNAME",
-    "-从可执行文件的扫描路径中移除指定的路径,pathxrm PATHNAME",
-    "-设置远程访问的密码,password",
-    "-创建windows平台的一键安装包,packwin|packexe PUBLIC_PATH PACKAGE_PATH",
-    "-从压缩文件提取源文件,unpack PACKAGE_PATH PUBLIC_PATH",
+    ["f", i18n`显示版本号`, "version", "-v", "--version"],
+    ["f", i18n`显示efront的安装路径`, "path", "--path"],
+    ["f", i18n`显示帮助信息`, "help", "-h", "--help", "help COMMAND", "-h COMMAND", "--help COMMAND"],
+    ["f", i18n`启动文档服务器`, "docs"],
+    ["f", i18n`查看efront自身占用的内存`, "memery", "memory", "-m", "--memery", "--memory"],
+    ["m", i18n`启动示例项目服务器`, "demo", "demo SRCNAME"],
+    ["m", i18n`创建应用，项目目录允许创建第二个应用`, "init", "from SRCNAME", "init APPNAME", "init APPNAME from SRCNAME", "from SRCNAME init APPNAME"],
+    ["m", i18n`创建简单应用，独占项目目录的单应用`, "create", "simple", "create|simple from SRCNAME", "create|simple APPNAME", "create|simple APPNAME from APPNAME"],
+    ["m", i18n`创建空应用`, "blank", "simple", "from blank", "simple from blank"],
+    ["q", i18n`自动识别环境并启动开发环境服务器`, "live", "lives", "live HTTP_PORT", "live HTTP_PORT HTTPS_PORT", "lives HTTPS_PORT", "lives HTTPS_PORT HTTP_PORT"],
+    ["a", i18n`在项目文件夹启动生产环境服务器`, "start", "starts", "start HTTP_PORT", "start HTTP_PORT HTTPS_PORT", "starts HTTPS_PORT", "starts HTTPS_PORT HTTP_PORT"],
+    ["a", i18n`在项目文件夹启动开发环境服务器`, "dev", "devs", "test", "dev|test HTTP_PORT", "dev|test HTTP_PORT HTTPS_PORT", "devs|tests HTTPS_PORT", "devs|tests HTTPS_PORT HTTP_PORT"],
+    ["a", i18n`在当前文件夹启动服务器`, "server", "serve|serv|http HTTP_PORT HTTPS_PORT", "serve|serv|http HTTP_PORT", "https HTTPS_PORT HTTP_PORT", "https HTTPS_PORT", "HTTP_PORT HTTPS_PORT", "HTTP_PORT", ""],
+    ["a", i18n`显示本机ip地址`, "ip", "-ip", "--ip"],
+    ["q", i18n`编译项目`, "public", "publish", "build", "release"],
+    ["a", i18n`监测文件变化，自动编译更新的部分并输出到指定目录`, "watch"],
+    ["a", i18n`关闭efront服务器`, "kill HTTP_PORT|HTTPS_PORT", "close HTTP_PORT|HTTPS_PORT"],
+    ["a", i18n`连接一台efront服务器，取得连接号`, "link ADDRESS"],
+    ["a", i18n`用一个连接号登录本机的efront服务器，接收并打印消息`, "care ADDRESS", "care ADDRESS LINKID"],
+    ["a", i18n`向一个连接号发送消息`, "cast ADDRESS LINKID MESSAGE"],
+    ["z", i18n`检查文件或文件夹中的外部变量`, "check FILEPATH"],
+    ["q", i18n`执行按efront方式加载的代码`, "run CODEFILE", "CODEFILE"],
+    ["z", i18n`查找含有指定的外部变量的文件`, "find VARIABLE", "find VARIABLE FILEPATH"],
+    ["-", i18n`从指定路径创建压缩文件`, "pack PUBLIC_PATH PACKAGE_PATH"],
+    ["a", i18n`对json数据进行签名`, "sign JSON_PATH SIGNNAME"],
+    ["z", i18n`根据模块的搜索路径查找真实路径`, "detect MODULE_PATH"],
+    ["z", i18n`格式化代码`, "format MODULE_PATH TARGET_PATH TABSIZE"],
+    ["z", i18n`导出与指定的对象路径关联的代码`, "pick MODULE_PATH TARGET_PATH KEYPATH"],
+    ["z", i18n`清理代码，删除已声明未使用的代码`, "wash MODULE_PATH TARGET_PATH"],
+    ["k", i18n`设置环境变量`, "setenv --NAME1=VALUE1 --NAME2=VALUE2", "setenv NAME VALUE", "set --NAME1=VALUE1", "set --NAME="],
+    ["k", i18n`列出已配置的环境变量`, "listenv", "env"],
+    ["-", i18n`创建国际化文案表`, "translate APPNAME"],
+    ["-", i18n`将指定的路径添加到可执行文件的扫描路径`, "pathx PATHNAME"],
+    ["-", i18n`从可执行文件的扫描路径中移除指定的路径`, "pathxrm PATHNAME"],
+    ["-", i18n`设置远程访问的密码`, "password"],
+    ["-", i18n`创建windows平台的一键安装包`, "packwin|packexe PUBLIC_PATH PACKAGE_PATH"],
+    ["-", i18n`从压缩文件提取源文件`, "unpack PACKAGE_PATH PUBLIC_PATH"]
 ];
-helps.forEach((str, cx) => {
-    var [info, ..._commands] = str.split(",");
-    var type = info.charAt(0);
-    var hide = type === "-";
-    info = info.slice(1);
-    var help = { info, type, hide, commands: _commands, cmds: _commands };
-    helps[cx] = help;
+helps.forEach((h, cx) => {
+    var [type, info, ...cmds] = h;
+    helps[cx] = { type, info, cmds, commands: cmds, hide: type === '-' };
 });
+
 var topics = {
-    COMMAND: "命令名",
-    APPNAME: "您的应用名",
-    SRCNAME: "源项目|blank,blank,kugou,pivot",
-    HTTP_PORT: " http 端口|80",
-    HTTPS_PORT: " https 端口|443",
-    VARIABLES: "变量名",
-    ADDRESS: "efront服务器地址",
-    LINKID: "efront服务器提供的连接号",
-    MESSAGE: "文本消息",
-    PUBLIC_PATH: "软件发布目录",
-    PACKAGE_PATH: "安装包的路径",
-    JSON_PATH: "json文件所在的路径",
-    SIGNNAME: "签名",
-    FILEPATH: "文件或文件夹的路径",
-    CODEFILE: "代码文件的路径",
-    MODULE_PATH: '源文件的模糊路径',
-    TARGET_PATH: '目标文件的模糊路径',
-    KEYPATH: '对象的属性路径',
-    TABSIZE: '缩进空格数',
+    COMMAND: [i18n`命令名`],
+    APPNAME: [i18n`您的应用名`],
+    SRCNAME: [i18n`源项目`, "blank", "kugou", "pivot"],
+    HTTP_PORT: [i18n` http端口`, 80],
+    HTTPS_PORT: [i18n` https端口`, 443],
+    VARIABLES: [i18n`变量名`],
+    ADDRESS: [i18n`efront服务器地址`],
+    LINKID: [i18n`efront服务器提供的连接号`],
+    MESSAGE: [i18n`文本消息`],
+    PUBLIC_PATH: [i18n`软件发布目录`],
+    PACKAGE_PATH: [i18n`安装包的路径`],
+    JSON_PATH: [i18n`json文件所在的路径`],
+    SIGNNAME: [i18n`签名`],
+    FILEPATH: [i18n`文件或文件夹的路径`],
+    CODEFILE: [i18n`代码文件的路径`],
+    MODULE_PATH: [i18n`源文件的模糊路径`],
+    TARGET_PATH: [i18n`目标文件的模糊路径`],
+    KEYPATH: [i18n`对象的属性路径`],
+    TABSIZE: [i18n`缩进空格数`]
 };
-topics.VARIABLES += "," + Object.keys(topics);
+Object.keys(topics).forEach(k => {
+    var v = topics[k];
+    if (v.length === 2) v.default = v.pop();
+    else if (v.length > 2) v.default = v[1];
+})
+topics.VARIABLES.push(...Object.keys(topics));
 module.exports = { helps, topics };

package/coms/zimoli/data.js

@@ -360,7 +360,7 @@ var parseData = function (sourceText) {
             sourceText = parseYML(sourceText);
         }
     } catch (e) {
-        throw "数据无法解析";
+        throw i18n`数据无法解析`;
     }
     return sourceText;
 };
@@ -422,7 +422,7 @@ function createApiMap(data) {
         fixApi(api, href);
         if (hasOwnProperty.call(apiMap, api.id)) {
             const lastApi = apiMap[api.id];
-            console.warn(`多次设置的id相同的api:%c${api.id}`, 'color:red');
+            console.warn(i18n`多次设置的id相同的api:%c${api.id}`, 'color:red');
             console.log(`[${api.name}](${lastApi.method} ${api.url})\r\n 被 [${api.name}](${lastApi.method} ${lastApi.url}) 覆盖`);
         }
         apiMap[api.id] = api;
@@ -534,7 +534,7 @@ var privates = {
             }
             if (lacks.length) {
 
-                console.log(`跳过了缺少参数的请求:${api.id} ${api.name} ${api.url}\r\n缺少参数：${lacks.join(', ')}`);
+                console.log(i18n`跳过了缺少参数的请求:${api.id} ${api.name} ${api.url}\r\n缺少参数：${lacks.join(', ')}`);
                 return false;
             }
         }
@@ -544,7 +544,7 @@ var privates = {
         return this.getConfigPromise().then((apiMap) => {
             serviceId = serviceId.replace(/[\?\:][\s\S]*$/, "");
             const api = apiMap[serviceId];
-            if (!api) throw new Error(`没有找到对应的接口 id ${serviceId}.`);
+            if (!api) throw new Error(i18n`没有找到对应的接口 id ${serviceId}.`);
             return extend({}, api, { root: apiMap });
         });
     },
@@ -632,7 +632,7 @@ var privates = {
     getConfigPromise() {
         if (!configPormise) {
             if (!_configfileurl) {
-                throw new Error("没有指定配置文件的路径，请使用data.loadConfig加载配置");
+                throw new Error(i18n`没有指定配置文件的路径，请使用data.loadConfig加载配置`);
             }
             var p = this.loadIgnoreConfig('get', _configfileurl);
             p.loading.abort = function () { };
@@ -652,7 +652,7 @@ var getInstanceId = function () {
 var error_report = isProduction ? alert : function (error, type) {
     error_report = alert;
     error_report(error, type);
-    console.info("已使用默认的报错工具，您可以使用 data.setReporter(error_reporter,error_finder) 替换! 本信息在仅在开发环境显示。");
+    console.info(i18n`已使用默认的报错工具，您可以使用 ${"data.setReporter(error_reporter,error_finder)"} 替换! 本信息在仅在开发环境显示。`);
 };
 
 var error_check = function (data) { };
@@ -714,8 +714,8 @@ var unbindInstance = function (instanceId, callback) {
         delete instanceListenerMap[instanceId];
     }
 };
-var OUTDATE = new Error("请求被覆盖");
-var ABORTED = new Error("请求已取消");
+var OUTDATE = new Error(i18n`请求被覆盖`);
+var ABORTED = new Error(i18n`请求已取消`);
 var data = {
     decodeStructure,
     encodeStructure,
@@ -881,7 +881,7 @@ var data = {
     },
     asyncInstance(sid, params, parse) {
         // 不同参数的请求互不影响
-        if (typeof sid !== "string") throw new Error("serviceId 只能是字符串");
+        if (typeof sid !== "string") throw new Error(i18n`serviceId 只能是字符串`);
         var id = parse instanceof Function || params ? getInstanceId() : 0;
         if (id) this.removeInstance(id);
         var response = this.getInstance(id || sid);
@@ -1133,7 +1133,7 @@ var data = {
     },
     rebuildInstance(instance, data, old = instance) {
         if (instance === data) return;
-        if (!isObject(instance)) throw new Error("只支持object类型的数据！");
+        if (!isObject(instance)) throw new Error(i18n`只支持object类型的数据！`);
         if (!isObject(data)) data = { data }, data.toString = data.valueOf = toDataString;
         if (instance instanceof Array) instance.splice(0, instance.length);
         var sample = new LoadingArray;

package/coms/zimoli/table.html

@@ -1,6 +1,6 @@
 <thead @mounted="setFixedColumn.call(this.parentNode),setContextMenu(this)">
     <tr inline-block #adapter thead @mounted="resizeT(this)">
-        <td draggable="false" fixed row-index>序号</td>
+        <td draggable="false" fixed row-index>${i18n`序号`}</td>
         <td fixed:="f.fixed" -repeat="f in fields track by f.id" :style="{width:f.width}" @dblclick="sort(f)"><i
                 -if="f.icon" -class="f.icon"></i><span -if="f.name" -html="f.name"></span><template
                 -else>&nbsp;</template>
@@ -26,13 +26,13 @@
 <tfoot>
     <tr .fade -if="!data||!data.length" style="padding-bottom: 20px;">
         <td style="text-align: center;">
-            <template -if="data.is_loading">加载中</template>
-            <template -else>无数据</template>
+            <template -if="data.is_loading">${i18n`加载中`}</template>
+            <template -else>${i18n`无数据`}</template>
         </td>
     </tr>
     <tr -elseif="hasFoot">
         <td>
-            共&nbsp;<span -bind="data.length"></span>&nbsp;个
+            ${i18n`共${"&nbsp;<span -bind=data.length></span>&nbsp;"}个`}
         </td>
     </tr>
 </tfoot>