efront 4.2.4 → 4.2.6

package/apps/pivot/index.html

@@ -10,7 +10,7 @@
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <link rel="Shortcut Icon" href="/favicon.ico" type="image/x-icon" />
     <meta name="viewport" content="initial-scale=1,maximum-scale=1,width=device-width" />
-    <title>Efront 服务器管控平台</title>
+    <title>efront 服务器管理工具</title>
     <script deleteoncompile efrontloader>
         // 若要在开发环境使用内置组件，请保留此script标签中的代码，在编译发布时，这里的代码会自动删除
     </script>

package/coms/basic/i18n.js

@@ -1,8 +1,9 @@
 "use strict";
 var languageMap = {};
 var languageIndex = 0;
-function i18n() {
-    return arguments[isFinite(this) ? this : languageIndex];
+function i18n(arg) {
+    if (typeof arg === 'string') arg = arguments;
+    return arg[isFinite(this) ? this : languageIndex];
 };
 i18n.lang = function (type) {
     var id = getLanguageIndexFromName(type) || 0;

package/coms/compile/common.js

@@ -16,6 +16,7 @@ const [
 var number_reg = /^(?:(?:0x[0-9a-f]+|0b\d+|0o\d+)(?:_[0-9a-f]+)*|(?:(?:(?:\d+_)*\d+|\d*)\.\d+(?:_\d+)*|(?:\d+_)*\d+\.?))(?:e[\+\-]?\d+(?:_\d+)*|[mniul]|ll)?$/i;
 var equal_reg = /^(?:[\+\-\*\/~\^&\|%]|\*\*|>>>?|<<)?\=$|^(?:\+\+|\-\-)$/;
 var skipAssignment = function (o, cx) {
+    if (!o) return;
     var next = arguments.length === 1 ? function () {
         o = o.next;
     } : function () {
@@ -1049,6 +1050,14 @@ var createString = function (parsed) {
     var keepspace = parsed.keepspace !== false;
     var patchspace = autospace && keepspace;
     var helpcode = parsed.helpcode;
+    var express_reg = parsed.program?.express_reg;
+    if (typeof helpcode === 'string') {
+        if (express_reg && !express_reg.test(helpcode.replace(/[\/\||,]/g, ''))) throw new Error("辅助级别异常：" + debug);
+        if (/[\/\|,]/i.test(helpcode)) var debug = `(?:${helpcode.replace(/[\/\|,]/g, '|')})`;
+        else debug = helpcode;
+    }
+    else debug = '';
+    var helpreg = debug ? new RegExp(/^\/[\/\*]\s*/.source + debug + /\:?\s*\<\!--/.source, "i") : /^\/[\/\*]\s*\<\!--/;
     var lasttype = SPACE;
     var uncomment = parsed.comment === false;
     var result = [], cacheresult, finalresult = result;
@@ -1071,10 +1080,10 @@ var createString = function (parsed) {
                 if (uncomment) break;
                 var tmp = o.text, opentmp = false;
                 if (helpcode) {
-                    if (/^\/[\/\*]\s*\<\!--/.test(tmp)) {
+                    if (helpreg.test(tmp)) {
                         opentmp = true;
                         if (/^\/\*/.test(tmp)) opentmp = 2;
-                        tmp = tmp.replace(/^\/[\/\*]\s*\<\!--\s*/, '');
+                        tmp = tmp.replace(helpreg, '');
                         cacheresult = [];
                         result = cacheresult;
                         result.push("/* [[ 开发辅助代码: */");

package/package.json

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