efront 3.14.0 → 3.14.2

package/coms/kugou/buildScroll.less

@@ -9,6 +9,10 @@
 }
 &+.titlebar>back{
     height: 44px;
+    pointer-events: all;
+}
+&+.titlebar{
+    pointer-events: none;
 }
 
 >png {

package/coms/zimoli/autodragchildren.js

@@ -216,8 +216,8 @@ var hooka = function (matcher, move, event, targetChild, isMovingSource) {
             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);
+            var needFire = !isFunction(move) || move(src, dst, dst + delta, appendSibling, targetBox) !== false;
+            if (needFire && 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);
         }

package/coms/zimoli/isMounted.js

@@ -2,7 +2,10 @@ function isMounted(parent) {
     if ("isMounted" in parent) return parent.isMounted;
     var temp = parent;
     while (temp && temp !== document.documentElement) {
+        if ("isMounted" in temp) {
+            return parent.isMounted = temp.isMounted;
+        }
         temp = temp.parentNode;
     }
-    return parent.isMounted = !!temp;
+    return !!temp;
 }

package/coms/zimoli/list.js

@@ -1,5 +1,5 @@
 // 中文编码 utf8
-function ylist(container, generator, $Y) {
+function ylist(container, generator, $Y, group) {
     const cache_height = 2000;
     var restHeight = cache_height;
     var list = container || div();
@@ -118,7 +118,7 @@ function ylist(container, generator, $Y) {
         if (isNaN(itemIndex)) return;
         itemIndex = +itemIndex;
         __animated = false;
-        if (!list.offsetHeight && !list.offsetWidth && !list.isMounted) {
+        if (!list.offsetHeight && !list.offsetWidth && !isMounted(list)) {
             saved_itemIndex = itemIndex;
             return;
         }
@@ -174,7 +174,7 @@ function ylist(container, generator, $Y) {
         }
         var indexed_item = getIndexedElement(index) || bottom_item;
         if (indexed_item) {
-            list.scrollTop = indexed_item.offsetTop + indexed_item.offsetHeight * ratio - parseFloat(getComputedStyle(list).paddingTop);
+            list.scrollTop = -getFirstElement().offsetTop + indexed_item.offsetTop + indexed_item.offsetHeight * ratio;
         }
     };
     var runbuild = lazy(function () {
@@ -264,8 +264,6 @@ function ylist(container, generator, $Y) {
             }
         }
         if (collection.length) {
-            var item = collection[collection.length - 1];
-            scrollTop -= item.offsetTop + getOffsetHeight(item) - collection[0].offsetTop;
             var { paddingCount, paddingMax } = list;
             if (paddingCount > 0 && paddingMax > 0 && paddingCount < paddingMax) {
                 let item = collection[collection.length - 1];
@@ -276,6 +274,13 @@ function ylist(container, generator, $Y) {
                     item = item.nextSibling;
                 }
             }
+            var item = collection[collection.length - 1];
+            if (item) item = item.nextSibling;
+            while (item && item.index % group) {
+                item = collection.pop();
+            }
+            var item = collection[collection.length - 1];
+            if (item) scrollTop -= item.offsetTop + getOffsetHeight(item) - collection[0].offsetTop;
             remove(collection);
         }
         //滚动到相应的位置
@@ -297,7 +302,7 @@ function ylist(container, generator, $Y) {
         if (!(paddingCount > 0 && paddingMax > 0 && paddingCount < paddingMax) || !(scrollTop < targetHeight)) {
             paddingCount = 0;
         }
-        while (scrollTop < targetHeight || paddingCount > 0) {
+        while (scrollTop < targetHeight || paddingCount > 0 || offset % group) {
             offset--;
             if (!(scrollTop < targetHeight)) {
                 paddingCount--;
@@ -350,7 +355,7 @@ function ylist(container, generator, $Y) {
     list.stopY = function () {
         var firstElement = getFirstVisibleElement();
         if (!firstElement) return;
-        var paddingTop = parseFloat(getComputedStyle(list).paddingTop);
+        var paddingTop = getFirstElement().offsetTop;
         var paddingBottom = parseFloat(getComputedStyle(list).paddingBottom);
 
         var scrolled_t = (list.scrollTop + paddingTop - firstElement.offsetTop) / firstElement.offsetHeight;
@@ -398,10 +403,11 @@ function ylist(container, generator, $Y) {
     list.scrollBy = scrollBy;
     list.index = function (update) {
         if (update === false) return saved_itemIndex;
-        var firstElement = getFirstVisibleElement();
-        if (!firstElement) return saved_itemIndex;
-        var index = firstElement.index;
-        var scrolled = (list.scrollTop - firstElement.offsetTop + parseFloat(getComputedStyle(list).paddingTop) + .5 | 0) / firstElement.offsetHeight;
+        var firstVisible = getFirstVisibleElement();
+        if (!firstVisible) return saved_itemIndex;
+        var index = firstVisible.index;
+        var firstElement = getFirstElement();
+        var scrolled = (list.scrollTop - firstVisible.offsetTop + firstElement.offsetTop + .5 | 0) / firstVisible.offsetHeight;
         return index + scrolled;
     };
     list.topIndex = function () {
@@ -477,8 +483,10 @@ function list() {
             $Y = container.getAttribute("direction") || container.tagName;
         }
     }
+    var groupCount = /\d+/.exec($Y);
+    if (groupCount) groupCount = +groupCount[0];
     $Y = /^[xh]|[xh]$/i.test($Y) ? "X" : "Y";
-    var list = ($Y === "X" ? xlist : ylist)(container, generator, $Y);
+    var list = ($Y === "X" ? xlist : ylist)(container, generator, $Y, groupCount || 2);
     if (bindSrc instanceof Array) {
         list.src = bindSrc;
         container.go(container.index() || 0);

package/coms/zimoli/render.js

@@ -2,12 +2,14 @@ var hasOwnProperty = {}.hasOwnProperty;
 var renderElements = Object.create(null);
 var presets = Object.create(null);
 presets.template = function (t) {
-    var node = document.createElement("div");
     var comment = document.createComment('template');
-    node.innerHTML = t.innerHTML;
-    comment.with = [].slice.call(node.childNodes, 0);
-    renderElement(comment.with, t.$scope, t.$parentScopes);
-    remove(node.childNodes);
+    once("append")(comment, function () {
+        var node = document.createElement(comment.parentNode.tagName || "div");
+        node.innerHTML = t.innerHTML;
+        comment.with = [].slice.call(node.childNodes, 0);
+        appendChild.after(comment,comment.with);
+        renderElement(comment.with, comment.$scope, comment.$parentScopes);
+    });
     return comment;
 };
 window.renderElements = renderElements;
@@ -624,7 +626,7 @@ function renderElement(element, scope = element.$scope, parentScopes = element.$
         element.renderid = 1;
         var parentNode = element.parentNode;
         if (parentNode) {
-            if (parentNode.renderid > 1 || parentNode.isMounted) element.renderid = 2;
+            if (parentNode.renderid > 1 || isMounted(parentNode)) element.renderid = 2;
         }
         element.renders = element.renders ? [].concat(element.renders) : [];
         var { ons, copys, attrs, props, binds, context: withContext, ids } = element.$struct;
@@ -698,7 +700,7 @@ function renderElement(element, scope = element.$scope, parentScopes = element.$
         rebuild(element);
         onappend(element, addRenderElement);
         onremove(element, removeRenderElement);
-        if (element.isMounted || element.renderid > 1) addRenderElement.call(element);
+        if (isMounted(element) || element.renderid > 1) addRenderElement.call(element);
     }
     if (elementid) scope[elementid] = element;
     for (var id of ids) {

package/coms/zimoli/search.js

@@ -5,7 +5,10 @@ function search(seartext, options, path = "name") {
             var name = seek(o, path);
             if (name === seartext) hasFullmatch = true;
             var [power, m] = mark.power(name, seartext);
-            return { power, [path]: m, value: o.value, item: o };
+            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;

package/coms/zimoli/table.html

@@ -1,10 +1,12 @@
-<tbody -src="d in data" :style="{'max-height':((innerHeight-46)/32|0)*32+36}">
+<tbody -src="(d,i) in data" :style="tbodyHeight()">
     <tr thead #adapter insert>
+        <td row-index>序号</td>
         <td -repeat="f in fields track by f.id" :style="{width:f.width}" @dblclick="sort(f)"><i -if="f.icon"
                 -class="f.icon"></i></span><span -if="f.name" -html="f.name"></span>
         </td>
     </tr>
     <tr>
+        <td row-index -bind="i+1"></td>
         <td -repeat="f in fields">
             <model -if="f.key" :field=f :data=d readonly></model>
             <a on-click="o.do(d)" -if="!f.key&&f.options&&(!o.when||o.when(d))"

package/coms/zimoli/table.js

@@ -146,7 +146,6 @@ function enrichField(f) {
     f.width = width + 60;
 }
 
-
 function table(elem) {
     var tableElement = isElement(elem) ? elem : document.createElement("table");
     var activeCols = [];
@@ -214,18 +213,21 @@ function table(elem) {
     table.dragbox = function () {
         return thead;
     };
+    var tbodyHeight = e => ({ 'max-height': ((innerHeight - getScreenPosition(table).top - 46) / 32 | 0) * 32 + 36 });
     care(table, function ([fields, data]) {
         thead = null;
-        this.innerHTML = template;
         fields.forEach(enrichField);
+        remove(this.children);
+        this.innerHTML = template;
+
         render(this, {
             fields,
-            tbody: list,
-            innerHeight: {
-                valueOf() {
-                    return innerHeight - getScreenPosition(table).top;
-                }
+            tbody() {
+                var e = list.apply(null, arguments);
+                css(e, tbodyHeight());
+                return e;
             },
+            tbodyHeight,
             data,
             adapter: null,
             model,
@@ -250,9 +252,10 @@ function table(elem) {
         cellMatchManager,
         function (src, dst, rel, append, parentNode) {
             if (table.src) {
-                var [fields] = table.src;
-                var [f] = fields.splice(src, 1);
-                fields.splice(dst, 0, f);
+                if (src < 1 || dst < 1) return false;
+                var fields = parentNode.$scope.fields;
+                var [f] = fields.splice(src - 1, 1);
+                fields.splice(dst - 1, 0, f);
             }
             var children = parentNode.children;
             var srcElement = children[src];

package/coms/zimoli/table.less

@@ -10,6 +10,9 @@
                 box-shadow: 1px 0 0 0 #00000033, -1px 0 0 0 #00000033;
             }
 
+            &:insert {
+                background: #999;
+            }
         }
     }
 
@@ -25,10 +28,15 @@ table,
     box-sizing: border-box;
 }
 
+* {
+    vertical-align: top;
+}
+
 & {
     outline: 1px solid #0006;
 }
 
+
 .y-ing {
     &:before {
         content: "";
@@ -91,21 +99,14 @@ table,
         }
 
         &:nth-of-type(odd) {
-
-            >td,
-            >th {
-                background-color: #eee;
-            }
+            background-color: #eee;
         }
 
         &:nth-of-type(even) {
-
-            >td,
-            >th {
-                background-color: #fff;
-            }
+            background-color: #fff;
         }
 
+
         &:hover {
 
             >td,
@@ -121,12 +122,28 @@ table,
         z-index: 1;
 
         >td {
-            background: #6669;
-            backdrop-filter: blur(20px);
             z-index: 1;
+            background: #999;
             color: #fff;
         }
     }
+
+}
+
+
+tr {
+
+    >th,
+    >td {
+        background: inherit;
+
+        &[row-index] {
+            user-select: none;
+            // pointer-events: none;
+            background: #fff;
+            text-align: right;
+        }
+    }
 }
 
 [thead] {

package/coms/zimoli/vbox.js

@@ -5,7 +5,6 @@ function ybox(generator) {
     var sign = Math.sign || function (a) {
         return +a > 0 ? 1 : -a > 0 ? -1 : 0;
     };
-    var { min, max } = Math;
     var _box;
     if (isNode(generator)) {
         _box = generator;
@@ -63,7 +62,7 @@ function ybox(generator) {
         return _Top;
     };
     var __speed = 0;
-    var smooth = function (useIncrease = true) {
+    var smooth = function smooth(useIncrease = true) {
         var abs_speed = abs(__speed << 2) / time_splitter;
         var abs_speed = abs(__speed << 2) / time_splitter;
         if (abs_speed < 1) {
@@ -107,9 +106,24 @@ function ybox(generator) {
         remove(increaser);
         return 0;
     };
+    var stop_timer = 0, stop_id = 0, cancel_id = 0;
+    var stop = lazy(function stop() {
+        if (cancel_id !== stop_id) return;
+        if (Math.abs(_box.stopY() - _box.Top() )> 0.0001) stop_timer = setTimeout(stop, 16);
+    }, 310);
+    var cancelFrame = function () {
+        __speed = _speed(0);
+        clearTimeout(stop_timer);
+        cancelAnimationFrame(smooth_timer);
+        cancelAnimationFrame(decrease_timer);
+        return ++cancel_id;
+    };
     var decrease = function () {
         if (_decrease(increaser_t) + _decrease(increaser_b)) decrease_timer = requestAnimationFrame(decrease);
-        else if (_box.stopY() - _box.Top()) decrease_timer = requestAnimationFrame(decrease);
+        else {
+            stop_id = cancel_id;
+            stop();
+        }
     };
     var increase = function (deltaY, minusOnly) {
         var t_height = increaser_t.height || 0;
@@ -170,9 +184,7 @@ function ybox(generator) {
         });
         bindtouch(_box, {
             start() {
-                cancelAnimationFrame(smooth_timer);
-                cancelAnimationFrame(decrease_timer);
-                _speed(0);
+                cancelFrame();
             },
             move(scrolled) {
                 var y = -this.Top();
@@ -203,11 +215,7 @@ function ybox(generator) {
     }
     if (isMounted(_box)) initScrollId.call(_box);
     on("append")(_box, initScrollId);
-    _box.cancelFrame = function () {
-        cancelAnimationFrame(smooth_timer);
-        cancelAnimationFrame(decrease_timer);
-        __speed = _speed(0);
-    };
+    _box.cancelFrame = cancelFrame;
     preventOverflowScrolling(_box);
     return _box;
 }

package/package.json

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