efront 4.0.13 → 4.0.16

package/docs//345/267/245/345/205/267//345/233/275/351/231/205/345/214/226.xht

@@ -39,12 +39,12 @@
         vertical-align: middle;
     }
 </style>
-<p><span>翻译结果仅做为参考，未必完美替换，语法参考<a @click="zimoli.go('/组件/basic/i18n.js',{mark:true})">i18n.js</a></span></p>
-<p -if="!window.showDirectoryPicker" error>国际化工具仅在浏览器支持 showDirectoryPicker 时可用</p>
+<p><span>${i18n`翻译结果仅做为参考，未必完美替换，语法参考:`}<a @click="zimoli.go('/组件/basic/i18n.js',{mark:true})">i18n.js</a></span></p>
+<p -if="!window.showDirectoryPicker" error>${i18n`国际化工具仅在浏览器支持 showDirectoryPicker 时可用`}</p>
 <div -else>
-    <button @click="chooseFolder">选择代码文件夹</button>
-    <button @click="editCode()">修改国际化参数</button>
-    <button style="float:right" -if="tableData.length" @click="exportCSV">导出到文件</button>
+    <button @click="chooseFolder">${i18n`选择代码文件夹`}</button>
+    <button @click="editCode()">${i18n`修改国际化参数`}</button>
+    <button style="float:right" -if="tableData.length" @click="exportCSV">${i18n`导出到文件`}</button>
     <hr />
     <form>
         <checkbox -src="filters" @change="runFilter"></checkbox>
