efront 2.44.10 → 2.46.1

package/coms/basic/BitTree.js

@@ -3,9 +3,9 @@
 const MAX_FREQUENCY = 0XFFFF;
 class BitTree extends Array {
     counts = [];
-    length = 0;
     total = 0;
     constructor(arr, a) {
+        super();
         if (isFinite(arr)) {
             arr = new Array(arr);
             if (a === undefined) a = 1;

package/coms/basic/crypt.js

@@ -58,6 +58,6 @@ module.exports = {
     checksign: function (data, mask) {
         var sign = data.sign;
         delete data.sign;
-        return sign = signonly(data, mask);
+        return sign === signonly(data, mask);
     }
 };

package/coms/basic/decodeRange.js

@@ -62,7 +62,6 @@ function main(buff) {
 		tree.count(i);
 		result.push(i);
 	}
-	console.log(d);
 	__buff = null;
 	return result;
 }

package/coms/basic/loader.js

@@ -36,7 +36,8 @@ if (PREVENT_FRAMEWORK_MODE !== false) {
     } catch (e) {
         document.write(message);
         top.location.reload();
-        throw message;
+        console.error(message);
+        return;
     }
 }
 var _devicePixelRatio = devicePixelRatio;
@@ -312,7 +313,7 @@ var loadModule = function (name, then, prebuilds = {}) {
         readFile(name, saveModule);
     }
 };
-var toRem = text => pixelDecoder && typeof text === 'string' ? text.replace(/(\:\s*)?\b((?:\d*\.)?\d+)px(\s*\))?/ig, (m, h, d, quote) => (h || "") + (d !== '1' ? h && quote ? renderPixelRatio * d + "pt" : pixelDecoder(d) : renderPixelRatio > 1 ? ".75pt" : 0.75 / devicePixelRatio + "pt") + (quote || "")) : text;
+var toRem = text => pixelDecoder && typeof text === 'string' ? text.replace(/(\:\s*)?\b((?:\d*\.)?\d+)px(\s*\))?/ig, (m, h, d, quote) => (h || "") + (d !== '1' ? h && quote ? renderPixelRatio * d + "pt" : pixelDecoder(d) : renderPixelRatio > 1 ? ".78pt" : 0.78 / devicePixelRatio + "pt") + (quote || "")) : text;
 if (document.head) var efrontsign = document.head.lastElementChild.attributes[0];
 if (efrontsign && /^compiledinfo\-/.test(efrontsign.name)) efrontsign = efrontsign.name.slice(efrontsign.name.indexOf('-') + 1);
 else efrontsign = '';

package/coms/basic/parseURL_test.js

@@ -0,0 +1,32 @@
+var parseURL = require("./parseURL");
+require("../efront/console");
+var test = function (url, key, value) {
+    var parsed = parseURL(url);
+    if (parsed[key] !== value) console.log(parsed), console.fail(`url:${url}, key:${key}, expect:${value}, result:${parsed[key]}`);
+    else console.pass(`url:${url}, key:${key}, expect:${value}, result:${parsed[key]}`);
+};
+
+test('http://efront.cc/kugou', 'pathname', '/kugou')
+test('http://efront.cc/kugou?a', 'path', '/kugou?a')
+test('http://yunxu1019@live.cn@github.com/?a', 'username', 'yunxu1019@live.cn')
+test('localhost', 'host', 'localhost')
+test('localhost:80', 'port', '80')
+test('localhost:80/', 'port', '80')
+test(':80', 'port', '80')
+test('80', 'port', '80')
+test('/80', 'pathname', '/80')
+test('a80', 'host', 'a80')
+test('a:80', 'host', 'a:80')
+test('a:b:80', 'host', 'b:80')
+test('a:b@a80', 'auth', 'a:b')
+test('c:a:b@a80', 'auth', 'a:b')
+test('c:d:a:b@a80', 'password', 'a:b')
+test('localhost:', 'protocol', 'localhost:')
+test('localhost:80', 'hostname', 'localhost')
+test('http//:80', 'hostname', 'http')
+test('http//:80', 'pathname', '//:80')
+test('//h:80', 'host', 'h:80')
+test('?80', 'path', '?80')
+test('?80', 'search', '?80')
+test('?80', 'query', '80')
+test('#?80', 'hash', '#?80')

package/coms/basic/refilm_decode.js

