efront 3.36.0 → 3.36.2

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

@@ -0,0 +1,137 @@
+- zh-CN:    服务器异常$1
+  en:    Server Exception $1
+
+- zh-CN:    $1之前需要使用$2命令在$3上设置$4
+  en:    Before $1, you need to use the $2 command to set $4 on $3
+
+- zh-CN:    请输入服务器密码
+  en:    Please enter the server password
+
+- zh-CN:    登录
+  en:    Sign in
+
+- zh-CN:    文本超长，无法翻译
+  en:    The text is too long to be translated
+
+- zh-CN:    没有权限！
+  en:    No permission!
+
+- zh-CN:    未找到指定的资源
+  en:    The specified resource was not found
+
+- zh-CN:    原始名称
+  en:    Original Name
+
+- zh-CN:    输入新名称
+  en:    Enter a new name
+
+- zh-CN:    请过一段时间再试
+  en:    Please try again later
+
+- zh-CN:    服务器取消了您的请求
+  en:    The server canceled your request
+
+- zh-CN:    文件
+  en:    file
+
+- zh-CN:    键名
+  en:    Key Name
+
+- zh-CN:    显示名
+  en:    Display Name
+
+- zh-CN:    密钥
+  en:    secret key
+
+- zh-CN:    备注
+  en:    remarks
+
+- zh-CN:    任务ID
+  en:    Task ID
+
+- zh-CN:    任务名
+  en:    Task Name
+
+- zh-CN:    是否启用
+  en:    Enabled or not
+
+- zh-CN:    任务代码
+  en:    Task Code
+
+- zh-CN:    标识
+  en:    identification
+
+- zh-CN:    应用名
+  en:    App Name
+
+- zh-CN:    路径
+  en:    route
+
+- zh-CN:    代理路径
+  en:    Proxy Path
+
+- zh-CN:    二维码
+  en:    QR code
+
+- zh-CN:    真实路径
+  en:    Real path
+
+- zh-CN:    动作
+  en:    action
+
+- zh-CN:    状态
+  en:    state
+
+- zh-CN:    地址
+  en:    address
+
+- zh-CN:    地理位置
+  en:    geographical position
+
+- zh-CN:    启动时间
+  en:    Start time
+
+- zh-CN:    端口
+  en:    port
+
+- zh-CN:    版本
+  en:    edition
+
+- zh-CN:    进程
+  en:    process
+
+- zh-CN:    访问量
+  en:    Visits
+
+- zh-CN:    房间名
+  en:    Room name
+
+- zh-CN:    数值
+  en:    numerical value
+
+- zh-CN:    文本
+  en:    text
+
+- zh-CN:    字典ID
+  en:    Dictionary ID
+
+- zh-CN:    字典名
+  en:    Dictionary name
+
+- zh-CN:    字典数据
+  en:    Dictionary data
+
+- zh-CN:    名称
+  en:    name
+
+- zh-CN:    服务器
+  en:    The server
+
+- zh-CN:    服务器地址
+  en:    server address
+
+- zh-CN:    密码
+  en:    password
+
+- zh-CN:    这是一个空白项目
+  en:    This is a blank project

package/apps/pivot/auth/login.html

@@ -1,12 +1,12 @@
 <div head>
-    请输入服务器密码
+    ${i18n`请输入服务器密码`}
 </div>
 <div body>
     <field ng-repeat="f in fields" ng-src="[f,data]"></field>
 </div>
 <div foot>
-    <button pending.="pending" type="submit">登录</button>
+    <button pending.="pending" type="submit">${i18n`登录`}</button>
 </div>
 <div message>
-    登录之前需要使用&nbsp;<b>efront password</b>&nbsp;命令在服务器上设置密码
+    ${i18n`${i18n`登录`}之前需要使用${`&nbsp;<b>efront password</b>&nbsp;`}命令在${i18n`服务器`}上设置${i18n`密码`}`}
 </div>

package/coms/basic/i18n.js

