efront 3.22.2 → 3.22.3

package/coms/basic/[]map.js

@@ -78,6 +78,6 @@ if (!function () { }.bind) Function.prototype.bind = function (context) {
     return function () {
         var _args = args.slice.call(arguments, 0, arguments.length);
         args.unshift.apply(_args, args);
-        return this.apply(context, _args);
+        return this.apply(context === void 0 || context === null ? this : context, _args);
     };
 };

package/coms/frame/list.less

@@ -4,22 +4,24 @@ btn {
 
 & {
     height: 100%;
-    overflow: auto;
 }
 
 table {
 
     td {
 
-        >span,
-        >model {
-            white-space: normal;
+        >[type=text] {
+            white-space: pre-wrap;
             word-break: break-all;
             overflow: hidden;
             display: -webkit-box;
             -webkit-line-clamp: 2;
             -webkit-box-orient: vertical;
+            line-height: 16px;
+            font-size: 10px;
             text-overflow: ellipsis;
+            color: #666;
+            height: 32px;
         }
     }
 }

package/coms/zimoli/autodragchildren.js

@@ -1,7 +1,6 @@
 var moveMarginX = function moveMarginX(element, movePixels) {
     if (element.moved === movePixels) return;
     element.moved = movePixels;
-    element.moving = new Date;
     css(element, {
         transition: movePixels !== false ? "margin .1s" : '',
         userSelect: "none",
@@ -21,25 +20,24 @@ var moveChildrenX = function (targetBox, previousElements, followedElements, mov
         if (area > 0) {
             var dragPosition = getScreenPosition(dragTarget);
             var dragPositionLeft = dragPosition.left;
-            var currentTime = new Date;
+            var dragPositionRight = dragPosition.left + dragPosition.width;
             previousElements.map(function (element) {
-                if (currentTime - element.moving < 100) return;
                 var elementPosition = getScreenPosition(element);
                 var elementCenter = elementPosition.left + elementPosition.width / 2;
-                if (elementCenter - (element.moved || 0) <= dragPositionLeft) {
+                var delta = elementCenter - (element.moved || 0);
+                if (delta + 7 <= dragPositionLeft) {
                     recover(element);
-                } else {
+                } else if (delta - 7 >= dragPositionLeft) {
                     moveMargin(element, dragPosition.width);
                 }
             });
-            var dragPositionRight = dragPosition.left + dragPosition.width;
             followedElements.map(function (element) {
-                if (currentTime - element.moving < 100) return;
                 var elementPosition = getScreenPosition(element);
                 var elementCenter = elementPosition.left + elementPosition.width / 2;
-                if (elementCenter - (element.moved || 0) <= dragPositionRight) {
+                var delta = elementCenter - (element.moved || 0);
+                if (delta + 6 <= dragPositionRight) {
                     moveMargin(element, -dragPosition.width);
-                } else {
+                } else if (delta - 6 >= dragPositionRight) {
                     recover(element);
                 }
             });
@@ -131,6 +129,18 @@ var hooka = function (matcher, move, event, targetChild, isMovingSource) {
         }
         return targets;
     };
+    var getBoundingClientRect = function () { return getScreenPosition(this.target) }
+    var bindExtra = function (element) {
+        var targets = getTargetIn(matcher, element, false);
+        if (isArray(targets)) {
+            var [target] = targets;
+            return {
+                style: target.style, target, getBoundingClientRect,
+                with: targets
+            };
+        }
+        return targets;
+    };
     if (event.target === this) return;
     // var targetChild = getTargetIn(matcher, event.target);
     if (!targetChild) return;
@@ -241,10 +251,10 @@ var hooka = function (matcher, move, event, targetChild, isMovingSource) {
         clearInterval(autoScroll.ing);
         autoScroll.ing = 0;
     };
-    var dragmove = function (event) {
+    var dragmove = lazy(function (event) {
         rebuildTargets();
         moveChildren.call(this, event);
-    };
+    }, -100);
 
     // 修改margin无效的情况
     function dragclone() {
@@ -278,6 +288,12 @@ var hooka = function (matcher, move, event, targetChild, isMovingSource) {
     function draglist() {
         draginit();
         rebuildTargets();
+        var _previousElements = previousElements.map(bindExtra);
+        var _followedElements = followedElements.map(bindExtra);
+        previousElements.splice(0, previousElements.length);
+        followedElements.splice(0, followedElements.length);
+        previousElements.push.apply(previousElements, _previousElements);
+        followedElements.push.apply(followedElements, _followedElements);
         autoScroll();
         var offall = function () {
             cancelScroll();
@@ -287,8 +303,8 @@ var hooka = function (matcher, move, event, targetChild, isMovingSource) {
         var offdragend = on("dragend")(targetChild, function () {
             offall();
             dragfire();
-            previousElements.map(e => moveMargin(e, false));
-            followedElements.map(e => moveMargin(e, false));
+            previousElements.forEach(e => moveMargin(e, false));
+            followedElements.forEach(e => moveMargin(e, false));
         });
         var offdragmove = on("dragmove")(targetChild, dragmove);
     }

package/coms/zimoli/gallery.js

@@ -55,7 +55,7 @@ function gallery(element, minWidth, generator) {
             var e = generator(realindex);
             return e;
         });
-        _box.stopY = noop;
+        _box.$stopY = noop;
         _box.delta = id;
         setWidth(_box);
         return _box;

package/coms/zimoli/getGenerator.js

@@ -2,6 +2,9 @@
 var _slider = createElement(div);
 var getGenerator = function (container, tagName = 'item') {
     if (!container) return;
+    var scopes = container.$parentScopes || [];
+    if (container.$scope) scopes = scopes.concat(container.$scope);
+    container.$generatorScopes = scopes;
     if (container.$generator) return container.$generator;
     var template = document.createElement(tagName);
     var templates = [].concat.apply([], container.childNodes).filter(a => {
@@ -21,8 +24,6 @@ var getGenerator = function (container, tagName = 'item') {
     appendChild(template, templates);
     container.insertBefore = _slider.insertBefore;
     container.appendChild = _slider.appendChild;
-    var scopes = container.$parentScopes || [];
-    if (container.$scope) scopes = scopes.concat(container.$scope);
     return container.$generator = function (index, com, element) {
         if (com === undefined) {
             if (!container.src || index >= container.src.length) return;
@@ -39,6 +40,7 @@ var getGenerator = function (container, tagName = 'item') {
                 if (template1.childNodes.length > 1) element.with = [].concat.apply([], template1.childNodes).slice(1);
             }
         }
+        var scopes = container.$generatorScopes;
         var parsedSrc = container.$src;
         if (parsedSrc) {
             var { keyName, itemName, indexName } = parsedSrc;

package/coms/zimoli/list.js

@@ -14,14 +14,18 @@ function ylist(container, generator, $Y) {
         saved_itemIndex = void 0;
         if (a !== void 0) scrollTo(a);
     });
+    var getNodeTarget = function (node) {
+        if (node.nodeType === 8 && node.template) return node.template;
+        return node;
+    };
     //取底部元素
     var getLastElement = function (nodeType) {
-        var children = nodeType === 1 ? list.children : list.childNodes;
+        var children = list.childNodes;
         for (var cx = children.length - 1; cx >= 0; cx--) {
             var child = children[cx];
-            if (isFinite(child.index) || nodeType === 2 && child.offsetHeight) {
-                return child;
-            }
+            if (!(isFinite(child.index) || nodeType === 2 && child.offsetHeight)) continue;
+            child = getNodeTarget(child);
+            return child;
         }
         return null;
     };
@@ -30,33 +34,33 @@ function ylist(container, generator, $Y) {
         var children = list.childNodes;
         for (var cx = children.length - 1; cx >= 0; cx--) {
             var child = children[cx];
-            if (isFinite(child.index) && child.index === index) {
-                return child;
-            }
+            if (child.index !== index) continue;
+            child = getNodeTarget(child);
+            return child;
         }
         return null;
     };
 
     //取顶部元素
     var getFirstElement = function (nodeType) {
-        var children = nodeType === 1 ? list.children : list.childNodes;
+        var children = list.childNodes;
         for (var cx = 0, dx = children.length; cx < dx; cx++) {
             var child = children[cx];
-            if (isFinite(child.index) || nodeType === 2 && child.offsetHeight) {
-                return child;
-            }
+            if (!(isFinite(child.index) || nodeType === 2 && child.offsetHeight)) continue;
+            child = getNodeTarget(child);
+            return child;
         }
         return null;
     };
     var getFirstVisibleElement = function (deltaY = 0) {
-        var children = list.children;
+        var children = list.childNodes;
         var { scrollTop } = list;
         scrollTop += deltaY;
         for (var cx = 0, dx = children.length; cx < dx; cx++) {
             var child = children[cx];
-            if (isFinite(child.index) && child.offsetTop + child.offsetHeight > scrollTop) {
-                return child;
-            }
+            if (!isFinite(child.index)) continue;
+            child = getNodeTarget(child);
+            if (child.offsetTop + child.offsetHeight > scrollTop) return child;
         }
         return null;
     };
@@ -88,7 +92,9 @@ function ylist(container, generator, $Y) {
         var children = list.children;
         for (var cx = children.length - 1; cx >= 0; cx--) {
             var child = children[cx];
-            if (isFinite(child.index) && child.offsetTop < scrollTop + list.clientHeight) {
+            if (!isFinite(child.index)) continue;
+            child = getNodeTarget(child);
+            if (child.offsetTop < scrollTop + list.clientHeight) {
                 return child;
             }
         }
@@ -96,7 +102,7 @@ function ylist(container, generator, $Y) {
     };
     //元素表
     var getChildrenMap = function () {
-        var children = list.children;
+        var children = list.childNodes;
         var map = {};
         for (var cx = 0, dx = children.length; cx < dx; cx++) {
             var child = children[cx];
@@ -152,6 +158,7 @@ function ylist(container, generator, $Y) {
                 if (item.previousElementSibling !== item) list.insertBefore(item, getNextSibling(last_item));
             }
             last_index = offset;
+            item = getNodeTarget(item);
             last_item = item;
             if (offset === index || !indexed_item) indexed_item = item;
             if (delta > 0) {
@@ -249,6 +256,7 @@ function ylist(container, generator, $Y) {
                 }
                 list.insertBefore(item, getNextSibling(last_element));
             }
+            item = getNodeTarget(item);
             if (!item.offsetHeight) {
                 console.warn(item, '!item.offsetHeight');
                 break;
@@ -312,6 +320,7 @@ function ylist(container, generator, $Y) {
                 item = createItem(offset);
                 if (!item) break;
                 list.insertBefore(item, first_element);
+                item = getNodeTarget(item);
                 scrollTop += flag_element.offsetTop - offsetTop;
                 offsetTop = flag_element.offsetTop;
                 first_element = item;
@@ -352,7 +361,7 @@ function ylist(container, generator, $Y) {
         }
     };
     list.getLastVisibleElement = getLastVisibleElement;
-    list.stopY = function (count, spd) {
+    list.$stopY = function (count, spd) {
         var firstElement = getFirstVisibleElement();
         var lastElement = getLastVisibleElement();
         if (!firstElement || !lastElement || !list.clientHeight) return false;
@@ -386,7 +395,7 @@ function ylist(container, generator, $Y) {
             if (deltay < 3) speed = .5;
             y = last_y + (target_y > last_y ? speed : -speed);
         }
-        list.Top(y);
+        list.$Top(y);
         if (target_y === y) {
             return false;
         }
@@ -394,12 +403,12 @@ function ylist(container, generator, $Y) {
     };
     //导出方法
     list.go = scrollTo;
-    list.Height = function () {
+    list.$Height = function () {
         var elem = getLastElement(2);
         var listRestHeight = elem ? elem.offsetHeight + elem.offsetTop - list.scrollTop : list.clientHeight;
         return currentY() + listRestHeight + restHeight;
     };
-    list.Top = function (y) {
+    list.$Top = function (y) {
         if (isFinite(y)) {
             var last_y = currentY();
             if (y !== last_y) {
@@ -431,7 +440,7 @@ function ylist(container, generator, $Y) {
     on("remove")(list, function () {
         saved_itemIndex = list.index();
     });
-    on("append")(list, function () {
+    onmounted(list, function () {
         if (isFinite(saved_itemIndex)) list.go(saved_itemIndex);
     })
     return list;

package/coms/zimoli/menu.js

@@ -25,9 +25,7 @@ function menu(buttons, map = buttons.map((a, cx) => cx)) {
     });
     css(extra_list, "min-width:180px;width:auto;height:auto;border:1px solid #000;background:#fff;padding:4px 0;");
     select(menu_extra, extra_list);
-    onappend(extra_list, function () {
-        extra_list.go(0);
-    });
+    extra_list.go(0);
     appendChild(menu_box, menu_items, menu_extra);
     return menu_box;
 }

package/coms/zimoli/menuList.js

@@ -14,6 +14,7 @@ var unfocus = function () {
     this.setFocus(null);
 };
 var setFocus = function (focused) {
+    console.log(focused)
     if (focused && focused.hasAttribute("disabled")) return;
     var page = this;
     if (focused) {
@@ -178,6 +179,7 @@ function main(page, items, active, direction = 'y') {
         }
         if (emptyFocus !== false) page.setFocus(target);
         if (!item.length) return;
+        console.log('popupmenu')
         page.setFocus(target);
         var clone = template.cloneNode();
         clone.$parentScopes = page.$parentScopes;
@@ -199,6 +201,7 @@ function main(page, items, active, direction = 'y') {
         once("remove")(menu, function () {
             removeFromList(mounted_menus, this);
         });
+        menu.go(0);
     }
     on("blur")(page, unfocus);
     var template = page.tempalte || document.createElement("ylist");
@@ -215,7 +218,7 @@ function main(page, items, active, direction = 'y') {
         time = +time;
         if (byMousedown && !time) return;
         if (time) byMousedown = false;
-
+        
         if (page.ispop || time) popTimer = setTimeout(function () {
             if (time) byMousedown = elem;
             page.setFocus(elem);
@@ -312,10 +315,7 @@ function main(page, items, active, direction = 'y') {
         }`;
             var notHidden = `!${itemName}.hidden`;
             var generator = getGenerator(page, 'menu-item');
-            var fire0 = function () {
-                fire.apply(this, arguments);
-                dispatch(window, 'render');
-            };
+            page.$generatorScopes.push($scope);
             list(page, function (index) {
                 var item = items[index];
                 if (!item) return;
@@ -323,18 +323,15 @@ function main(page, items, active, direction = 'y') {
                 var a = $scope["menu-item"](null, item);
                 if (src.itemName) a.setAttribute("e-if", notHidden);
                 a.setAttribute("e-class", className);
+                a.setAttribute("on-mouseleave", "cancel.call(this)");
+                a.setAttribute("on-mouseenter", "popMenu.call(this)");
+                a.setAttribute("on-pointermove", "popMenu.call(this)");
+                a.setAttribute("on-click", "open.call(this)");
+                a.setAttribute("_menu", src.itemName);
+                if (istoolbar) a.setAttribute("on-pointerdown", "popMenu1");
                 a = generator(index, item, a);
-                a.menu = item;
-                on("mouseleave")(a, cancel);
-                on("mouseenter")(a, open);
-                on("pointermove")(a, open);
-                if (istoolbar) on("pointerdown")(a, open1);
-                on("click")(a, fire0);
                 return a;
             });
-            on("append")(page, function () {
-                this.go(0);
-            })
         }
         else {
             page.innerHTML = menuList;
@@ -349,7 +346,6 @@ function main(page, items, active, direction = 'y') {
     }
     else {
         var generator = getGenerator(page, 'menu-item');
-
         list(page, function (index) {
             var elem = generator(index);
             if (!elem) return;
@@ -362,7 +358,7 @@ function main(page, items, active, direction = 'y') {
             on("mouseenter")(elem, open);
             on("pointermove")(elem, cancel);
             if (istoolbar) on("pointerdown")(elem, open1);
-            on("click")(elem, fire0);
+            on("click")(elem, fire);
             return elem;
         }, direction);
     }

package/coms/zimoli/on.js

@@ -231,6 +231,18 @@ var broadcast = function (k, hk, event) {
     var element = this;
     var handlers = element[hk];
     if (handlers.length > 1) handlers = handlers.slice();
+    if (event.which === 1 && event.buttons === 0) {
+        // firefox 无按键
+        Object.defineProperty(event, 'which', { value: 0 });
+    }
+    if (event.which === 1 && event.buttons === 2) {
+        // firefox 右键
+        Object.defineProperty(event, 'which', { value: 3 });
+    }
+    if (event.which === 1 && event.buttons === 4) {
+        // firefox 中键
+        Object.defineProperty(event, 'which', { value: 2 });
+    }
     for (var [eventtypes, handler, context] of handlers) {
         if (eventtypes.self && event.target !== element) continue;
         if (!checkKeyNeed(eventtypes, event)) continue;

package/coms/zimoli/once.js

@@ -1,15 +1,17 @@
 "use strict";
 var oncetree = {};
+function emit(ontype, target, handler, firstmost) {
+    var off = ontype.call(this, target, function (event) {
+        off();
+        return handler.call(this, event);
+    }, firstmost);
+    return off;
+}
 function _once(key) {
     if (oncetree[key]) return oncetree[key];
-    return oncetree[key] = function (target, handler, firstmost) {
-        var off = on(key).call(this, target, function (event) {
-            off();
-            return handler.call(this, event);
-        }, firstmost);
-        return off;
-    };
+    return oncetree[key] = emit.bind(null, on(key));
 }
+once.emit = emit;
 function once(key, target, handler, firstmost) {
     if (isFunction(handler) && isNode(target)) return _once(key).call(this, target, handler, firstmost);
     return _once(key);

package/coms/zimoli/render.js

@@ -564,7 +564,17 @@ var createEmiter = function (on) {
             search[0] += `with(this.$parentScopes[${scopes.length}])`;
             getter1 = createGetter(search, false);
         }
-        on(key)(this, function (e) {
+        var onkey;
+        if (key === 'mounted' || key === 'mount') {
+            onkey = on === once ? oncemount : onmounted;
+        }
+        else if (key === 'wheel' || key === 'mousewheel') {
+            onkey = on === once ? once.emit.bind(null, onmousewheel) : onmousewheel;
+        }
+        else {
+            onkey = on(key);
+        }
+        onkey(this, function (e) {
             digest();
             if (parsedSrc) {
                 var target = e.currentTarget || e.target;

package/coms/zimoli/scrollbar.js

@@ -86,7 +86,7 @@ var scrollbary = function () {
         var run = function () {
             var thumbPosition = getScreenPosition(scroller.thumb);
             if (delta > 0 && thumbPosition.bottom - delta / 6 < scrollTimerTarget || delta < 0 && thumbPosition.top - delta / 6 > scrollTimerTarget) {
-                var targetTop = scroller.Top() + delta;
+                var targetTop = scroller.$Top() + delta;
                 var target = scroller.target;
                 scroller.scrollTo(targetTop);
                 if (target) setTargetTop(target, targetTop);
@@ -126,11 +126,11 @@ var scrollbary = function () {
 
 
     var setTargetTop = function (target, top) {
-        if (target.Top instanceof Function) target.Top(top);
+        if (target.$Top instanceof Function) target.$Top(top);
         else target.scrollTop = top;
     };
     var getTargetTop = function (target) {
-        if (target.Top instanceof Function) return target.Top();
+        if (target.$Top instanceof Function) return target.$Top();
         return target.scrollTop;
     };
 
@@ -152,7 +152,7 @@ var scrollbary = function () {
             _scrollbar.autoshow();
         });
         on("change")(_scrollbar, function () {
-            var top = _scrollbar.Top();
+            var top = _scrollbar.$Top();
             setTargetTop(_container, top);
         });
         if (followResize) on("resize")(followResize, _scrollbar.reshape);
@@ -167,7 +167,7 @@ var scrollbary = function () {
         _scrollbar.scrollTo = scrollTo;
         var _handler = document.createElement("scrollbar-thumb");
         _handler.className = "thumb";
-        _scrollbar.Top = getTop;
+        _scrollbar.$Top = getTop;
         _scrollbar.autohide = lazy(function () {
             this.thumb.style.opacity = 0;
         }, 600);

package/coms/zimoli/table.html

@@ -1,14 +1,20 @@
-<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>
+<thead @mounted="setFixedColumn.call(this.parentNode)">
+    <tr inline-block #adapter thead @mounted="resizeT(this)">
+        <td 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>
         </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>
+</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>
+        <td fixed:="f.fixed" -repeat="(f,i) in fields"
+            @mounted="this.style=adapter.children[i+1].getAttribute('style')">
+            <model -if="f.key&&!isEmpty(d[f.key])" :field=f :data=d readonly></model>
+            <template -else>&nbsp;</template>
             <a on-click="o.do(d)" -if="!f.key&&f.options&&(!o.when||o.when(d))"
                 _type="o.type instanceof Function?o.type(d):o.type" -repeat="o in f.options">
                 <span -text="o.name instanceof Function?o.name(d):o.name"></span>