efront 3.16.1 → 3.18.0

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);
+    }, 40);
     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 > 40 && 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.1",
+    "version": "3.18.0",
     "description": "一个开发工具，开放源代码，自带组件库和编译环境，可以用来开发web组件，web应用或nodejs模块，或做为已有代码的加密工具，也可以做为静态页面服务器或跨域中转服务器使用",
     "main": "public/efront.js",
     "directories": {