efront 4.11.2 → 4.11.5

package/coms/zimoli/render.js

@@ -109,13 +109,19 @@ function rebuild(element) {
 }
 var variableReg = /([^\:\,\+\=\-\!%\^\|\/\&\*\!\;\?\>\<~\{\}\s\[\]\(\)]|\?\s*\.(?=[^\d])|\s*\.\s*)+/g;
 var variableOnlyReg = new RegExp(`^${variableReg.source}$`);
+var getScopeList = function (element) {
+    return element.$parentScopes.concat([element.$scope]);
+};
 var createGetter = function (target, search, isprop = true) {
     if (!search) return function () { };
     if (/^\{/.test(search)) search = `(${search})`;
     search = renderExpress(search);
-    if (isprop) return $$eval.bind(target, search, null);
-    if (variableOnlyReg.test(search)) return $$eval.bind(target, search + "(event)", null);
-    else return $$eval.bind(target, search, null);
+    var scopes = getScopeList(target);
+    if (isprop) var getter = $$eval.bind(target, search, scopes);
+    else if (variableOnlyReg.test(search)) getter = $$eval.bind(target, search + "(event)", scopes);
+    else getter = $$eval.bind(target, search, scopes);
+    getter.scopes = scopes;
+    return getter;
 };
 var createComment = function (renders, type, expression) {
     var comment = document.createComment(`${type} ${expression}`);
@@ -389,10 +395,11 @@ var parseIfWithRepeat = function (ifExpression, repeatExpression) {
     };
 };
 
-var mountElementIds = function (element) {
+var mountElementIds = function (element, ids) {
     var scope = element.$scope;
-    for (var id of element.$struct.ids) {
-        if (scope[id] && scope[id] !== element) throw new Error(i18n`同一个id不能使用两次:` + id);
+    if (!scope) return;
+    for (var id of ids) {
+        if (isHandled(scope[id]) && scope[id] !== element) throw new Error(i18n`同一个id不能使用两次:` + id);
         scope[id] = element;
     }
 }
@@ -447,28 +454,6 @@ var structures = {
 };
 structures["else-if"] = structures.elseif = structures.else;
 structures["for-each"] = structures.foreach = structures.for = structures.each = structures.repeat;
-var createBinder = function (binder) {
-    return function (search) {
-        var getter = createGetter(this, `(${search})`);
-        var oldValue;
-        this.$renders.push(function () {
-            var value = getter(this);
-            if (shallowEqual(value, oldValue)) return;
-            var oldv = oldValue;
-            oldValue = value;
-            if (isNode(value) || isArray(value)) {
-                if (value !== this.firstChild) {
-                    remove(this.childNodes);
-                    appendChild(this, value);
-                }
-            } else {
-                if (isEmpty(value)) value = '';
-                if (binder(this) !== value) binder(this, value, oldv);
-            }
-        });
-
-    }
-}
 var createMapper = function (write, mapper) {
     return function (search) {
         var getter = isArray(search) ? search.map(s => createGetter(this, s)) : createGetter(this, search);
@@ -596,7 +581,7 @@ var directives = {
             var change = getstr || "'value' in this?this.value:this.innerHTML";
         }
         setter2 = null;
-        var changeme = $$eval.bind(this, search + "=" + change, null);
+        var changeme = $$eval.bind(this, search + "=" + change, getScopeList(this));
         var onchange = function () {
             changeme(this);
             var value = getter(this);
@@ -687,12 +672,9 @@ var createEmiter = function (on) {
             }
             var res;
             if (scope) {
-                var temp = this.$scope;
-                this.$parentScopes.push(temp);
-                this.$scope = scope;
+                getter.scopes.push(scope);
                 res = getter(this, e);
-                this.$parentScopes.pop();
-                this.$scope = temp;
+                getter.scopes.pop();
             }
             else {
                 res = getter(this, e);
@@ -750,6 +732,8 @@ function renderRest(element, struct, replacer = element) {
     }
     if (binds.src) directives.src.call(element, binds.src);
     if (renders && renders.length) element.$renders.push.apply(element.$renders, renders);
+    if (!isElement(replacer)) replacer = element;
+    struct.ons.forEach(([on, key, value]) => on.call(element, replacer, key, value));
 }
 
 function renderElement(element, scope = element.$scope, parentScopes = element.$parentScopes, once) {
@@ -774,10 +758,12 @@ function renderElement(element, scope = element.$scope, parentScopes = element.$
         }
         element.$parentScopes = parentScopes || [];
         var s = createStructure(element);
+        element.$struct = s;
+        mountElementIds(element, s.ids);
         if (isEmpty(s.once)) s.once = once;
         element.$eval = $eval;
     }
-    mountElementIds(element);
+    element.$scope = scope;
     if (element.$renderid <= -1) element = renderStructure(element);
     if (!element) return;
     if (!element || element.$renderid < 0 || element.nodeType !== 1) {
@@ -791,8 +777,9 @@ function renderElement(element, scope = element.$scope, parentScopes = element.$
         if (parentNode) {
             if (parentNode.$renderid > 1 || isMounted(parentNode)) element.$renderid = 2;
         }
+        var $struct = element.$struct;
         element.$renders = element.$renders || element.renders ? [].concat(element.$renders || [], element.renders || []) : [];
-        var { copys, binds, once } = element.$struct;
+        var { copys, binds, once } = $struct;
         if (once) element.$renderid = 9;
         if (binds.src) {
             element.$src = parseRepeat(binds.src);
@@ -802,15 +789,18 @@ function renderElement(element, scope = element.$scope, parentScopes = element.$
         var constructor = getFromScopes(tagName, scope, parentScopes);
         if (isFunction(constructor)) {
             var replacer = constructor.call(scope, element, scope, parentScopes);
-            if (isNode(replacer) && element !== replacer) {
-                if (!replacer.$scope) replacer.$scope = scope;
-                if (!replacer.$parentScopes) replacer.$parentScopes = parentScopes;
+            if (element === replacer) {
+                var struct1 = createStructure(element, false);
+                renderRest(element, struct1);
+                element.$scope = scope;
+            }
+            else if (isNode(replacer)) {
                 if (isElement(replacer) && !replacer.$renderid) {
+                    if (!replacer.$scope) replacer.$scope = scope;
+                    if (!replacer.$parentScopes) replacer.$parentScopes = parentScopes;
                     createStructure(replacer);
-                    replacer.$struct = mergeStruct(element.$struct, replacer.$struct);
                     if (replacer.children && replacer.children.length) renderElement(replacer.children, replacer.$scope, replacer.$parentScopes, once);
                     renderRest(replacer, replacer.$struct);
-                    replacer.$struct.ons.forEach(([on, key, value]) => on.call(replacer, replacer, key, value));
                 }
                 copyAttribute(replacer, copys);
                 if (nextSibling) appendChild.before(nextSibling, replacer);
@@ -827,18 +817,12 @@ function renderElement(element, scope = element.$scope, parentScopes = element.$
         if (element.children && element.children.length) renderElement(element.children, scope, parentScopes, once);
     }
     if (!isFirstRender) return element;
-    renderRest(element, element.$struct, replacer);
+    renderRest(element, $struct, replacer);
     if (isNode(replacer) && replacer !== element) {
         if (!replacer.$renders) replacer.$renders = [];
         replacer.$renders.push.apply(replacer.$renders, element.$renders);
-        if (replacer.$struct && replacer.$struct !== element.$struct) {
-            element.$struct.ons.forEach(([on, key, value]) => on.call(element, replacer, key, value));
-        }
         element = replacer;
     }
-    else {
-        element.$struct.ons.forEach(([on, key, value]) => on.call(element, element, key, value));
-    }
     if (element.$renders.length) {
         if (element.$renderid !== 9) {
             onmounted(element, addRenderElement);
@@ -857,26 +841,22 @@ var createEval = function (deep) {
     while (deep-- > 0) {
         context[deep] = `with($parentScopes[${deep}])`;
     }
-    return new Function("$parentScopes", "$scope", "code", "event", `${context.join('')}with($scope)return eval(code)`);
+    return new Function("$parentScopes", "code", "event", `${context.join('')}return eval(code)`);
 };
 var evalcontexts = [createEval(0)];
 
-function $$eval(search, scope, target = this, event) {
-    var needpop = scope && scope !== this.$scope;
-    if (needpop) {
-        this.$parentScopes.push(this.$scope);
-        this.$scope = scope;
-    }
-    var length = this.$parentScopes ? this.$parentScopes.length : 0;
+function $$eval(search, scopes, target = this, event) {
+    var length = scopes.length;
     if (!evalcontexts[length]) evalcontexts[length] = createEval(length);
     var eval2 = evalcontexts[length];
-    var res = eval2.call(target, this.$parentScopes, this.$scope, search, event);
-    if (needpop) this.$scope = this.$parentScopes.pop();
+    var res = eval2.call(target, scopes, search, event);
     return res;
 }
 
 function $eval(search, scope, event) {
-    return $$eval.call(this, search, scope, this, event);
+    var scopes = getScopeList(this);
+    if (isHandled(scope) && scope !== this.$scope) scopes.push(scope);
+    return $$eval.call(this, search, scopes, this, event);
 }
 
 var merge = function (dst, src) {
@@ -938,9 +918,9 @@ var pushid = function (ids, name) {
     if (name1 !== name) ids.push(name1);
 };
 
-function createStructure(element) {
+function createStructure(element, useExists) {
     if (isArrayLike(element)) return Array.prototype.map.call(element, createStructure);
-    if (element.$struct) return element.$struct;
+    if (useExists !== false && element.$struct) return element.$struct;
     if (element.nodeType !== 1) return;
     // 处理结构流
     var attributes = element.attributes;
@@ -1009,7 +989,7 @@ function createStructure(element) {
         // ng-html,ng-src,ng-text,ng-model,ng-style,ng-class,...
         var key = name.replace(/^(ng|v|[^\_\:\.]*?)\-|^[\:\_\.]|^v\-bind\:/i, "").toLowerCase();
         if (directives.hasOwnProperty(key) || /^([\_\:\.]|v\-bind\:)/.test(name)) {
-            binds[key] = value;
+            if (value) binds[key] = value;
             element.removeAttribute(name);
         }
         // ng-click on-click v-click @click @mousedown ...
@@ -1017,11 +997,11 @@ function createStructure(element) {
             var match = emiter_reg.exec(name);
             var ngon = (match[1] || match[0]).toLowerCase() === 'once' ? 'once' : 'on';
             element.removeAttribute(name);
-            ons.push([emiters[ngon], name.replace(emiter_reg, ''), value]);
+            if (value) ons.push([emiters[ngon], name.replace(emiter_reg, ''), value]);
         }
         // placeholder_ href_ checked_ ...
         else if (/[_@\:\.]$/.test(name)) {
-            attr1[name.replace(/[_@\:\.]$/, "")] = value;
+            if (value) attr1[name.replace(/[_@\:\.]$/, "")] = value;
             element.removeAttribute(name);
         }
         // title alt name type placeholder href checked ...

package/coms/zimoli/view.less

@@ -27,7 +27,6 @@ body>& {
 >[body] {
     padding: 6px 20px 6px 6px;
     margin-right: -20px;
-    background: #f2f4f622;
     display: block;
     width: auto;
     height: 100%;

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

@@ -0,0 +1,35 @@
+var ensp = s => Array(s + 1).join("\u2002"/*&ensp*/);
+var getEnspBefore = function (node) {
+    if (!node) return 0;
+    while (node && (node.nodeType !== 1 || !/^br$/i.test(node.tagName))) {
+        node = node.previousSibling;
+    }
+    if (node) {
+        var next = node.nextSibling;
+        if (next) {
+            next = /^[\u2002\u0020\u00a0]+/.exec(next.nodeValue);
+            if (next) return next[0].length;
+        }
+    }
+};
+return function (forcetab) {
+    var selection = document.getSelection();
+    var { anchorNode, anchorOffset } = selection;
+    if (anchorNode.nodeType === 1) {
+        var child = anchorNode.childNodes[anchorOffset];
+        var spaceSize = 4;
+        if (child.nodeType === 1) spaceSize = getEnspBefore(child?.previousSibling?.previousSibling || anchorNode);
+        if (!spaceSize && forcetab !== false) spaceSize = 4;
+        if (!spaceSize) return;
+        var space = document.createTextNode(ensp(spaceSize));
+        anchorNode.insertBefore(space, child);
+        selection.setBaseAndExtent(space, spaceSize, space, spaceSize);
+    }
+    else if (anchorNode.nodeType === 3) {
+        if (forcetab === 0) return;
+        var spaceSize = (4 - anchorOffset % 4);
+        anchorNode.nodeValue = anchorNode.nodeValue.slice(0, anchorOffset) + ensp(spaceSize) + anchorNode.nodeValue.slice(anchorOffset);
+        anchorOffset += spaceSize;
+        selection.setBaseAndExtent(anchorNode, anchorOffset, anchorNode, anchorOffset);
+    }
+};

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

@@ -0,0 +1,99 @@
+<style>
+    :scope {
+        white-space: pre-wrap;
+        line-height: 1.36;
+        word-break: break-all;
+        padding: 10px 20px;
+        border-radius: 3px;
+        display: inline-block;
+        background: #2c2c2c;
+        color: #d4d4d4;
+        font-family: Consolas, "Courier New", monospace;
+        vertical-align: top;
+        text-decoration-line: none;
+        tab-size: 4;
+    }
+
+    stamp {
+        color: #808080;
+    }
+
+    strap,
+    value {
+        color: #569cd6;
+    }
+
+    regexp {
+        color: #d16969;
+    }
+
+    text {
+        color: #ce9178;
+    }
+
+    flow {
+        color: #c586c0;
+    }
+
+    digit {
+        color: #b5cea8;
+    }
+
+    label {
+        color: #569cd6;
+    }
+
+    selector {
+        color: #d7ba7d;
+    }
+
+    @deep(@num, @color) {
+        deep@num {
+            color: @color;
+        }
+    }
+
+    @deep(0, #ffd700);
+    @deep(1, #da70d6);
+    @deep(2, #179fff);
+    @deep(3, #ffd700);
+    @deep(4, #da70d6);
+    @deep(5, #179fff);
+    @deep(6, #ffd700);
+    @deep(7, #da70d6);
+    @deep(8, #179fff);
+    @deep(9, #ffd700);
+    @deep(10, #da70d6);
+    @deep(11, #179fff);
+    @deep(12, #ffd700);
+    @deep(13, #da70d6);
+    @deep(14, #179fff);
+    @deep(15, #ffd700);
+    @deep(16, #da70d6);
+    @deep(17, #179fff);
+
+    express,
+    property {
+        color: #9cdcfe;
+    }
+
+    invoke,
+    method {
+        color: #dcdcaa;
+    }
+
+    predef {
+        color: #4ec9b0;
+    }
+
+    outside {
+        color: #4fc1ff;
+    }
+
+    comment {
+        color: #6a9955;
+    }
+</style>
+<script>
+    茨菰$渲染;
+</script>

package/coms//350/214/250/350/217/260//345/205/211/346/240/207.js

@@ -0,0 +1 @@
+return "\u0080";

package/coms//350/214/250/350/217/260//346/211/253/346/217/217.js

@@ -0,0 +1,12 @@
+var { STAMP, PIECE, SPACE } = compile$common;
+return function (a, type) {
+    if (光标) var index = a.indexOf(光标);
+    if (index >= 0) a = a.slice(0, index) + a.slice(index + 1);
+    var c = compile$scanner2(a, type);
+    if (index >= 0) {
+        c.scoped;
+        var patched = 追加光标(c, index, 光标);
+        if (!patched) c.push({ type: SPACE, text: 光标 });
+    }
+    return c;
+}

package/coms/{docs/codecolor.js → /350/214/250/350/217/260//346/240/207/347/255/276/345/214/226.js}

@@ -153,4 +153,5 @@ var codecolor = function (c, encode) {
     };
     c.forEach(setcolor);
     return c;
-}
+}
+return codecolor;

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

@@ -0,0 +1,45 @@
+
+var { SCOPED, QUOTED, SPACE, STAMP, STRAP, EXPRESS, PROPERTY } = compile$common;
+var encode = function (text) {
+    return text.replace(/[\<\>\|]/g, a => `&#${a.charCodeAt()};`);
+};
+
+var rows = function (type, text) {
+    if (typeof text !== 'string') {
+        console.log(text)
+        return [];
+    }
+    type = type.toLowerCase();
+    if (type in 语言) {
+        var c = 语言[type](text);
+        标签化(c, encode);
+        text = c.toString();
+
+    }
+    else text = encode(text);
+
+    var codes = text.split(/\r\n|\r|\n/);
+    var minSpace = Infinity;
+    for (var c of codes) {
+        var m = /^\s+/.exec(c);
+        if (!m) {
+            minSpace = 0;
+            break;
+        }
+        if (m[0].length < minSpace) {
+            minSpace = m[0].length;
+        }
+    }
+    if (minSpace > 0 && minSpace < Infinity) codes = codes.map(c => /^\s+/.test(c) ? c.slice(minSpace) : c);
+    return codes;
+}
+function 茨菰(type, text) {
+    return `<code type=${type}>${rows(type, text).join("<br/>")}</code>`;
+}
+茨菰.text = function (type, text) {
+    return `${rows(type, text).join("<br/>")}`;
+};
+
+茨菰.rows = rows;
+茨菰.encode = encode;
+return 茨菰;

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

@@ -0,0 +1,132 @@
+<编辑框 e-class="上色.className" e-style="{whiteSpace:'pre'}" onkeyup="!event.isComposing&&updatecode(event)"
+    onkeydown.tab="keytab(event)" onkeyup.enter="tab(false)">
+</编辑框>
+<script>
+    var coder = this;
+    care(coder, function ([text, type]) {
+        try {
+            var colored = 上色.text(type, text);
+            coder.innerHTML = colored;
+            coder.type = type;
+        } catch {
+            if (typeof text === 'string') coder.innerHTML = 渲染.encode(text);
+        }
+    })
+    var markAnchorOffset = function () {
+        var { anchorNode, anchorOffset } = document.getSelection();
+        if (!anchorNode || !coder) return;
+        var [c] = coder.children;
+        if (anchorNode.nodeType === 1) {
+            var node = document.createTextNode(光标);
+            anchorNode.insertBefore(node, anchorNode.childNodes[anchorOffset])
+        }
+        else if (anchorNode.nodeType === 3) {
+            anchorNode.nodeValue = anchorNode.nodeValue.slice(0, anchorOffset) + 光标 + anchorNode.nodeValue.slice(anchorOffset);
+        }
+    };
+    var unmarkAnchorOffset = function () {
+        var c = coder;
+        var node = c.firstChild;
+        while (node) {
+            if (node.nodeType === 1) {
+                if (node.innerText.indexOf(光标) >= 0) {
+                    node = node.firstChild;
+                    continue;
+                }
+            }
+            else if (node.nodeType === 3) {
+                if (node.nodeValue.indexOf(光标) >= 0) break;
+            }
+            node = node.nextSibling;
+        }
+        if (node) {
+            var offset = node.nodeValue.indexOf(光标);
+            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] = coder.children;
+        if (anchorNode === c || !anchorNode) return -anchorOffset;
+        var sibling = anchorNode.previousSibling ? anchorNode.previousSibling : anchorNode.parentNode.previousSibling;
+        while (sibling && sibling !== c) {
+            switch (sibling.nodeType) {
+                case 1:
+                    anchorOffset += sibling.innerText.length || 1;
+                    break;
+                case 3:
+                    anchorOffset += sibling.nodeValue.length;
+                    break;
+            }
+            sibling = sibling.previousSibling ? sibling.previousSibling : sibling.parentNode.previousSibling;
+        }
+        return anchorOffset;
+    };
+    var setAnchorOffset = function (anchorOffset) {
+        var [c] = coder.children;
+        if (anchorOffset < 0) {
+            anchorOffset = -anchorOffset;
+            if (anchorOffset > c.childNodes.length) anchorOffset = c.childNodes.length;
+            return document.getSelection().setBaseAndExtent(c, anchorOffset, c, anchorOffset);
+        }
+        var offset = anchorOffset;
+        var child = c.firstChild;
+        while (child) {
+            var delta = 0;
+            switch (child.nodeType) {
+                case 1:
+                    delta = child.innerText.length || 1;
+                    break;
+                case 3:
+                    delta = child.nodeValue.length;
+                    break;
+            }
+            if (delta >= offset) {
+                if (child.nodeType === 1) {
+                    if (child.firstChild) {
+                        child = child.firstChild;
+                        continue;
+                    }
+                    offset -= 1;
+                    break;
+                }
+                break;
+            }
+            offset -= delta;
+            if (offset <= 0) break;
+            child = child.nextSibling;
+        }
+        if (!child) child = c, offset = c.childNodes.length;
+        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;
+    };
+    var updatecode = lazy(function (event) {
+        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;
+        unmarkAnchorOffset();
+        var text = 上色.text(coder.type, innerText);
+        更新(text);
+        unmarkAnchorOffset();
+        return;
+    });
+    var keytab = function (event) {
+        event.preventDefault();
+        tab();
+    };
+
+</script>