efront 3.36.9 → 3.37.0

package/coms/basic/strings.js

@@ -27,11 +27,12 @@ function encode(str, q = "\"") {
 function decode(s) {
     var r = /^(['"`])([\s\S]*)\1$/.exec(s);
     if (!r) return s;
-    return r[2].replace(/\\u[0-9a-f]{4}|\\x[0-9a-f]{2}|\\([\s\S])/ig, (a, b) => {
+    return r[2].replace(/\\u[0-9a-f]{4}|\\x[0-9a-f]{2}|\\([0-7]{1,3}|[\s\S])/ig, (a, b) => {
         if (!b) {
             return String.fromCharCode(parseInt(a.slice(2), 16));
         }
         if (unescapeMap.hasOwnProperty(a)) return unescapeMap[a];
+        if (/^[0-7]+$/.test(b)) return String.fromCharCode(parseInt(b, 8));
         return b;
     });
 }

package/coms/compile/Javascript.js

@@ -479,7 +479,7 @@ var removeImport = function (c, i, code) {
         used[name] = [];
         if (dec[0] !== "*") dec[0].forEach((dn, i) => {
             var da = dec[0].attributes[i];
-            used[dn].forEach(u => {
+            if (used[dn]) used[dn].forEach(u => {
                 u.text = name + da[0];
                 used[name].push(u);
             });
@@ -538,9 +538,18 @@ var removeExport = function (c, i, code) {
     }
     var [dec, map, o] = getDeclared(n.next, 'export');
     if (/^(class|function)$/.test(n.text)) {
+        var e = skipAssignment(code, i + 1);
+        if (code[e] && code[e].type !== STAMP) {
+            code.splice(e, 0, { type: STAMP, text: ';' });
+        }
         c.text = `exports.${dec[0]}`;
         c.type = EXPRESS;
-        code.splice(i + 1, 0, ...scan(`=${dec[0]}\r\n`));
+        code.splice(i + 1, 0, ...scan(`=`));
+        var nn = n.next;
+        var d = nn.text;
+        if (used[d]) used[d].forEach(a => a.text = `exports.${d}`);
+        delete used[d];
+        delete envs[d];
         return;
     }
     var nn = n.next;
@@ -549,12 +558,16 @@ var removeExport = function (c, i, code) {
     if (!code.exportDecs) {
         code.exportDecs = [];
     }
-    dec.forEach((d, i) => {
+    dec.forEach(function rm(d) {
+        if (d instanceof Array) return d.forEach(rm);
         for (var a of used[d]) {
             if (a.kind && a.kind !== 'export') continue;
             if (!a.export) code.exportDecs.push(a), a.export = true;
         }
     });
+    dec.forEach(d => {
+        if (typeof d === 'string') for (var a of used[d]) if (a.kind === 'export') a.needEqual = true;
+    });
     code.splice(i, oi - i);
 };
 
@@ -592,7 +605,7 @@ Javascript.prototype.fix = function (code) {
         delete code.exportDecs;
         exportDecs.forEach(e => {
             e.text = 'exports.' + e.text;
-            if (e.kind) {
+            if (e.needEqual) {
                 var n = e.next;
                 if (!n || n.type !== STAMP || n.text !== '=') {
                     var i = code.indexOf(e);

package/coms/compile/common.js

@@ -12,7 +12,7 @@ const [
     /* 512 */LABEL,
     /*1024 */PROPERTY,
 ] = new Array(20).fill(0).map((_, a) => 1 << a);
-var number_reg = /^(0x[0-9a-f]+|0b\d+|0o\d+|(\d*\.\d+|\d+\.?)(e[\+\-]?\d+|[mn])?)$/i;
+var number_reg = /^(0x[0-9a-f]+|0b\d+|0o\d+|(\d*\.\d+|\d+\.?))(e[\+\-]?\d+|[mn])?$/i;
 var equal_reg = /^(?:[\+\-\*\/~\^&\|%]|\*\*|>>>?|<<)?\=$|^(?:\+\+|\-\-)$/;
 var skipAssignment = function (o, cx) {
     var next = arguments.length === 1 ? function () {

package/coms/kugou/bg.less

@@ -45,7 +45,7 @@
         background-color: #2873;
         position: absolute;
         border-radius: 50%;
-        backdrop-filter: invert(1);
+        // backdrop-filter: invert(1);
         transition: all .2s;
     }
 }

package/coms/role/file.js

@@ -1,4 +1,4 @@
 function file(fileInfo) {
     var ext = /\.[^\.]+$/.exec(fileInfo.name);
-    return option(fileInfo.name, ext, false);
+    return optionbar(fileInfo.name, ext, false);
 }

package/coms/role/folder.js

@@ -1,5 +1,5 @@
 function folder(fileInfo) {
     var children = fileInfo.children;
-    var _folder = option(fileInfo.name, children && children.length,14);
+    var _folder = optionbar(fileInfo.name, children && children.length,14);
     return _folder;
 }

package/coms/zimoli/field.js

@@ -1,5 +1,5 @@
 function main(elem) {
-    elem = option.apply(null, arguments);
+    elem = optionbar.apply(null, arguments);
     var scope = {};
     care(elem, function (p) {
         if (elem.childNodes.length) return;

package/coms/zimoli/popup.js

@@ -181,7 +181,7 @@ var isypop = function (target) {
             || target.offsetLeft - previousSibling.offsetLeft >= previousSibling.offsetWidth / 2
         )
     ) return true;
-    var padding = parseFloat(getComputedStyle(offsetParent).paddingTop) + parseFloat(getComputedStyle(offsetParent).paddingBottom);
+    var padding = offsetParent ? parseFloat(getComputedStyle(offsetParent).paddingTop) + parseFloat(getComputedStyle(offsetParent).paddingBottom) : 0;
     if (offsetParent && target.offsetTop / target.offsetHeight < .2 && (offsetParent.clientWidth - padding) / target.offsetWidth > 1.5) return true;
 
 };

package/coms/zimoli/renderDefaults.js

@@ -3,8 +3,10 @@ extend(renderDefaults, {
     btn: button,
     button,
     a: button,
-    opt: option,
-    optn: option,
+    optionbar: optionbar,
+    optbar: optionbar,
+    opt: optionbar,
+    optn: optionbar,
     go: zimoli.go,
     care,
     cast,

package/package.json

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