efront 4.35.7 → 4.36.0

package/coms/compile/common.js

@@ -287,6 +287,21 @@ var getContitionHeadBeforeScoped = function (p, nodo) {
             return getIfElseHead(pp);
     }
 };
+var getClassHeadBeforeScoped = function (p) {
+    var i = 0;
+    while (p && p.isClass) {
+        p = p.prev;
+        i++;
+    }
+    while (p && i > 0) {
+        var o = p;
+        if (p.type === STRAP && /^(class|interface)$/.test(p.text)) {
+            i--;
+        }
+        p = p.prev;
+    }
+    return o;
+}
 var getFunctionHeadBeforeScoped = function (p) {
     var pp = getprev(p);
     if (pp && pp.type === EXPRESS) pp = getprev(pp);
@@ -1282,9 +1297,25 @@ var getSemicolonBetween = function (prev, next) {
         }
         return;
     }
+    if (prev.brace) {
+        if (pp.type === SCOPED && pp.entry === '(' ||
+            pp.type === STAMP && pp.text === '=>'
+        ) pp = getFunctionHeadBeforeScoped(pp);
+        else if (prev.isClass) {
+            pp = getClassHeadBeforeScoped(prev);
+        }
+        else pp = null;
+        if (pp) pp = getprev(pp);
+        if (!pp) return;
+        if (pp.type === STAMP && (
+            !/^([,;]|\+\+|\-\-)$/.test(pp.text)
+            || pp.unary
+        ) || pp.type === STRAP && pp.transive && !pp.isend) return ';';
+        return;
+    }
     if (prev.type === STRAP) {
         if ((STRAP | EXPRESS | VALUE | QUOTED) & next.type) return " ";
-        if (next.type === LABEL) return ";";
+        if (next.type === LABEL) return /^(do|else|try|catch|finally)$/.test(prev.text) ? " " : ";";
     }
 }
 var needBreakBetween = function (prev, next) {
@@ -1475,7 +1506,7 @@ var createString = function (parsed) {
                 var prev = getprev(o);
                 if (patchspace && !intag && prev && o.type !== QUOTED && (lasttype === STAMP && !prev.unary && !prev.needle
                     || lasttype & ~(SPACE | STAMP | COMMENT) && o.brace
-                    || lasttype === STRAP && !/^(this|arguments|import)$/.test(prev.text)
+                    || lasttype === STRAP && !/^(this|arguments|import)$/.test(prev.text) && (!prev.unary || o.brace)
                 )) result.push(" ");
                 result.push(o.entry);
                 if (o.length > 0) {
@@ -1554,6 +1585,10 @@ var createString = function (parsed) {
         lasttype = o.type;
     };
     parsed.forEach(run);
+    var pend = parsed[parsed.length - 1];
+    if (pend?.type === COMMENT && /^\/\//.test(pend.text)) {
+        finalresult.push('\r\n');
+    }
     return finalresult.join("");
 }
 var rename = function (used, from, to) {

package/coms/compile/common_test.js

@@ -60,3 +60,51 @@ assert(common.number_reg.test("1.1920928955078125e-07F"), true)
 assert(new RegExp(common.number_reg.source.replace(/^\^|\$$/g, ''), 'ig').exec("00080000h"), ["00080000h"])
 assert(new RegExp(common.number_reg.source.replace(/^\^|\$$/g, ''), 'ig').exec("2A3h"), ["2A3h"])
 assert(new RegExp(common.number_reg.source.replace(/^\^|\$$/g, ''), 'ig').exec("1.1920928955078125e-07F"), ["1.1920928955078125e-07F"])
+function testCrateString(text, want = text) {
+    var code = scanner2(text);
+    code.keepspace = false;
+    var res = common.createString(code);
+    assert(res, want);
+}
+testCrateString('else\r\na:{break a}', 'else a:{break a}')
+testCrateString('do\r\na:{break a}', 'do a:{break a}')
+testCrateString('try\r\na:{break a}', 'try a:{break a}')
+testCrateString('finally\r\na:{break a}', 'finally a:{break a}')
+testCrateString('catch\r\na:{break a}', 'catch a:{break a}')
+testCrateString(
+    'a = function () {}\r\n a: do { break a } white(true)',
+    'a=function(){};a:do{break a}white(true)'
+)
+testCrateString(
+    'function a() {}\r\nreturn',
+    'function a(){}return'
+)
+testCrateString(
+    'a = function () {}()\r\n return',
+    'a=function(){}();return'
+)
+testCrateString(
+    'a = class{}\r\n return',
+    'a=class{};return'
+)
+testCrateString(
+    'class a{}\r\n return',
+    'class a{}return'
+)
+testCrateString(
+    'class a extends class b{}{}\r\n return',
+    'class a extends class b{}{}return'
+)
+testCrateString(
+    'new class a extends class b{}{}\r\n return',
+    'new class a extends class b{}{};return'
+)
+testCrateString(
+    'new class a extends function b(){}{}\r\n return',
+    'new class a extends function b(){}{};return'
+)
+testCrateString(
+    'new class a extends()=>{}{}\r\n return',
+    'new class a extends()=>{}{};return'
+)
+testCrateString('if(true){}a:do{break a}white(true)')

package/coms/compile/namekill.js

@@ -0,0 +1,13 @@
+function till(kill, i, arr) {
+    var s = kill = "_" + i + kill.replace(/[&\^%\?@#\\]/g, '_');
+    var i = 1;
+    while (kill in this) {
+        kill = s + "_" + i++;
+    }
+    return kill;
+}
+module.exports = function nametill(names, prevent) {
+    prevent = Object.create(prevent);
+    names.forEach(n => prevent[n] = true);
+    return names.map(till, prevent);
+}

package/coms/compile/powermap.js

@@ -12,7 +12,7 @@ var powermap = {
     'instanceof,in,==,>=,<=,>,<,!=,!==,===,!in,!instanceof'/* 6 */,
     '>>,>>>,<<'/* 7 */, '+,-'/* 8 */, '*,/,%,\\'/* 9 */, '**'/* 10 */,
     '++,--'/* 11 */,
-    "typeof,await,yield,delete,void,..."/*12*/,
+    "typeof,import,await,yield,delete,void,..."/*12*/,
     "',!,~,#,new"/* 13 */,
     "::,?.,->,."/*14*/,
 ].forEach((pp, i) => {

package/coms/compile/scanner2.js

@@ -4,6 +4,7 @@ var createShortList = function (keys, prevent) {
     return createShortName(keys.length, prevent);
 };
 var renameHashName = require("./nametill");
+var renameBothName = require('./namekill');
 var createNameList = createShortList;
 var Html = require("./Html");
 var Javascript = require("./Javascript");
@@ -190,11 +191,16 @@ class Code extends Array {
         createNameList = createShortList;
     }
     // 压缩
-    press(keepspace) {
+    press(keepspace, pressMethod) {
         this.keepspace = keepspace;
         this.pressed = true;
         this.helpcode = false;
-        compress(this.scoped);
+        if (pressMethod < 0) {
+            createNameList = renameBothName;
+            compress(this.scoped);
+            createShortList = createShortList;
+        }
+        else compress(this.scoped);
         return this;
     }
     getNodeAt(row, col) {

package/coms/compile/wraphtml.js

@@ -1,3 +1,3 @@
 function wrapHtml(htmldata) {
-    return htmldata ? `\`${String(htmldata).replace(/>\s+</g, "><").trim()}\`` : '``';
+    return htmldata ? `\`${String(htmldata).replace(/>\s+</g, "><").replace(/\\[^`]/g, "\\$&").trim()}\`` : '``';
 }

package/coms/compile//347/256/227/345/274/217.js

@@ -6,15 +6,18 @@ const {
     createString,
 } = require("./common");
 var powermap = require("./powermap");
-var number_rep = /^([+-]?[\d\.]+)(?:e([+-]?\d+))?$/;
+var number_rep = /^([+-]?[\d\.]+)(?:e([+-]?\d+))?([ijkn]*)$/;
+var 三角函数 = `sin,cos,tan,cot,sec,csc,arcsin,arccos,arctan,arccot,arcsec,arccsc`.split(',');
 class Math extends Program {
-    number_reg = /^(\d+(?:\.\d+){0,2}|(?:\.\d+){1,2}|(?:\d+\.){1,3})\.*(?:e[+-]?\d+)?$/;
+    number_reg = /^(\d+(?:\.\d+){0,2}|(?:\.\d+){1,2}|(?:\d+\.){1,3})\.*(?:e[+-]?\d+)?[ijkn]*$/;
     powermap = Object.assign({}, powermap);
     value_reg = /^(false|true|null|Infinity|NaN|undefined|eval|this|arguments)$/;
+    straps = 三角函数;
     constructor() {
         super();
         var pmap = this.powermap;
         pmap["+-"] = pmap["-+"] = powermap["+"];
+        pmap["+."] = powermap["?."];
         pmap["×"] = pmap[".*"] = powermap["*"];
         pmap["≈"] = pmap["~="] = pmap["=="];
         pmap["≉"] = pmap["!≈"] = pmap["!~="] = pmap["~!="] = pmap["=="];
@@ -23,7 +26,13 @@ class Math extends Program {
         pmap["^"] = powermap["**"];
         pmap["_"] = powermap["?."];
         pmap["'"] = powermap["?."];
-        this.stamps.push('\\', '_');
+        var newp = powermap['new'];
+        三角函数.forEach(k => {
+            pmap[k] = newp;
+        })
+        pmap["$"] = pmap["@"] = powermap["!"];
+        this.stamps.push('\\', '_', "@", "$");
+        this.scopes.push(["|", "|"])
     }
 }
 Math.prototype.createScoped = createScoped;
@@ -49,10 +58,10 @@ var make = function (pt, left, right) {
     if (left) left = uncup(left);
     if (right) right = uncup(right);
     if (isNull(left)) {
-        return { [pt]: right instanceof Array ? ["", right] : right };
+        return { [pt]: right instanceof Array && !right.iscup ? ["", right] : right };
     }
     if (isNull(right)) {
-        return { [pt]: [left] };
+        return { [pt]: left instanceof Array && left.iscup ? left : [left] };
     }
     if (left[pt]) {
         left[pt].push(right);
@@ -94,20 +103,29 @@ var getRows = function (code) {
     var trs = [];
     var maxsize = 0;
     for (var r of rows) {
-        var row = split(r, ',').map(toFlat);
+        var row = getArgs(r);
         maxsize = row.length;
         trs.push(row);
     }
     rows.maxsize = maxsize;
+    trs.iscup = true;
     return trs;
 }
 var getArgs = function (a) {
-    return split(a, ',').map(a => {
+    var res = [];
+    res.iscup = true;
+    split(a, ',').forEach(a => {
         var cells = createExpressList(a);
         if (!cells[cells.length - 1]?.first) cells.pop();
-        if (cells.length === 1) return toFlat(cells[0]);
-        return cells.map(toFlat);
+        if (cells.length === 1) {
+            res.push(toFlat(cells[0]));
+            return;
+        }
+        cells.map(toFlat).forEach(a => {
+            res.push(a);
+        });
     });
+    return res;
 }
 var uncup = function (cup) {
     if (cup.iscup && cup.length <= 1) cup = cup[0];
@@ -142,7 +160,8 @@ var toFlat = function (exp) {
     for (var cx = 0, dx = exp.length; cx < dx; cx++) {
         var e = exp[cx];
         if (e.type & (SPACE | COMMENT)) continue;
-        if (e.type & STAMP) {
+        if (e.type & (STAMP | STRAP)) {
+            if (e.text === '.') e.text = "+.";
             var p = pmap[e.text] || 0;
             if ((!p0 || p > p0 || !left.length) && !e.ion) {
                 cache.push(left, e.text, p0);
@@ -183,6 +202,10 @@ var toFlat = function (exp) {
                     else if (f instanceof Object) {
                         left.push(make("", f, args));
                     }
+                    else if (/\d\.$/.test(f) && args.length === 1 && args[0]['/']) {
+                        f = f.replace(/\.$/, '');
+                        left.push(make("+.", f, args))
+                    }
                     else {
                         left.push({ [f]: args });
                     }
@@ -213,25 +236,32 @@ var toFlat = function (exp) {
                             else {
                                 args.push(ions);
                             }
-                            left = [make("**", left, ...args)];
+                            left = [make("^*", left, args)];
                         }
                         else {
-                            left = [make("**", left, ions)];
+                            if (ions === '*' && left[0]["["] && left.length === 1) {
+                                ions = "H";
+                            }
+                            left = [make("^*", left, ions)];
                         }
                     }
                     else {
                         var args = getArgs(e);
                         // 下标
-                        left = [make("_", left, ...args)];
+                        left = [make("_", left, args)];
                     }
                     left.iscup = true;
                 }
                 else {
                     // 矩阵
-                    left.push(getRows(e));
+                    left.push(make("[", null, getRows(e)));
                 }
             }
             else if (e.entry === "{") {
+                left.push(make("{", null, getRows(e)));
+            }
+            else if (e.entry === '|') {
+                left.push(make("^|", getRows(e)));
             }
         }
         else {
@@ -241,9 +271,9 @@ var toFlat = function (exp) {
             }
             if (e.isdigit) a: {
                 var et = e.text;
-                var [, a, e10] = number_rep.exec(et);
+                var [, a, e10, s] = number_rep.exec(et);
                 var b = a.split('.');
-                if (b.length > 2 || e10) {
+                if (b.length > 2) {
                     var nrep = b[2] || b[1];
                     var npre = b[0];
                     if (b[2]) {
@@ -257,15 +287,29 @@ var toFlat = function (exp) {
                     if (String(+nrep) === nrep) nrep = +nrep;
                     var v = [npre, nrep];
                     if (b.length > (b[2] ? 4 : b[1] ? 3 : 2)) v.push(b.slice(b[2] ? 3 : b[1] ? 2 : 1, b.length).join('.') + ".");
-                    else if (e10) v.push('');
+                    else if (e10 || s) v.push('');
                     if (e10) {
                         if (String(+e10) === e10) e10 = +e10;
                         v.push(e10);
                     }
+                    else if (s) v.push('');
+                    if (s) v.push(s);
                     v = { "..": v };
                     left.push(v);
                     continue;
                 }
+                else if (s || e10) {
+                    if (String(+a) === a) a = +a;
+                    var v = [a];
+                    if (e10) {
+                        if (String(+e10) === e10) e10 = +e10;
+                        v.push(e10);
+                    }
+                    if (s) v.push(s);
+                    v = { ".": v };
+                    left.push(v);
+                    continue;
+                }
                 var v = +a;
                 if (/^\+/.test(et)) {
                     if (String(v) !== a.slice(1)) break a;
@@ -275,7 +319,11 @@ var toFlat = function (exp) {
                 left.push(v);
                 continue;
             }
-            left.push(e.text);
+            var text = e.text;
+            if (e.type === QUOTED) {
+                text = strings.decode(text);
+            }
+            left.push(text);
         }
     }
     if (!left.length) {
@@ -290,29 +338,37 @@ var toFlat = function (exp) {
     }
     return uncup(left);
 }
-
-function main(text) {
-    var code = scanner2(text, math);
+function seprate(code, addrow) {
     var rows = split(code, ';');
     var res = [];
     res.iscup = true;
     for (var r of rows) {
         var cells = split(r, ',');
+        var cup = addrow ? res : [];
         for (var c of cells) {
             var exps = createExpressList(c);
             for (var e of exps) {
                 var a = toFlat(e);
                 if (!a) continue;
                 if (a.iscup) {
-                    for (var b of a) res.push(b, ' ');
+                    if (addrow) for (var b of a) cup.push(b, ' ');
+                    else for (var b of a) cup.push(a);
                 }
-                else res.push(a, ' ');
+                else if (addrow) cup.push(a, ' ');
+                else cup.push(a);
             }
-            if (res.length) res[res.length - 1] = ', ';
+            if (addrow && cup.length) cup[res.length - 1] = ', ';
+        }
+        if (cup.length) {
+            if (addrow) cup[res.length - 1] = '\r\n';
+            else res.push(cup.length === 1 ? cup[0] : cup);
         }
-        if (res.length) res[res.length - 1] = '\r\n';
     }
-    res.pop();
+    if (addrow) res.pop();
     return uncup(res);
 }
+function main(text) {
+    var code = scanner2(text, math);
+    return seprate(code, true);
+}
 main.MathScript = Math;

package/coms/compile//347/256/227/345/274/217_test.js

@@ -28,5 +28,10 @@ t(`group(
     x+y=10 tab(circle,1),
     x*y=25 tab(circle,2)
 )`)
+t(`a + -2`);
+t(`2+3i`);
 t.debug = true;
-t(`a + -2`);
+t(`@1`);
+t(`#1`);
+t(`_1`);
+t("1*|11|")

package/coms/compile//347/264/240/351/246/250.js

@@ -214,7 +214,7 @@ var wrapColor = function (k) {
     var f = color[k];
     macros[k] = function (c) {
         if (color.isColor(c)) return f(...arguments);
-        return `${k}(${Array.apply(null, arguments).join(',')})`;
+        return `${k}(${Array.prototype.join.call(arguments, ',')})`;
     };
 };
 

package/coms/frame/chat.js

@@ -164,10 +164,11 @@ async function pullFileWithRTC(scope, file) {
         // <!-- console.log('接收端打开') -->
         report();
     };
-    channel.onclose = function () {
+    channel.onclose = async function () {
         // <!-- console.log('接收端关闭') -->
         if (writed === file.size) tipbox.setText(`接收完成`, 'success');
         else tipbox.setText('接收异常', "error");
+        await writable.close();
     };
     channel.onerror = function (event) {
         // <!-- console.log('接收端异常',event) -->

package/coms/zimoli/arriswise.js

@@ -33,12 +33,15 @@ var replaceArg = function (arg) {
     }
     return arg;
 };
-function build(func, argNames, argsArr) {
+function build(func, argNames, argsArr, isWrapper) {
     var newf = String(func).replace(regexps, rep);
-    return Function.apply(null, argNames.map(replaceArg).concat("return " + newf))
+    if (isWrapper) newf = newf.replace(/^\s*function[\s\S]*?\{([\s\S]*)\}\s*$/, "$1");
+    else newf = "return " + newf;
+    return Function.apply(null, argNames.map(replaceArg).concat(newf))
         .apply(this, argsArr.map(replaceArg));
 }
 var arriswise = function (func, args = []) {
+    var isWrapper = func === args[args.length - 3];
     if (isFunction(args.slice)) {
         // 兼容老方法
         var argArr = args.slice(args.length - 3 >>> 1);
@@ -46,8 +49,9 @@ var arriswise = function (func, args = []) {
         return build.call(arguments[2] || this, func,
             args.slice(0, args.length - 3 >>> 1),
             argArr,
+            isWrapper
         );
     }
     var allArgumentsNames = args[args.length - 1];
-    return build.call(this, func, allArgumentsNames, [].slice.call(args, 0));
+    return build.call(this, func, allArgumentsNames, [].slice.call(args, 0), isWrapper);
 };

package/coms/zimoli/bggrid-func.less

@@ -1,7 +1,7 @@
 .grid() {
-    @mask-color1 : rgba(255, 255, 255, .6);
+    @mask-color1 : rgba(255, 255, 255, .3);
     @mask-color2 : rgba(0, 0, 0, 0);
-    @mask-color3 : rgba(0, 0, 0, .1);
+    @mask-color3 : rgba(0, 0, 0, .3);
     background-image:
         linear-gradient(45deg, @mask-color1, 25%, @mask-color1, 25%, @mask-color2, 75%, @mask-color1, 75%, @mask-color1),
         linear-gradient(45deg, @mask-color1, 25%, @mask-color1, 25%, @mask-color2, 75%, @mask-color1, 75%, @mask-color1),

package/coms/zimoli/drag.js

@@ -16,7 +16,8 @@ var getOffset = function (e) {
     if (isFinite(e.screenX)) return [e.screenX, e.screenY];
 };
 
-var getMouse = function (e) {
+var getMousePosition = function (e) {
+    if ('screenX' in e) return [e.screenX, e.screenY];
     return [e.clientX, e.clientY];
 };
 var z;
@@ -51,7 +52,7 @@ function drag(target, initialEvent, preventOverflow, isMovingSource) {
     if ((!target.hasAttribute || target.hasAttribute('draggable')) && target.draggable === false) return;
     initialEvent.preventDefault();
     var target_offset = getOffset(target);
-    var saved_delta = { x: target_offset[0] - initialEvent.clientX, y: target_offset[1] - initialEvent.clientY };
+    var saved_delta = { x: target_offset[0] - getMousePosition(initialEvent)[0], y: target_offset[1] - getMousePosition(initialEvent)[1] };
     var clone;
     if (target.style) {
         var saved_opacity = target.style.opacity;
@@ -90,12 +91,13 @@ function drag(target, initialEvent, preventOverflow, isMovingSource) {
             extraClones.map(c => document.body.appendChild(c));
             saved_delta.x += clone_left - target_left;
             saved_delta.y += clone_top - target_top;
-            target.setAttribute("dragging", '');
+            if (target.setAttribute) target.setAttribute("dragging", '');
             dispatch("dragstart", target);
         }
         event.moveLocked = true;
-        var offsetLeft = saved_delta.x + event.clientX;
-        var offsetTop = saved_delta.y + event.clientY;
+        var [screenX, screenY] = getMousePosition(event);
+        var offsetLeft = saved_delta.x + screenX;
+        var offsetTop = saved_delta.y + screenY;
         var [c_left, c_top] = getOffset(clone);
         var cloneDeltaLeft = -c_left, cloneDeltaTop = -c_top;
         var [c_left, c_top] = move.call(clone, offsetLeft, offsetTop, preventOverflow);
@@ -115,7 +117,10 @@ function drag(target, initialEvent, preventOverflow, isMovingSource) {
         remove(extraClones);
         extraTargets.map((target, cx) => css(target, extraStyles[cx]));
         if (tgz != null) css(target, { zIndex: tgz });
-        if (saved_delta.ing) target.removeAttribute("dragging"), dispatch("dragend", target);
+        if (saved_delta.ing) {
+            if (target.removeAttribute) target.removeAttribute("dragging");
+            dispatch("dragend", target);
+        }
         drag.target = null;
         saved_delta = null;
     };

package/coms/zimoli/list.js

@@ -650,8 +650,7 @@ function ylist(container, generator, $Y) {
 var allArgumentsNames = arguments[arguments.length - 1];
 if (allArgumentsNames.done) return ylist;
 allArgumentsNames.done = true;
-var xlist = arriswise.call(this, arguments[arguments.length - 3], arguments).apply(this, arguments);
-
+var xlist = arriswise.call(this, arguments[arguments.length - 3], arguments);
 var getGeneratorFromArray = function (source) {
     return function (index) {
         if (index >= source.length || index < 0) return null;

package/coms/zimoli/moveupon.js

@@ -50,16 +50,35 @@ var locktouch = function (target, handles) {
         }
     }
 };
-
+var getX = function (event) {
+    if ('screenX' in event) return event.screenX;
+    return event.clientX;
+};
+var getY = function (event) {
+    if ('screenY' in event) return event.screenY;
+    return event.clientY;
+};
 function moveupon(target, handles, initialEvent) {
     var { start, move, end } = handles;
     var touchLocked = false;
+    var savedX, savedY;
     var offmouseup, offtouchend, offtouchcancel;
+    var setMovement = function (event) {
+        if ("movementX" in event) return
+        var x = getX(event);
+        event.movementX = x - savedX;
+        savedX = x;
+        var y = getY(event);
+        event.movementY = y - savedY;
+        savedY = y;
+    }
     var mousemove = function (event) {
+        setMovement(event);
         if (isFunction(move)) move.call(target, event);
     };
 
     var touchmove = function (event) {
+        setMovement(event);
         extendTouchEvent(event);
         if (isFunction(move)) move.call(target, event);
     };
@@ -87,6 +106,7 @@ function moveupon(target, handles, initialEvent) {
 
     if (initialEvent) {
         if (locktouch(initialEvent.target, handles)) return;
+        if (target.notouch) return;
         if (initialEvent.type === "touchstart") {
             extendTouchEvent(initialEvent);
             initialEvent.preventDefault();
@@ -100,8 +120,11 @@ function moveupon(target, handles, initialEvent) {
     onmousedown(target, function (event) {
         if (touchLocked) return;
         if (locktouch(event.target, handles)) return;
+        if (target.notouch) return;
         touchLocked = true;
         hookmouse(event);
+        savedX = getX(event);
+        savedY = getY(event);
         if (isFunction(start)) start.call(this, event);
     });
     ontouchstart(target, function (event) {
@@ -109,6 +132,8 @@ function moveupon(target, handles, initialEvent) {
         if (locktouch(event.target, handles)) return;
         touchLocked = true;
         extendTouchEvent(event);
+        savedX = getX(event);
+        savedY = getY(event);
         hooktouch(event);
         if (isFunction(start)) start.call(this, event);
     });

package/coms/zimoli/picture.less

@@ -1,3 +1,4 @@
+@import "bggrid-func.less";
 & {
     width: 100%;
     height: 100%;
@@ -10,24 +11,6 @@
     background-color: #000;
 }
 
-
-.grid() {
-    @mask-color1 : rgba(255, 255, 255, .6);
-    @mask-color2 : rgba(0, 0, 0, 0);
-    @mask-color3 : rgba(0, 0, 0, .1);
-    background-image:
-        linear-gradient(45deg, @mask-color1, 25%, @mask-color1, 25%, @mask-color2, 75%, @mask-color1, 75%, @mask-color1),
-        linear-gradient(45deg, @mask-color1, 25%, @mask-color1, 25%, @mask-color2, 75%, @mask-color1, 75%, @mask-color1),
-        linear-gradient(45deg, @mask-color3, 25%, @mask-color3, 25%, @mask-color2, 75%, @mask-color3, 75%, @mask-color3),
-        linear-gradient(45deg, @mask-color3, 25%, @mask-color3, 25%, @mask-color2, 75%, @mask-color3, 75%, @mask-color3);
-    background-size: 20px 20px;
-    background-position: 0 0, 10px 10px, 10px 0, 0 10px;
-    background-repeat: repeat;
-    background-clip: border-box;
-    background-color: #fff;
-
-}
-
 &[grid],
 &.grid,
 &[type=grid] {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "4.35.7",
+    "version": "4.36.0",
     "description": "一个开发环境，提供一种自由的前端开发模式，也可作为辅助工具使用。",
     "main": "public/efront.js",
     "directories": {