efront 3.36.3 → 3.36.6

package/coms/compile/unstruct_test.js

@@ -4,10 +4,9 @@ var { createString } = require("./common");
 function test(codetext, expect, ret = false) {
     var code = scanner2(codetext);
     var i = -2;
-    code = unstruct(code, () => ++i >= 0 ? "_" + i : '_', ret);
+    code = unstruct(code, () => ++i >= 0 ? "_" + i : '_', ret && "@");
     assert(code.map(createString).join("; "), expect);
 }
-
 test('a+b', "a + b");
 test('a + !c', "_ = !c, a + _");
 test('a + b * c', "_ = b * c, a + _");
@@ -17,38 +16,46 @@ test('a * a + b * c', "_ = a * a, _0 = b * c, _ + _0");
 test('a * a + b * c * c ** d', "_ = a * a, _0 = b * c, _1 = c ** d, _0 = _0 * _1, _ + _0");
 test('a * a || b * c * c ** d', "_ = a * a @re _ = b * c, _0 = c ** d, _ * _0");
 test('a * a || b * c || c * d', "_ = a * a @re _ = b * c @re c * d");
-test('a?b:c', "_ = a; return [_ ? 1 : 2, _]; _ = b; return [2, _]; _ = c; return [1, _]");
+test('a?b:c', "_ = a; return [_ ? 1 : 2, 0]; _ = b; return [2, 0]; _ = c");
 test('a * a && b * c * c ** d', "_ = a * a @rz _ = b * c, _0 = c ** d, _ * _0");
-test('a = b', "a = b; return [1, a]", true);
-test('a = b = c', "_ = c; b = _; a = _; return [1, a]", true);
-test('a = b = c + d', "_ = c + d; b = _; a = _; return [1, a]", true);
-test('a = b = c + d * 1', "_ = d * 1; _ = c + _; b = _; a = _; return [1, a]", true);
-test('return a = b', "a = b; return [1, a]", true);
-test('a*a', "_ = a * a; return [1, _]", true);
-test('a * a && b * c * c ** d', "_ = a * a; if (!_) return [2, _]; _ = b * c; _0 = c ** d; _ = _ * _0; return [1, _]", true);
+test('a = 1 + 2', "_ = 1 + 2, a = _", true);
+test('a = b', "a = b", true);
+test('a = b = c', "_ = c, b = _, a = _", true);
+test('a = b = c + d', "_ = c + d, b = _, a = _", true);
+test('a = b = c + d * 1', "_ = d * 1, _ = c + _, b = _, a = _", true);
+test('return a = b', "a = b; return [a, 2]", true);
+test('a*a', "_ = a * a", true);
+test('a * a && b * c * c ** d', "_ = a * a; if (!_) return [1, 0]; _ = b * c, _0 = c ** d, _ = _ * _0", true);
+test('a * a || b * c * c ** d', "_ = a * a; if (_) return [1, 0]; _ = b * c, _0 = c ** d, _ = _ * _0", true);
+test('a * a ?? b * c * c ** d', "_ = a * a; if (_ !== null && _ !== undefined) return [1, 0]; _ = b * c, _0 = c ** d, _ = _ * _0", true);
+test('a * a && await b*c', "_ = a * a; if (!_) return [2, 0]; _ = b; return [_, 1]; _ = @; _ = _ * c", true);
 
