efront 4.4.12 → 4.4.14

package/coms/compile/unstruct.js

@@ -480,8 +480,9 @@ var _return = function (r) {
     r.push(...x);
     relink(r);
 };
+
 var remove_end_comma = function (o) {
-    if (!o.length || o.type !== SCOPED || o.entry === '[') return;
+    if (!o.length || (o.type !== void 0) && o.type !== SCOPED || o.entry === '[') return;
     for (var cx = o.length - 1; cx >= 0; cx--) {
         var m = o[cx];
         if (!(m.type & (SPACE | COMMENT))) {
@@ -570,6 +571,11 @@ var _invoke = function (t, getname) {
                 }
                 if (!iseval || m[m.length - 1] === o.last) {
                     var q = toqueue(m, getdeepname, 1);
+                    if (q.length > 1 && queue.length) {
+                        var q0 = q[0];
+                        var q0f = q0.first;
+                        if (q0f?.type === STRAP && !q0f.transive) remove_end_comma(queue[queue.length - 1]);
+                    }
                     var qe = q[q.length - 1];
                     splice(o, by, ey - by, ...qe ? cloneNode(qe.name) : []);
                     cy = by + 1;
@@ -588,8 +594,7 @@ var _invoke = function (t, getname) {
             nameindex = _nameindex;
             // if (!cache.length) continue;
             if (queue.length) flushqueue(result, queue), queue = [];
-            for (var c of cache) pushstep(result, c);
-            cache = [];
+            if (cache.length) flushqueue(result, cache), cache = [];
             var n = o.next;
             if (n && !needbreak(n)) {
                 lastlink = n.type === SCOPED;
@@ -1119,7 +1124,7 @@ var poplabel = function (result) {
                 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语句异常";
+            if (cx < 0) throw console.log(result.map(r => createString(r)), e.text, createString([b.prev, b])), i18n`break语句异常`;
             end.push({ type: VALUE, text: b.continue ? b.continue.contat - cx : result.length - cx }, { type: STAMP, text: "," }, { type: VALUE, text: "0" });
             relink(end);
         }

package/coms/compile/unstruct_test.js

@@ -153,4 +153,5 @@ test(`c=b+ !a`, "_ = !a, c = b + _");
 test(`do {var loadcount = 0;} while (loadcount !== 0);`, `loadcount = 0; _ = loadcount !== 0; if (_) return [0, 0]`);
 unstruct.debug = true; r++;
 test("if(a)try{a}catch{};a;", 'if (!a) return [4, 0]; return [1, 7];\r\n a; return [0, 9];\r\n return [1, 9];\r\n return [1, 0];\r\n a');
-test("url = (o===void 0||o===null?void 0:o.url)", '_ = void 0, _ = o === _; if (_) return [1, 0]; _ = o === null;\r\n if (!_) return [1, 0]; _ = void 0; return [2, 0];\r\n _ = o.url; return [1, 0];\r\n url = _', true);
+test("url = (o===void 0||o===null?void 0:o.url)", '_ = void 0, _ = o === _; if (_) return [1, 0]; _ = o === null;\r\n if (!_) return [1, 0]; _ = void 0; return [2, 0];\r\n _ = o.url; return [1, 0];\r\n url = _', true);
+test("p ? (ishttps ? `https` : `http`).toUpperCase() + i18n`端口` + (ishttps ? ': ' : ':  ') + p : ''","if (!p) return [1, 0]; if (!ishttps) return [1, 0]; _0 = `https`; return [2, 0];\r\n _0 = `http`; return [1, 0];\r\n _0 = (_0); _1 = _0.toUpperCase(); _ = _1 + i18n`端口`; if (!ishttps) return [1, 0]; _2 = ': '; return [2, 0];\r\n _2 = ':  '; return [1, 0];\r\n _ = _ + (_2), _ = _ + p; return [2, 0];\r\n ''; return [1, 0]")

package/coms/compile/washcode.js

@@ -70,7 +70,7 @@ var washcode = function (code, pick) {
     var called_map = Object.create(null);
     for (var cx = 0, dx = explist.length; cx < dx; cx++) {
         var exp = explist[cx];
-        console.info(`正在处理:${1 + cx}/${dx}`);
+        console.info(i18n`正在处理:${1 + cx}/${dx}`);
         var scoped = createScoped(exp);
         var refs = createRefMap(scoped);
         var used = scoped.used;
@@ -190,7 +190,7 @@ var washcode = function (code, pick) {
                     ws = writed_map[ks.join('.')];
                 }
                 if (!ws) {
-                    if (!(ks[0] in envs) && !/^(arguments|this|true|false|null)$/.test(ks[0])) console.warn(`检测到错误，无法建立代码关联：${k}`);
+                    if (!(ks[0] in envs) && !/^(arguments|this|true|false|null)$/.test(ks[0])) console.warn(i18n`检测到错误，无法建立代码关联：${k}`);
                     prevent_map[k] = true;
                     continue;
                 }

package/coms/docs/execute.js

@@ -32,7 +32,7 @@ var execute = function (commName, then, logpad) {
         warn: log.bind("#fc0", '警告'),
     };
     window.onerror = a => console.error(a);
-    window.console.info(`load ${commName}!`);
+    window.console.info(i18n`加载 ${commName}!`);
 
     init(commName, function (comm) {
         window[commName] = function () {

package/coms/explorer/Explorer.js

@@ -34,12 +34,12 @@ e.open = async function (p) {
     });
     this.selected = files.filter(f => f.selected);
 }
-e.delete = function () { alert("无法删除！") }
-e.mov = function () { alert("无法移动！") }
-e.copy = function () { alert("无法复制！") }
-e.read = function () { alert("无法读取文件内容！") }
-e.rename = function () { alert("无法重命名！") }
-e.upload = function () { alert("添加失败！") }
+e.delete = function () { alert(i18n`无法删除！`) }
+e.mov = function () { alert(i18n`无法移动！`) }
+e.copy = function () { alert(i18n`无法复制！`) }
+e.read = function () { alert(i18n`无法读取文件内容！`) }
+e.rename = function () { alert(i18n`无法重命名！`) }
+e.upload = function () { alert(i18n`添加失败！`) }
 e.getToken = function () { }
 e.uploadAll = async function (files) {
     var $scope = this;

package/coms/explorer/context.js

@@ -55,7 +55,7 @@ var popupEdit = function ($scope, active) {
 };
 return extend([
     {
-        name: "返回(O)",
+        name: i18n`返回(O)`,
         hotkey: "backspace",
         when: never,
         do() {
@@ -63,7 +63,7 @@ return extend([
         }
     },
     {
-        name: "打开(O)",
+        name: i18n`打开(O)`,
         hotkey: "Enter",
         when: never,
         do(d) {
@@ -73,7 +73,7 @@ return extend([
         }
     },
     {
-        name: "剪切(C)",
+        name: i18n`剪切(C)`,
         hotkey: "Ctrl+X",
         when: getStable,
         do(d) {
@@ -83,7 +83,7 @@ return extend([
         }
     },
     {
-        name: "复制(R)",
+        name: i18n`复制(R)`,
         hotkey: "Ctrl+C",
         when: getStable,
         do(d) {
@@ -93,7 +93,7 @@ return extend([
         }
     },
     {
-        name: "全选(A)",
+        name: i18n`全选(A)`,
         hotkey: "Ctrl+A",
         when: never,
         do(d) {
@@ -103,11 +103,11 @@ return extend([
         }
     },
     {
-        name: "替换(R)",
+        name: i18n`替换(R)`,
         when: never,
     },
     {
-        name: "粘贴(V)",
+        name: i18n`粘贴(V)`,
         hotkey: "Ctrl+V",
         when(e) {
             var copyed = getPageScope(e.target).copyed;
@@ -122,16 +122,16 @@ return extend([
             var pathbase = "/" + $scope.pathlist.join("/").replace(/^\/+|\/+$/g, '');
             for (var c of cp) {
                 if (pathbase.indexOf(c.fullpath.replace(/^\/+|\/+$/g, '')) >= 0) {
-                    return alert.warn("不能移入子文件夹");
+                    return alert.warn(i18n`不能移入子文件夹`);
                 }
             }
             var token = await $scope.getToken();
             for (var c of cp) {
                 var newname = c.name;
                 if ($scope.hasName(c.name)) {
-                    newname = prompt(`请输入新的${cp.isfolder ? '文件夹' : "文件"}名:`, function (a) {
+                    newname = prompt(i18n`请输入新的${cp.isfolder ? i18n`文件夹` : i18n`文件`}名:`, function (a) {
                         if (isEmpty(a)) return false;
-                        if ($scope.hasName(a)) return "命名冲突"
+                        if ($scope.hasName(a)) return i18n`命名冲突`
                         return explorer$filetip(a);
                     });
                     newname.querySelector("input,textarea").value = c.name.replace(/\/$/, '');
@@ -141,7 +141,7 @@ return extend([
                 else {
                     var offunload = on("beforeunload")(window, function (event) {
                         event.preventDefault();
-                        alert("有文件正在复制！");
+                        alert(i18n`有文件正在复制！`);
                         return false;
                     });
                     var task = explorer$deepcp($scope, c, pathbase + "/" + newname);
@@ -157,12 +157,12 @@ return extend([
         }
     },
     {
-        name: "新建文件夹(D)",
+        name: i18n`新建文件夹(D)`,
         when: notGetActive,
         do: popupAdd
     },
     {
-        name: "添加文件(F)",
+        name: i18n`添加文件(F)`,
         when: notGetActive,
         async do(d) {
             var $scope = getPageScope(d);
@@ -171,13 +171,13 @@ return extend([
     },
     {
         hotkey: "F2",
-        name: '重命名(R)',
+        name: i18n`重命名(R)`,
         when: getStable,
         do: popupRen
     },
     {
         get name() {
-            return this.confirm ? "确认删除(D)" : "删除(D)";
+            return this.confirm ? i18n`确认删除(D)` : i18n`删除(D)`;
         },
         hotkey: "Shift+Del",
         confirm: false,
@@ -192,7 +192,7 @@ return extend([
                 var elem = div();
                 elem.innerHTML = `<fileitem -repeat="d in selected"></fileitem>`;
                 render(elem, { fileitem: explorer$fileitem, selected });
-                await yousure(`确认要删除如下 ${selected.length} 项吗？`, elem);
+                await yousure(i18n`确认要删除如下 ${selected.length} 项吗？`, elem);
             }
             else if (this.confirm === null) {
                 this.confirm = e;

package/coms/explorer/deepcp.js

@@ -38,8 +38,8 @@ async function cp([from, dist]) {
 };
 function deepcp(scope, from, dist) {
     var task = new Task();
-    if (from.isfolder) task.title = "复制文件夹";
-    else task.title = "复制文件";
+    if (from.isfolder) task.title = i18n`复制文件夹`;
+    else task.title = i18n`复制文件`;
     task.open('copy', cp);
     task.scope = scope;
     dist = dist.replace(/^\/+|\/+$/g, '');

package/coms/explorer/edit.html

@@ -1,10 +1,10 @@
 <div head>
-    <span v-text="origin?'修改':'添加'"></span>文件夹
+    <span v-text="origin?${i18n`修改`}:${i18n`添加`}"></span>${i18n`文件夹`}
 </div>
 <div body>
     <field v-if="!f.readonly||!!data[f.key]" -repeat="f in fields" ng-src="[f,data]"></field>
 </div>
 <div foot>
-    <btn @click="remove()" class="white">取消</btn>
-    <button type="submit" disabled_="!data.name||fields[1].valid(data.name)!==undefined">保存</button>
+    <btn @click="remove()" class="white">${i18n`取消`}</btn>
+    <button type="submit" disabled_="!data.name||fields[1].valid(data.name)!==undefined">${i18n`保存`}</button>
 </div>

package/coms/frame/chat.html

@@ -41,8 +41,8 @@
     <a class="file" @click="chooseFile()" -if="user">
         <template -src="fileIcon"></template>
         <span>
-            文件
+            ${i18n`文件`}
         </span>
     </a>
-    <a @click="send('html',text);">发送</a>
+    <a @click="send('html',text);">${i18n`发送`}</a>
 </div>

package/coms/frame/route.js

@@ -42,7 +42,7 @@
             hotkey = hotkey.split(',');
             for (var k of hotkey) {
                 k = k.trim().toLowerCase().replace(/[\+\_\s]+/g, '.');
-                if (keymap[k]) console.warn("检查到两个菜单项使用了相同的快捷键", item, keymap[k]);
+                if (keymap[k]) console.warn(i18n`检查到两个菜单项使用了相同的快捷键`, item, keymap[k]);
                 keymap[k] = item;
             }
             item.hotkey = hotkey;

package/coms/kugou/parseSongsList.js

@@ -1,7 +1,7 @@
 a => {
     if (isElement(a)) {
         var m = /songsdata\s*=\s*(\[[\s\S]*\])/.exec(a.innerText);
-        if (!m) throw new Error("无法加载数据！");
+        if (!m) throw new Error(i18n`无法加载数据！`);
         if (m) a = m[1];
         a = JSON.parse(a);
     }

package/coms/reptile/colored_console.js

@@ -98,11 +98,12 @@ var write = function (hasNewLine, str) {
         reset = colors.Reset;
     var hasNewLine = /^(warn|error|pass|fail)$/.test(log);
     var logger = function () {
-        var label = fgColor + bgColor + info + reset;
+        var label = logger.tip ? fgColor + bgColor + logger.tip + reset : '';
         var time_stamp = '';
-        var str = [time_stamp, label].concat(Array.prototype.map.call(arguments, a => renderColor(a))).join(" ");
+        var str = [time_stamp, label].filter(a => !!a).concat(Array.prototype.map.call(arguments, a => renderColor(a))).join(" ");
         write1(hasNewLine, str);
     };
+    logger.tip = info;
     colored[log] = logger;
 });
 var write1 = function (hasNewLine, str) {
@@ -296,4 +297,9 @@ colored.format = function (a) {
     a = renderColor(a);
     return a;
 };
+if (typeof i18n !== 'undefined') {
+    colored.info.tip = i18n`提示`;
+    colored.warn.tip = i18n`注意`;
+    colored.error.tip = i18n`错误`;
+}
 module.exports = colored;

package/coms/reptile/cross.js

@@ -101,7 +101,7 @@ var cross = cross_.bind(function (callback, onerror) {
         },
         set responseType(v) {
             if (v === "document") return;
-            if (this.status !== 0) throw new Error("状态错误");
+            if (this.status !== 0) throw new Error(i18n`状态错误`);
             responseType = v;
         },
         setRequestHeader(key, value) {

package/coms/reptile/decodeHttpResponse.js

@@ -17,7 +17,7 @@ function decodeHttpResponse(response) {
         case undefined:
             break;
         default:
-            console.warn("内容格式不支持:", response.headers["content-encoding"]);
+            console.warn(i18n`内容格式不支持:`, response.headers["content-encoding"]);
     }
     if (decoder) response = response.pipe(decoder);
     return response;

package/coms/reptile/detectWithExtension.js

@@ -31,7 +31,7 @@ async function detectWithExtension(filenames, extensions = [""], folders = [""])
             if (!findedFolder) findedFolder = f + params;
         } catch { }
     }
-    if (!findedFolder) throw new Error(`路径<gray>${filenames}</gray>不存在`);
+    if (!findedFolder) throw new Error(i18n`路径<gray>${filenames}</gray>不存在`);
     return findedFolder;
 }
 module.exports = detectWithExtension;

package/coms/zimoli/Enum.js

@@ -29,7 +29,7 @@ Enum.prototype = {
     }
 };
 function Enum(keys) {
-    if (!this) throw new Error("请用new关键字创建！");
+    if (!this) throw new Error(i18n`请用new关键字创建！`);
     this[0] = 0;
     if (keys) {
         if (!isArray(keys)) {

package/coms/zimoli/api.js

@@ -42,7 +42,7 @@ var api = function () {
     }
 
     if (!uri) {
-        throw '不存在uri';
+        throw i18n`不存在uri`;
     }
     if (typeof parameters === "string") {
         prefix = parameters;
@@ -52,7 +52,7 @@ var api = function () {
     var url = baseUrl + uri;
     var req = function () {
         onstart && onstart();
-        prefix && console.log("正在" + prefix);
+        prefix && console.log(i18n`正在` + prefix);
         var clear = function () {
             req.ing = false;
             api.count--;
@@ -66,11 +66,11 @@ var api = function () {
         var xhr_onerror = function () {
             setTimeout(clear);
             if (!navigator.onLine) {
-                onerror && onerror("请求网络失败，请确认网络连接正常！", -1);
+                onerror && onerror(i18n`请求网络失败，请确认网络连接正常！`, -1);
             } else {
-                onerror && onerror(xhr.responseText || "无法访问服务器！", xhr);
+                onerror && onerror(xhr.responseText || i18n`无法访问服务器！`, xhr);
             }
-            prefix && console.error(prefix + "失败！");
+            prefix && console.error(prefix + i18n`失败！`);
         };
 
         var xhr_onload = function () {
@@ -80,8 +80,8 @@ var api = function () {
                 try {
                     var result = JSON.parse(text);
                     if (result.result === "error") {
-                        prefix && console.error(prefix + "失败！");
-                        return onerror && onerror(result.message || prefix + "失败！", 0);
+                        prefix && console.error(prefix + i18n`失败！`);
+                        return onerror && onerror(result.message || prefix + i18n`失败！`, 0);
                     }
                     if (result.result === "timeout") {
                         return onlogout && onlogout(result);
@@ -89,17 +89,17 @@ var api = function () {
                     try {
                         onsuccess && onsuccess(result);
                     } catch (e) {
-                        onerror && onerror(prefix + "处理返回结果失败！");
-                        console.error('处理结果失败！', e);
+                        onerror && onerror(prefix + i18n`处理返回结果失败！`);
+                        console.error(i18n`处理结果失败！`, e);
                     }
-                    prefix && console.info(prefix + "成功！");
+                    prefix && console.info(prefix + i18n`成功！`);
                 } catch (e) {
-                    prefix && console.error(prefix + "失败！", e);
-                    onerror && onerror(xhr.responseText || prefix + "接口返回信息异常！", 1);
+                    prefix && console.error(prefix + i18n`失败！`, e);
+                    onerror && onerror(xhr.responseText || prefix + i18n`接口返回信息异常！`, 1);
                 }
             } else {
-                prefix && console.error(prefix + "失败！");
-                onerror && onerror(prefix + "接口未返回信息！", 2);
+                prefix && console.error(prefix + i18n`失败！`);
+                onerror && onerror(prefix + i18n`接口未返回信息！`, 2);
             }
         };
         if (REQ) {
@@ -109,7 +109,7 @@ var api = function () {
             xhr.setRequestHeader = function (key, value) {
                 if (setted_headers[key]) {
                     if (setted_headers[key] === value) return;
-                    console.warn('屏蔽了重复设置', key);
+                    console.warn(i18n`屏蔽了重复设置`, key);
                     return;
                 }
                 setted_headers[key] = value;
@@ -141,7 +141,7 @@ var api = function () {
         };
         xhr.onabort = function (event) {
             setTimeout(clear);
-            onerror && onerror("请求取消！");
+            onerror && onerror(i18n`请求取消！`);
             return xhr;
         };
         xhr.onprogress = function (event) {
@@ -149,7 +149,7 @@ var api = function () {
         };
         xhr.ontimeout = function () {
             setTimeout(clear);
-            onerror && onerror("请求超时！");
+            onerror && onerror(i18n`请求超时！`);
         };
         if (typeof parameters !== "string") {
             switch ({
@@ -180,7 +180,7 @@ var api = function () {
                 case "[object FormData]":
                     break;
                 default:
-                    console.warn("不支持的数据格式", {}.toString.call(parameters));
+                    console.warn(i18n`不支持的数据格式`, {}.toString.call(parameters));
             }
         }
         for (let k in useXMLHttpRequestHeaders) {
@@ -242,7 +242,7 @@ var api = function () {
             }
             runner = req;
             req();
-            console.log("队列有" + api.inqueue + "个请求");
+            console.log(i18n`队列有${api.inqueue}个请求`);
         } else {
             if (req.ing) {
                 return;

package/coms/zimoli/avatarEditor.js

@@ -11,7 +11,7 @@ function main(scope) {
             var scope = this;
             filepicker.onchange = function () {
                 if (scope.upload) scope.upload(this.files[0]);
-                else console.warn("没有发现上传函数");
+                else console.warn(i18n`没有发现上传函数`);
             };
             filepicker.click();
         }

package/coms/zimoli/care.js

@@ -13,7 +13,7 @@ function care(target, type, listener) {
     var listeners = target[type];
     if (listeners.length && !allowMultiHandle) return;
     if (listener instanceof Function && !~listeners.indexOf(listener)) {
-        if (listeners.length > 600) throw new Error("请不要在同一个对象上使用过多的同类型的care!");
+        if (listeners.length > 600) throw new Error(i18n`请不要在同一个对象上使用过多的同类型的care!`);
         listeners.push(listener);
     }
 }
@@ -42,9 +42,9 @@ function parse(target, type, listener) {
             }
             break;
         default:
-            throw new Error("参数数量不正确");
+            throw new Error(i18n`参数数量不正确`);
     }
-    if (!isObject(target)) throw new Error("care只能使用在对象上！");
+    if (!isObject(target)) throw new Error(i18n`care只能使用在对象上！`);
     type = `care(${type})`;
     return [target, type, listener, allowMultiHandle];
 }

package/coms/zimoli/cast.js

@@ -17,7 +17,7 @@ function cast(target, type, data) {
             type = "default";
             break;
         default:
-            throw new Error("参数数量不正确");
+            throw new Error(i18n`参数数量不正确`);
     }
     if (!isObject(target)) return;
 

package/coms/zimoli/chooseFile.js

@@ -17,7 +17,7 @@ function chooseFile(accept, multiple, extra) {
                 if (!value) return;
                 var ActiveXObject = window.ActiveXObject;
                 if (!ActiveXObject) {
-                    alert("您的浏览器环境无法选择文件！");
+                    alert(i18n`您的浏览器环境无法选择文件！`);
                     return;
                 }
                 try {
@@ -25,7 +25,7 @@ function chooseFile(accept, multiple, extra) {
                     var file = fso.GetFile(value);
                     ok([file]);
                 } catch (e) {
-                    alert(e + "打开文件失败！");
+                    alert(e + i18n`打开文件失败！`);
                 }
             } else {
                 var count = 0;

package/coms/zimoli/clock.js

@@ -1,4 +1,4 @@
 function Clock(value = 0, from, step = 1, to) {
-    if (!this) throw new Error("请用new关键字进行创建!");
+    if (!this) throw new Error(i18n`请用new关键字进行创建!`);
     var value =0;
 }

package/coms/zimoli/confirm.js

@@ -59,11 +59,11 @@ function confirm() {
     } else if (isNode(message)) {
         appendChild(body, message);
     } else {
-        throw new Error(`消息体不合法！`);
+        throw new Error(i18n`消息体不合法！`);
     }
     message = String(body.innerText).replace(/\s+/g, " ");
     if (conflictReg.test(String(body.innerText).replace(/\s+/g, ""))) {
-        throw new Error(`您的传达了有歧义的信息：${message}`);
+        throw new Error(i18n`您的传达了有歧义的信息：${message}`);
     }
     if (!options) {
         for (var k in defaultOptions) {

package/coms/zimoli/createElement.js

@@ -19,7 +19,7 @@ var prototype = {
     },
     insertBefore(child, referer) {
         if (referer) {
-            if (referer.parentNode !== this) throw new Error('The node before which the new node is to be inserted is not a child of this node');
+            if (referer.parentNode !== this) throw new Error(i18n`父元素不能是当前元素的子元素`);
             appendChild.before(referer, child, false);
         } else {
             appendChild(this, child, false);
@@ -55,7 +55,7 @@ var prototype = {
         return this;
     }
 }
-console.error("createElement将会在未来的版本中移除！");
+console.error(i18n`createElement将会在未来的版本中移除！`);
 function createElement(name) {
     var node = isNode(name) ? name.cloneNode() : isFunction(name) ? name() : document.createElement(name);
     if (name.className) addClass(node, name.className);

package/coms/zimoli/cross.js

@@ -13,12 +13,12 @@ if (cookiesData) {
     try {
         extend(cookiesMap, JSAM.parse(cookiesData));
     } catch (e) {
-        console.warn("加载cookie出错！");
+        console.warn(i18n`加载cookie出错！`);
     }
 }
 
 var digest = function () {
-    Promise.resolve().then(function(){
+    Promise.resolve().then(function () {
         dispatch('render', window);
     });
 };
@@ -56,7 +56,7 @@ var cross = cross_.bind(function (callback, onerror) {
 
 cross.setHost = function (host) {
     var parsed = parseURL(host);
-    if (!host) return console.error("cross_host格式不正确", host);
+    if (!host) return console.error(i18n`cross_host格式不正确`, host);
     var host = parsed.host + (parsed.pathname || '/');
     host = (/^https/.test(location_href) ? "https://" : "http://") + host;
     cross_.setHost(host);

package/coms/zimoli/css.js

@@ -96,7 +96,7 @@ var cssTargetNode = function (targetNode, oStyle, oValue) {
                         var value = transformValue(oStyle[k], key);
                         setValue(styleobject, key, value);
                     } catch (e) {
-                        console.warn(key, oStyle[k], "无效");
+                        console.warn(key, oStyle[k], i18n`无效`);
                     }
                 }
             }

package/coms/zimoli/downloadmap.js

@@ -1,5 +1,5 @@
 var path = window.require && window.require("path");
-if (!path) throw new Error("请运行在有文件操作的环境下");
+if (!path) throw new Error(i18n`请运行在有文件操作的环境下`);
 var getRect = function (points) {
     var minpoint = [].concat(points[0] || []), maxpoint = [].concat(points[points.length - 1] || []);
     var { min, max } = Math;
@@ -64,7 +64,7 @@ var downloadmap = function (rootpath, map_locations, zoom_location, config, info
             cx++;
             return Promise.resolve(ry).then(px);
         };
-        return Promise.all(new Array(10).fill(0).map(e => px())).then(a => (cz++ , ind = inc)).then(pz);
+        return Promise.all(new Array(10).fill(0).map(e => px())).then(a => (cz++, ind = inc)).then(pz);
     };
     pz();
 };

package/coms/zimoli/filterTime.js

@@ -74,7 +74,7 @@ function filterTime(time, format) {
                 case 0:
                     return `${month}${format || '月'}${date}${format ? '' : '日'} `;
                 case 1:
-                    if (month1 % 12 - month % 12 === 1) {
+                    if (month1 < month) {
                         return `${month}${format || '月'}${date}${format ? '' : '日'} `;
                     }
                     return "去年" + month + "月";