efront 4.35.3 → 4.35.5

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

@@ -78,6 +78,12 @@ test(`a    >{b{a:b}}`, `a>b{a:b;}`);
 test(`a{>b{a:b}}`, `a>b{a:b;}`);
 test(`.type(@type,@media) {.@{type} {&:before{content:"@{media}";}}}.type(videoinput, "相机");`, `.videoinput:before{content:"相机";}`);
 test(`.type(@type,@media) {.@{type} {&:before{content:"@{media}";}}}.type(videoinput, 相机);`, `.videoinput:before{content:"相机";}`);
+test(`
+    @avatar-top: -12px;
+    a{
+        top: 12px- @avatar-top;
+    }
+`,'a{top:24px;}');
 common.createString.debug = true;
 Program.debug = true;
 test(`@type(@len){
@@ -89,7 +95,7 @@ test(`@type(@len){
         }
         }
         @type(1)
-        `, '');
+        `, '>[nlist]{width:1.9em;}');
 Program.debug = false;
 common.createString.debug = false;
 assert(素馨(`:not(a):not(b){c:d}`, 'abc'), `abc :not(a):not(b){c:d;}`);
@@ -132,4 +138,4 @@ assert(素馨(`h1{a:c; span{a:b} i{a:b} }`, '.home-', true), `.home- h1 span{a:b
 assert(素馨(`h1{ button{&:not(hover){.track{a:b}}} }`, '.home-', true), `.home- h1 button:not(hover) .track{a:b;}`);
 assert(素馨(`@type(@a){&[type=@a]{a:1}} @type(white)`, '.btn-', true), `.btn-[type=white]{a:1;}`);
 assert(素馨(`a,b{c,d{ g&{e:f}}}`, '', true), `a gc,b gc,a gd,b gd{e:f;}`);
-assert(素馨(`a{a:lch(from rgb(20 20 20) l c h)}`, '', true), `a{a:lch(from rgb(20 20 20) l c h);}`);
+assert(素馨(`a{a:lch(from rgb(20 20 20) l c h)}`, '', true), `a{a:lch(from rgb(20 20 20) l c h);}`);

package/coms/explorer/main.less

@@ -52,6 +52,7 @@ padding {
 
 & {
     height: 100%;
+    overflow: hidden;
 }
 
 fileitem {

package/coms/reptile/colors.js

@@ -40,7 +40,8 @@ var colors = module.exports = {
     BgCyan2: "\x1b[106m",
     BgWhite2: "\x1b[107m",
 };
-colors.label = colors.strap = colors.value = colors.FgBlue2;
+colors.tag = colors.FgBlue2;
+colors.label = colors.strap = colors.value = colors.FgWhite;
 colors.comment = colors.FgGreen;
 colors.invoke = colors.method = colors.FgYellow2;
 colors.express = colors.property = colors.FgCyan2;

package/coms/zimoli/arriswise.js

@@ -36,7 +36,7 @@ var replaceArg = function (arg) {
 function build(func, argNames, argsArr) {
     var newf = String(func).replace(regexps, rep);
     return Function.apply(null, argNames.map(replaceArg).concat("return " + newf))
-        .apply(this, replaceArg(argsArr));
+        .apply(this, argsArr.map(replaceArg));
 }
 var arriswise = function (func, args = []) {
     if (isFunction(args.slice)) {

package/coms/zimoli/color-config.less

@@ -1,2 +1,2 @@
 @border-solid: #0003;
-@border-focus: #06fe;
+@border-focus: #29c;

package/coms/zimoli/confirm.js

@@ -151,7 +151,7 @@ function confirm() {
     Promise.resolve().then(function () {
         if (isMounted(element)) return;
         element.$mask = true;
-        popup(element, target || [.5, .5], target ? 'rhomb' : true);
+        popup(element, target || [.5, .5], target ? 'rhomb' : target !== false);
         element.focus();
         if (!target) drag.on(head, element);
         else {

package/coms/zimoli/popup.js

@@ -141,7 +141,7 @@ var popup_view = function (element, target, style) {
     }
     else if (target instanceof Array) {
         if (isNode(style) && style.$mask) addMask(element, style);
-        else if (typeof style === 'boolean') addMask(element);
+        else if (typeof style === 'boolean' && style) addMask(element);
         popup_to_point(element, target);
     }
     else if (target === true || target < 0) {

package/coms/zimoli/prompt.js

@@ -35,6 +35,7 @@ function prompt() {
     var submit = null;
     var wrap = false;
     var value = '';
+    var mask = false;
     var attrs = {
         type: null,
         max: null,
@@ -48,6 +49,7 @@ function prompt() {
         else if (typeof arg === 'string') msg = arg;
         else if (isArray(arg)) opts = arg;
         else if (isFunction(arg) || arg instanceof RegExp) check = arg;
+        else if (typeof arg === 'boolean') mask = arg;
         else if (isObject(arg)) {
             if (isFunction(arg.test)) check = arg;
             if (isFunction(arg.check)) check = arg.check;
@@ -55,6 +57,7 @@ function prompt() {
             if (isString(arg.msg || arg.title)) msg = arg.msg || arg.title;
             if (isHandled(arg.info)) info = arg.info;
             if (isHandled(arg.value)) value = arg.value;
+            if (isHandled(arg.mask)) mask = arg.mask;
             for (var k in attrs) {
                 if (k in arg) attrs[k] = arg[k];
             }
@@ -117,7 +120,7 @@ function prompt() {
         } else {
             c.errored = true;
         }
-    });
+    }, { target: mask });
     on('mounted')(ipt, function () {
         if (setDisable) setDisable();
         setTimeout(function () {

package/coms/zimoli/scrollbar.less

@@ -44,6 +44,6 @@
         border-radius: 7px;
         height: 100%;
         width: 100%;
-        background-color: #0092cc;
+        background-color: #29c9;
     }
 }

package/coms/zimoli/table.js

@@ -611,7 +611,7 @@ function table(elem) {
             model,
             scrollbar,
             sort(f) {
-                this.data.sort(f);
+                this.data = this.data.toSorted(f);
             },
             setWidth(target, f) {
                 css(target, { width: f.width });

package/coms/zimoli/vbox.js

@@ -147,6 +147,7 @@ function ybox(generator) {
     } else {
         var wheelTime = 0;
         onmousewheel(_box, function (event) {
+            if (event.defaultPrevented) return;
             event.preventDefault();
             var isNew = event.timeStamp - wheelTime > 120;
             wheelTime = event.timeStamp;

package/coms//350/214/250/350/217/260//344/270/212/350/211/262.xht

@@ -39,10 +39,14 @@
         color: #b5cea8;
     }
 
-    label {
+    tag {
         color: #569cd6;
     }
 
+    label {
+        color: #ccc;
+    }
+
     selector {
         color: #d7ba7d;
     }

package/coms//350/214/250/350/217/260//346/240/207/347/255/276/345/214/226.js

@@ -71,6 +71,7 @@ var codecolor = function (c) {
     };
     var setExpress = function (o, label) {
         if (!o.text || o.wraped) return;
+        if (o.type !== EXPRESS) return;
         o.wraped = true;
         var keys = o.text.split(".");
         var pdot = !keys[0] && keys.length > 1;
@@ -124,6 +125,13 @@ var codecolor = function (c) {
         switch (o.type) {
             case LABEL:
                 o.text = wrap(o.text, 'label');
+                var label = o.tack;
+                used[o.tack].forEach(o => {
+                    if (o.text !== label) return;
+                    var prev = o.prev;
+                    if (!prev || prev.type !== STRAP || prev.isend || !/^(break|continue)$/.test(prev.text)) return;
+                    o.text = wrap(o.text, 'label');
+                })
                 break;
             case QUOTED:
                 if (o.length || !o.text) {
@@ -157,7 +165,7 @@ var codecolor = function (c) {
                 if (o.tag_leave) o.tag_leave = wrapcode(o.tag_leave, 'stamp');
                 if (o.entry) o.entry = wrapcode(o.entry, 'stamp');
                 if (o.leave) o.leave = wrapcode(o.leave, 'stamp');
-                o.tag = wrapcode(o.tag, 'label');
+                o.tag = wrapcode(o.tag, 'tag');
                 o.forEach(setcolor);
                 break;
             case SCOPED:

package/coms//350/214/250/350/217/260//346/270/262/346/237/223.js

@@ -9,7 +9,7 @@ var rows = function (type, text) {
     type = String(type).toLowerCase();
     if (type in 语言) {
         var c = 语言[type](text);
-        标签化(c);
+        标签化(c, c.envs);
         text = c.toString();
     }
     else text = 标签化.encode(text);

package/coms//350/214/250/350/217/260//347/274/226/350/276/221/346/241/206.xht

@@ -1,6 +1,6 @@
 <style>
     & {
-        overflow: auto;
+        overflow: hidden;
         border-top: 0;
         border-bottom: 0;
         display: block;
@@ -43,7 +43,7 @@
                 margin-left:-@{w}em;
                 border-left: @{w}em solid transparent;
                 width: 100%;
-                overflow-x: auto;
+                overflow-x: hidden;
             }
 
             >[nlist] {
@@ -107,6 +107,13 @@
             height: 1.36em;
         }
     }
+
+    >scrollbar {
+        right: 0;
+        left: auto !important;
+        position: fixed;
+        z-index: 1;
+    }
 </style>
 <编辑框 spellcheck=false e-class="上色.className" e-style="{whiteSpace:'pre'}" ntype:="codeSpan">
     <list contenteditable="false" nlist# :src="(r,i) in coderows" -style="{height:codeHeight}">
@@ -115,9 +122,16 @@
     <list clist# body contenteditable:="contenteditable" :src="(r,i) in coderows" -style="{height:codeHeight}">
         <d -html="r"></d>
     </list>
+    <scrollbar x></scrollbar>
+    <scrollbar y :target="this.parentNode"></scrollbar>
 </编辑框>
 <script>
     var coder = this;
+    onmousewheel(this, function (event) {
+        if (!event.shiftKey) return;
+        event.preventDefault();
+        clist.scrollLeft += event.deltaY;
+    });
     vbox(this);
     var contenteditable = !this.readonly;
     watch(coder, {

package/package.json

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