-test("await a", "_ = a; return [1, _]", true);
-test("await a()", "_ = a(); return [1, _]", true);
-test("(1+ +1)", "_ = +1; _ = 1 + _; _ = (_); return [1, _]", true);
-test("await a(await b)", "_ = b; return [1, _]; _ = a(_); return [1, _]", true);
-test("await a(await b).s(await c)", "_ = b; return [1, _]; _ = a(_); _0 = c; return [1, _0]; _ = _.s(_0); return [1, _]", true);
-test("a*a + await a(await b).s(await c)", "_ = a * a; _0 = b; return [1, _0]; _0 = a(_0); _1 = c; return [1, _1]; _0 = _0.s(_1); return [1, _0]; _ = _ + _0; return [1, _]", true);
-test("a*a + await a(await b(await c)).s(await c)", "_ = a * a; _0 = c; return [1, _0]; _0 = b(_0); return [1, _0]; _0 = a(_0); _1 = c; return [1, _1]; _0 = _0.s(_1); return [1, _0]; _ = _ + _0; return [1, _]", true);
-test("await a, await b", "_ = a; return [1, _]; _ = b; return [1, _]", true);
-test("await a * b, await b", "_ = a; return [1, _]; _ = _ * b; return [1, _]; _ = b; return [1, _]", true);
-test("if(a) await b", "if (!a) return [1]; _ = b; return [1, _]", true);
-test("if(a) await b; else await c", "if (!a) return [1]; _ = b; return [2, _]; _ = c; return [1, _]", true);
-test("if(a) await b; else if(e) await c", "if (!a) return [1]; _ = b; return [2, _]; if (!e) return [1]; _ = c; return [1, _]", true);
-test("if(a) await b; else if(e) await c else await d", "if (!a) return [1]; _ = b; return [3, _]; if (!e) return [1]; _ = c; return [2, _]; _ = d; return [1, _]", true);
-test("if(await a) await b", "_ = a; return [1, _]; if (!_) return [1]; _ = b; return [1, _]", true);
-test("for(a=0;a<10;a++) await a", "a = 0; return [1]; _ = a < 10; if (!_) return [3]; _ = a; return [1, _]; _ = a++; return [-2]", true);
-test("for(a=0;a<10;a++) await a, await b", "a = 0; return [1]; _ = a < 10; if (!_) return [4]; _ = a; return [1, _]; _ = b; return [1, _]; _ = a++; return [-3]", true);
-test("while(a) await b", "_ = a; if (!_) return [3]; _ = b; return [1, _]; return [-2]", true);
-test("do{await b}while(a)", "_ = b; return [1, _]; _ = a; return [_ ? -2 : 1]", true);
-test("switch(a){case 1:}", "_ = a; _0 = 1; if (_ === _0) return [1]", true);
-test("switch(a){case 1:break;}", "_ = a; _0 = 1; if (_ === _0) return [1]; return [1]", true);
-test("switch(a){case 1:break;case 2:break;}", "_ = a; _0 = 1; if (_ === _0) return [2]; _0 = 2; if (_ === _0) return [2]; return [2]; return [1]", true);
-test("switch(a){case 1:case 2:break;}", "_ = a; _0 = 1; if (_ === _0) return [2]; _0 = 2; if (_ === _0) return [1]; return [1]", true);
-test("switch(a){case 1:case 2:x=1;}", "_ = a; _0 = 1; if (_ === _0) return [2]; _0 = 2; if (_ === _0) return [1]; x = 1", true);
-test("switch(a){case 1:case 2:x=1;}", "_ = a; _0 = 1; if (_ === _0) return [2]; _0 = 2; if (_ === _0) return [1]; x = 1", true);
+test("await a", "_ = a; return [_, 1]", true);
+test("await a()", "_ = a(); return [_, 1]", true);
+test("(1+ +1)", "_ = +1, _ = 1 + _; _ = (_)", true);
+test("await a(await b)", "_ = b; return [_, 1]; _ = @; _ = a(_); return [_, 1]", true);
+test("await a(await b).s(await c)", "_ = b; return [_, 1]; _ = @; _ = a(_); _0 = c; return [_0, 1]; _0 = @; _ = _.s(_0); return [_, 1]", true);
+test("a*a + await a(await b).s(await c)", "_ = a * a; _0 = b; return [_0, 1]; _0 = @; _0 = a(_0); _1 = c; return [_1, 1]; _1 = @; _0 = _0.s(_1); return [_0, 1]; _0 = @; _ = _ + _0", true);
+test("a*a + await a(await b(await c)).s(await c)", "_ = a * a; _0 = c; return [_0, 1]; _0 = @; _0 = b(_0); return [_0, 1]; _0 = @; _0 = a(_0); _1 = c; return [_1, 1]; _1 = @; _0 = _0.s(_1); return [_0, 1]; _0 = @; _ = _ + _0", true);
+test("await a, await b", "_ = a; return [_, 1]; _ = b; return [_, 1]", true);
+test("await a * b, await b", "_ = a; return [_, 1]; _ = @; _ = _ * b; _ = b; return [_, 1]", true);
+test("if(a);", "", true);
+test("if(a) await b", "if (!a) return [1, 0]; _ = b; return [_, 1]", true);
+test("if(a) await b; else await c", "if (!a) return [2, 0]; _ = b; return [_, 1]; return [2, 0]; _ = c; return [_, 1]", true);
+test("if(a) b; else await c", "if (!a) return [1, 0]; _ = b; return [2, 0]; _ = c; return [_, 1]", true);
+test("if(a) await b; else if(e) await c", "if (!a) return [2, 0]; _ = b; return [_, 1]; return [2, 0]; if (!e) return [1, 0]; _ = c; return [_, 1]", true);
+test("if(a) await b; else if(e) await c else await d", "if (!a) return [2, 0]; _ = b; return [_, 1]; return [4, 0]; if (!e) return [2, 0]; _ = c; return [_, 1]; return [2, 0]; _ = d; return [_, 1]", true);
+test("if(await a) await b", "_ = a; return [_, 1]; if (!_) return [1, 0]; _ = b; return [_, 1]", true);
+test("for(a=0;a<10;a++) await a", "a = 0; return [1, 0]; _ = a < 10; if (!_) return [3, 0]; _ = a; return [_, 1]; _ = a++; return [-2, 0]", true);
+test("for(a=0;a<10;a++) await a, await b", "a = 0; return [1, 0]; _ = a < 10; if (!_) return [4, 0]; _ = a; return [_, 1]; _ = b; return [_, 1]; _ = a++; return [-3, 0]", true);
+test("while(a) await b", "_ = a; if (!_) return [3, 0]; _ = b; return [_, 1]; return [-2, 0]", true);
+test("do{await b}while(a)", "_ = b; return [_, 1]; _ = a; return [_ ? -2 : 1, 0]", true);
+test("switch(a){case 1:}", "_ = a; _0 = 1; if (_ === _0) return [1, 0]", true);
+test("switch(a){case 1:break;}", "_ = a; _0 = 1; if (_ === _0) return [1, 0]; return [1, 0]", true);
+test("switch(a){case 1:break;case 2:break;}", "_ = a; _0 = 1; if (_ === _0) return [1, 0]; _0 = 2; if (_ === _0) return [2, 0]; return [2, 0]; return [1, 0]", true);
+test("switch(a){case 1:case 2:break;}", "_ = a; _0 = 1; if (_ === _0) return [1, 0]; _0 = 2; if (_ === _0) return [1, 0]; return [1, 0]", true);
+test("switch(a){case 1:case 2:x=1;}", "_ = a; _0 = 1; if (_ === _0) return [1, 0]; _0 = 2; if (_ === _0) return [1, 0]; x = 1", true);
+test("switch(a){case 1:case 2:x=1;}", "_ = a; _0 = 1; if (_ === _0) return [1, 0]; _0 = 2; if (_ === _0) return [1, 0]; x = 1", true);
 test("with(a){ a = 1}", `_ = a; if (_0 = with_("a", [_])) _0.a = 1; else a = 1;`, true);
