efront 3.35.1 → 3.35.2

package/coms/basic/#loader.js

@@ -621,7 +621,9 @@ var init = function (name, then, prebuilds) {
     }, prebuilds);
     return res;
 };
-var forceRequest = {};
+var forceRequest = {
+    Promise: true
+};
 var removeGlobalProperty = function (property) {
     forceRequest[property] = true;
 };
@@ -853,6 +855,7 @@ var initIfNotDefined = function (defined, path, onload) {
 
 if (document) loadResponseTreeFromStorage();
 initIfNotDefined([].map, "[]map", map => map);
+"use ../basic_/#checkPromise.js";
 initIfNotDefined(Promise, "Promise", promise => Promise = promise);
 // <!-- window.modules = modules; -->
 var onload = function () {

package/coms/basic/Tree.js

@@ -169,7 +169,7 @@ class Tree extends Array {
         for (var data of datas) {
             if (isObject(data) || isString(data)) {
                 var item;
-                if (data instanceof Item) {
+                if (data.constructor === Item) {
                     item = data;
                     Tree.remove(item);
                 }

package/coms/basic_/#checkPromise.js

@@ -0,0 +1,9 @@
+if (Promise) {
+    var SafePromise = void 0;
+    Promise.resolve({
+        then() {
+            SafePromise = Promise;
+        }
+    });
+    Promise = SafePromise;
+}

package/coms/basic_/Array2.js

@@ -1,9 +1,61 @@
-var setPrototypeOf = Object.setPrototypeOf || function (obj, proto) {
-    var hasOwnProperty = Object.prototype.hasOwnProperty;
-    for (var p in proto) if (hasOwnProperty.call(proto, p) && !(p in obj)) obj[p] = proto[p];
-    return obj;
+var hasOwnProperty = Object.prototype.hasOwnProperty;
+var setPrototypeOf = Object.setPrototypeOf;
+a: if (!setPrototypeOf) {
+    var getOwnPropertyDescriptor = Object.getOwnPropertyDescriptor;
+    var getOwnPropertyNames = Object.getOwnPropertyNames;
+    var defineProperty = Object.defineProperty;
+    try {
+        defineProperty({}, 'o', { value: 0 });
+        setPrototypeOf = function (obj, proto) {
+            for (var n of getOwnPropertyNames(proto)) {
+                var d = getOwnPropertyDescriptor(proto, n);
+                defineProperty(obj, n, d);
+            }
+            return obj;
+        }
+        break a;
+    } catch (e) {
+        getOwnPropertyDescriptor = null;
+        defineProperty = null;
+        getOwnPropertyNames = null;
+    }
+    // <!--
+    console.error('当前运行环境使用class extends Array会有难以解决的不兼容性问题，请更换代码的实现方式！');
+    // -->
+    setPrototypeOf = function (obj, proto) {
+        for (var p in proto) if (hasOwnProperty.call(proto, p) && !(p in obj)) obj[p] = proto[p];
+        obj.constructor = proto.constructor;
+        return obj;
+    }
 }
+var wrapMethod = method => function () {
+    var res = method.apply(this, arguments);
+    var res0 = this.constructor.apply(this, []);
+    res0.length = res.length;
+    for (var k in res) {
+        k = +k;
+        if ((k & 0x7fffffff) !== k) break;
+        res0[k] = res[k];
+    }
+    return res0;
+};
+var map = wrapMethod([].map);
+var slice = wrapMethod([].slice);
+var filter = wrapMethod([].filter);
+var splice = wrapMethod([].splice);
+var concat = wrapMethod([].concat);
+
 function Array2() {
-    return setPrototypeOf(Array.apply(this, arguments), this.constructor.prototype);
+    var proto = this.constructor.prototype;
+    /**
+     * @type {PropertyDescriptor}
+     */
+    if (!hasOwnProperty.call(proto, 'map')) proto.map = map;
+    if (!hasOwnProperty.call(proto, 'slice')) proto.slice = slice;
+    if (!hasOwnProperty.call(proto, 'filter')) proto.filter = filter;
+    if (!hasOwnProperty.call(proto, 'splice')) proto.splice = splice;
+    if (!hasOwnProperty.call(proto, 'concat')) proto.concat = concat;
+    var obj = setPrototypeOf(Array.apply(this, arguments), proto);
+    return obj;
 }
 Array2.prototype = Array.prototype;

package/coms/basic_/Promise.js

@@ -3,14 +3,14 @@ var Array = window.Array;
 var setTimeout = window.setTimeout;
 var Function = window.Function;
 var console = window.console;
-var Error = window.Error;
+var navigator = window.navigator;
 var requestAnimationFrame = window.setImmediate || window.setTimeout;
 var isFunction = function (f) {
     return typeof f === "function";
 };
-if (window.Promise) {
-    var Promise = window.Promise;
-} else {
+var Promise = window.Promise;
+"use ./#checkPromise.js";
+if (!Promise) {
     var isThenable = function (pendding) {
         return pendding instanceof Promise || pendding && isFunction(pendding.then);
     };
@@ -93,7 +93,7 @@ if (window.Promise) {
             if (this.oked || this.ohed) fire(this);
             return promise;
         },
-        catch(f) {
+        "catch"(f) {
             return this.then(null, f);
         },
     }

package/coms/compile/Program.js

@@ -94,7 +94,33 @@ var stringsFromRegExp = function (reg) {
     var res = combine(...queue).map(a => a.join(""));
     return res;
 }
-
+var supportUnicodeRegExp = false;
+var spaceDefined = [
+    "\\u0002",
+    "\\b-\\r",// "\\b"/*8*/, "\\t"/*9*/, "\\n"/*10*/, "\\v"/*11*/, "\\f"/*12*/, "\\r"/*13*/,
+    " "/*32*/,
+    "\\u007f", "\\u00a0", "\\u00ad", "\\u034f", "\\u061c",
+    "\\u115f", "\\u1160",
+    "\\u17b4", "\\u17b5",
+    "\\u180b-\\u180e",
+    "\\u1cbb", "\\u1cbc",
+    "\\u2000-\\u200f",
+    "\\u2028-\\u202f",
+    "\\u205f-\\u206f",
+    "\\u2800", "\\u3000", "\\u3164",
+    "\\ufe00-\\ufe0f",
+    "\\ufeff", "\\uffa0",
+    "\\ufff0-\\ufff8",
+    "\\u{133fc}",
+    "\\u{1d173}-\\u{1d17a}"
+]
+try {
+    new RegExp('.', 'u');
+    supportUnicodeRegExp = true;
+} catch (e) {
+    spaceDefined.pop();
+    spaceDefined.pop();
+}
 class Program {
     quotes = [
         [/'/, /'/, /\\[\s\S]/],
@@ -126,29 +152,11 @@ class Program {
     classstrap_reg = /^(class)$/;
     extends_reg = /^(extends)$/;
     export_reg = /^(export)$/;
-    spaces = [
-        "\\u0002",
-        "\\b-\\r",// "\\b"/*8*/, "\\t"/*9*/, "\\n"/*10*/, "\\v"/*11*/, "\\f"/*12*/, "\\r"/*13*/,
-        " "/*32*/,
-        "\\u007f", "\\u00a0", "\\u00ad", "\\u034f", "\\u061c",
-        "\\u115f", "\\u1160",
-        "\\u17b4", "\\u17b5",
-        "\\u180b-\\u180e",
-        "\\u1cbb", "\\u1cbc",
-        "\\u2000-\\u200f",
-        "\\u2028-\\u202f",
-        "\\u205f-\\u206f",
-        "\\u2800", "\\u3000", "\\u3164",
-        "\\ufe00-\\ufe0f",
-        "\\ufeff", "\\uffa0",
-        "\\ufff0-\\ufff8",
-        "\\u{133fc}",
-        "\\u{1d173}-\\u{1d17a}"
-    ]
+    spaces = spaceDefined;
     nocase = false
     lastIndex = 0
     compile(s) {
-        return s.replace(/\\[\s\S]|[\[\]\(\)\{\}\+\.\-\*\?\$\^\|\\\/]/g, function (m) {
+        return s.replace(/\\[\s\S]|[\[\]\(\)\{\}\+\.\-\*\?\$\^\|\\\/ ]/g, function (m) {
             if (m.length > 1) {
                 return m;
             }
@@ -177,7 +185,6 @@ class Program {
         var lasttype;
         var Code = this.Code;
         var queue = new Code();
-        queue.__proto__ = Code.prototype;
         var origin = queue;
         var colonstrap_reg = this.colonstrap_reg;
         var forceend_reg = this.forceend_reg;
@@ -656,11 +663,12 @@ class Program {
         tokens = Object.keys(tokens).join("");
         tokens = this.compile(tokens) + spaces;
         var express = `[^${tokens}]+`;
-        this.express_reg = new RegExp(`^${express}$`, 'u');
-        this.space_reg = new RegExp(`^[${spaces}]+$`, 'u');
-        this.space_exp = new RegExp(`[${spaces}]+`, 'u');
+        var flagUnicode = supportUnicodeRegExp ? 'u' : '';
+        this.express_reg = new RegExp(`^${express}$`, flagUnicode);
+        this.space_reg = new RegExp(`^[${spaces}]+$`, flagUnicode);
+        this.space_exp = new RegExp(`[${spaces}]+`, flagUnicode);
         var quotes = this.createRegExp(quoteslike.map(q => q[0]), true).source;
-        this.entry_reg = new RegExp([`[${spaces}]+|${quotes}|[${scopes}]|${this.number_reg.source.replace(/^\^|\$$/g, "")}[^${tokens}]*|${express}|[${stamps}]`], "giu");
+        this.entry_reg = new RegExp([`[${spaces}]+|${quotes}|[${scopes}]|${this.number_reg.source.replace(/^\^|\$$/g, "")}[^${tokens}]*|${express}|[${stamps}]`], "gi" + flagUnicode);
     }
 }
 module.exports = Program;

package/coms/zimoli/active.js

@@ -4,8 +4,8 @@ function active(target, value, item = value, srcElem) {
     activeEvent.item = item;
     activeEvent.value = value;
     if (srcElem) {
-        if (Object.defineProperty) Object.defineProperty(activeEvent, 'currentTarget', { value: srcElem });
-        else activeEvent.currentTarget = srcElem;
+        if (Object.defineProperty) Object.defineProperty(activeEvent, 'active', { value: srcElem });
+        else activeEvent.active = srcElem;
     }
     activeEvent = dispatch(target, activeEvent);
     return activeEvent && !activeEvent.defaultPrevented;

package/coms/zimoli/appendChild.js

@@ -1,7 +1,4 @@
 var slice = [].slice;
-var { appendChild: _appendChild, insertBefore: _insertBefore } = document.createElement('a');
-var isWorseIE = /msie\s+[2-8]/i.test(navigator.userAgent);
-
 function release(node) {
     if (node === null || node === undefined) return node;
     return isFunction(node) ? node() : isNode(node) ? node : document.createTextNode(node);
@@ -35,15 +32,7 @@ function appendChild(parent, obj, transition) {
             if (hasEnterStyle(o) && transition !== false) {
                 isFunction(appendChild.transition) && appendChild.transition(o);
             }
-            if (isWorseIE) {
-                try {
-                    _appendChild.call(parent, o);
-                } catch (e) {
-                    console.error("appendChild", parent.tagName, o.tagName);
-                }
-            } else {
-                _appendChild.call(parent, o);
-            }
+            parent.appendChild(o);
             o.with && appendChild(parent, o.with, transition);
             if (isMounted(parent)) _onappend(o);
         }
@@ -62,7 +51,7 @@ function insertBefore(alreadyMounted, obj, transition) {
         var o = release(children[cx]);
         if (!o) continue;
         if (o.removeTimer) clearTimeout(o.removeTimer);
-        _insertBefore.call(parent, o, alreadyMounted);
+        parent.insertBefore(o, alreadyMounted);
         o.with && insertBefore(alreadyMounted, o.with, transition);
         if (isMounted(parent)) _onappend(o);
         if (hasEnterStyle(o) && transition !== false) {
@@ -82,7 +71,7 @@ function insertAfter(alreadyMounted, obj, transition) {
     for (var cx = 0, dx = children.length; cx < dx; cx++) {
         var o = release(children[cx]);
         if (o.removeTimer) clearTimeout(o.removeTimer);
-        _insertBefore.call(parent, o, alreadyMounted.nextSibling);
+        parent.insertBefore(o, alreadyMounted.nextSibling);
         o.with && insertBefore(alreadyMounted.nextSibling, o.with, transition);
         if (isMounted(parent)) _onappend(o);
         if (hasEnterStyle(o) && transition !== false) {
@@ -108,4 +97,18 @@ appendChild.replace = function (alreadyMounted, element) {
     if (!alreadyMounted || !alreadyMounted.parentNode) return;
     insertBefore(alreadyMounted, element);
     remove(alreadyMounted);
+};
+var wrapTargetMethod = function (target, methodName) {
+    var method = target[methodName];
+    if (method.wrapped) return;
+    var newMethod = target[methodName] = function (node) {
+        var res = method.apply(this, arguments);
+        _onappend(node);
+        return res;
+    };
+    newMethod.wrapped = true;
+};
+appendChild.wrapTarget = function (target) {
+    wrapTargetMethod(target, 'insertBefore');
+    wrapTargetMethod(target, 'appendChild');
 };

package/coms/zimoli/cross.js

@@ -40,6 +40,9 @@ var cross = cross_.bind(function (callback, onerror) {
                     }
                     break;
                 default:
+                    if (xhr.response === void 0) {
+                        xhr.response = xhr.responseText;
+                    }
                     callback();
             }
             saveCookie();

package/coms/zimoli/css.js

@@ -129,13 +129,10 @@ var cssTargetSelector = function (targetSelector, oStyle, oValue) {
             var key = transformCssKey(oStyle);
             styleobject[key] = oValue;
         } else {
-            oStyle.replace(/^;+|;+$/g, "").split(/;+/).map(function (kv) {
-                var [k, v] = kv.split(":");
-                delete styleobject[k];
-                if (k) styleobject[k] = v || '';
-            });
+            oStyle = parseKV(oStyle, ';', ':');
         }
-    } else if (isObject(oStyle)) {
+    }
+    if (isObject(oStyle)) {
         for (var k in oStyle) {
             var key = transformCssKey(k);
             styleobject[key] = oStyle[k];
@@ -144,12 +141,12 @@ var cssTargetSelector = function (targetSelector, oStyle, oValue) {
     var rowStyles = [];
     var styleSheet = stylesheet.styleSheet;
     var cssText = stylesheet.savedText || (styleSheet ? styleSheet.cssText : stylesheet.innerHTML).replace(/^[\s\S]*?\{([\s\S]*?)\}[\s\S]*?$/, "$1");
-    cssText.split(";").forEach(function (kv) {
-        var k = kv.replace(/^(.*?)\:.*$/, "$1");
+    cssText.trim().split(/\s*;\s*/).forEach(function (kv) {
+        var k = kv.replace(/^(.*?)\s*\:.*$/, "$1");
         if (k && !(k in styleobject)) rowStyles.push(kv);
     });
     for (var k in styleobject) {
-        if (styleobject[k]) {
+        if (!isEmpty(styleobject[k])) {
             rowStyles.push(k + ":" + transformValue(styleobject[k], k));
         }
     }

package/coms/zimoli/dispatch.js

@@ -8,6 +8,7 @@ var dispatch = "dispatchEvent" in document ? function dispatchEvent(target, even
         return target[fire] && target[fire](event);
     }
 };
+var isWorseEnv = /MSIE\s([2-9]|10)|Presto/.test(navigator.userAgent);
 /**
  * @param {Event} e 
  */
@@ -15,7 +16,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)) {
+    if (f && (t.nodeType !== 1 || t.constructor === window.HTMLUnknownElement || isWorseEnv && !(on in t.constructor.prototype))) {
         return f.call(t, e) !== false;
     }
     return res;

package/coms/zimoli/grid.js

@@ -308,7 +308,6 @@ function grid(breakpoints) {
 }
 class Point extends Array {
     constructor(value, range) {
-        super();
         var solid = false;
         if (isObject(value)) {
             this.value = value.value;
@@ -334,7 +333,7 @@ var createPoints = function (values, direction = "x", result = new Point(0)) {
     if (!(values instanceof Array)) values = arguments;
     for (var cx = 0, dx = values.length; cx < dx; cx++) {
         var value = values[cx];
-        if (value instanceof Array && !(value instanceof Point)) {
+        if (value instanceof Array && value.constructor !== Point) {
             if (!result.length) throw new Error("数据转换为grid失败！");
             createPoints(value, direction === "x" ? "y" : "x", result[result.length - 1]);
         } else {

package/coms/zimoli/list.js

@@ -581,20 +581,6 @@ var getGeneratorFromArray = function (source) {
     };
 };
 
-
-var _insertBefore = function (child, referer) {
-    if (referer) {
-        if (referer.parentNode !== this) throw new Error('关联节点不是当前节点的子节点！');
-        appendChild.before(referer, child, false);
-    } else {
-        appendChild(this, child, false);
-    }
-    return child;
-};
-var _appendChild = function (child) {
-    appendChild(this, child, false);
-    return child;
-};
 /**
  * 
  * @param {Boolean|Array|Function} generator 
@@ -644,8 +630,7 @@ function list() {
     if (groupCount) groupCount = +groupCount[0];
     $Y = /^[xh]|[xh]$/i.test($Y) ? "X" : "Y";
     if (!container) container = document.createElement('list');
-    container.insertBefore = _insertBefore;
-    container.appendChild = _appendChild;
+    appendChild.wrapTarget(container);
     var list = ($Y === "X" ? xlist : ylist)(container, generator, $Y);
     if (!list.group) list.group = groupCount || 2;
     if (bindSrc instanceof Array) {

package/coms/zimoli/menu.js

@@ -133,7 +133,6 @@ function main(elem, mode) {
                     care(elem, function (src) {
                         if (src) src = getTreeFromData(src);
                         var hasIcon = src.hasIcon;
-                        JSON.stringify(src);
                         elem.useIcon = hasIcon;
                         elem.src = src;
                     });

package/coms/zimoli/once.js

@@ -1,7 +1,7 @@
 "use strict";
 var oncetree = {};
 function emit(ontype, target, handler, firstmost) {
-    var off = ontype.call(this, target, function (event) {
+    var off = ontype(target, function (event) {
         off();
         return handler.call(this, event);
     }, firstmost);

package/coms/zimoli/render.js

@@ -648,7 +648,8 @@ var createEmiter = function (on) {
             digest();
             var parsedSrc = this.$src;
             if (parsedSrc instanceof Repeater) {
-                var target = e.currentTarget === this ? e.target : e.currentTarget || e.target;
+                if (e.active || e.currentTarget) var target = e.active || e.currentTarget;
+                else var target = e.target;
                 if (target === this) {
                     scope = parsedSrc.createScope();
                 }

package/coms/zimoli/tree.js

@@ -61,7 +61,7 @@ function tree() {
         }
         var tabs = new Array(com.tab + 1).join("<t></t>");
         if (isFunction(generator)) {
-            var elem = generator(index, com instanceof Item ? com.value : com, com);
+            var elem = generator(index, com.constructor === Item ? com.value : com, com);
             if (!elem) return;
             span = document.createElement('span');
             span.innerHTML = tabs;

package/docs/index.html

@@ -8,7 +8,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=Edge" />
     <meta charset="utf-8" />
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <link rel="Shortcut Icon" href="/favicon.ico" type="image/x-icon" />
+    <link rel="Shortcut Icon" href="favicon.ico" type="image/x-icon" />
     <meta name="viewport" content="initial-scale=1,maximum-scale=1,width=device-width" />
     <title>efront 文档</title>
     <style>

package/docs/main.xht

@@ -11,6 +11,7 @@
         position: absolute;
         padding-left: var(--leftwidth);
         overflow: hidden;
+        background: #fff;
     }
 
     :root+scrollbar {
@@ -61,7 +62,8 @@
         position: relative;
         background: linear-gradient(#f2f4ff, 70%, #e9fff2);
     }
-    :root>menu v{
+
+    :root>menu v {
         display: inline-block;
         font-size: 12px;
         color: #79a;
@@ -110,7 +112,6 @@
     })
     var initVersionInfo = async function () {
         var xhr = await cross("get", "version");
-        console.log(xhr)
         var version = xhr.response.split(",");
         menus[0].name += ` <v>${version[0]}</v>`;
     }

package/docs/mark.xht

@@ -160,7 +160,7 @@
         };
         var page = document.createElement("markdown");
         on("mounted")(page, async function () {
-            var xhr = await cross('get', "./welcome:" + md);
+            var xhr = await cross('get', "./welcome:" + encodeURI(md));
             page.innerHTML = markdown(xhr.response, md);
             for (var target of page.querySelectorAll("a")) {
                 onclick(target, clickAnchor);

package/package.json

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