efront 3.36.3 → 3.36.5

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.5",
     "description": "简化前端开发，优化web性能",
     "main": "public/efront.js",
     "directories": {