efront 3.22.3 → 3.22.4

package/apps/pivot/auth/login.html

@@ -6,4 +6,7 @@
 </div>
 <div foot>
     <button pending.="pending" type="submit">登录</button>
+</div>
+<div message>
+    登录之前需要使用&nbsp;<b>efront password</b>&nbsp;命令在服务器上设置密码
 </div>

package/apps/pivot/auth/login.js

@@ -9,7 +9,7 @@ function main(host) {
     page.innerHTML = login;
     drag.on(page);
     fields[0].readonly = !!host;
-    on("append")(page, function () {
+    on("mounted")(page, function () {
         move.bindPosition(page, [.5, .5]);
     });
     renderWithDefaults(page, {

package/apps/pivot/auth/login.less

@@ -4,11 +4,24 @@
 
 [foot],
 [head] {
-    &::before{
+    &::before {
         display: none;
     }
+
     text-align: center;
 }
-.button{
-    padding: 0px 40px;
+
+[message] {
+    padding: 2px 4px;
+    line-height: 1.2;
+    text-align: center;
+    color: #29c;
+    border-top: 1px solid #29c;
+    background: #29c1;
+    margin: 0 auto;
+    font-size: 12px;
 }
+
+.button {
+    padding: 0px 40px;
+}

package/apps/pivot/log/boot.js

@@ -5,10 +5,11 @@ var fields = refilm`
         var ip = e.data[e.field.key];
         var m = /(\d+\.){3}\d+$/.exec(ip);
         if (m) {
+            var l = document.createElement('label');
+            appendChild(e, l);
+            l.innerHTML = ' ';
             var setAddress = function (a) {
-                var l = document.createElement('label');
                 l.innerText = a;
-                appendChild(e, l);
             };
             if (e.data.address) setAddress(e.data.address);
             else e.data.address = data.from("iplocation", { ip: m[0] }, function (a) {

package/coms/layer/glance.js

@@ -139,10 +139,12 @@ function main(mainPath, historyName = "") {
             }, 20);
         }
     };
-    on("transitionend")(layer, function (event) {
+    var update = function (event) {
         if (event.target !== this) return;
         dispatch(window, 'resize');
-    });
+    };
+    on("transitionrun")(layer, update);
+    on("transitionend")(layer, update);
     layer.closeLeft = function () {
         closed = true;
         bindClass();

package/coms/zimoli/autodragchildren.js

@@ -21,33 +21,33 @@ var moveChildrenX = function (targetBox, previousElements, followedElements, mov
             var dragPosition = getScreenPosition(dragTarget);
             var dragPositionLeft = dragPosition.left;
             var dragPositionRight = dragPosition.left + dragPosition.width;
-            previousElements.map(function (element) {
+            previousElements.forEach(function (element) {
                 var elementPosition = getScreenPosition(element);
                 var elementCenter = elementPosition.left + elementPosition.width / 2;
                 var delta = elementCenter - (element.moved || 0);
-                if (delta + 7 <= dragPositionLeft) {
+                if (delta + 2 <= dragPositionLeft) {
                     recover(element);
-                } else if (delta - 7 >= dragPositionLeft) {
+                } else if (delta - 2 >= dragPositionLeft) {
                     moveMargin(element, dragPosition.width);
                 }
             });
-            followedElements.map(function (element) {
+            followedElements.forEach(function (element) {
                 var elementPosition = getScreenPosition(element);
                 var elementCenter = elementPosition.left + elementPosition.width / 2;
                 var delta = elementCenter - (element.moved || 0);
-                if (delta + 6 <= dragPositionRight) {
+                if (delta + 2 <= dragPositionRight) {
                     moveMargin(element, -dragPosition.width);
-                } else if (delta - 6 >= dragPositionRight) {
+                } else if (delta - 2 >= dragPositionRight) {
                     recover(element);
                 }
             });
         } else {
-            previousElements.map(recover);
-            followedElements.map(recover);
+            previousElements.forEach(recover);
+            followedElements.forEach(recover);
         }
     } else {
-        previousElements.map(recover);
-        followedElements.map(recover);
+        previousElements.forEach(recover);
+        followedElements.forEach(recover);
     }
 };
 var scrollX = function (targetBox, moveChildren) {
@@ -84,14 +84,8 @@ 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 boxfinder;
+    if (isMovingSource === false) boxfinder = matcher, matcher = null;
     var that = this;
 
     var draggingSourceOpacity = isMovingSource !== false ? 0 : 1;
@@ -100,7 +94,7 @@ var hooka = function (matcher, move, event, targetChild, isMovingSource) {
         moveMargin(element, 0);
     };
     var cloneCell = function (element) {
-        var targets = getTargetIn(matcher, element, false);
+        var targets = matcher ? getTargetIn(matcher, element, false) : element;
         if (isArray(targets)) {
             var extra = targets.slice(1);
             targets = cloneVisible(targets[0]);
@@ -131,6 +125,7 @@ var hooka = function (matcher, move, event, targetChild, isMovingSource) {
     };
     var getBoundingClientRect = function () { return getScreenPosition(this.target) }
     var bindExtra = function (element) {
+        if (!matcher) return element;
         var targets = getTargetIn(matcher, element, false);
         if (isArray(targets)) {
             var [target] = targets;
@@ -150,11 +145,10 @@ var hooka = function (matcher, move, event, targetChild, isMovingSource) {
     }
     var targetBox, saved_opacity, saved_filter, moveMargin, moveChildren;
     var previousElements, followedElements, rebuildTargets, scroll;
-    var that = this;
     var draginit = function () {
         that.setAttribute('dragchildren', '');
         if (targetBox) addClass(targetBox, 'dropping');
-        if (getTargetIn(dragbox, targetChild)) {
+        if (isMovingSource !== false) {
             targetBox = targetChild.parentNode;
             previousElements = getPreviousElementSiblings(targetChild);
             followedElements = getFollowedElementSiblings(targetChild);
@@ -168,7 +162,7 @@ var hooka = function (matcher, move, event, targetChild, isMovingSource) {
             followedElements = [];
             moveChildren = () => { };
             rebuildTargets = function () {
-                var temp = matcher(drag.target);
+                var temp = boxfinder(drag.target);
                 if (temp === targetBox) return;
                 if (previousElements) previousElements.map(recover);
                 if (followedElements) followedElements.map(recover);
@@ -186,11 +180,12 @@ var hooka = function (matcher, move, event, targetChild, isMovingSource) {
                 previousElements = [].slice.call(targetBox.children, 0).reverse();
                 followedElements = [];
                 [moveMargin, moveChildren, scroll] = getMoveFuncs(previousElements[0]);
-                moveChildren = moveChildren.bind(null, that, previousElements, followedElements, moveMargin, recover);
+                moveChildren = moveChildren.bind(null, targetBox, previousElements, followedElements, moveMargin, recover);
             };
         }
     };
     var dragfire = function () {
+        if (!targetBox) return;
         that.removeAttribute('dragchildren');
         removeClass(targetBox, "dropping");
         var dst, appendSibling, delta;
@@ -321,7 +316,7 @@ var hookEvent = function (matcher, move, event) {
     hooka.call(this, matcher, move, event, targetChild);
 };
 function addhook() {
-    var mousedownEvent, targetElement, callback, matcher, dropid, allowdrops;
+    var mousedownEvent, targetElement, callback, boxfinder, dropid, allowdrops;
     [].forEach.call(arguments, function (arg) {
         switch (typeof arg) {
             case "string":
@@ -331,7 +326,7 @@ function addhook() {
                 if (!callback) {
                     callback = arg;
                 } else {
-                    matcher = callback;
+                    boxfinder = callback;
                     callback = arg;
                 }
                 break;
@@ -354,7 +349,7 @@ function addhook() {
     if (!mousedownEvent) return;
     var target = targetElement || mousedownEvent.currentTarget;
     hooka.call(targetElement, function (target) {
-        var res = [].filter.call(allowdrops || (matcher ? matcher(target) : document.querySelectorAll("[allowdrop]")), function (child) {
+        var res = Array.prototype.filter.call(allowdrops || (boxfinder ? boxfinder(target) : document.querySelectorAll("[allowdrop]")), function (child) {
             return target && overlap(child, target);
         }).filter(e => {
             var a = e.getAttribute("allowdrop");

package/coms/zimoli/drag.js

@@ -33,7 +33,7 @@ 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') || a.dragable === false, initialEvent.target)) return;
+    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)) {

package/coms/zimoli/pagination.html

@@ -4,7 +4,7 @@
 <btn class="prev" ng-click="prev()">
     ◀
 </btn>
-<xlist elementid='pglist' ng-src="page in pages" ng-style="{width:fromPixel(40*pages.length)}">
+<xlist #pglist ng-src="page in pages">
     <btn class="item">
         <span ng-bind=page></span>
     </btn>

package/coms/zimoli/pagination.js

@@ -1,5 +1,5 @@
 function main(element) {
-    var page = element || div();
+    var page = element || document.createElement('pagination');
     page.innerHTML = pagination;
     render(page, {
         xlist: list,
@@ -7,26 +7,10 @@ function main(element) {
         fromPixel,
         pages: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13],
         next() {
-            var index = this.pglist.index();
-            index += 10;
-            if (this.pages.length < index + 10) {
-                index = this.pages.length - 10;
-            }
-            if (index < 0) {
-                index = 0;
-            }
-            this.pglist.go(index);
+            this.pglist.scrollBy(this.pglist.clientWidth);
         },
         prev() {
-            var index = this.pglist.index();
-            index -= 10;
-            if (this.pages.length < index + 10) {
-                index = this.pages.length - 10;
-            }
-            if (index < 0) {
-                index = 0;
-            }
-            this.pglist.go(index);
+            this.pglist.scrollBy(-this.pglist.clientWidth);
         },
         start() {
             this.pglist.go(0);
@@ -39,10 +23,11 @@ function main(element) {
             this.pglist.go(index);
         }
     });
-
-    page.querySelector("xlist").go(0);
-    once("append")(page, function () {
-        console.log(page);
-    })
+    var pglist = page.querySelector('xlist');
+    onmounted(page, function () {
+        console.log(pglist)
+        pglist.XScrollBoxId = 1;
+        pglist.go(0);
+    });
     return page;
 }

package/coms/zimoli/pagination.less

@@ -1,26 +1,41 @@
+*{
+    box-sizing: border-box;
+}
 & {
     white-space: nowrap;
+    display: block;
+    min-width: 240px;
+    width: 100%;
+    position: relative;
+}
+
+>xlist {
     display: inline-block;
+    text-overflow: clip;
+    text-align: center;
+    position: relative;
+    overflow: hidden;
+    vertical-align: top;
+    border-left: 72px solid transparent;
+    border-right: 72px solid transparent;
+    margin: 0 -72px 0 -72px;
 
-    >xlist {
-        width: auto;
-        display: inline-block;
-        text-overflow: clip;
-        min-width: 40px;
-        text-align: center;
-        max-width: 400px;
-        position: relative;
-        overflow: hidden;
-        vertical-align: top;
+    .button {
+        border-radius: 0;
     }
+}
 
-    btn {
-        width: 40px;
-        height: 40px;
-        line-height: 40px;
-        vertical-align: top;
-        display: inline-block;
-        background-color: inherit;
-        color: inherit;
-    }
+btn.button {
+    box-shadow: none;
+    padding: 0 10px;
+    min-width: 36px;
+    height: 28px;
+    line-height: 28px;
+    color: #999;
+    margin: 0;
+    vertical-align: top;
+    display: inline-block;
+    background-color: inherit;
+    color: inherit;
+    z-index: 1;
 }

package/coms/zimoli/table.html

@@ -21,4 +21,12 @@
             </a>
         </td>
     </tr>
-</tbody>
+</tbody>
+<tfoot>
+    <tr -if="!data||!data.length" style="padding-bottom: 20px;">
+        <td style="text-align: center;">
+            <template -if="data.is_loading">加载中</template>
+            <template -else>无数据</template>
+        </td>
+    </tr>
+</tfoot>

package/coms/zimoli/table.js

@@ -12,7 +12,6 @@ var moveMargin = function (element, movePixels) {
         marginRight: movePixels ? -movePixels + "px" : ""
     });
 };
-
 var markRowTds = function (tr, deltas, colstart, colend) {
     var inc = 0;
     var collections = [];
@@ -20,8 +19,8 @@ var markRowTds = function (tr, deltas, colstart, colend) {
         while (deltas[inc] > 0) {
             deltas[inc++]--;
         }
-        var colspan = +td.getAttribute("colspan") || 1;
-        var rowspan = +td.getAttribute("rowspan") || 1;
+        var colspan = getColspan(td);
+        var rowspan = getRowspan(td);
         rowspan = rowspan > 1 ? rowspan - 1 : 0;
         colspan = colspan > 1 ? colspan - 1 : 0;
         for (var cx = inc, dx = colspan + inc; cx <= dx; cx++) {
@@ -40,8 +39,8 @@ var markRowTds = function (tr, deltas, colstart, colend) {
     });
     return collections;
 };
-var forEachTableRow = function (table, call) {
-    for (var tr of table.children) {
+var forEachRow = function (tbody, call) {
+    for (var tr of tbody.children) {
         if (isTableRow(tr)) {
             call(tr);
         }
@@ -51,12 +50,18 @@ var forEachTableRow = function (table, call) {
     }
 }
 var getRowsOfTdsByCol = function (table, start, end) {
-    var savedRowDeltas = [];
     var savedCollections = [];
-    forEachTableRow(table, function (tr) {
+    var thead = getThead(table);
+    var tbody = getTbody(table);
+    var savedRowDeltas;
+    if (thead) savedRowDeltas = [], forEachRow(thead, function (tr) {
         var collections = markRowTds(tr, savedRowDeltas, start, end);
         savedCollections.push(collections);
-    })
+    });
+    if (tbody) savedRowDeltas = [], forEachRow(tbody, function (tr) {
+        var collections = markRowTds(tr, savedRowDeltas, start, end);
+        savedCollections.push(collections);
+    });
     return savedCollections;
 }
 var getTdsByCol = function (table, start, end) {
@@ -81,17 +86,29 @@ var getTbody = function (table) {
         if (/^tbody$/i.test(c.tagName) || c.hasAttribute("tbody")) return c;
     }
 };
+var getTfoot = function (table) {
+    for (var c of table.children) {
+        if (/^tfoot$/i.test(c.tagName) || c.hasAttribute("tfoot")) return c;
+    }
+};
 var isTableRow = function (e) {
     return trElementReg.test(e.tagName);
 };
+var getRowspan = function (e) {
+    return +e.getAttribute('rowspan') || 1;
+};
+var getColspan = function (e) {
+    return +e.getAttribute('colspan') || 1;
+}
 var resizeColumn = function (target, targetW) {
     var deltaW = targetW - target.offsetWidth;
-    forEachTableRow(this, function (tr) {
+    forEachRow(this, function (tr) {
         resizeT(tr, tr.offsetWidth + deltaW);
     });
     for (var c of this.children) {
         if (!isTableRow(c)) {
             var tr = c.querySelector('tr');
+            if (!tr) continue;
             c.style.width = tr.style.width;
         }
     }
@@ -104,6 +121,7 @@ var resizeColumn = function (target, targetW) {
         for (var c of cs) {
             w += c.offsetWidth;
         }
+        if (!cs.length) continue;
         w = targetW - w;
         while (w !== 0) {
             var c = cs.pop();
@@ -134,8 +152,8 @@ var getFirstSingleColCell = function (table, col) {
     var tds = getTdsByCol(table, col, col);
     while (tds.length) {
         var td = tds.shift();
-        var colspan = td.getAttribute("colspan") || 1;
-        if (1 === +colspan) return td;
+        var colspan = getColspan(td);
+        if (1 === colspan) return td;
     }
 }
 var adaptTarget = function (event) {
@@ -212,7 +230,7 @@ function enrichField(f) {
     }
 }
 var tbodyHeight = function (tbody) {
-    return { 'max-height': ((innerHeight - getScreenPosition(tbody).top - 16) / 32 | 0) * 32 }
+    return { 'max-height': ((innerHeight - getScreenPosition(tbody).top - 8) / 36 | 0) * 36 }
 };
 
 var setFixed = function (children, scrolled, left, borderRight) {
@@ -271,67 +289,103 @@ var setFixedColumn = function () {
     }
     setFixed.call(this, children, this.scrollLeft, 'left', 'borderRight');
     setFixed.call(this, children.reverse(), this.scrollWidth - this.clientWidth - this.scrollLeft, 'right', 'borderLeft');
+    var tfoot = getTfoot(this);
+    if (tfoot) {
+        css(tfoot, { left: this.scrollLeft });
+    }
+};
+var setClass = function (tds, cls, old) {
+    tds.forEach(td => td[cls] = true);
+    old.forEach(td => { if (!td[cls]) removeClass(td, cls) });
+    tds.forEach(td => { addClass(td, cls); delete td[cls] });
+};
+var getTdsOfSameRow = function (td) {
+    var tds = [td];
+    var tmp = td;
+    var rowspan = getRowspan(td);
+    var { colstart, colend } = td;
+    while (tmp) {
+        tmp = tmp.previousElementSibling;
+        if (!tmp) break;
+        if (colstart - tmp.colend > 1) break;
+        if (getRowspan(tmp) > rowspan) break;
+        tds.push(tmp);
+        colstart = tmp.colstart;
+    };
+    tmp = td;
+    while (tmp) {
+        tmp = tmp.nextElementSibling;
+        if (!tmp) break;
+        if (tmp.colstart - colend > 1) break;
+        if (getRowspan(tmp) > rowspan) break;
+        tds.push(tmp);
+        colend = tmp.colend;
+    }
+    var tr = td.parentNode;
+    while (rowspan > 1) {
+        tr = tr.nextElementSibling;
+        if (!tr) break;
+        for (var c of tr.children) {
+            if (c.colstart >= colstart && c.colend <= colend) {
+                if (getRowspan(c) <= rowspan) {
+                    tds.push(c);
+                }
+            }
+        }
+        rowspan--;
+    }
+    return tds;
 };
-
 function table(elem) {
     var tableElement = isElement(elem) ? elem : document.createElement("table");
     var activeCols = [];
-    var adaptCursor = adaptTarget.bind(tableElement);
-    var off;
-    tableElement.init = function () {
-        off = on("mousemove")(window, adaptCursor);
-    };
-    tableElement.dispose = tableElement.destroy = function () {
-        off();
-    };
-    on("append")(tableElement, tableElement.init);
-    on("remove")(tableElement, tableElement.destroy);
-    if (isMounted(tableElement)) tableElement.init();
-
+    bind('mousemove')(tableElement, adaptTarget);
     moveupon(tableElement, {
         start(event) {
             if (this.resizing) event.preventDefault();
         },
         move: resizeTarget,
     });
+    var activeRows = [];
     onmousemove(tableElement, function (event) {
+        if (table.resizing) return;
+        var tbody = getTbody(table);
+        a: if (tbody) {
+            var tr = getTargetIn(tbody, event.target, false);
+            if (!tr) break a;
+            var td = getTargetIn(tr, event.target, false);
+            if (!td) break a;
+            var tds = getTdsOfSameRow(td);
+            setClass(tds, 'x-ing', activeRows);
+            activeRows = tds;
+            return;
+        }
         if (!thead) {
             thead = getThead(table);
         }
         if (!getTargetIn(thead, event.target)) return;
-        if (table.resizing) return;
         var tds = getTargetIn(cellMatchManager, event.target);
-        if (!isArray(tds)) tds = [];
-        tds.map(function (td) {
-            td.ying = true;
-        });
-        activeCols.map(function (td) {
-            if (!td.ying) removeClass(td, "y-ing");
-        });
-        activeCols = tds.map(function (td) {
-            addClass(td, "y-ing");
-            delete td.ying;
-            return td;
-        });
+        setClass(tds, 'y-ing', activeCols);
+        activeCols = tds;
     });
     onmouseleave(tableElement, function () {
-        activeCols.map(function (td) {
+        activeCols.forEach(function (td) {
             removeClass(td, "y-ing");
         });
+        activeRows.forEach(function (td) {
+            removeClass(td, 'x-ing');
+        });
     });
     var table = tableElement;
     var thead;
     var markedRows = false;
     var cellMatchManager = function (element) {
-        if (!thead) {
-            [thead] = table.getElementsByTagName("thead");
-            if (!thead) thead = table.querySelector('[thead]');
-        }
+        if (!thead) thead = getThead(table);
         if (!getTargetIn(thead, element)) return false;
         if (!tdElementReg.test(element.tagName)) return false;
         if (!markedRows) {
             var savedRowDeltas = [];
-            [].map.call(thead.children, function (tr) {
+            Array.prototype.forEach.call(thead.children, function (tr) {
                 markRowTds(tr, savedRowDeltas);
             });
             markedRows = true;
@@ -340,9 +394,6 @@ function table(elem) {
         return getTdsByCol(table, colstart, colend);
     };
 
-    table.dragbox = function () {
-        return thead;
-    };
     table.useIncrease = false;
     var _vbox = function () {
         table.$Left = function (x) {
@@ -398,6 +449,7 @@ function table(elem) {
             },
             a: button,
             setFixedColumn,
+            pagination
         }, this.$parentScopes.concat(this.$scope));
     })
     autodragchildren(