efront 4.9.4 → 4.10.1

package/coms/docs/codetext.xht

@@ -1,5 +1,8 @@
 <style>
     :scope {
+        white-space: pre-wrap;
+        line-height: 1.36;
+        word-break: break-all;
         padding: 10px 20px;
         border-radius: 3px;
         display: inline-block;
@@ -88,13 +91,51 @@
 </style>
 <script>
     var encode = function (text) {
-        return text.replace(/[\<\>\|]/g, a => `&#${a.charCodeAt()};`)
+        return text.replace(/[\<\>\|]/g, a => `&#${a.charCodeAt()};`);
     };
     var typescript = new compile$Javascript;
-    typescript.straps = typescript.straps.concat("interface", "implements", "declare", "module", "readonly", "enum");
-    typescript.tags[0].push(["{", "}"]);
+    typescript.straps = typescript.straps.concat(
+        "interface", "implements", "declare", "module", "namespace",
+        "readonly", "private", "asserts", "is",
+        "enum", "type");
+    typescript.tags[0].push("{");
     var js = new compile$Javascript;
-    js.tags[0].push(["{", "}"]);
+    js.tags[0].push("{");
+    var json = new compile$Javascript;
+    json.inExpress = true;
+    var gl = new compile$Javascript;
+    gl.straps = gl.straps.concat(
+        "in", "out", "inout", "uniform", "buffer", "shared",
+        "highp", "mediump", "lowp",
+        "invariant", "const", "varying", "attribute",
+        "sampler2D", "texture2D",
+        "sampler3D", "texture3D",
+        "coherent", "volatile", "restrict", "readonly", "writeonly",
+        "flat", "noperspective", "smooth",
+        "packed", "shared", "std140", "std340", "row_major", "colum_major",
+        "location", "set", "binding", "offset", "index", "xfb_buffer", "xfb_offset", "local_size",
+        "void",
+        'require', 'enable', 'disable', 'warn',
+        'struct',
+        'float', 'int',
+        'vec4', 'vec3', 'vec2',
+        'mat4', 'mat3', 'mat2',
+        'bool', 'const', 'precision',
+        "step", "smoothstep",
+        "mix", "clamp"
+    );
+    var struct_reg = /^(while|do|for|with|switch|case|default|if|else|try|catch|finally)$/;
+
+    gl.setType = function (o) {
+        var { type } = o;
+        var queue = o.queue;
+        var last = o.prev;
+        if (type & (SCOPED | EXPRESS | PROPERTY)) {
+            if (last && last === queue[queue.length - 1] && last.type & (EXPRESS | STRAP | PROPERTY)) {
+                last.istype = !struct_reg.test(last.text);
+            }
+        }
+    }
     var codesupports = {
         javascript(a, blink) {
             if (blink) var index = a.indexOf(blink);
@@ -114,17 +155,41 @@
             codecolor(c, encode);
             return c.toString();
         },
+        json(a) {
+            var c = compile$scanner2(a, json);
+            codecolor(c, encode);
+            return c.toString();
+        },
+        glsl(a) {
+            var c = compile$scanner2(a, gl);
+            codecolor(c, encode);
+            return c.toString();
+        },
         html(a) {
             var code = compile$scanner2(a, 'html');
             var scoped = code.scoped;
-            codecolor(code, encode);
             backEach(scoped.richNodes, n => {
                 if (n.isScript) {
-                    var js = compile$scanner2(compile$common.createString(n));
-                    codecolor(js, encode);
+                    var js = [];
+                    compile$common.createString(n).replace(/^(\s*\<\!--)([\s\S]*)(--\!?\>\s*)$|^[\s\S]*$/, (m, p, a, f) => {
+                        if (!a) {
+                            js = compile$scanner2(m);
+                        }
+                        else {
+                            js = compile$scanner2(a);
+                            js.unshift(
+                                { type: compile$common.COMMENT, text: p },
+                            );
+                            js.push(
+                                { type: compile$common.COMMENT, text: f }
+                            );
+                        }
+                        codecolor(js, encode);
+                    });
                     n.splice(0, n.length, ...js);
                 }
             })
+            codecolor(code, encode);
             return code.toString();
         },
         css(a) {
@@ -133,11 +198,12 @@
             return c.toString();
         }
     };
+    codesupports.gl = codesupports.glsl;
     codesupports.cmd = codesupports.bat;
     codesupports.jsx = codesupports.js = codesupports.javascript;
     codesupports.tsx = codesupports.ts = codesupports.typescript;
-    codesupports.xml = codesupports.html;
-    var { SCOPED, QUOTED, SPACE, EXPRESS } = compile$common;
+    codesupports.jsp = codesupports.asp = codesupports.php = codesupports.xml = codesupports.html;
+    var { SCOPED, QUOTED, SPACE, STRAP, EXPRESS, PROPERTY } = compile$common;
     var patchBlink = function (code, index, blink) {
         for (var cx = 0, dx = code.length; cx < dx; cx++) {
             var c = code[cx];
@@ -198,7 +264,7 @@
         if (c) return c.text += blink, true;
         return false;
     };
-    function codetext(type, text, blink) {
+    var rows = function (type, text, blink) {
         type = type.toLowerCase();
         if (type in codesupports) {
             text = codesupports[type](text, blink);
@@ -208,12 +274,17 @@
         var minSpace = 0;
         for (var c of codes) {
             var m = /^\s*/.exec(c);
-            if (m && m[0].length < c.length) {
+            if (m && m[0].length < minSpace) {
                 minSpace = m[0].length;
             }
         }
         if (minSpace > 0) codes = codes.map(c => /^\s+/.test(c) ? c.slice(minSpace) : c);
-        return `<code type=${type}>${codes.join("<br/>").replace(/\t/g, Array(5).join('&ensp;')).replace(/\s/g, '&ensp;')}</code>`;
+        return codes;
+    }
+    function codetext(type, text, blink) {
+        var ws = rows(type, text, blink);
+        return `<code type=${type}>${ws.join("<br/>")}</code>`;
     }
+    codetext.rows = rows;
     codetext.encode = encode;
 </script>

package/coms/frame/route.js

@@ -141,19 +141,19 @@
                     }
                     mmap[menu.id] = menu;
                 }
-                if (menu.id === opened.active) actived = menu, actived_value = historys.length;
+                if (menu.id === opened.$active) actived = menu, actived_value = historys.length;
             }
             return res;
         };
         result.push.apply(result, items.filter(a));
         result.opened = opened.map(a => mmap[a]).filter(a => !!a);
-        var active = result.active;
+        var active = result.$active;
         if (!active || result.indexOf(active) < 0) {
-            actived = mmap[opened.active] || actived;
+            actived = mmap[opened.$active] || actived;
             if (actived) {
                 if (actived_value === historys.length) {
                     setActive(actived, true);
-                    result.active = actived;
+                    result.$active = actived;
                 };
             }
         }
@@ -176,38 +176,38 @@
         data.setInstance("option-buttons", zimoli.options || [], false);
         var menu = getChild(zimoli);
         if (!menu) return;
-        if (menu !== result.active) {
-            setActive(result.active, false);
+        if (menu !== result.$active) {
+            setActive(result.$active, false);
             setActive(menu, true);
-            result.active = menu;
+            result.$active = menu;
         }
         if (menu.id) {
             var opened = result.opened || [];
             var oped = opened.map(a => a.id);
-            oped.active = menu.id;
+            oped.$active = menu.id;
             data.setInstance('menu-opened', oped);
         }
     });
     result.open = function (menu) {
         if (!menu) {
-            menu = result.active || result[0];
-            delete result.active;
+            menu = result.$active || result[0];
+            delete result.$active;
         }
         if (!menu.path) {
             menu.closed = !menu.closed;
             return;
         }
-        if (menu === result.active) return;
+        if (menu === result.$active) return;
         var opened = result.opened || [];
         if (!~opened.indexOf(menu) && !getChild(menu).id) {
             opened.push(menu);
         }
-        if (result.active && result.active.id !== menu.id) {
-            setActive(result.active, false);
+        if (result.$active && result.$active.id !== menu.id) {
+            setActive(result.$active, false);
         }
         setActive(menu, true);
         result.load(menu);
-        result.active = menu;
+        result.$active = menu;
     };
     result.close = function (menu) {
         if (menu === result[0]) return;
@@ -228,7 +228,7 @@
         }
     };
     result.reload = function () {
-        result.load(result.active);
+        result.load(result.$active);
         return result;
     };
     result.from = result.fetch = function (url) {

package/coms/zimoli/XMLHttpRequest.js

@@ -14,14 +14,11 @@ return class XMLHttpRequest {
         this.url = url;
     }
     send(data) {
-        var u = new URL(this.url);
-        if (!u.host) u.host = location.host || 'localhost'
-        this.fetch(this.url, { method: this.method }).then(d => {
-            
+        this.fetch(this.url, { method: this.method, headers: { referer: document.location.href.replace(/^#[\s\S]*$/g, '') } }).then(async d => {
             this.fetched = d;
             this.readyState = 4;
             this.status = d.status;
-            this.responseText = d.text();
+            this.responseText = await d.text();
             if (this.onreadystatechange) this.onreadystatechange({ target: this });
             if (this.onload) this.onload({ target: this });
         }, e => {

package/coms/zimoli/alert.js

@@ -71,8 +71,8 @@ function alert() {
         } else {
             elem = _text(elem, styles.log, [text]);
         }
-        if (!container.parentNode) popup(container);
-        if (!elem.parentNode) appendChild(container, elem);
+        if (!isMounted(container)) popup(container);
+        if (!isMounted(elem)) appendChild(container, elem);
         waitclose(autoclose, 400);
         return elem;
     };

package/coms/zimoli/confirm.js

@@ -141,7 +141,7 @@ function confirm() {
     element.tabIndex = -1;
 
     Promise.resolve().then(function () {
-        if (element.parentNode) return;
+        if (isMounted(element)) return;
         element.mask = true;
         popup(element, target || [.5, .5], target ? 'rhomb' : true);
         element.focus();

package/coms/zimoli/createEvent.js

@@ -2,16 +2,15 @@
  * 创建自定义事件
  */
 if ("createEvent" in document) var createEvent = function createEvent(eventName, canBubble = false, cancelable = true) {
-    var event = document.createEvent("Event");
+    var event = document.createEvent(/Events?$/.test(eventName) ? eventName : "Event");
     event.initEvent(eventName, canBubble, cancelable);
     return event;
 }
-else if ("createEventObject" in document) var createEvent = function createEventObject(eventName) {
-    var event = document.createEventObject();
+else var createEvent = function createEventObject(eventName) {
+    if ("createEventObject" in document) var event = document.createEventObject();
+    else if (window.Event) event = new Event(eventName);
+    else event = {};
     event.type = eventName;
-    return event;
-}
-else var Event = window.Event, createEvent = function (eventName) {
-    var event = new Event(eventName);
+    if (!event.initMouseEvent) event.initMouseEvent = function () { };
     return event;
 }

package/coms/zimoli/dispatch.js

@@ -1,11 +1,15 @@
-var dispatch = "dispatchEvent" in document ? function dispatchEvent(target, event) {
-    return target.dispatchEvent(event);
+var dispatch = "dispatchEvent" in document ? function dispatchEvent2(target, event) {
+    try {
+        return target.dispatchEvent(event);
+    } catch (e) {
+        return -1;
+    }
 } : function (target, event) {
     var fire = "on" + event.type;
     try {
         return target.fireEvent(fire, event);
     } catch (e) {
-        return target[fire] && target[fire](event);
+        return -1;
     }
 };
 var isWorseEnv = /MSIE\s([2-9]|10)|Presto/.test(navigator.userAgent);
@@ -16,7 +20,7 @@ function dispatch2(t, e) {
     var on = 'on' + e.type;
     var f = t[on];
     var res = dispatch(t, e);
-    if (f && (t.nodeType !== 1 || t.constructor === window.HTMLUnknownElement || isWorseEnv && !(on in t.constructor.prototype))) {
+    if (f && (res === -1 || t.nodeType && t.nodeType !== 1 || t.constructor === window.HTMLUnknownElement || isWorseEnv && !(on in t.constructor.prototype))) {
         return f.call(t, e) !== false;
     }
     return res;

package/coms/zimoli/getScreenPosition.js

@@ -1,4 +1,4 @@
-function getScreenPosition(target) {
+function getScreenPosition(target, bounding = true) {
     if (!target) {
         target = {
             offsetTop: 0,
@@ -12,7 +12,7 @@ function getScreenPosition(target) {
             top = target.offsetTop,
             width = target.offsetWidth,
             height = target.offsetHeight;
-        while (target.offsetParent) {
+        if (bounding) while (target.offsetParent) {
             target = target.offsetParent;
             left += target.offsetLeft - target.scrollLeft + target.clientLeft;
             top += target.offsetTop - target.scrollTop + target.clientTop;
@@ -30,10 +30,10 @@ function getScreenPosition(target) {
     }
     var rect = target.getBoundingClientRect();
     var { left, top, width, height, right, bottom } = rect;
-    rect = { left, top, width, height, right, bottom };
-    if (rect.width === undefined) {
-        rect.width = rect.right - rect.left;
-        rect.height = rect.bottom - rect.top;
+    if (width === undefined) {
+        width = right - left;
+        height = bottom - top;
     }
+    rect = { left, top, width, height, right, bottom };
     return rect;
 }

package/coms/zimoli/grid.js

@@ -485,28 +485,27 @@ var grid_prototype = {
             if (rest_height < 1) {
                 return (height - rest_height) / (grid_height - bounds_bottom - bounds_top) * 100 + "%";
             }
-            var rest_offset = fromOffset(rest_height / (bounds_top + bounds_bottom) * (parseFloat(grid_padding_top) + parseFloat(grid_padding_bottom)));
+            var rest_offset = rest_height / (bounds_top + bounds_bottom) * (grid_padding_top + grid_padding_bottom);
             if (rest_height < height) {
-                return `calc(${(height - rest_height) / (grid_height - bounds_bottom - bounds_top) * 100}% + ${rest_offset})`;
+                return `calc(${(height - rest_height) / (grid_height - bounds_bottom - bounds_top) * 100}% + ${fromOffset(rest_offset)})`;
             }
-            return rest_offset;
+            return height / rest_height * rest_offset;
         }
         var setRelativeDiv = function (_div, width, height, left, top) {
             var [bounds_top, bounds_right, bounds_bottom, bounds_left] = bounds;
-            var computed = getComputedStyle(grid);
             css(_div, {
-                width: getDivSize(left, width, bounds_left, bounds_right, grid.width, computed.paddingLeft, computed.paddingRight),
-                height: getDivSize(top, height, bounds_top, bounds_bottom, grid.height, computed.paddingTop, computed.paddingBottom)
+                width: getDivSize(left, width, bounds_left, bounds_right, grid.width, grid_left, grid_right),
+                height: getDivSize(top, height, bounds_top, bounds_bottom, grid.height, grid_top, grid_bottom)
             });
             if (top <= 0) {
-                css(_div, { marginTop: fromOffset(- parseFloat(computed.paddingTop)) });
+                css(_div, { marginTop: fromOffset(- grid_top) });
             } else if (top + height >= grid.height) {
-                css(_div, { marginBottom: fromOffset(-parseFloat(computed.paddingBottom)) });
+                css(_div, { marginBottom: fromOffset(-grid_bottom) });
             }
             if (left <= 0) {
-                css(_div, { marginLeft: fromOffset(-parseFloat(computed.paddingLeft)) });
+                css(_div, { marginLeft: fromOffset(-grid_left) });
             } else if (left + width >= grid.width) {
-                css(_div, { marginRight: fromOffset(-parseFloat(computed.paddingRight)) });
+                css(_div, { marginRight: fromOffset(-grid_right) });
             }
         }
         var append = function (point, index, points) {
@@ -607,6 +606,11 @@ var grid_prototype = {
                 }
             }
         };
+        var computed = getComputedStyle(grid);
+        var grid_top = parseFloat(computed.paddingTop);
+        var grid_bottom = parseFloat(computed.paddingBottom);
+        var grid_left = parseFloat(computed.paddingLeft);
+        var grid_right = parseFloat(computed.paddingRight);
         append(this.breakpoints);
         var reshapecount = 0;
         var store = function (point) {

package/coms/zimoli/list.js

@@ -72,6 +72,18 @@ function ylist(container, generator, $Y) {
         }
         return null;
     };
+    var getRelativeElement = function (element, delta) {
+        delta = +delta;
+        if (!delta || !isFinite(element.index)) return;
+        var target = element.index + delta;
+        if (!target) return;
+        if (delta < 0) var key = "previousElementSibling";
+        else key = "nextElementSibling";
+        while (element) {
+            if (element.index === target) return element;
+            element = element[key];
+        }
+    }
     var hasCover = function (child) {
         var scrollTop = list.scrollTop;
         if (child.offsetTop + child.offsetHeight < scrollTop || child.offsetTop >= scrollTop + list.clientHeight) return false;
@@ -581,6 +593,7 @@ function ylist(container, generator, $Y) {
         else if (emit) list.setFocus(e, true), dispatch(list, 'focused');
         else list.setFocus(e);
     };
+    list.getRelativeElement = getRelativeElement;
     return list;
 }
 var allArgumentsNames = arguments[arguments.length - 1];
@@ -667,6 +680,5 @@ function list() {
         if (src && old) children = Array.prototype.filter.call(children, c => src[c.index] !== old[c.index]);
         remove(children);
     };
-
     return list;
 }

package/coms/zimoli/on.js

@@ -416,7 +416,7 @@ var on = document.efronton = function (k) {
 var invoke = function (event, type, pointerType) {
     var target = event.target;
     var touch = event.changedTouches ? event.changedTouches[0] : event;
-    var clickEvent = document.createEvent("MouseEvents");
+    var clickEvent = createEvent("MouseEvents");
     clickEvent.touchend = true;
     clickEvent.pointerType = pointerType
     clickEvent.initMouseEvent(type, true, true, window, 1, touch.screenX, touch.screenY, touch.clientX, touch.clientY, false, false, false, false, 0, null);
@@ -426,6 +426,7 @@ var invoke = function (event, type, pointerType) {
 (function () {
     var pointeractive = null;
     if ("onpointerdown" in document) return;
+    document.onpointerdown = null;
     var getPointerType = function (event) {
         return event.type.replace(/(start|move|end|cancel|down|up|leave|out|over|enter)$/i, '');
     };

package/coms/zimoli/picture.js

@@ -163,7 +163,7 @@ function picture(url, to = 0, key) {
         var urls = [].concat(url);
         var p = slider(gen, false);
     }
-    p.go(to);
+    if (isFinite(to)) p.go(to);
     p.getScale = function () {
         if (p.current) return p.current.getScale();
         return 1;

package/coms/zimoli/render.js

@@ -467,7 +467,7 @@ var src2 = function (search) {
     var savedValue;
     this.$renders.push(function () {
         var origin = getter(this);
-        var temp = shallowClone(origin, 1);
+        var temp = shallowClone(origin);
         if (isHandled(savedValue)) {
             if (shallowEqual(temp, savedValue, 1)) return;
         }

package/coms/zimoli/slider.js

@@ -68,6 +68,8 @@ function slider() {
         direction,
         _speed = speed(1);
     var reshape = function (index, ising, emit) {
+        if (!isFinite(index)) return;
+        index = +index;
         outter.index = current_index = index;
         var width = outter.clientWidth || +innerWidth;
         var indexLeft = floor(index);
@@ -272,6 +274,8 @@ function slider() {
     })
 
     outter.go = lazy(function (index, cache) {
+        if (!isFinite(index)) return;
+        index = +index;
         if (outter.index === index && cache !== false) return;
         negative_index = -index;
         var _removingMain = _imageMain;