efront 3.16.0 → 3.17.2

package/coms/zimoli/once.js

@@ -1,15 +1,16 @@
+"use strict";
 var oncetree = {};
 function _once(key) {
     if (oncetree[key]) return oncetree[key];
-    return oncetree[key] = function (target, handler) {
-        var off = on(key)(target, function (event) {
+    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;
     };
 }
-function once(key, target, handler) {
-    if (isFunction(handler) && isNode(target)) return _once(key)(target, handler);
+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/onmounted.js

@@ -9,5 +9,5 @@ function onmounted(target, handle) {
     if (isMounted(target)) {
         handle.call(target);
     }
-    onappend(target, handle);
+    on("mounted")(target, handle);
 }

package/coms/zimoli/render.js

@@ -228,7 +228,7 @@ var createIf = function (search, id = 0) {
                 appendChild.before(this, element);
                 if (element.renderid < 0) {
                     element.renderid = id;
-                    elements[cx] = render(element);
+                    elements[cx] = render(element, this.$scope, this.$parentScopes);
                 }
             }
             else {
@@ -599,7 +599,7 @@ function getFromScopes(key, scope, parentScopes) {
     }
 }
 
-function renderElement(element, scope = element.$scope, parentScopes = element.$parentScopes) {
+function renderElement(element, scope = element.$scope, parentScopes = element.$parentScopes, eager) {
     if (!isNode(element) && element.length) {
         return [].concat.apply([], element).map(function (element) {
             return renderElement(element, scope, parentScopes);
@@ -699,10 +699,10 @@ function renderElement(element, scope = element.$scope, parentScopes = element.$
     }
     ons.forEach(([on, key, value]) => on.call(element, key, [withContext, value]));
     if (element.renders.length) {
-        rebuild(element);
-        onappend(element, addRenderElement);
+        onmounted(element, addRenderElement);
         onremove(element, removeRenderElement);
         if (isMounted(element) || element.renderid > 1) addRenderElement.call(element);
+        else if (eagermount) rebuild(element);
     }
     if (elementid) scope[elementid] = element;
     for (var id of ids) {
@@ -797,13 +797,26 @@ function renderStructure(element, scope, parentScopes = []) {
     if (!element.$struct) element.$struct = { ons, copys, binds, attrs: attr1, props, context: withContext, ids };
     if (element.renderid <= -1) createStructure.call(element, types.if, types.repeat, withContext);
 }
-function render(element, scope, parentScopes) {
+var eagermount = false, renderlock = false;
+function render(element, scope, parentScopes, lazy = true) {
     var if_top_length = if_top.length;
+    var haslock = false;
+    if (!renderlock) {
+        haslock = true;
+        renderlock = true;
+        if (isBoolean(scope) && arguments.length === 2) lazy = +scope, scope = undefined;
+        else if (isBoolean(parentScopes) && arguments.length === 3) lazy = +parentScopes, parentScopes = undefined;
+        else lazy = +lazy;
+        eagermount = !lazy;
+    }
     var e = renderElement(element, scope, parentScopes);
+    if (haslock) {
+        renderlock = false;
+        eagermount = false;
+    }
     if (if_top_length < if_top.length) if_top.splice(if_top_length, if_top.length - if_top_length);
     return e;
 }
-
 var digest = lazy(refresh, -{});
 render.digest = render.apply = render.refresh = digest;
 render.parseRepeat = parseRepeat;

package/coms/zimoli/renderDefaults.js

@@ -8,6 +8,7 @@ extend(renderDefaults, {
     go: zimoli.go,
     care,
     cast,
+    container,
     input,
     padding,
     block,

package/coms/zimoli/resize.js

@@ -142,6 +142,7 @@ function resize(elem, initialEvent) {
 }
 moveupon(window, handle);
 
+
 resize.on = function (elem, dragHandle) {
     if (elem) {
         elem.dragHandle = dragHandle;
@@ -150,6 +151,23 @@ resize.on = function (elem, dragHandle) {
         var off = onmousemove(window, getResizer);
         onremove(elem, off);
     });
+    var computed = getComputedStyle(elem);
+    var resizeh = function () {
+        var elem = this;
+        if (elem.scrollWidth > elem.clientWidth) {
+            css(elem, { width: elem.offsetWidth });
+            dispatch(elem, 'resize');
+        }
+        if (elem.scrollHeight > elem.clientHeight) {
+            css(elem, { height: elem.offsetHeight });
+            dispatch(elem, 'resize');
+        }
+        if (unbind && parseInt(computed.height) && parseInt(computed.width)) {
+            unbind();
+            unbind = null;
+        };
+    }
+    if (!parseInt(computed.height) || !parseInt(computed.width)) var unbind = bind('render')(elem, resizeh);
     if (!~resizingElements.indexOf(elem)) {
         resizingElements.push(elem);
         once('remove')(elem, function () {

package/coms/zimoli/scrollbar.js

@@ -2,7 +2,7 @@ var scrollbary = function () {
     var reshape = function (scrollHeight, offsetHeight) {
         var target = this.target;
         if (target) {
-            this.style.height = target.offsetHeight + "px";
+            css(this, { height: target.offsetHeight });
         }
         var scrollbarHeight = this.offsetHeight;
         var ratio = offsetHeight / scrollHeight;
@@ -10,11 +10,14 @@ var scrollbary = function () {
         if (thumbHeight < 14) thumbHeight = 14;
         if (thumbHeight < 0) thumbHeight = 0;
         this.restHeight = scrollHeight - offsetHeight;
-        this.thumb.style.height = thumbHeight + "px";
+        css(this.thumb, {
+            height: thumbHeight
+        });
         if (thumbHeight >= this.clientHeight) {
             this.style.opacity = 0;
         } else {
             this.style.opacity = 1;
+            this.autoshow();
         }
     };
     var getTop = function () {
@@ -59,7 +62,7 @@ var scrollbary = function () {
         deltaY = targetY - thumbTop;
         moving.y += deltaY;
         if (targetY !== thumbTop) {
-            thumb.style.top = targetY + "px";
+            css(thumb, { top: targetY });
             dispatch(target, "change");
         }
     };
@@ -138,7 +141,7 @@ var scrollbary = function () {
         return { Height, height };
     };
 
-    function bindTarget(_container) {
+    function bindTarget(_container, followResize = _container) {
         var _scrollbar = this;
         _container.with = _scrollbar;
         onappend(_container, _scrollbar.reshape);
@@ -146,24 +149,33 @@ var scrollbary = function () {
         on("scroll")(_container, function () {
             var top = getTargetTop(_container);
             _scrollbar.scrollTo(top);
+            _scrollbar.autoshow();
         });
         on("change")(_scrollbar, function () {
             var top = _scrollbar.Top();
             setTargetTop(_container, top);
         });
-        _scrollbar.reshape();
+        if (followResize) on("resize")(followResize, _scrollbar.reshape);
     }
-    function scrollbar() {
-        var _scrollbar = div();
+    function scrollbar(elem) {
+        var _scrollbar = elem || document.createElement("scrollbar");
         _scrollbar.reshape = function () {
             var _container = _scrollbar.target;
             var { Height, height } = getTargetHeight(_container);
             reshape.call(_scrollbar, Height, height);
         };
         _scrollbar.scrollTo = scrollTo;
-        var _handler = div();
+        var _handler = document.createElement("scrollbar-thumb");
         _handler.className = "thumb";
         _scrollbar.Top = getTop;
+        _scrollbar.autohide = lazy(function () {
+            this.thumb.style.opacity = 0;
+        }, 600);
+        _scrollbar.autoshow = function () {
+            this.autohide();
+            this.thumb.style.opacity = 1;
+        };
+
         moveupon(_handler, {
             start: mousedown,
             move: mousemove,

package/coms/zimoli/scrollbar.less

@@ -1,10 +1,31 @@
 & {
     position: absolute;
-    width: 14px;
+    width: 6px;
     background-color: rgba(0, 0, 0, .1);
     border-radius: 7px;
     height: 100px;
+    border-left: 3px solid transparent;
+
+    &:hover {
+        >.thumb {
+            opacity: 1 !important;
+            overflow: visible;
+        }
+    }
+
     >.thumb {
+        &:after {
+            position: absolute;
+            top: 0;
+            bottom: 0;
+            left: -4px;
+            right: -4px;
+            width: auto;
+            display: block;
+            content: "";
+        }
+
+        transition: opacity .2s;
         position: absolute;
         border-radius: 7px;
         height: 100%;

package/coms/zimoli/tree.js

@@ -132,7 +132,7 @@ function tree() {
         }
         var tabs = new Array(com.tab + 1).join("<t></t>");
         if (isFunction(generator)) {
-            var elem = generator(index, com instanceof Item ? com.value : com);
+            var elem = generator(index, com instanceof Item ? com.value : com, com);
             if (!elem) return;
             span = document.createElement('span');
             span.innerHTML = tabs;
@@ -222,9 +222,9 @@ function tree() {
         };
         com.target = _div;
         _div.refresh();
-        onclick(_div, function () {
+        onclick(_div, function (event) {
             var isClosed = com.isClosed();
-            if (!active(banner, com.value, com, _div)) {
+            if (!active(banner, com.value, com, element.$src ? createItemTarget.call(element, com.value) : _div)) {
                 return;
             }
             if (isClosed === com.isClosed() && com.length) {

package/coms/zimoli/vbox.js

@@ -84,7 +84,7 @@ function ybox(generator) {
     var stop = _box.stopY;
     var stop2 = lazy(function () {
         scrollY.smooth(stop);
-    }, 310);
+    }, 60);
     var decrease = function () {
         var res = _decrease(increaser_t) + _decrease(increaser_b);
         if (!res) {
@@ -126,7 +126,12 @@ function ybox(generator) {
         // ie
         addClass(_box, "trident");
     } else {
+        var wheelTime = 0;
         onmousewheel(_box, function (event) {
+            if (event.timeStamp - wheelTime > 60 && Math.abs(event.deltaY) < 12) {
+                wheelTime = event.timeStamp;
+                return;
+            }
             var deltay = -event.deltaY;
             if (event.moveLocked) return;
             event.moveLocked = true;
@@ -137,7 +142,6 @@ function ybox(generator) {
                 box = getTargetIn(e => e === _box || /^(?:auto|scroll)$/i.test(getComputedStyle(e).overflowY) && e.scrollHeight - e.scrollTop > e.clientHeight, event.target);
             }
             if (box === _box) {
-                event.preventDefault();
                 scrollY.call(_box, -deltay, false);
                 stop2();
             }
@@ -169,7 +173,7 @@ function ybox(generator) {
             temp = temp.parentNode;
         }
         this.YScrollBoxId = +scrollId + 1;
-    }
+    };
     if (isMounted(_box)) initScrollId.call(_box);
     on("append")(_box, initScrollId);
     on("remove")(_box, scrollY.reset);

package/coms/zimoli/zimoli.js

@@ -145,7 +145,7 @@ function go(pagepath, args, history_name, oldpagepath) {
             history_name.activate = pagepath;
             history_name.activateNode = _page;
         }
-        if (isString(pagepath)) {
+        else if (isString(pagepath)) {
             if (fullfill_is_dispatched > 0) return;
             fullfill_is_dispatched = 1;
             var event = createEvent("zimoli");

package/package.json

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