+test("try{a=2+1}catch(e){}", 'return [65536, 7]; _ = 2 + 1, a = _; return [0, 9]; e = @; return [1, 9]', true);
+test("try{a=2+1}catch(e){a=3}", 'return [65536, 7]; _ = 2 + 1, a = _; return [0, 9]; e = @; a = 3; return [1, 9]', true);

package/coms/docs/codetext.xht

@@ -84,7 +84,7 @@
     var encode = function (text) {
         return text.replace(/[\<\>\|]/g, a => `&#${a.charCodeAt()};`)
     };
-    var codecolor = function (c) {
+    var codecolor = function (c, blink) {
         var envs = c.envs;
         var predefs = Object.create(null);
         predefs.module = true;
@@ -95,6 +95,8 @@
         var { STRAP, SCOPED, QUOTED, LABEL, COMMENT, STAMP, VALUE, EXPRESS, PROPERTY, PIECE } = c;
         var deep = 0;
         var setcolor = function (o) {
+            var text = o.text;
+            if (o.blink >= 0) o.text = o.text.slice(0, o.blink) + blink + o.text.slice(o.blink);
             switch (o.type) {
                 case LABEL:
                     o.text = `<label>${o.text}</label>`;
@@ -137,16 +139,16 @@
                     if (next && next.type === c.SCOPED && next.entry === '(') {
                         keys[keys.length - 1] = `<invoke>${keys[keys.length - 1]}</invoke>`;
                     }
+                    var [name0] = text.split(".");
                     var [name] = keys;
-                    if (/^</.test(name));
-                    else if (/^(arguments|this|super|Infinity|NaN)$/.test(name)) name = `<strap>${name}</strap>`;
-                    else if (name in envs) name = name in predefs ? `<predef>${name}</predef>` : `<outside>${name}</outside>`;
-
+                    if (/^</.test(name0));
+                    else if (/^(arguments|this|super|Infinity|NaN)$/.test(name0)) name = `<strap>${name}</strap>`;
+                    else if (name0 in envs) name = name0 in predefs ? `<predef>${name}</predef>` : `<outside>${name}</outside>`;
                     keys[0] = name;
                     o.text = keys.map(k => /^\</.test(k) || !k ? k : `<express>${k}</express>`).join(".");
                     break;
                 case STRAP:
-                    if (/^(if|else|switch|case|do|while|for|break|continue|default|import|from|as|export|try|catch|finally|await|yield|return)/.test(o.text))
+                    if (/^(if|else|switch|case|do|while|for|break|continue|default|import|from|as|export|try|catch|finally|await|yield|return)/.test(text))
                         o.text = `<flow>${o.text}</flow>`;
                     else o.text = `<strap>${o.text}</strap>`;
                     break;
@@ -166,10 +168,17 @@
     var typescript = new compile$Javascript;
     typescript.straps = typescript.straps.concat("interface", "implements", "declare", "module", "readonly", "enum");
     var codesupports = {
-        javascript(a) {
+        javascript(a, blink) {
+            if (blink) var index = a.indexOf(blink);
+            if (index >= 0) a = a.slice(0, index) + a.slice(index + 1);
             var c = compile$scanner2(a);
-            codecolor(c);
-            return c.toString();
+            if (index >= 0) {
+                var patched = patchBlink(c, index, blink);
+            }
+            codecolor(c, blink);
+            a = c.toString();
+            if (index >= 0 && !patched) a = blink + a;
+            return a;
         },
         typescript(a) {
             var c = compile$scanner2(a, typescript);
@@ -199,15 +208,67 @@
     codesupports.jsx = codesupports.js = codesupports.javascript;
     codesupports.tsx = codesupports.ts = codesupports.typescript;
     codesupports.xml = codesupports.html;
-    function codetext(type, text) {
-        try {
-            type = type.toLowerCase();
-            if (type in codesupports) text = codesupports[type](text);
-            else text = encode(text);
-
-        } catch (e) {
-            console.error(e);
+    var { SCOPED, QUOTED } = compile$common;
+    var patchBlink = function (code, index, blink) {
+        for (var cx = 0, dx = code.length; cx < dx; cx++) {
+            var c = code[cx];
+            var haschildren = c => c.type === SCOPED || c.type === QUOTED && c.length;
+            if (c.start === index) {
+                if (haschildren(c)) {
+                    c.entry = blink + c.entry;
+                }
+                else {
+                    c.blink = 0;
+                }
+                return true;
+            }
+            else if (c.start < index && c.end > index) {
+                if (haschildren(c)) {
+                    return patchBlink(c, index, blink);
+                }
+                else {
+                    c.blink = index - c.start;
+                    return true;
+                }
+            }
+            else if (c.end === index) {
+                if (haschildren(c)) {
+                    c.leave += blink;
+                }
+                else {
+                    c.blink = c.text.length;
+                }
+                return true;
+            }
+            else if (c.start > index) {
+                if (cx === 0) {
+                    if (code.entry) return code.entry += blink, true;
+                    return false;
+                }
+                else {
+                    var p = code[cx - 1];
+                    if (haschildren(p)) {
+                        p.leave += blink;
+                    }
+                    else {
+                        p.blink = p.text.length;
+                    }
+                    return true;
+                }
+            }
+        }
+        if (code.leave) {
+            code.leave = blink + code.leave;
+            return true;
+        }
+        return false;
+    };
+    function codetext(type, text, blink) {
+        type = type.toLowerCase();
+        if (type in codesupports) {
+            text = codesupports[type](text, blink);
         }
+        else text = encode(text);
         var codes = text.split(/\r\n|\r|\n/);
         var minSpace = 0;
         for (var c of codes) {

package/coms/docs/markdown.js

@@ -99,7 +99,12 @@ function markdown(text) {
         if (q.length === 1) return `<m>${_}</m>`;
         var t = /^\S+/.exec(c);
         if (t) t = t[0]; c = c.slice(t.length).replace(/^(\r\n|\r|\n)|\s+$/g, '');
-        return codetext(t, c);
+        try {
+            return codetext(t, c);
+        } catch (e) {
+            console.error(e);
+            return c;
+        }
     }).replace(/\s*((&nbsp;\s*)+)/g, "$1").split(/\r\n|\r|\n/).forEach(richtext);
     list_elem = null;
     list_tag = null;

package/coms/zimoli/AudioContext_test.less

@@ -60,7 +60,7 @@
             }
 
             span {
-                writing-mode: horizontal-tb;
+                writing-mode: vertical-rl;
             }
 
 

package/coms/zimoli/alert.js

@@ -12,10 +12,11 @@ styles.default = '#000a';
 var fontSize = 16;
 var singleHeight = fontSize * 3.125 | 0;
 var container = document.createElement('alert-container');
-css(container, 'height:0;left:0;right:0;transition:all 0.2s ease-out;position:absolute;')
+css(container, 'top:0;height:0;left:0;right:0;transition:all 0.2s ease-out;position:absolute;')
 var _text = function (bgcolor, parameters) {
     var box = document.createElement('div');
-    box.innerHTML = `<div style='padding:${fromPixel(10)} ${fromPixel(20)};background-color:${bgcolor};color:${color.pair(bgcolor, 1)};'>${[].slice.call(parameters, 0).join(", ")}</div>`;
+    css(box, `background-color:${bgcolor};color:${color.pair(bgcolor, 1)};`);
+    box.innerHTML = [].slice.call(parameters, 0).join(", ");
     box.initialStyle = `margin-top:-${fromPixel(singleHeight)};`;
     return box;
 };
@@ -55,13 +56,12 @@ function alert() {
     } else {
         elem = _text(styles.log, [text]);
     }
-    var _onclose = function (event) {
+    var _onclose = lazy(function (event) {
         if (onclose) {
             onclose.call(this, event);
         }
         if (close_timer) clearTimeout(close_timer);
-        if (!container.children.length) remove(container);
-    }
+    });
     onremove(elem, _onclose);
     var close_timer;
     var waitclose = function (autoclose, deltaTime) {
@@ -78,7 +78,7 @@ function alert() {
     };
     waitclose(autoclose, 400)
     elem.setText = function (content, timeout = true) {
-        var c = elem.children[0];
+        var c = elem;
         c.innerHTML = content;
         text = content;
         if (timeout) {
@@ -87,7 +87,7 @@ function alert() {
         }
     };
     if (!container.parentNode) popup(container);
-    appendChild(container, elem);
+    if (!elem.parentNode) appendChild(container, elem);
     return elem;
 }
 for (var k in styles) {

package/coms/zimoli/alert.less

@@ -6,5 +6,7 @@
     margin: 0 auto;
     height: auto;
     line-height: 1.2;
+    padding: 10px 20px;
     text-align: center;
+    position: relative;
 }

package/coms/zimoli/cless.js

@@ -1,4 +1,4 @@
-
+"use strict";
 var _create = function (commFactory, className, _invoke) {
     if (!className) return commFactory;
     if (commFactory instanceof Promise) {

package/coms/zimoli/getGenerator.js

@@ -24,7 +24,7 @@ var getGenerator = function (container, tagName = 'item') {
     var template = document.createElement(container.tagName);
     var templates = [];
     for (let a of container.childNodes) {
-        if (a.hasAttribute('insert')) {
+        if (a.nodeType === 1 && a.hasAttribute('insert')) {
             if (!templates.length) a.$isbefore = true;
             else a.$isafter = true;
         }

package/coms/zimoli/menuItem.html

@@ -1,5 +1,5 @@
 <template -if='hasIcon?'>
-    <i -class="icon?" -style="{color:menu.color}"></i>
+    <i -class="menu.icon" -style="{color:menu.color}"></i>
     <template -if="menu.name">
         &nbsp;&nbsp;
     </template>

package/coms/zimoli/menuItem.js

@@ -19,7 +19,7 @@ function main(elem, scope, hasIcon) {
         menu,
         checker,
     };
-    if (hasIcon) scope.hasIcon = true;
+    if (hasIcon || menu.icon) scope.hasIcon = true;
     render(item.children, scope);
     if (menu.line) item.setAttribute("line", ''), on("click")(item, preventDefault);
     return item;

package/coms/zimoli/render.js

@@ -886,6 +886,7 @@ class Struct {
 function createStructure(element) {
     if (isArrayLike(element)) return Array.prototype.map.call(element, createStructure);
     if (element.$struct) return element.$struct;
+    if (element.nodeType !== 1) return;
     // 处理结构流
     var attributes = element.attributes;
     var attrs = Array.apply(null, attributes);

package/coms/zimoli/zimoli.js

@@ -58,7 +58,8 @@ if (/MSIE\s*[2-7]/.test(navigator.userAgent)) {
             if (currentHash && currentHash === targetHash) return;
             var targetHashIndex = targetHash.indexOf("#" + current_history);
             if (targetHashIndex < 0) return;
-            var targetpath = targetHash.slice(targetHashIndex + current_history.length);
+            var targetpath = targetHash.slice(targetHashIndex + current_history.length + 1);
+            targetpath = decodeURI(targetpath);
             go(targetpath);
             return;
         }

package/docs/main.xht

@@ -150,7 +150,7 @@
             var map = Object.create(null);
             var children = [];
             for (var a of c.children) {
-                if (/_test\.([tj]sx?|xht|html|less|md)$/i.test(a)) {
+                if (/_test\.([tj]sx?|xht|html|less|css|md)$/i.test(a)) {
                     var testName = a.replace(/\.\w+$/g, '');
                     if (!map[testName]) map[testName] = [];
                     map[testName].push(a);
@@ -175,7 +175,7 @@
             c.children = children;
             c.closed = true;
         }
-
+        data.setInstance('components', m);
         menus[2].children = m;
     };
     var initMenus = async function () {

package/docs//347/273/204/344/273/266.xht

@@ -18,10 +18,6 @@
         border-bottom: 46px solid transparent;
     }
 
-    textarea {
-        outline: none;
-        white-space: nowrap;
-    }
 
     p4 {
         line-height: 1.8;
@@ -75,15 +71,16 @@
         overflow: auto;
         width: 100%;
         height: 100%;
-        padding-bottom: 600px;
+        padding: 10px 20px 600px 20px;
         white-space: nowrap;
+        outline: none;
     }
 
     markdown {
         margin: -6px -20px 0 -10px;
     }
 
-    button {
+    [foot]>button {
         padding: 0 20px;
     }
 
@@ -125,7 +122,7 @@
     </p4>
 </div>
 <div body -elseif="tags[1].actived">
-    <div codearea #coder onkeyup="updatecode()"></div>
+    <div codearea #coder onkeyup="!event.isComposing&&updatecode()" onkeydown.tab="keytab(event)"></div>
     <resultpad .result #coderesult></resultpad>
 </div>
 <div foot -if="tags[1].actived">
@@ -134,6 +131,38 @@
     <btn @click="execute()">运行</btn>
 </div>
 <script>
+    var commaps = Object.create(null);
+    var initCommap = function (live) {
+        var commap = commaps[live];
+        if (!commap) {
+            commap = commaps[live] = Object.create(null);
+            var lives = data.getInstance("components");
+            if (live) {
+                lives = lives.slice().sort((a, b) => {
+                    if (a.name === live) return -1;
+                    return 0;
+                });
+                lives.forEach(a => {
+                    for (var c of a.children) {
+                        var name = c.name.replace(/\.[^\.]+$/, '');
+                        var real = `${a.name}$${name}`;
+                        if (!commap[name]) commap[name] = real;
+                        commap[real] = real;
+                    }
+                })
+            }
+        }
+        return commap;
+    };
+    var request = modules["get request"]();
+    modules["set request"](function (url, onload, onerror, version) {
+        if (!/[\*~]/.test(url)) return request(url, onload, onerror, version);
+        var name = url.replace(/[\*~][\s\S]*$/, '');
+        var live = url.slice(name.length + 1);
+        var commap = initCommap(live);
+        name = name.replace(/[^\/]+$/g, a => commap[a] || a);
+        return request(name, onload, onerror, version)
+    });
     var 分析 = lazy(async function (com, props) {
         if (props.mark) props.url = '/mark/coms/' + com.replace(/\.js$/i, '.md');
         scope.doc = props;
@@ -206,7 +235,43 @@
         scope.codetext = scope.coder.innerText;
         execute();
     };
-
+    var blink = "\u0080";
+    var markAnchorOffset = function () {
+        var { anchorNode, anchorOffset } = document.getSelection();
+        if (!anchorNode || !scope.coder) return;
+        var [c] = scope.coder.children;
+        if (anchorNode.nodeType === 1) {
+            var node = document.createTextNode(blink);
+            anchorNode.insertBefore(node, anchorNode.childNodes[anchorOffset])
+        }
+        else if (anchorNode.nodeType === 3) {
+            anchorNode.nodeValue = anchorNode.nodeValue.slice(0, anchorOffset) + blink + anchorNode.nodeValue.slice(anchorOffset);
+        }
+    };
+    var unmarkAnchorOffset = function () {
+        var [c] = scope.coder.children;
+        var node = c.firstChild;
+        while (node) {
+            if (node.nodeType === 1) {
+                if (node.innerText.indexOf(blink) >= 0) {
+                    node = node.firstChild;
+                    continue;
+                }
+            }
+            else if (node.nodeType === 3) {
+                if (node.nodeValue.indexOf(blink) >= 0) break;
+            }
+            node = node.nextSibling;
+        }
+        if (node) {
+            var offset = node.nodeValue.indexOf(blink);
+            node.nodeValue = node.nodeValue.slice(0, offset) + node.nodeValue.slice(offset + 1);
+            document.getSelection().setBaseAndExtent(node, offset, node, offset);
+            if (!node.nodeValue) {
+                remove(node);
+            }
+        }
+    }
     var getAnchorOffset = function () {
         var { anchorNode, anchorOffset } = document.getSelection();
         var [c] = scope.coder.children;
@@ -246,8 +311,12 @@
             }
             if (delta >= offset) {
                 if (child.nodeType === 1) {
-                    child = child.firstChild;
-                    continue;
+                    if (child.firstChild) {
+                        child = child.firstChild;
+                        continue;
+                    }
+                    offset -= 1;
+                    break;
                 }
                 break;
             }
@@ -259,36 +328,44 @@
         return document.getSelection().setBaseAndExtent(child, offset, child, offset);
     }
     var initcode = function (innerText) {
-        var colored = codetext("js", innerText);
-        var offset = getAnchorOffset();
+        try {
+            var colored = codetext("js", innerText, blink);
+        } catch { return; }
         var innerHTML = scope.coder.innerHTML.replace(/\s*contenteditable\=[^\s\>]+/i, '');
         if (innerHTML === colored) return;
         var [c0] = scope.coder.children;
-        var nodesCount = c0 ? c0.childNodes.length : 0;
+        var contentLength = c0 ? innerText.length : 0;
+        var scrollTop = c0 ? c0.scrollTop : 0;
+        var scrollLeft = c0 ? c0.scrollLeft : 0;
         scope.coder.innerHTML = colored;
         var [c] = scope.coder.children;
-        if (nodesCount < c.childNodes.length) {
-            if (offset < 0) offset--;
-            else if (offset > 0) offset++;
-        }
+        c.scrollTop = scrollTop;
+        c.scrollLeft = scrollLeft;
         c.contentEditable = true;
-        setAnchorOffset(offset);
     };
-    var updatecode = lazy(function (event) {
+    var updatecode = lazy(function () {
+        markAnchorOffset();
         var innerText = scope.coder.innerText;
-        if (scope.codetext.replace(/[\s\u00a0]+/g, ' ').trim() === innerText.replace(/[\s\u00a0]+/g, ' ').trim()) return;
+        var trimspace = (_, a) => a ? "" : " ";
+        var trimreg = /[\s\u00a0\u2002\u0080]+([\}\{\;\[\]\(\)\,\>\<\+\-\*\&\^\/%!~:?])*/g;
+        unmarkAnchorOffset();
+        if (scope.codetext.replace(trimreg, trimspace).trim() === innerText.replace(trimreg, trimspace).trim()) return;
         initcode(innerText);
+        unmarkAnchorOffset();
         scope.codetext = scope.coder.innerText;
     });
     var execute = async function () {
         try {
+            var live = /^([\s\S]+)\//.exec(scope.name);
+            if (live) live = live[1];
+            var commap = initCommap(live);
             remove(scope.coderesult.childNodes);
             var codetext = scope.codetext.replace(/[\u2002\u00a0]/g, ' ');
             data.patchInstance("docscode", { codetext: codetext })
             var code = compile$scanner2(codetext);
             var envs = code.envs;
             var argNames = Object.keys(envs);
-            var args = await Promise.all(argNames.map(a => init(a)));
+            var args = await Promise.all(argNames.map(a => init(a + "*" + live, null, { ["init*" + live]: init, ["put*" + live]: put, ["zimoli*" + live]: zimoli, ["appendChild*" + live]: appendChild, ["remove*" + live]: remove })));
             var func = createFunction("", codetext, argNames, code.async, code.yield);
             var res = func.apply(window, args);
             if (isFunction(res)) {
@@ -299,6 +376,7 @@
             }
         } catch (e) {
             alert(String(e), 'error');
+            throw e;
         }
     };
     var tags = [
@@ -309,6 +387,7 @@
     var actived = tags.map(t => t.actived);
     var xmenu = menu;
     var page = view();
+    on("submit")(page, e => e.preventDefault());
     page.innerHTML = template;
     var scope = {
         btn: button,
@@ -326,8 +405,11 @@
         updatecode,
         saveTagIndex(i) {
             data.setInstance("docscode", { tagIndex: i });
-            if (i === 1 && !scope.codetext) loadcode();
+            if (i === 1 && !scope.codetext) requestAnimationFrame(loadcode);
         },
+        keytab(event) {
+            event.preventDefault();
+        }
     };
     render(page, scope);
     function main(name) {

package/package.json

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