efront 4.25.3 → 4.26.1

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

@@ -1,6 +1,3 @@
-- zh-CN: "不能有特殊符号\"$1\""
-  en:    "Cannot have special symbol '$1'"
-
 - zh-CN: 不启用
   en:    Disable
 
@@ -43,6 +40,15 @@
 - zh-CN: 英语
   en:    English
 
+- zh-CN: 大写锁定已打开
+  en:    Capitalization lock turned on
+
+- zh-CN: 数字键盘已关闭
+  en:    The numeric keypad is turned off
+
+- zh-CN: "不能有特殊符号\"$1\""
+  en:    "Cannot have special symbol '$1'"
+
 - zh-CN: 商店
   en:    Store
 

package/coms/compile/Javascript.js

@@ -47,6 +47,7 @@ class Javascript extends Program {
     strapexp_reg = /^(new|void|typeof|delete|class|function|await)/;
     forceend_reg = /^(return|yield|break|continue|debugger|async)$/;
     defaultType = EXPRESS;
+    lbtype = true;
 }
 var propresolve_reg = /^(static|get|set|async|readonly|private|pub)$/;
 

package/coms/compile/Javascript_test.js

@@ -54,6 +54,7 @@ testDetour('0o1ll.a', '0o1ll["a"]')
 var ts = new Javascript;
 ts.straps.push('interface', 'implements', "declare", "module", "readonly", "enum", 'type');
 ts.tags[0].push("{")