@@ -12,9 +12,11 @@ var getLanguageIndexFromName = function (language) {
     if (isFinite(language)) return language;
     if (language in languageMap) return languageMap[language];
     language = String(language).toLowerCase();
-    for (var k in languageMap) {
-        for (var kk of k.toLowerCase().split("-")) {
-            if (language.indexOf(kk) >= 0) return languageMap[k];
+    for (var l of language.split(",").slice(0, 12)) {
+        for (var k in languageMap) {
+            for (var kk of k.toLowerCase().split("-")) {
+                if (l.indexOf(kk) >= 0) return languageMap[k];
+            }
         }
     }
     return languageIndex;

package/coms/basic/refilm_decode.js

@@ -386,7 +386,7 @@ function parse(piece) {
         } else if (/^[\/]/.test(type)) {
             type = type.slice(1);
         }
-        if (typeof options === "string" && !/^\$#\d+$/.test(options)) {
+        if (typeof options === "string" && !/^[\$#]+\d+$/.test(options)) {
             console.log(options)
             options = is(options);
             var needUnfold = /^\[|\]$/.test(options);

package/coms/compile/common.js

@@ -419,6 +419,7 @@ var createScoped = function (parsed, wash) {
                             if (o.next.type === STAMP) {
                                 isAster = true;
                                 o = o.next;
+                                o.isExpress = o.prev.isExpress;
                             }
                         case "catch":
                             if (s === 'catch') isCatch = true;
@@ -560,6 +561,7 @@ var createScoped = function (parsed, wash) {
                     scoped.body = o;
                     o.isExpress = isExpress;
                     run(o.first);
+                    if (isArrow && id >= 0 && o) o = o.next;
                     if (wash && isFunction) {
                         var e = o.next;
                         if (e && e.type === EXPRESS && /^[\.\[]/.test(e.text) || e && e.type === SCOPED && e.entry === "[") {

package/coms/compile/scanner2_test.js

@@ -76,6 +76,13 @@ function testAssign() {
     a()`);
     console.log(m.press().toString());
 }
+function testArrow() {
+    var m = scanner(`(a)=>(b)=>{c,b};`);
+    console.log("1", m.envs);
+    var m = scanner(`(a,b)=>{c,b};`);
+    console.log("2", m.envs);
+}
+
 function testFormat() {
     var t = fs.readFileSync(path.join(__dirname, "../efront/memery.js")).toString();
     assert(scanner(t).toString(), t);
@@ -111,6 +118,7 @@ Program.debug = true;
 // testJsx2();
 // testJsx3();
 // testJsxOnlyHtml();
-testSpaceLess();
+// testSpaceLess();
+testArrow();
 // var typescript = require("../typescript/index");
 // typescript.transpile(data.toString(), { noEmitHelpers: true });

package/coms/compile/translate.js

@@ -4,7 +4,7 @@ var strings = require("../basic/strings");
 var program = null;
 var patchTranslate = function (c) {
     if (c.length) {
-        c.translate = c.map((o, i) => o.type === PIECE ? strings.decode(`\`${o.text}\``) : ` $#${i + 1 >> 1} `).join('');
+        c.translate = c.map((o, i) => o.type === PIECE ? strings.decode(`\`${o.text}\``) : `$${i + 1 >> 1}`).join('');
     }
     else {
         if (/^['"`]/.test(c.text) && c.text.length > 2) {
@@ -66,7 +66,12 @@ function getI18nPrefixedText(code, dist = []) {
 
 function translate([imap, supports], code) {
     var texts = getI18nPrefixedText(code);
+    texts.sort((a, b) => {
+        if (a.start > b.start && a.end < b.end) return -1;
+        return 0;
+    });
     var getm = function (tt) {
+        tt = tt.trim();
         if (!imap[tt]) {
             console.warn(`<yellow>国际化翻译缺失：</yellow>${tt}`);
             imap[tt] = supports.map(_ => tt);
@@ -83,9 +88,9 @@ function translate([imap, supports], code) {
                 p.leave = ")";
             }
             var tt = t.translate;
-            replace(t, ...scanner2(`(${getm(tt)})`.replace(/\$#(\d+)/g, (_, i) => {
+            replace(t, ...scanner2(`(${getm(tt)})`.replace(/[\$#]+(\d+)/g, (_, i) => {
                 var a = (i << 1) - 1;
-                if (a in t) return createString(t[a]);
+                if (a in t) return `\${${createString(t[a])}}`;
                 return _;
             })));
         }
@@ -101,7 +106,7 @@ function translate([imap, supports], code) {
             t.queue.splice(i, e + 1 - i, ...scanner2("[" + t.fields.map(f => {
                 return "{" + Object.keys(f).map(k => {
                     var v = f[k];
-                    if (/\$#\d+/.test(v)) v = v.replace(/\$#(\d+)/g, (_, i) => {
+                    if (/[\$#]\d+/.test(v)) v = v.replace(/[\$#]+(\d+)/g, (_, i) => {
                         var a = (i << 1) - 1;
                         if (a in t) return createString(t[a]);
                         return _;

package/coms/typescript-helpers/__asyncDelegator.js

@@ -0,0 +1,12 @@
+/**
+ * typescript:asyncDelegator
+ * 这个文件由工具生成，请不要手动修改
+ * 
+ * Efront Authors
+ * 2023-03-31T13:49:30.678Z
+ */
+var __asyncDelegator = (this && this.__asyncDelegator) || function (o) {
+    var i, p;
+    return i = {}, verb("next"), verb("throw", function (e) { throw e; }), verb("return"), i[Symbol.iterator] = function () { return this; }, i;
+    function verb(n, f) { i[n] = o[n] ? function (v) { return (p = !p) ? { value: __await(o[n](v)), done: false } : f ? f(v) : v; } : f; }
+};

package/coms/typescript-helpers/__asyncValues.js

@@ -0,0 +1,14 @@
+/**
+ * typescript:asyncValues
+ * 这个文件由工具生成，请不要手动修改
+ * 
+ * Efront Authors
+ * 2023-03-31T13:49:30.678Z
+ */
+var __asyncValues = (this && this.__asyncValues) || function (o) {
+    if (!Symbol.asyncIterator) throw new TypeError("Symbol.asyncIterator is not defined.");
+    var m = o[Symbol.asyncIterator], i;
+    return m ? m.call(o) : (o = typeof __values === "function" ? __values(o) : o[Symbol.iterator](), i = {}, verb("next"), verb("throw"), verb("return"), i[Symbol.asyncIterator] = function () { return this; }, i);
+    function verb(n) { i[n] = o[n] && function (v) { return new Promise(function (resolve, reject) { v = o[n](v), settle(resolve, reject, v.done, v.value); }); }; }
+    function settle(resolve, reject, d, v) { Promise.resolve(v).then(function(v) { resolve({ value: v, done: d }); }, reject); }
+};

package/coms/typescript-helpers/__esDecorate.js

@@ -0,0 +1,34 @@
+/**
+ * typescript:esDecorate
+ * 这个文件由工具生成，请不要手动修改
+ * 
+ * Efront Authors
+ * 2023-03-31T13:49:30.678Z
+ */
+var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
+    function accept(f) { if (f !== void 0 && typeof f !== "function") throw new TypeError("Function expected"); return f; }
+    var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
+    var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
+    var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
+    var _, done = false;
+    for (var i = decorators.length - 1; i >= 0; i--) {
+        var context = {};
+        for (var p in contextIn) context[p] = p === "access" ? {} : contextIn[p];
+        for (var p in contextIn.access) context.access[p] = contextIn.access[p];
+        context.addInitializer = function (f) { if (done) throw new TypeError("Cannot add initializers after decoration has completed"); extraInitializers.push(accept(f || null)); };
+        var result = (0, decorators[i])(kind === "accessor" ? { get: descriptor.get, set: descriptor.set } : descriptor[key], context);
+        if (kind === "accessor") {
+            if (result === void 0) continue;
+            if (result === null || typeof result !== "object") throw new TypeError("Object expected");
+            if (_ = accept(result.get)) descriptor.get = _;
+            if (_ = accept(result.set)) descriptor.set = _;
+            if (_ = accept(result.init)) initializers.push(_);
+        }
+        else if (_ = accept(result)) {
+            if (kind === "field") initializers.push(_);
+            else descriptor[key] = _;
+        }
+    }
+    if (target) Object.defineProperty(target, contextIn.name, descriptor);
+    done = true;
+};

package/coms/typescript-helpers/__propKey.js

@@ -0,0 +1,10 @@
+/**
+ * typescript:propKey
+ * 这个文件由工具生成，请不要手动修改
+ * 
+ * Efront Authors
+ * 2023-03-31T13:49:30.678Z
+ */
+var __propKey = (this && this.__propKey) || function (x) {
+    return typeof x === "symbol" ? x : "".concat(x);
+};

package/coms/typescript-helpers/__runInitializers.js

@@ -0,0 +1,14 @@
+/**
+ * typescript:runInitializers
+ * 这个文件由工具生成，请不要手动修改
+ * 
+ * Efront Authors
+ * 2023-03-31T13:49:30.678Z
+ */
+var __runInitializers = (this && this.__runInitializers) || function (thisArg, initializers, value) {
+    var useValue = arguments.length > 2;
+    for (var i = 0; i < initializers.length; i++) {
+        value = useValue ? initializers[i].call(thisArg, value) : initializers[i].call(thisArg);
+    }
+    return useValue ? value : void 0;
+};

package/coms/typescript-helpers/__setFunctionName.js

@@ -0,0 +1,11 @@
+/**
+ * typescript:setFunctionName
+ * 这个文件由工具生成，请不要手动修改
+ * 
+ * Efront Authors
+ * 2023-03-31T13:49:30.678Z
+ */
+var __setFunctionName = (this && this.__setFunctionName) || function (f, name, prefix) {
+    if (typeof name === "symbol") name = name.description ? "[".concat(name.description, "]") : "";
+    return Object.defineProperty(f, "name", { configurable: true, value: prefix ? "".concat(prefix, " ", name) : name });
+};

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

@@ -34,8 +34,8 @@
         background: #069 !important;
     }
 
-    span,
-    a {
+    p span,
+    p a {
         vertical-align: middle;
     }
 </style>
@@ -325,22 +325,23 @@
         { name: "斯洛文尼亚语", id: "slo", lang: 'sl' },
     ];
     supports.forEach(s => s.key = s.id);
-    var getAllText = function (data, e) {
+    var getAllText = function (data, f) {
         try {
-            if (/^\s*<!doctype\s/i.test(data)) return [];
-            if (/\.(xht|vue)$/i.test(e.name)) {
+            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;
                 data = compile$wraphtml(htmltext) + ";\r\n" + scripts.join("\r\n");
             }
-            else if (/\.html?$/i.test(e.name)) {
-                data = compile$wraphtml(htmltext);
+            else if (/\.html?$/i.test(f.name)) {
+                data = compile$wraphtml(data);
             }
             var code = compile$scanner2(String(data));
             return compile$translate.getI18nPrefixed(code);
         }
         catch (e) {
-            alert("提取出错了", "error");
-            throw e;
+            alert("提取文本时存在异常", "error");
+            console.error(e, f.path);
+            return [];
         }
     };
     var 已找到的字符串 = [];
@@ -519,32 +520,30 @@
         for (var e of pretrans) {
             var data = await readText(e);
             data = parseYML(data);
-            for (var d of data) {
-                for (var k in d) {
+            loop: for (var d of data) {
+                var liang = 0, fanyi = {};
+                for (var { lang: k, id } of supports) {
+                    if (!d[k]) continue;
+                    if (preMap[d[k]]) continue loop;
                     preMap[d[k]] = d;
+                    liang++;
+                    fanyi[id] = d[k];
                 }
+                result.push({ text: d[supports[0].lang], fanyi, liang });
             }
         }
+        var untrans = [];
         Object.keys(textMap).map(k => {
             var texts = textMap[k];
             var count = texts["#count"];
             delete texts["#count"];
             var files = Object.keys(texts);
-            var liang = 0;
-            if (k in preMap) {
-                var fanyi = {};
-                detailScope.supports.forEach(s => {
-                    var v = preMap[k][s.lang]
-                    if (v) {
-                        fanyi[s.id] = v;
-                        liang++;
-                    }
-                })
-            }
-            result.push({ text: k, occurs: texts, files: files.join(',\r\n'), count, fanyi, liang });
+            k = k.trim();
+            if (k in preMap) return;
+            untrans.push({ text: k, occurs: texts, files: files.join(',\r\n'), count });
         });
 
-        已找到的字符串 = result;
+        已找到的字符串 = untrans.concat(result);
         runFilter();
     }
     var exportCSV = async function () {

package/package.json

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