efront 3.22.6 → 3.22.9

package/coms/kugou/playList.js

@@ -28,7 +28,7 @@ var $scope = {
 function main() {
     var page = view();
     page.initialStyle = 'margin-top:10px;opacity:0';
-    page.setAttribute("_dragable", "false");
+    page.setAttribute("_draggable", "false");
     page.innerHTML = playList;
     $scope.play = function (i) {
         if (page.play instanceof Function) {

package/coms/layer/glance.js

@@ -9,7 +9,7 @@ var dragview = function (dragview) {
             offsetWidth = menu.offsetWidth;
             var { target } = event;
             moving = null;
-            if (/(input|textarea|select)/i.test(target.tagName) || getTargetIn(a => a.nodrag || a.hasAttribute('nodrag') || a.dragable === false, event.target)) {
+            if (/(input|textarea|select)/i.test(target.tagName) || getTargetIn(a => a.contentEditbale || a.draggable, event.target)) {
                 moving = false;
             } else {
                 var { childNodes } = target;

package/coms/zimoli/autodragchildren.js

@@ -25,9 +25,11 @@ var moveChildrenX = function (targetBox, previousElements, followedElements, mov
                 var elementPosition = getScreenPosition(element);
                 var elementCenter = elementPosition.left + elementPosition.width / 2;
                 var delta = elementCenter - (element.moved || 0);
-                if (delta + 2 <= dragPositionLeft) {
+                if ((!element.hasAttribute || element.hasAttribute('draggable')) && element.draggable === false);
+                else if (delta + 2 <= dragPositionLeft) {
                     recover(element);
-                } else if (delta - 2 >= dragPositionLeft) {
+                }
+                else if (delta - 2 >= dragPositionLeft) {
                     moveMargin(element, dragPosition.width);
                 }
             });
@@ -35,9 +37,11 @@ var moveChildrenX = function (targetBox, previousElements, followedElements, mov
                 var elementPosition = getScreenPosition(element);
                 var elementCenter = elementPosition.left + elementPosition.width / 2;
                 var delta = elementCenter - (element.moved || 0);
-                if (delta + 2 <= dragPositionRight) {
+                if ((!element.hasAttribute || element.hasAttribute('draggable')) && element.draggable === false);
+                else if (delta + 2 <= dragPositionRight) {
                     moveMargin(element, -dragPosition.width);
-                } else if (delta - 2 >= dragPositionRight) {
+                }
+                else if (delta - 2 >= dragPositionRight) {
                     recover(element);
                 }
             });
@@ -53,6 +57,10 @@ var moveChildrenX = function (targetBox, previousElements, followedElements, mov
 var scrollX = function (targetBox, moveChildren) {
     var dragTarget = drag.target;
     if (!dragTarget || !targetBox) return;
+    targetBox = getTargetIn(function (a) {
+        var computed = getComputedStyle(a);
+        return (computed.overflowX || computed.overflow) !== 'visible' && a.scrollWidth > a.clientWidth;
+    }, targetBox);
     var areaPosition = getScreenPosition(targetBox);
     var dragPosition = getScreenPosition(dragTarget);
     var scrollDelta = 0;
@@ -133,7 +141,8 @@ var hooka = function (matcher, move, event, targetChild, isMovingSource) {
             var [target] = targets;
             return {
                 style: target.style, target, getBoundingClientRect,
-                with: targets
+                with: targets,
+                draggable: !target.hasAttribute('draggable') || target.draggable,
             };
         }
         return targets;
@@ -227,7 +236,6 @@ var hooka = function (matcher, move, event, targetChild, isMovingSource) {
             var children = targetBox.children;
             var srcElement = children[src];
             var dstElement = children[dst + delta];
-            console.log(targetChild, src)
             src = bindTarget(src, isMovingSource ? targetChild : srcElement);
             dst = bindTarget(dst, dstElement);
             var needFire = !isFunction(move) || move(src, dst, dst + delta, appendSibling, targetBox) !== false;
@@ -249,7 +257,8 @@ var hooka = function (matcher, move, event, targetChild, isMovingSource) {
     var autoScroll = function () {
         if (autoScroll.ing) return;
         if (scroll) autoScroll.ing = setInterval(function () {
-            var delta = scroll(targetBox, moveChildren);
+            var delta = scroll(targetBox, dragmove);
+            if (isFunction(matcher)) return;
             if (isMovingSource === false) { }
             else if (delta < 0) {
                 var p = null;

package/coms/zimoli/color.js

@@ -282,12 +282,12 @@ function single(c, u) {
 	return [r * u, g * u, b * u];
 }
 function angle(c1, c2) {
+	c1 = parse(c1);
+	c2 = parse(c2);
+	c1 = normal(c1);
+	c2 = normal(c2);
 	var theta = rgb2h(c2[0], c2[1], c2[2]) - rgb2h(c1[0], c1[1], c1[2]);
 	if (theta < 0) theta += 360;
-	// c1 = parse(c1);
-	// c2 = parse(c2);
-	// c1 = normal(c1);
-	// c2 = normal(c2);
 	// var [r1, g1, b1] = single(c1);
 	// var [r2, g2, b2] = single(c2);
 	// var c = [g1 * b2 - g2 * b1, b1 * r2 - b2 * r1, r1 * g2 - r2 * g1];

package/coms/zimoli/drag.js

@@ -34,14 +34,14 @@ var setZIndex = function () {
 };
 function drag(target, initialEvent, preventOverflow, isMovingSource) {
     if (/^(?:select|input|textarea)$/i.test(initialEvent.target.tagName) || getTargetIn(a => a.nodrag || a.hasAttribute('nodrag'), initialEvent.target)) return;
-    if (target.dragable === false) return;
-    initialEvent.preventDefault();
     if (isArray(target)) {
         var extraTargets = target.slice(1);
         target = target[0];
     } else {
         var extraTargets = target.with ? [].concat(target.with) : [];
     }
+    if ((!target.hasAttribute || target.hasAttribute('draggable')) && target.draggable === false) return;
+    initialEvent.preventDefault();
     var target_offset = getOffset(target);
     var saved_delta = { x: target_offset[0] - initialEvent.screenX, y: target_offset[1] - initialEvent.screenY };
     var clone;

package/coms/zimoli/mark.js

@@ -52,15 +52,17 @@ var power = function (source, search) {
         var match_text_pre = source.slice(0, match_start2);
         var match_text_aft = source.slice(match_start2 + match_text.length);
         var pp = 0, ap = 0;
+        var p = match_text.length;
+        if (match_text_pre.length) p += .1 / match_text_pre.length - .2;
+        if (match_text_aft.length) p += .1 / match_text_aft.length - .1;
         if (match_text_pre.length > 1) {
             [pp, match_text_pre] = power(match_text_pre, search);
         }
         if (match_text_aft.length > 1) {
             [ap, match_text_aft] = power(match_text_aft, search);
         }
-        var p = match_text.length;
-        p *= p;
-        return [p + pp + ap, match_text_pre + MARK_PRE + match_text + MARK_AFT + match_text_aft];
+        p += (pp + ap) * .01;
+        return [p, match_text_pre + MARK_PRE + match_text + MARK_AFT + match_text_aft];
     }
     return [0, source];
 };

package/coms/zimoli/search.js

@@ -1,19 +1,77 @@
 function search(seartext, options, path = "name") {
-    if (options instanceof Array) {
-        var hasFullmatch = false;
-        var a = options.map(o => {
-            var name = seek(o, path);
-            if (name === seartext) hasFullmatch = true;
-            var [power, m] = mark.power(name, seartext);
-            o = Object.create(o);
-            o.power = power;
-            if (path) o[path] = m;
-            return o;
-        }).filter(a => a.power > 0);
-        a.sort(function (a, b) {
-            return b.power - a.power;
-        });
-        a.hasFullmatch = hasFullmatch;
-        return a;
+    var a = new SearchResult;
+    a.searchPath = path;
+    a.searchText = seartext;
+    a.source = options;
+    if (a.searchText) a.start();
+    return a;
+}
+function minusPower(a, b) {
+    return a.power - b.power >= 0;
+}
+function returnName() {
+    return this.name;
+}
+class SearchResult extends Array {
+    searchPath = 'name';
+    searchText = null;
+    source = null;
+    complete = true;
+    searched = 0;
+    searchid = 0;
+    hasFullmatch = false;
+    callback = null;
+    addItem(o) {
+        var path = this.searchPath;
+        var seartext = this.searchText;
+        if (isEmpty(o)) return;
+        var name = seek(o, path);
+        if (name === seartext) this.hasFullmatch = true;
+        var [power, m] = mark.power(name, seartext);
+        if (isNode(o)) {
+            o = extend({
+                name: o.name,
+                title: o.title,
+                value: o.value,
+                key: o.key,
+                nodeType: o.nodeType,
+                tagName: o.tagName,
+                nodeValue: o.nodeValue,
+            }, o);
+        }
+        else o = isObject(o) ? Object.create(o) : new o.constructor(o);
+        o.power = power;
+        if (isString(path)) o[path] = m;
+        else o.name = m, o.toString = returnName, o.valueOf = returnName;
+        if (o.power > 0) {
+            saveToOrderedArray(this, o, minusPower);
+        }
+    }
+    search(text, callback) {
+        if (isFunction(callback)) this.callback = callback;
+        if (text === this.searchText) return;
+        this.searchText = text;
+        this.start();
+    }
+    async start() {
+        this.searched = 0;
+        this.splice(0, this.length);
+        var searchid = ++this.searchid;
+        this.complete = false;
+        if (this.searchText) for (var o of this.source) {
+            this.addItem(o);
+            if (++this.searched % 6000 === 0) {
+                if (isFunction(this.callback)) this.callback();
+                await new Promise(function (ok) {
+                    setTimeout(ok, 20)
+                });
+                if (this.searchid !== searchid) break;
+            }
+        }
+        this.complete = true;
+        if (isFunction(this.callback)) this.callback();
+    }
+    abort() {
+        this.searchid++;
     }
 }

package/coms/zimoli/select.js

@@ -124,7 +124,7 @@ function select(target, list, removeOnSelect, direction) {
         var initList2 = function (src) {
             src.forEach(s => {
                 optionsMap[s.key] = s;
-                s.selected = s.key === target.value;
+                if (isObject(s)) s.selected = s.key === target.value;
             });
             list = selectList(generator, src, !!target.multiple, !!target.editable);
             list.value = target.value;
@@ -183,6 +183,7 @@ function select(target, list, removeOnSelect, direction) {
             if (!target.multiple) {
                 onclick(list, onlistclick);
             }
+            removeOnSelect = undefined;
             bindEvent();
         };
     }

package/coms/zimoli/selectList.js

@@ -2,7 +2,7 @@ var singleClick = function () {
     var node = this.parentNode;
     if (node.activeNode === this) return;
     if (node.activeNode) {
-        if (node.activeNode.origin) node.activeNode.origin.selected = false;
+        if (isObject(node.activeNode.origin)) node.activeNode.origin.selected = false;
         node.activeNode.removeAttribute("selected");
     }
     this.setAttribute("selected", "");
@@ -11,8 +11,9 @@ var singleClick = function () {
     if (node.value === this.value) return;
     node.value = this.value;
     node.name = this.name;
-    if (this.origin) this.origin.selected = true;
+    if (isObject(this.origin)) this.origin.selected = true;
     dispatch(node, "change");
+    if (getTargetIn(node, document.activeElement)) document.activeElement.blur();
 };
 var multipleClick = function () {
     var node = this.parentNode;
@@ -25,10 +26,15 @@ var multipleClick = function () {
         values.splice(index, 1);
         this.removeAttribute("selected");
     }
-    if (this.origin) this.origin.selected = true;
+    if (isObject(this.origin)) this.origin.selected = true;
     dispatch(node, "change");
 };
 
+var searchinput = function () {
+    var ipt = document.createElement("input");
+    ipt.placeholder = '搜索';
+    return ipt;
+};
 
 function main() {
     var children, multiple, addable, generator, page;
@@ -101,9 +107,46 @@ function main() {
 
 
     var hasIcon = false, iconed = '';
+
+    if (children.length > 6) {
+        var ipt = searchinput()
+        page.insertBefore(ipt, page.firstChild);
+        var searchtext = function () {
+            if (this.value) children = searchResult;
+            else children = searchResult.source;
+            if (isMounted(this)) searchResult.search(this.value);
+        };
+        var searchResult = search(ipt.value, children, a => {
+            return isObject(a) ? getName(a) : String(a);
+        });
+        searchResult.callback = function () {
+            if (!searchResult.complete) {
+                page.setAttribute('searching', '');
+            }
+            else {
+                if (searchResult.searchText && !searchResult.length) {
+                    page.setAttribute('empty', '');
+                }
+                else {
+                    page.removeAttribute('empty');
+                }
+                page.removeAttribute('searching');
+            }
+            itemMap = Object.create(null);
+            page.clean();
+            page.go(0);
+        }
+        on('remove')(ipt, function () {
+            searchResult.abort();
+        });
+        on('input')(ipt, searchtext);
+        on('keyup')(ipt, searchtext);
+        on('change')(ipt, searchtext);
+
+    }
     var page = list(page, function (i) {
         if (i < 0 || i >= children.length) return;
-        return createItem(generator ? generator(i) : children[i]);
+        return createItem(generator ? generator(i, children[i]) : children[i]);
     });
     once("mounted")(page, function () {
         var index = 0;
@@ -220,6 +263,6 @@ function main() {
     };
     bind('keydown.enter')(page, enter);
     bind('keydown.space')(page, enter);
-    on('mousedown')(page, e => e.preventDefault());
+    on('mousedown')(page, e => !/^input$/i.test(e.target.tagName) && e.preventDefault());
     return page;
 }

package/coms/zimoli/selectList.less

@@ -78,4 +78,50 @@
         vertical-align: top;
         margin-left: 10px;
     }
+}
+
+&>input {
+    height: 28px;
+    line-height: 28px;
+    padding: 0 16px;
+    border: none;
+    appearance: none;
+    width: 100%;
+    min-width: 0;
+    box-sizing: border-box;
+    display: block;
+    position: sticky;
+    top: 0;
+    border-bottom: 1px solid #0006;
+
+    &:focus {
+        outline-offset: -1px;
+        outline: 1px solid #2ca2f9;
+    }
+}
+
+&[searching] {
+    &::before {
+        content: "正在搜索..";
+        position: absolute;
+        left: 0;
+        top: 0;
+        right: 0;
+        display: block;
+        font-size: 12px;
+        text-align: right;
+        pointer-events: none;
+        padding: 0 16px;
+    }
+}
+
+&[empty] {
+    background-color: #fff;
+}
+
+b {
+    border: 1px solid #29e;
+    background-color: #29e2;
+    font-weight: 400;
+    border-radius: 2px;
 }

package/coms/zimoli/selectList_test.html

@@ -10,5 +10,5 @@
 </select>
 <select -src="(o,i) in options6000">
     <option value="" insert selected>60000个选项</option>
-    <option -text="'选项'+o">选项</option>
+    <option -html="'选项'+o">选项</option>
 </select>

package/coms/zimoli/table.html

@@ -1,6 +1,6 @@
 <thead @mounted="setFixedColumn.call(this.parentNode)">
     <tr inline-block #adapter thead @mounted="resizeT(this)">
-        <td fixed row-index>序号</td>
+        <td draggable="false" fixed row-index>序号</td>
         <td fixed:="f.fixed" -repeat="f in fields track by f.id" :style="{width:f.width}" @dblclick="sort(f)"><i
                 -if="f.icon" -class="f.icon"></i><span -if="f.name" -html="f.name"></span><template
                 -else>&nbsp;</template>
@@ -9,7 +9,7 @@
 </thead>
 <tbody -src="(d,i) in data" :style="tbodyHeight(this)">
     <tr inline-block @mounted="this.style.width=adapter.style.width">
-        <td fixed row-index -bind="i+1" @mounted="this.style=adapter.firstChild.getAttribute('style')">
+        <td draggable="false" fixed row-index -bind="i+1" @mounted="this.style=adapter.firstChild.getAttribute('style')">
         </td>
         <td fixed:="f.fixed" -repeat="(f,i) in fields"
             @mounted="this.style=adapter.children[i+1].getAttribute('style')">

package/coms/zimoli/test_scroll.js

@@ -7,50 +7,36 @@ function createTouchEvent(eventtype, extra = {}) {
 }
 
 
-function _test_scroll(banner) {
-    var clientY = 10;
-    var touchstartEvent = createTouchEvent("touchstart", { clientY });
+function _test_scroll() {
+    var banner = this;
+    var clientY = 2;
+    var touchstartEvent = createTouchEvent("touchstart", { clientY, clientX: 0 });
     var deltaY = 100;
+    onclick.preventClick = true;
     dispatch(banner, touchstartEvent);
     var interval_handle = setInterval(function () {
-        clientY -= deltaY;
-        var touchmoveEvent = createTouchEvent("touchmove", { clientY });
-        dispatch(banner, touchmoveEvent);
+        clientY += deltaY;
+        var touchmoveEvent = createTouchEvent("touchmove", { clientY, clientX: 0 });
+        dispatch(window, touchmoveEvent);
     }, 10);
 
     setTimeout(function () {
-        deltaY = -10
-    }, 300);
+        deltaY = -2
+    }, 200);
     setTimeout(function () {
-        deltaY = 100
+        deltaY = 5
     }, 400);
-    setTimeout(function () {
-        deltaY = -10
-    }, 420);
-    setTimeout(function () {
-        deltaY = -50
-    }, 450);
-    setTimeout(function () {
-        deltaY = 50
-    }, 470);
-    setTimeout(function () {
-        deltaY = -100050
-    }, 480);
-    setTimeout(function () {
-        deltaY = +100050
-    }, 490);
     setTimeout(function () {
         clearInterval(interval_handle);
+    }, 510);
+    setTimeout(function () {
         var touchendEvent = createTouchEvent("touchend");
+        touchendEvent.touches.pop();
         dispatch(banner, touchendEvent);
-    }, 510);
+    }, 560);
 }
 
-function main(banner){
-    if(banner.isMounted){
-        _test_scroll(banner);
-    }else{
-        on("append")(banner,_test_scroll);
-    }
+function main(banner) {
+    oncemount(banner, _test_scroll);
 
 }

package/coms/zimoli/vbox_test.js

@@ -2,7 +2,7 @@ function vbox_test() {
     var vbox1 = vbox();
     var vbox2 = vbox();
     vbox2.innerHTML = '<span></span>';
-    test_scroll(vbox2);
     appendChild(vbox1, vbox2);
+    test_scroll(vbox2);
     return vbox1;
 }

package/coms/zimoli/view.js

@@ -1,6 +1,6 @@
 
 var prototype = {
-    dragable: undefined,
+    draggable: undefined,
     resizable: false,
     closeable: true,
     showTitle: true,
@@ -98,10 +98,10 @@ function view(element) {
     if (window !== element) {
         extend(window, element);
         once("append")(window, function () {
-            if (window.dragable !== true && window.dragable !== false) {
-                window.dragable = /^(fixed|absolute)$/i.test(getComputedStyle(window).position);
+            if (window.draggable !== true && window.draggable !== false) {
+                window.draggable = /^(fixed|absolute)$/i.test(getComputedStyle(window).position);
             }
-            if (window.dragable) window.setAttribute('dragable', 'dragable');
+            if (window.draggable) window.setAttribute('draggable', 'draggable');
         })
         if (window.resizable) resize.on(window);
     }

package/coms/zimoli/view.less

@@ -16,7 +16,7 @@ body>& {
     border: 1px solid #0006;
 }
 
-&[dragable] {
+&[draggable] {
     position: absolute;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "3.22.6",
+    "version": "3.22.9",
     "description": "一个开发工具，开放源代码，自带组件库和编译环境，可以用来开发web组件，web应用或nodejs模块，或做为已有代码的加密工具，也可以做为静态页面服务器或跨域中转服务器使用",
     "main": "public/efront.js",
     "directories": {