+ts.lbtype = false;
 var testTypescript = function (text) {
     var s = scanner2(text, ts);
     return assert(s.toString(), text);

package/coms/compile/Program.js

@@ -149,6 +149,7 @@ class Program {
     control_reg = /^(if|else|switch|case|do|while|for|loop|break|continue|default|import|from|as|export|try|catch|finally|throw|await|yield|return)$/;
     type_reg = /^(var|let|const|function|fn|func|class|interface|type|struct|enum|impl|local)$/;
     nocase = false
+    lbtype = false;
     keepspace = false;
     lastIndex = 0
     detectLabel(o) {
@@ -171,7 +172,6 @@ class Program {
                     o.isprop = true;
                     break;
                 }
-                if (last.type & (STAMP | STRAP) || last.istype) break;
                 inExpress = true;
                 if (!queue.question) queue.question = 1;
                 else queue.question++;
@@ -206,9 +206,15 @@ class Program {
                     queue.question--;
                     if (last.type === STAMP && last.text === '?') {
                         inExpress = false;
-                        o.istype = true;
-                        last.istype = true;
-                        last.type = EXPRESS;
+                        var lp = last.prev;
+                        if (lp) {
+                            var lpp = lp.prev;
+                            if (lpp?.type === EXPRESS) {
+                                lpp.type = LABEL;
+                            }
+                            lp.needle = true;
+                            last.needle = true;
+                        }
                     }
                     else {
                         inExpress = true;
@@ -239,8 +245,7 @@ class Program {
                 if (!queue.isargl && last.type & (EXPRESS | STRAP | VALUE | QUOTED)) {
                     // label
                     var lp = last.prev;
-                    if (lp && lp.type === STAMP && lp.text === ',') {
-                        o.istype = true;
+                    if (lp && !this.lbtype && lp.type === STAMP && lp.text === ',') {
                         break;
                     }
                     if (!lp || lp.type !== STRAP || !lp.transive || lp.isend) {

package/coms/compile/common.js

@@ -1121,6 +1121,7 @@ var getDeclared = function (o, kind, queue) {
                     continue;
                 }
                 break;
+            case LABEL:
             case PROPERTY:
                 var n = getnext(o);
                 if (n) {
@@ -1587,8 +1588,14 @@ var createExpressList = function (code) {
     for (var cx = 0, dx = code.length; cx < dx;) {
         var o = code[cx];
         var ex = skipAssignment(code, cx);
-        if (code[ex] && code[ex].type === STAMP && /[,;]/.test(code[ex].text)) {
-            ex++;
+        var c = code[ex];
+        if (c?.type === STAMP) {
+            if (/^[,;]$/.test(c.text)) {
+                ex++;
+            }
+            else if (c.text === ':' && !c.isExpress && c.prev?.type !== PROPERTY) {
+                ex++;
+            }
         }
         if (ex > dx) ex = dx;
         var exp = [];

package/coms/compile/createExpressList_test.js

@@ -2,7 +2,7 @@ var { createExpressList, createString } = common;
 var test = function (text) {
     var code = scanner2(text);
     var exps = createExpressList(code);
-    console.log(code.isExpressQueue(),exps.map(createString))
+    console.log(code.isExpressQueue(), exps.map(createString))
 };
 test('a')
 test('a+b=c')
@@ -17,4 +17,9 @@ test('try{}catch{}\r\nfinally{}\r\n if(m)c=d+a;else aa debugger\r\n a')
 test('var a')
 test('var a,b,c=1;')
 test('a:')
-test('a`b`,a`aa{s}`,c;')
+test('a`b`,a`aa{s}`,c;')
+test('case 1?2:3:{}case 2:default:``')
+test('a: b,c,d;')
+test('a: var b,c,d;')
+test('a: if(){}')
+test('a: a=1, b: b=2;')

package/coms/zimoli/password.js

@@ -1,24 +1,59 @@
+
 function password() {
     var element = div();
+    var capslock = null, numhide = null;
+    bind('keydown')(element, function (event) {
+        var which = event.which;
+        switch (which) {
+            case 144/*numlock*/:
+                if (numhide !== null) numhide = !numhide; break;
+            case 20/*capslock*/: if (capslock !== null) capslock = !capslock; break;
+        }
+        if (!numhide && /^Numpad/.test(event.code)) {
+            numhide = which < 96;
+        }
+        if (which >= 65 && which <= 90) {
+            var key = event.key;
+            capslock = event.shiftKey ^ (key >= "A" && key <= "Z");
+        }
+        updatetips();
+    });
     var saved_value = element.value = "";
     var savedKeyCodes = [];
-    element.innerHTML = "<input type=password /><insert></insert><holder></holder>";
-    var [_input, insert, holder] = element.children;
-    var text = document.createTextNode("");
-    element.insertBefore(text, _input);
+    element.innerHTML = "<tips></tips><input type=password /><text><insert></insert></text><holder></holder>";
+    var [tips, _input, text, holder] = element.children;
+    var textNode = document.createTextNode('');
+    text.insertBefore(textNode, text.firstChild);
     var build = function () {
         element.value = String.fromCharCode(...savedKeyCodes);
         if (!savedKeyCodes.length && element.placeholder) {
             element.appendChild(holder);
             holder.innerText = element.placeholder;
-            element.insertBefore(insert, holder);
         } else {
             holder.parentNode === element && element.removeChild(holder);
-            element.appendChild(insert);
         }
-        text.nodeValue = savedKeyCodes.map(e => "●").join("");
-        element.scrollLeft = insert.offsetLeft + insert.offsetWidth + element.clientTop + 2;
+        textNode.nodeValue = savedKeyCodes.map(e => "●").join("");
     };
+    bind('focus')(element, function () {
+        capslock = null;
+        numhide = null;
+        updatetips();
+    });
+    bind('blur')(element, function () {
+        capslock = null;
+        numhide = null;
+        updatetips();
+    })
+    var updatetips = function () {
+        var tip = [];
+        if (capslock) {
+            tip.push(i18n`大写锁定已打开`);
+        }
+        if (numhide) {
+            tip.push(i18n`数字键盘已关闭`);
+        }
+        tips.innerText = tip.join(', ');
+    }
     element.onfocus = function () {
         addClass(element, 'focus');
         saved_value = element.value;

package/coms/zimoli/password.less

@@ -24,7 +24,7 @@
     line-height: 26px;
     border-radius: 3px;
     font-size: 16px;
-    -webkit-appearance: none;
+    appearance: none;
     box-shadow: none;
     outline: none;
     background-color: #fff;
@@ -32,17 +32,57 @@
     vertical-align: middle;
     position: relative;
     overflow: auto;
-    overflow: hidden;
+    border: 1px solid transparent;
+    overflow: visible;
 
-    >insert {
+    &.focus {
+        >input {
+            border-color: transparent;
+            outline: none;
+        }
+
+        outline: none;
+        border-color: #29c;
+
+        >tips:not(:empty) {
+            display: block;
+        }
+    }
+
+
+    >tips {
+        display: none;
+        position: absolute;
+        left: 2px;
+        border: 1px solid;
+        border-bottom: none;
+        background: #FFF;
+        top: -12px;
+        line-height: 12px;
+        font-size: 12px;
+        height: 12px;
+        padding: 2px 4px 0 4px;
+    }
+
+    insert {
         display: inline;
         border-left: .75pt solid;
         opacity: 0;
         white-space: nowrap;
     }
 
+    >text {
+        position: relative;
+        overflow: hidden;
+        text-overflow: clip;
+        white-space: nowrap;
+        width: 100%;
+        display: block;
+    }
+
     >holder {
         color: #777;
+        position: relative;
     }
 
     >input[type=password] {
@@ -64,7 +104,7 @@
         height: auto;
     }
 
-    >input:focus+insert {
+    &.focus insert {
         animation: flash-opacity 1s linear 0s infinite;
     }
 }

package/coms//350/214/250/350/217/260//350/257/255/350/250/200.js

@@ -9,6 +9,7 @@ go.istype = function (o) {
 };
 
 var typescript = new compile$Javascript;
+typescript.lbtype = false;
 typescript.straps = typescript.straps.concat(
     "interface", "implements", "declare", "module", "namespace",
     "readonly", "private", "asserts", "is",

package/package.json

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