@@ -260,8 +260,16 @@ function parse(piece) {
     }
     var [name, type, options] = piece, key, repeat;
     if (piece.length === 1 && isObject(name)) {
-        var { name, needs, type, key, size, unit, endwith, ratio, value, repeat, comment, options } = name;
+        var { name, needs, required, checks, type, key, size, unit, endwith, ratio, value, repeat, comment, options } = name;
     } else {
+        var is_require = a => {
+            if (/^\*|\*$/.test(a)) {
+                required = true;
+                return a.replace(/^\*|\*$/, '');
+            }
+            return a;
+        };
+        type = is_require(type);
         if (typeof name === 'string') {
             if (!isContainer) {
                 if (!type) {
@@ -362,14 +370,17 @@ function parse(piece) {
             type = type.slice(1);
         }
         if (typeof options === "string") {
+            options = is_require(options);
             var needUnfold = /^\[|\]$/.test(options);
             options = options.replace(/^\[|\]$/g, '');
             if (/,/.test(options)) options = scanSlant(options, ',');
             else options = scanSlant(options, "");
             if (needUnfold) unfoldOptions(size, options);
         }
+        name = is_require(name);
+        key = is_require(key);
     }
-    var field = { name, needs, type, key, size, unit, endwith, ratio, value, repeat, comment, options };
+    var field = { name, checks, required, needs, type, key, size, unit, endwith, ratio, value, repeat, comment, options };
     var parent = piecepath[piecepath.length - 1];
     if (parent) {
         field.parent = parent;

package/coms/basic/valid.js

@@ -0,0 +1,10 @@
+function valid(field, data) {
+    var error;
+    if (isEmpty(data[field.key])) {
+        if (field.required) {
+            return "empty";
+        }
+        return;
+    }
+    return error;
+}

package/coms/compile/scanner2.js

@@ -315,7 +315,7 @@ var detour = function (o, ie) {
 class Program extends Array {
     COMMENT = COMMENT
     SPACE = SPACE
-    STAMP = STRAP
+    STRAP = STRAP
     STAMP = STAMP
     VALUE = VALUE
     QUOTED = QUOTED

package/coms/zimoli/alert.js

@@ -1,9 +1,14 @@
 var styles = {
-    log: "#2a53cd",
-    info: "#228B22",
-    warn: "#dd6a16",
-    error: "#dc352e"
+    blue: "#2a83cd",
+    green: "#228B22",
+    orange: "#fdca86",
+    red: "#cc352e"
 };
+styles.success = styles.pass = styles.green;
+styles.info = styles.blue;
+styles.error = styles.danger = styles.red;
+styles.warn = styles.orange;
+styles.default = '#000';
 var alerts = [];
 var clean = Cleanup(alerts);
 var build = function () {
@@ -17,15 +22,15 @@ var build = function () {
 };
 var fontSize = 16;
 var singleHeight = fontSize * 3.125 | 0;
-var _text = function (color, parameters) {
+var _text = function (bgcolor, parameters) {
     var box = div();
     css(box, `top:${fromPixel(alerts.length ? Math.max.apply(Math, alerts.map(e => e.offsetTop + e.children[0].offsetHeight)) : 0)};height:0;line-height:${fromPixel(singleHeight - 20)};left:0;right:0;font-size:${fromPixel(fontSize)}; transition: all 0.2s ease-out;position:absolute;color:#fff;text-align:center;`);
-    box.innerHTML = `<div style='width: 720px;white-space:pre-wrap;max-width:100%;display:inline-block;height:auto;padding:${fromPixel(10)} ${fromPixel(20)};background-color:${color};'>${[].slice.call(parameters, 0).join(", ")}</div>`;
+    box.innerHTML = `<div style='width: 720px;white-space:pre-wrap;max-width:100%;display:inline-block;height:auto;padding:${fromPixel(10)} ${fromPixel(20)};background-color:${bgcolor};color:${color.pair(bgcolor)};'>${[].slice.call(parameters, 0).join(", ")}</div>`;
     box.initialStyle = `margin:-${fromPixel(singleHeight)} auto;opacity:0;`;
     return box;
 };
 function alert() {
-    var color = String(this), text, autoclose = true, onclose;
+    var color = String(isString(this) && this || styles.default), text, autoclose = true, onclose;
     var color_reg = /^#(?:\w{6}|\w{3})$/;
     [].map.call(arguments, function (arg) {
         switch (typeof arg) {

package/coms/zimoli/appendChild.js

@@ -116,6 +116,7 @@ appendChild.insert = function (parent, element, relative = parent.childNodes[0]
     }
 };
 appendChild.replace = function (alreadyMounted, element) {
+    if (alreadyMounted === element) return;
     if (!alreadyMounted || !alreadyMounted.parentNode) return;
     insertBefore(alreadyMounted, element);
     remove(alreadyMounted);

package/coms/zimoli/autodragchildren.js

@@ -86,6 +86,16 @@ var bindTarget = function (index, element) {
 };
 
 var hooka = function (matcher, move, event, targetChild, isMovingSource) {
+    var dragbox = this.dragbox;
+    if (dragbox instanceof Function) {
+        dragbox = dragbox.call(this);
+        if (dragbox && !getTargetIn(dragbox, event.target)) return;
+    }
+    else {
+        dragbox = this;
+    }
+    var that = this;
+
     var draggingSourceOpacity = isMovingSource !== false ? 0 : 1;
 
     var recover = function (element) {
@@ -130,41 +140,89 @@ var hooka = function (matcher, move, event, targetChild, isMovingSource) {
     }
     var targetBox, saved_opacity, saved_filter, moveMargin, moveChildren;
     var previousElements, followedElements, rebuildTargets, scroll;
-    if (getTargetIn(this, targetChild)) {
-        targetBox = targetChild.parentNode;
-        previousElements = getPreviousElementSiblings(targetChild);
-        followedElements = getFollowedElementSiblings(targetChild);
-        saved_filter = targetBox.style.filter;
-        saved_opacity = targetBox.style.opacity;
-        rebuildTargets = function () { };
-        [moveMargin, moveChildren, scroll] = getMoveFuncs(targetChild);
-        moveChildren = moveChildren.bind(null, targetBox, previousElements, followedElements, moveMargin, recover);
-    } else {
-        previousElements = [];
-        followedElements = [];
-        moveChildren = () => { };
-        rebuildTargets = function () {
-            var temp = matcher(drag.target);
-            if (temp === targetBox) return;
-            if (previousElements) previousElements.map(recover);
-            if (followedElements) followedElements.map(recover);
-            if (targetBox) {
-                removeClass(targetBox, "dropping");
-            }
-            targetBox = temp;
-            if (!targetBox) {
-                previousElements = [];
+    var that = this;
+    var draginit = function () {
+        that.setAttribute('dragchildren', '');
+        if (targetBox) addClass(targetBox, 'dropping');
+        if (getTargetIn(dragbox, targetChild)) {
+            targetBox = targetChild.parentNode;
+            previousElements = getPreviousElementSiblings(targetChild);
+            followedElements = getFollowedElementSiblings(targetChild);
+            saved_filter = targetBox.style.filter;
+            saved_opacity = targetBox.style.opacity;
+            rebuildTargets = function () { };
+            [moveMargin, moveChildren, scroll] = getMoveFuncs(targetChild);
+            moveChildren = moveChildren.bind(null, targetBox, previousElements, followedElements, moveMargin, recover);
+        } else {
+            previousElements = [];
+            followedElements = [];
+            moveChildren = () => { };
+            rebuildTargets = function () {
+                var temp = matcher(drag.target);
+                if (temp === targetBox) return;
+                if (previousElements) previousElements.map(recover);
+                if (followedElements) followedElements.map(recover);
+                if (targetBox) {
+                    removeClass(targetBox, "dropping");
+                }
+                targetBox = temp;
+                if (!targetBox) {
+                    previousElements = [];
+                    followedElements = [];
+                    moveChildren = () => { };
+                    return;
+                }
+                addClass(targetBox, "dropping");
+                previousElements = [].slice.call(targetBox.children, 0).reverse();
                 followedElements = [];
-                moveChildren = () => { };
-                return;
+                [moveMargin, moveChildren, scroll] = getMoveFuncs(previousElements[0]);
+                moveChildren = moveChildren.bind(null, targetBox, previousElements, followedElements, moveMargin, recover);
+            };
+        }
+    };
+    var dragfire = function () {
+        that.removeAttribute('dragchildren');
+        removeClass(targetBox, "dropping");
+        var dst, appendSibling, delta;
+        var src = previousElements.length;
+        if (previousElements.length && previousElements[0].moved) for (var cx = 1, dx = previousElements.length + 1; cx < dx; cx++) {
+            if (!previousElements[cx]) {
+                dst = 0;
+                delta = 0;
+                appendSibling = appendChild.before;
+            } else if (!previousElements[cx].moved) {
+                dst = previousElements.length - cx;
+                delta = -1;
+                appendSibling = appendChild.after;
+                break;
             }
-            addClass(targetBox, "dropping");
-            previousElements = [].slice.call(targetBox.children, 0).reverse();
-            followedElements = [];
-            [moveMargin, moveChildren, scroll] = getMoveFuncs(previousElements[0]);
-            moveChildren = moveChildren.bind(null, targetBox, previousElements, followedElements, moveMargin, recover);
-        };
-    }
+        }
+
+        if (followedElements.length && followedElements[0].moved) for (var cx = 1, dx = followedElements.length + 1; cx < dx; cx++) {
+            if (!followedElements[cx]) {
+                dst = followedElements.length + previousElements.length;
+                delta = 0;
+                appendSibling = appendChild.after;
+            } else if (!followedElements[cx].moved) {
+                dst = previousElements.length + cx;
+                delta = 1;
+                appendSibling = appendChild.before;
+                break;
+            }
+        }
+        if (appendSibling) {
+            var children = targetBox.children;
+            var srcElement = children[src];
+            var dstElement = children[dst + delta];
+            src = bindTarget(src, srcElement);
+            dst = bindTarget(dst, dstElement);
+            isFunction(move) && move(src, dst, dst + delta, appendSibling, targetBox);
+            if (srcElement === children[src] && dstElement === children[dst + delta] && srcElement && dstElement) appendSibling(dstElement, srcElement);
+        } else if (isMovingSource === false) {
+            move(previousElements.length, previousElements.length, previousElements.length, null, targetBox);
+        }
+    };
+
     var offall = function () {
         offmousup();
         offtouchend();
@@ -190,8 +248,8 @@ var hooka = function (matcher, move, event, targetChild, isMovingSource) {
 
     // 修改margin无效的情况
     function dragclone() {
+        draginit();
         rebuildTargets();
-        if (targetBox) addClass(targetBox, 'dropping');
         var _previousElements = previousElements.map(cloneCell);
         var _followedElements = followedElements.map(cloneCell);
         previousElements.splice(0, previousElements.length);
@@ -204,109 +262,33 @@ var hooka = function (matcher, move, event, targetChild, isMovingSource) {
         var offall = function () {
             offdragmove();
             offdragend();
-            removeClass(targetBox, "dropping");
         };
         var offdragend = on("dragend")(targetChild, function () {
             offall();
+            dragfire();
             css(targetBox, { opacity: saved_opacity, filter: saved_filter });
             remove(previousElements);
             remove(followedElements);
-            var dst, appendSibling, delta;
-            var src = previousElements.length;
-            if (previousElements.length && previousElements[0].moved) for (var cx = 1, dx = previousElements.length + 1; cx < dx; cx++) {
-                if (!previousElements[cx]) {
-                    dst = 0;
-                    delta = 0;
-                    appendSibling = appendChild.before;
-                } else if (!previousElements[cx].moved) {
-                    dst = previousElements.length - cx;
-                    delta = -1;
-                    appendSibling = appendChild.after;
-                    break;
-                }
-            }
-
-            if (followedElements.length && followedElements[0].moved) for (var cx = 1, dx = followedElements.length + 1; cx < dx; cx++) {
-                if (!followedElements[cx]) {
-                    dst = followedElements.length + previousElements.length;
-                    delta = 0;
-                    appendSibling = appendChild.after;
-                } else if (!followedElements[cx].moved) {
-                    dst = previousElements.length + cx;
-                    delta = 1;
-                    appendSibling = appendChild.before;
-                    break;
-                }
-            }
             previousElements.map(recover);
             followedElements.map(recover);
-            if (appendSibling) {
-                var children = targetBox.children;
-                var srcElement = children[src];
-                var dstElement = children[dst + delta];
-                src = bindTarget(src, srcElement);
-                dst = bindTarget(dst, dstElement);
-                isFunction(move) && move(src, dst, dst + delta, appendSibling, targetBox);
-                if (srcElement === children[src] && dstElement === children[dst + delta] && srcElement && dstElement) appendSibling(dstElement, srcElement);
-            } else if (isMovingSource === false) {
-                move(previousElements.length, previousElements.length, previousElements.length, null, targetBox);
-            }
         });
         var offdragmove = on("dragmove")(targetChild, dragmove);
     }
     // 仅修改Margin就可以实现拖拽效果
     function draglist() {
+        draginit();
         rebuildTargets();
-        if (targetBox) addClass(targetBox, 'dropping');
         autoScroll();
         var offall = function () {
             cancelScroll();
             offdragmove();
             offdragend();
-            if (targetBox) removeClass(targetBox, "dropping");
         };
         var offdragend = on("dragend")(targetChild, function () {
             offall();
-            var dst, appendSibling, delta;
-            var src = previousElements.length;
-            if (previousElements.length && previousElements[0].moved) for (var cx = 1, dx = previousElements.length + 1; cx < dx; cx++) {
-                if (!previousElements[cx]) {
-                    dst = 0;
-                    delta = 0;
-                    appendSibling = appendChild.before;
-                } else if (!previousElements[cx].moved) {
-                    dst = previousElements.length - cx;
-                    delta = -1;
-                    appendSibling = appendChild.after;
-                    break;
-                }
-            }
-
-            if (followedElements.length && followedElements[0].moved) for (var cx = 1, dx = followedElements.length + 1; cx < dx; cx++) {
-                if (!followedElements[cx]) {
-                    dst = followedElements.length + previousElements.length;
-                    delta = 0;
-                    appendSibling = appendChild.after;
-                } else if (!followedElements[cx].moved) {
-                    dst = previousElements.length + cx;
-                    delta = 1;
-                    appendSibling = appendChild.before;
-                    break;
-                }
-            }
+            dragfire();
             previousElements.map(e => moveMargin(e, false));
             followedElements.map(e => moveMargin(e, false));
-            if (appendSibling) {
-                var children = targetBox.children;
-                var srcElement = children[src];
-                var dstElement = children[dst + delta];
-                src = bindTarget(src, srcElement);
-                dst = bindTarget(dst, dstElement);
-                isFunction(move) && move(src, dst, dst + delta, appendSibling, targetBox);
-                if (srcElement === children[src] && dstElement === children[dst + delta] && srcElement && dstElement) appendSibling(dstElement, srcElement);
-            } else if (isMovingSource === false) {
-                move(previousElements.length, previousElements.length, previousElements.length, null, targetBox);
-            }
         });
         var offdragmove = on("dragmove")(targetChild, dragmove);
     }
@@ -320,9 +302,7 @@ var hookEvent = function (matcher, move, event) {
     if (event.target === this) return;
     var targetChild = getTargetIn(matcher, event.target, false);
     if (!targetChild) return;
-    var dragbox = this.dragbox;
-    if (dragbox instanceof Function) dragbox = dragbox.call(this);
-    hooka.call(dragbox || this, matcher, move, event, targetChild);
+    hooka.call(this, matcher, move, event, targetChild);
 };
 function addhook() {
     var mousedownEvent, targetElement, callback, matcher, dropid, allowdrops;

package/coms/zimoli/avatar.js

@@ -4,7 +4,6 @@ function main(elem) {
     }
     if (!/^img$/i.test(elem.tagName)) {
         care(elem, function (src) {
-            console.log(elem);
             css(elem, { backgroundImage: `url('${src}')` });
         })
     }

package/coms/zimoli/button.js

@@ -95,6 +95,11 @@ function button(texter, type) {
         if (_texter.tagName) {
             var button = _texter;
             if (button.childNodes.length) {
+                if (button.childNodes.length === 1 && button.childNodes[0].nodeType !== 1) {
+                    _texter = createElement(_label);
+                    _texter.appendChild(button.childNodes[0]);
+                    button.appendChild(_texter);
+                }
                 appendChild.before(button.childNodes[0], tracker);
             } else {
                 appendChild(button, tracker);

package/coms/zimoli/button.less

@@ -18,7 +18,9 @@
     overflow: hidden;
     outline: none;
 }
-
+>.label{
+    position: relative;
+}
 
 @keyframes busy-loading {
     0% {
@@ -139,9 +141,11 @@
         margin-left: -2px;
         height: 200%;
         background: #fff9;
+        background: inherit;
+        opacity: 0.9;
         border-left: 1px #fff3 solid;
         border-right: 3px #fff6 solid;
-        animation: ltr 3s linear 1s infinite;
+        animation: ltr 2s linear 0s infinite;
     }
 
 }

package/coms/zimoli/checker.less

@@ -1,26 +1,25 @@
 & {
-    display: inline-block;
-    height: 1em;
-    width: 1em;
-    border-radius: 2px;
-    border: .1em solid;
+    height: .8em;
+    width: .8em;
     position: relative;
+    border: .1em solid;
+    margin-right: .3em;
+    font-family: sans-serif;
+    display: inline-block;
+    line-height: 1;
+    text-align: center;
+    margin-top: .15em;
+    border-radius: .12em;
     vertical-align: middle;
-    margin-right: 4px;
 
     >s {
         display: none;
-        border-radius: 50%;
-        width: 1em;
-        height: 1em;
-        line-height: 1;
         text-decoration: none;
-        text-align: center;
         position: absolute;
-        margin: -.5em;
         font-weight: bold;
-        top: 50%;
-        left: 50%;
+        left: 0;
+        right: 0;
+        top: -.4em;
     }
 }