@@ -73,10 +73,10 @@
     var editCode = function () {
         supports.forEach(s => s.checked = false);
         detailScope.supports.forEach(s => s.checked = true);
-        var editor = frame$edit("国际化参数", {
+        var editor = frame$edit(i18n`国际化参数`, {
             submit(form) {
                 if (form.appid && !form.sign || form.sign && !form.appid) {
-                    return "appid和密钥不能只有一个！";
+                    return i18n`appid和密钥不能只有一个！`;
                 }
                 detailScope.supports = supports.filter(s => s.checked);
                 var smap = {};
@@ -87,14 +87,14 @@
             }
         }, {
             fields: [
-                { name: "提示", readonly: true, key: 'apply_info', type: 'text' },
-                { name: "appid及密钥申请地址", readonly: true, key: 'apply_url', type: 'anchor' },
-                { name: "appid", key: 'appid', type: 'input' },
-                { name: "密钥", key: 'sign', type: "input" },
-                { name: "目标语言", type: 'checkbox', options: supports }
+                { name: i18n`提示`, readonly: true, key: 'apply_info', type: 'text' },
+                { name: i18n`appid及密钥申请地址`, readonly: true, key: 'apply_url', type: 'anchor' },
+                { name: i18n`appid`, key: 'appid', type: 'input' },
+                { name: i18n`密钥`, key: 'sign', type: "input" },
+                { name: i18n`目标语言`, type: 'checkbox', options: supports }
             ], data: {
                 apply_url: 'https://fanyi-api.baidu.com/',
-                apply_info: 'efront目前使用的翻译接口免费额度受限，如果遇到翻译失败的情况，您可以自己申请一个appid和密钥配置后使用',
+                apply_info: i18n`efront目前使用的翻译接口免费额度受限，如果遇到翻译失败的情况，您可以自己申请一个appid和密钥配置后使用`,
                 appid: baiduFanyiConfig.appid,
                 sign: baiduFanyiConfig.sign
             }
@@ -295,41 +295,41 @@
     //     祖鲁语: ["zu", "Zulu"]
     // };
     var supports = [
-        { name: "中文", id: "zh", lang: "zh-CN" },
-        { name: "繁体中文", id: "cht", lang: "zh-TW" },
-        { name: "英语", id: "en", lang: "en" },
-        // { name: "文言文", id: "wyw" },
-        // { name: "粤语", id: "yue" },
-        { name: "日语", id: "jp", lang: "ja" },
-        { name: "法语", id: "fra", lang: 'fr' },
-        { name: "俄语", id: "ru", lang: 'ru' },
-        { name: "韩语", id: "kor", lang: "ko" },
-        { name: "德语", id: "de", lang: "de" },
-        { name: "意大利语", id: "it", lang: 'it' },
-        { name: "泰语", id: "th", lang: "th" },
-        { name: "越南语", id: "vie", lang: 'vi' },
-        { name: "阿拉伯语", id: "ara", lang: "ar" },
-        { name: "荷兰语", id: "nl", lang: "nl" },
-        { name: "芬兰语", id: "fin", lang: "fi" },
-        { name: "希腊语", id: "el", lang: "el" },
-        { name: "西班牙语", id: "spa", lang: "es" },
-        // { name: "葡萄牙语", id: "pt", lang: /pt\-(BR|PT)/ },
-        { name: "匈牙利语", id: "hu", lang: 'hu' },
-        { name: "瑞典语", id: "swe", lang: 'sv' },
-        { name: "丹麦语", id: "dan", lang: 'da' },
-        { name: "捷克语", id: "cs", lang: 'cs' },
-        // { name: "波兰语", id: "pl" },
-        { name: "保加利亚语", id: "bul", lang: "bg" },
-        { name: "爱沙尼亚语", id: "est", lang: 'et' },
-        { name: "罗马尼亚语", id: "rom", lang: 'ro' },
-        { name: "斯洛文尼亚语", id: "slo", lang: 'sl' },
+        { name: i18n`中文`, id: "zh", lang: "zh-CN" },
+        { name: i18n`繁体中文`, id: "cht", lang: "zh-TW" },
+        { name: i18n`英语`, id: "en", lang: "en" },
+        // { name: i18n`文言文`, id: "wyw" },
+        // { name: i18n`粤语`, id: "yue" },
+        { name: i18n`日语`, id: "jp", lang: "ja" },
+        { name: i18n`法语`, id: "fra", lang: 'fr' },
+        { name: i18n`俄语`, id: "ru", lang: 'ru' },
+        { name: i18n`韩语`, id: "kor", lang: "ko" },
+        { name: i18n`德语`, id: "de", lang: "de" },
+        { name: i18n`意大利语`, id: "it", lang: 'it' },
+        { name: i18n`泰语`, id: "th", lang: "th" },
+        { name: i18n`越南语`, id: "vie", lang: 'vi' },
+        { name: i18n`阿拉伯语`, id: "ara", lang: "ar" },
+        { name: i18n`荷兰语`, id: "nl", lang: "nl" },
+        { name: i18n`芬兰语`, id: "fin", lang: "fi" },
+        { name: i18n`希腊语`, id: "el", lang: "el" },
+        { name: i18n`西班牙语`, id: "spa", lang: "es" },
+        // { name: i18n`葡萄牙语`, id: "pt", lang: /pt\-(BR|PT)/ },
+        { name: i18n`匈牙利语`, id: "hu", lang: 'hu' },
+        { name: i18n`瑞典语`, id: "swe", lang: 'sv' },
+        { name: i18n`丹麦语`, id: "dan", lang: 'da' },
+        { name: i18n`捷克语`, id: "cs", lang: 'cs' },
+        // { name: i18n`波兰语`, id: "pl" },
+        { name: i18n`保加利亚语`, id: "bul", lang: "bg" },
+        { name: i18n`爱沙尼亚语`, id: "est", lang: 'et' },
+        { name: i18n`罗马尼亚语`, id: "rom", lang: 'ro' },
+        { name: i18n`斯洛文尼亚语`, id: "slo", lang: 'sl' },
     ];
     supports.forEach(s => s.key = s.id);
     var getAllText = function (data, f) {
         try {
             if (/^\s*(\<\!--[\s\S]*?--\>\s*)*<!doctype\s/i.test(data)) return [];
             if (/\.(xht|vue)$/i.test(f.name)) {
-                var { scripts, outerHTML: htmltext, attributes = '', tagName, styles } = compile$scanner2(data, 'html').scoped;
+                var { scripts, innerHTML, outerHTML: htmltext = innerHTML, attributes = '', tagName, styles } = compile$scanner2(data, 'html').scoped;
                 data = compile$wraphtml(htmltext) + ";\r\n" + scripts.join("\r\n");
             }
             else if (/\.html?$/i.test(f.name)) {
@@ -346,20 +346,20 @@
     };
     var 已找到的字符串 = [];
     var fields = [
-        { name: "字符串", key: "text", width: 280 },
-        { name: "已翻译", key: "liang", width: 80 },
-        { name: "出现文件", key: "files", width: 200 },
-        { name: "出现次数", key: "count", width: 80 },
+        { name: i18n`字符串`, key: "text", width: 280 },
+        { name: i18n`已翻译`, key: "liang", width: 80 },
+        { name: i18n`出现文件`, key: "files", width: 200 },
+        { name: i18n`出现次数`, key: "count", width: 80 },
     ];
     var filters = {
         key: "filter",
         options: [
             {
-                name: "只看中文", key: "cnonly", get checked() {
+                name: i18n`只看中文`, key: "cnonly", get checked() {
                     return true;
                 },
                 set checked(v) {
-                    alert('暂不支持翻译其他语言', 'warn');
+                    if (v === false) alert(i18n`暂不支持翻译其他语言`, 'warn');
                 },
                 test(a) {
                     return /[\u3400-\ufad9\u{20000}-\u{2a6d6}\u{2fa1d}]/u.test(a.text);
@@ -411,7 +411,7 @@
         if (!detailWindow) {
             detailWindow = view();
             on('submit')(detailWindow, e => e.preventDefault());
-            detailWindow.innerHTML = `<div head>翻译: "<span -bind="item?.text"></span>"<drop @click="close()"></drop></div><lattice itemwidth=260 -src="s in supports" body><field style="display:inline-block;padding:0 0 6px 12px;" ><label style="padding-left:0"><span -bind="s.name"></span>(<span -bind="s.lang"></span>)</label><textarea -model="fanyi[s.id]" class='body' style="resize:none"></textarea></field></lattice><div foot><a style="float:left" @click="baidu">一键百度</a></div>`;
+            detailWindow.innerHTML = `<div head>${i18n`翻译: `}"<span -bind="item?.text"></span>"<drop @click="close()"></drop></div><lattice itemwidth=260 -src="s in supports" body><field style="display:inline-block;padding:0 0 6px 12px;" ><label style="padding-left:0"><span -bind="s.name"></span>(<span -bind="s.lang"></span>)</label><textarea -model="fanyi[s.id]" class='body' style="resize:none"></textarea></field></lattice><div foot><a style="float:left" @click="baidu">${i18n`一键百度`}</a></div>`;
             drag.on(detailWindow, detailWindow.firstElementChild);
             resize.on(detailWindow);
             css(detailWindow, `position:absolute;left:0;top:0;bottom:0;width:260px;`);
@@ -502,7 +502,7 @@
             tmap[e.path].push(t);
         }
         for (var e of result) {
-            msg.setText("正在提取 " + e.path);
+            msg.setText(i18n`正在提取 ` + e.path);
             var data = await readText(e);
             var texts = getAllText(data, e);
             for (var t of texts) {
@@ -514,7 +514,7 @@
                 }
             }
         }
-        msg.setText("提取完成");
+        msg.setText(i18n`提取完成`);
         var result = [];
         var preMap = Object.create(null);
         for (var e of pretrans) {
@@ -525,6 +525,7 @@
                 for (var { lang: k, id } of supports) {
                     if (!d[k]) continue;
                     if (preMap[d[k]] && preMap[d[k]] !== d) continue loop;
+                    if (/\\r/.test(d[k])) console.log(d[k]);
                     preMap[d[k]] = d;
                     liang++;
                     fanyi[id] = d[k];
@@ -563,10 +564,10 @@
             objs.push(o);
         }
         var f = await window.showSaveFilePicker({
-            suggestedName: "#国际化.yml",
+            suggestedName: `#国际化.yml`,
             excludeAcceptAllOption: true,
             types: [{
-                description: 'yml文件',
+                description: i18n`yml文件`,
                 accept: { 'text/plain': ['.yml'] },
             }],
         });

package/docs//345/267/245/345/205/267//345/255/227/347/254/246/351/233/206/346/243/200/346/237/245.xht

@@ -52,19 +52,19 @@
         padding: 0 20px;
     }
 </style>
-<h2>字符集检查工具</h2>
+<h2>${i18n`字符集检查工具`}</h2>
 <div style="text-align: right;padding: 0 20px;">
-    <button @click="check">检查</button>
+    <button @click="check">${i18n`检查`}</button>
 </div>
 <div>
     <field>
-        <label>要检查的字符集区间（unicode）</label>
+        <label>${i18n`要检查的字符集区间`}（unicode）</label>
         <padding>
             <div textarea contenteditable="true" -model="ranges"></div>
         </padding>
     </field>
     <field>
-        <label>当前浏览器支持的字符集区间(unicode)</label>
+        <label>${i18n`当前浏览器支持的字符集区间`}(unicode)</label>
         <padding>
             <div textarea contenteditable="true" -model="result"></div>
         </padding>
@@ -96,7 +96,7 @@
         return parseInt(str, 16);
     }
     var check = async function () {
-        var elem = alert("正在检查", false);
+        var elem = alert(i18n`正在检查`, false);
         var reg = /\\(x[0-9a-f]{2}|u[0-9a-f]{4}|u\{[0-9a-f]+\})/ig;
         var dist0 = [];
         ranges.replace(/<\/?\w+\/?>/g, '').replace(new RegExp(`${reg.source}(?:-${reg.source})?|${/[\s\S]/.source}`, 'ig'), function (_, a, b) {
@@ -119,7 +119,7 @@
                 continue;
             }
             b = fromHex(b);
-            elem.setText(`正在检查${_}`);
+            elem.setText(i18n`正在检查${_}`);
             await new Promise(a => setTimeout(a, 20));
             var start = a;
             var temp = [];
@@ -147,7 +147,7 @@
             dist1[i][0] = `<a>${dist1[i][0]}</a>`;
             return `<w>${a}</w>`;
         })
-        elem.setText("检查完成", 600);
+        elem.setText(i18n`检查完成`, 600);
         ranges = dist1.map(a => a[0]).join("");
         result = dist.join("");
     }

package/docs//347/273/204/344/273/266.xht

@@ -99,25 +99,25 @@
 <xmenu -src="(t,i) in tags" @active="saveTagIndex(i)"></xmenu>
 <h2 head>
     <span -bind="name"></span>
-    <b -if="doc?.less" l>有样式表</b>
-    <b -if="doc?.mark" w>有文档</b>
-    <b -if="doc?.test" t>有测试代码</b>
+    <b -if="doc?.less" l>${i18n`有样式表`}</b>
+    <b -if="doc?.mark" w>${i18n`有文档`}</b>
+    <b -if="doc?.test" t>${i18n`有测试代码`}</b>
 </h2>
 <div body -if="tags[0].actived">
     <container -if="doc?.url" .src="doc.url">
     </container>
     <p4 envs>
         <span -if="envs?.length">
-            环境依赖项:&nbsp; <m -repeat="c in envs" -bind="c"> </m>
+            ${i18n`环境依赖项:`}&nbsp; <m -repeat="c in envs" -bind="c"> </m>
         </span>
-        <span -else> 无环境依赖项 </span>
+        <span -else> ${i18n`无环境依赖项`} </span>
     </p4>
     <p4 imported>
         <span -if="required?.length">
-            导入项:&nbsp;<m -repeat="c in required" -bind="c"></m>
+            ${i18n`导入项:`}&nbsp;<m -repeat="c in required" -bind="c"></m>
         </span>
         <span -else>
-            无导入项
+            ${i18n`无导入项`}
         </span>
     </p4>
 </div>
@@ -126,9 +126,9 @@
     <resultpad .result #coderesult></resultpad>
 </div>
 <div foot -if="tags[1].actived">
-    <a -if="doc?.test" @click="clearpad()">清理</a>
-    <a -if="doc?.test" @click="loadcode()">载入测试代码</a>
-    <btn @click="execute()">运行</btn>
+    <a -if="doc?.test" @click="clearpad()">${i18n`清理`}</a>
+    <a -if="doc?.test" @click="loadcode()">${i18n`载入测试代码`}</a>
+    <btn @click="execute()">${i18n`运行`}</btn>
 </div>
 <script>
     var commaps = Object.create(null);
@@ -380,8 +380,8 @@
         }
     };
     var tags = [
-        { name: "简介" },
-        { name: "试试" }
+        { name: i18n`简介` },
+        { name: i18n`试试` }
     ];
     tags[data.getInstance("docscode").tagIndex | 0].actived = true;
     var actived = tags.map(t => t.actived);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "4.0.13",
+    "version": "4.0.16",
     "description": "简化前端开发，优化web性能",
     "main": "public/efront.js",
     "directories": {