efront 4.21.3 → 4.22.0

package/coms/zimoli/table.less

@@ -68,6 +68,11 @@ td {
 
 thead {
 
+    th,
+    td {
+        z-index: 1;
+    }
+
     .y-ing,
     .x-ing {
         >mask {

package/coms/zimoli/user.js

@@ -51,9 +51,9 @@ var proto = {
     },
     getPassport() {
         if (!passport) {
-            passport = encode62.timeencode(encode62.decode62(user._passport, user.session));
+            passport = encode62.packencode(encode62.decode62(user._passport, user.session));
         }
-        return passport = encode62.timeupdate(passport);
+        return passport = encode62.packupdate(passport);
     },
     Login(userinfo) {
         this.login(userinfo);

package/coms/zimoli/view.js

@@ -117,7 +117,7 @@ var resize2 = function () {
         changed = true;
         css(foot, {
             marginTop: fromOffset(-height)
-        })
+        });
         css(body, {
             paddingBottom: fromOffset(body.clientTop + body.clientHeight + body.offsetTop - foot.offsetTop)
         });
@@ -129,7 +129,7 @@ function view(element) {
     extend(w, prototype);
     if (w !== element) {
         extend(w, element);
-        once("append")(w, function () {
+        oncemount(w, function () {
             if (w.draggable !== true && w.draggable !== false) {
                 w.draggable = /^(fixed|absolute)$/i.test(getComputedStyle(w).position);
             }
@@ -138,8 +138,7 @@ function view(element) {
         if (w.resizable) resize.on(w);
     }
     resizingList.set(w, resize2);
-    w.renders = [resize2];
     w.reshape = lazy(resize2);
-    onmounted(w, w.reshape);
+    w.$digest = resize2;
     return w;
 }

package/coms/zimoli/watch.js

@@ -2,8 +2,10 @@ function watcher({ changes }) {
     var watches = this.$watches;
     for (var k in changes) {
         if (k in watches) {
+            var h = watches[k];
             var { current, previous } = changes[k];
-            watches[k].call(this, current, previous);
+            if (h instanceof Function) h.call(this, current, previous);
+            else if (h instanceof Array) h.forEach(h => h.call(this, current, previous));
         }
     }
 }

package/coms/zimoli/zimoli.js

@@ -431,7 +431,7 @@ function create(pagepath, args, from, needroles) {
 var zimoliid = 0, zimoliad = 0;
 function zimoli(pagepath, args, history_name, oldpagepath) {
     if (arguments.length === 0) {
-        if (zimoliid !== zimoliad && zimoli.caller === go) return;
+        if (zimoliid !== zimoliad) return;
         history_name = current_history;
         var _history = history[history_name] || [];
         root_path = _history[0] || "/main";
@@ -592,9 +592,13 @@ function addGlobal(element, name = null, isBack) {
         if (isFunction(body.layer)) {
             body.layer(element, oldElement, history);
         } else if (body !== element) {
+            if (oldElement) {
+                var oldPrev = oldElement.previousSibling, oldPare = oldElement.parentNode;
+                remove(oldElement);
+                oldElement = oldPrev || oldPare.firstChild;
+            }
             if (isBack || !oldElement) appendChild.insert(body, element);
             else appendChild.after(oldElement, element);
-            remove(oldElement);
         }
         global[name] = element;
     } else if (isNode(name)) {

package/coms//350/214/250/350/217/260/tab.js

@@ -1,4 +1,4 @@
-var ensp = s => Array(s + 1).join("\u2002"/*&ensp*/);
+var ensp = s => Array(s + 1).join(" "/*&ensp*/);
 var getEnspBefore = function (node) {
     if (!node) return 0;
     while (node && (node.nodeType !== 1 || !/^br$/i.test(node.tagName))) {
@@ -14,7 +14,31 @@ var getEnspBefore = function (node) {
 };
 return function (forcetab) {
     var selection = document.getSelection();
-    var { anchorNode, anchorOffset } = selection;
+    var { anchorNode, anchorOffset, focusNode, focusOffset } = selection;
+    if (anchorNode !== focusNode || anchorOffset !== focusOffset) return;
+    if (forcetab < 0) {
+        var tempNode = anchorNode;
+        var space = ensp(4);
+        while (tempNode) {
+            if (tempNode.nodeType === 1) {
+                if (/^br$/i.test(tempNode.tagName)) return;
+                tempNode = tempNode.lastChild || tempNode.previousSibling;
+                continue;
+            }
+            if (tempNode.nodeValue.indexOf(space) >= 0) {
+                tempNode.nodeValue = tempNode.nodeValue.replace(space, '');
+                if (tempNode === anchorNode) {
+                    anchorOffset -= 4;
+                    if (anchorOffset < 0) anchorOffset = 0;
+                    selection.setBaseAndExtent(tempNode, anchorOffset, tempNode, anchorOffset);
+                }
+                return;
+            }
+            if (/[\r\n\u2028\u2029]/.test(tempNode.nodeValue)) return;
+            tempNode = tempNode.previousSibling || tempNode.parentNode?.previousSibling;
+        }
+        return;
+    }
     if (anchorNode.nodeType === 1) {
         var child = anchorNode.childNodes[anchorOffset];
         var spaceSize = 4;

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

@@ -63,7 +63,7 @@ var codecolor = function (c, encode) {
         used[k].forEach(k in predefs ? setPredef : setOutside);
     }
     if (c.program) var { space_exp: spaceReg, control_reg } = c.program;
-    if (spaceReg) var unspaceReg = new RegExp(`(?:${spaces.avoid()})+`, 'g');
+    if (spaceReg) var unspaceReg = new RegExp(`(?:[^${光标}])+`, 'g');
     var wraptext = function (t, l) {
         if (unspaceReg) t = t.replace(unspaceReg, a => {
             a = encode(a);

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

@@ -7,12 +7,37 @@
         display: block;
         padding: 6px 0;
     }
+
+    &.noinput {
+        &:before {
+            position: absolute;
+            background: #c24;
+            color: #fff;
+            left: 0;
+            right: 0;
+            top: 0;
+            height: 20px;
+            line-height: 20px;
+            font-size: 16px;
+            display: block;
+            content: "当前浏览器编辑会造成异常";
+        }
+    }
 </style>
-<编辑框 e-class="上色.className" e-style="{whiteSpace:'pre'}" onkeyup="!event.isComposing&&updatecode(event)"
-    onkeydown.tab="keytab(event)" onkeyup.enter="tab(false)">
+<编辑框 spellcheck=false e-class="上色.className" e-style="{whiteSpace:'pre'}" onkeydown="updatechar"
+    onkeydown.tab.prevent.only="keytab(1)" onkeydown.tab.shift.prevent.only="keytab(-1)" onkeyup.enter.only="tab(false)"
+    oninput='!event.isComposing&&updatecode(event)' onkeydown.space.only='fixpace'>
 </编辑框>
 <script>
     var coder = this;
+    if (!('oninput' in document)) {
+        on('focus')(this, function () {
+            if (this.contentEditable) addClass(this, "noinput");
+        });
+        on('blur')(this, function () {
+            removeClass(this, 'noinput');
+        })
+    }
     var coderid = 0;
     care(coder, async function ([text, type]) {
         try {
@@ -29,9 +54,9 @@
         coder.innerHTML = colored;
     };
     coder.getValue = function () {
-        return coder.innerText.replace(/[\u00a0\u2002]/g, ' ');
+        return coder.innerText;
     };
-    var markAnchorOffset = function () {
+    var markAnchorOffset = function (光标) {
         var { anchorNode, anchorOffset } = document.getSelection();
         if (!anchorNode || !coder) return;
         var [c] = coder.children;
@@ -123,32 +148,170 @@
         return document.getSelection().setBaseAndExtent(child, offset, child, offset);
     }
     var trimspace = (_, a) => a ? "" : " ";
-    var jstext = "";
     var 更新 = function (colored) {
         var { scrollTop, scrollLeft } = coder;
         coder.innerHTML = colored;
         coder.scrollTop = scrollTop;
         coder.scrollLeft = scrollLeft;
+        unmarkAnchorOffset();
     };
-    var updatecode = lazy(async function (event) {
-        var id = ++coderid;
-        var trimreg = /[\s\u00a0\u2002\u0080]+([\}\{\;\[\]\(\)\,\>\<\+\-\*\&\^\/%!~:?])*/g;
-        var innerText = coder.innerText;
-        if (jstext.replace(trimreg, trimspace).trim() === innerText.replace(trimreg, trimspace).trim()) return;
-        jstext = innerText;
-        markAnchorOffset();
-        var innerText = coder.innerText;
+    var anchorChar = null, inText = false;
+    var followChar = null, beforeText = false;
+    var fixpace = function (event) {
+        event.preventDefault();
+        document.execCommand('insertText', false, ' ');
+    };
+    var updatechar = function (event) {
+        coderid++;
+        var { anchorNode, anchorOffset } = document.getSelection();
+        if (!coder || !anchorNode) return;
+        while (anchorNode.nodeType === 1 || anchorOffset === 0) {
+            if (anchorNode.nodeType === 1) {
+                var { childNodes } = anchorNode;
+                if (childNodes.length > 0) {
+                    if (anchorOffset >= childNodes.length) {
+                        anchorNode = anchorNode.lastChild;
+                        if (anchorNode.nodeType === 1) anchorOffset = anchorNode.childNodes.length;
+                        else anchorOffset = anchorNode.nodeValue.length;
+                    }
+                    else {
+                        anchorNode = childNodes[anchorOffset];
+                        anchorOffset = 0;
+                    }
+                }
+                else {
+                    anchorNode = anchorNode.previousSibling;
+                    if (anchorNode.nodeType === 1) anchorOffset = anchorNode.childNodes.length;
+                    else anchorOffset = anchorNode.nodeValue.length;
+                }
+            }
+            if (anchorOffset === 0) {
+                anchorNode = anchorNode.previousSibling || anchorNode.parentNode.previousSibling;
+                if (!anchorNode) return;
+                do {
+                    if (anchorNode.nodeType === 1) {
+                        if (anchorNode.lastChild) {
+                            anchorOffset = anchorNode.childNodes.length;
+                        }
+                        else {
+                            anchorNode = anchorNode.previousSibling;
+                        }
+                    }
+                    else {
+                        if (anchorNode.nodeValue) {
+                            anchorOffset = anchorNode.nodeValue.length;
+                            break;
+                        }
+                        else {
+                            anchorNode = anchorNode.previousSibling || anchorNode.parentNode.previousSibling;
+                        }
+                    }
+                } while (anchorChar?.nodeType === 3 || anchorOffset === 0);
+            }
+            if (!anchorNode) return;
+        }
+        if (anchorNode.nodeType === 3) {
+            inText = /^text$/i.test(anchorNode.parentNode.tagName);
+            beforeText = inText;
+            if (anchorOffset > 0) {
+                anchorChar = anchorNode.nodeValue.charAt(anchorOffset - 1);
+            }
+            else {
+                anchorChar = '';
+            }
+            if (anchorOffset >= anchorNode.nodeValue.length) {
+                followChar = anchorNode.nextSibling || anchorNode.parentNode.nextSibling;
+                if (followChar.nodeType === 1) {
+                    beforeText = /^text$/i.test(followChar.tagName);
+                    followChar = followChar.innerText.charAt(0);
+                }
+                else if (followChar.nodeType === 3) {
+                    beforeText = /^text$/i.test(followChar.parentNode.tagName);
+                    followChar = followChar.nodeValue.charAt(0);
+                }
+                else {
+                    followChar = '';
+                }
+            }
+            else {
+                followChar = anchorNode.nodeValue.charAt(anchorOffset);
+            }
+
+        }
+        else {
+            inText = false;
+            beforeText = false;
+            followChar = '';
+        }
+
+    };
+    var pairsmap = Object.create(null);
+    [
+        `""`,
+        "''",
+        '``',
+        "()",
+        "[]",
+        "{}",
+    ].forEach(a => {
+        var [k, p] = a.split('');
+        pairsmap[k] = p;
+    });
+    var codeHistory = [];
+    var historyIndex = 0;
+    var updatecode = function (event) {
+        var { data, inputType } = event;
+        coderid++;
+        var patchAfter = '';
+        console.log("follow-char", followChar, 'data', data, 'anchor-char', anchorChar);
+        switch (inputType) {
+            case "insertText":
+                if (data === ' ') return;
+                if (anchorChar in pairsmap) {
+                    if (followChar === pairsmap[anchorChar] && data === followChar) {
+                        document.execCommand('forwardDelete');
+                    }
+                    else if (data in pairsmap) {
+                        if (inText || beforeText) return;
+                        patchAfter = pairsmap[data];
+                    }
+                }
+                else {
+                    if (data in pairsmap) {
+                        if (inText || beforeText) return;
+                        patchAfter = pairsmap[data];
+                    }
+                }
+                break;
+            case "insertParagraph": return;
+            case "deleteContentForward": return;
+            case "deleteContentBackward":
+                if (anchorChar in pairsmap && followChar === pairsmap[anchorChar]) {
+                    document.execCommand('forwardDelete');
+                }
+                if (inText) return;
+                updatechar();
+                if (inText) return;
+                break;
+
+        }
+        markAnchorOffset(光标 + patchAfter);
+        var markedText = coder.innerText;
+        historyIndex = codeHistory.length;
+        codeHistory.push(coder.innerHTML);
         unmarkAnchorOffset();
-        var text = await 上色.text(coder.type, innerText);
+        updateonly(coderid, markedText);
+    };
+    var updateonly = lazy(async function (id, markedText) {
         if (coderid !== id) return;
-        更新(text);
-        unmarkAnchorOffset();
+        markedText = await 上色.text(coder.type, markedText);
+        if (coderid !== id) return;
+        更新(markedText);
         dispatch(coder, 'change');
         return;
-    });
-    var keytab = function (event) {
-        event.preventDefault();
-        tab();
+    }, -60);
+    var keytab = function (direction) {
+        tab(direction);
     };
 
 </script>

package/docs//345/267/245/345/205/267//345/233/275/351/231/205/345/214/226.xht

@@ -611,11 +611,13 @@
             }
         }
         msg.setText(i18n`正在提取字符串..`);
+        css(msg, 'text-align:left');
         css(msg.firstElementChild, 'text-align:left');
         var textMap = Object.create(null);
         已找到的字符串.is_loading = true;
         var addTranslate = function (translate) {
             if (!isHandled(translate)) return;
+            translate = translate.replace(/^\s*([\s\S]*?)([：\:]?\s*)$/, '$1');
             var tmap = textMap[translate];
             if (!tmap) tmap = textMap[translate] = Object.create(null), tmap["#count"] = 0;
             if (!tmap[e.path]) tmap[e.path] = [];
@@ -646,6 +648,9 @@
             var data = await readText(e);
             data = parseYML(data);
             loop: for (var d of data) {
+                for (var k in d) {
+                    d[k] = d[k].replace(/^\s*([\s\S]*?)([：\:]?\s*)$/, '$1');
+                }
                 var liang = 0, fanyi = {};
                 for (var { lang: k, id } of supports) {
                     if (!d[k]) continue;

package/package.json

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