efront 4.29.0 → 4.29.1

package/coms/{frame → pivot}/login.xht

@@ -83,7 +83,7 @@
                     remove(page);
                 } else {
                     user.login({});
-                    go('/main');
+                    zimoli();
                 }
             } catch (e) {
                 console.log(e);

package/coms/zimoli/contextmenu.js

@@ -47,6 +47,7 @@ function contextmenu(target, menuItems) {
         start(event) {
             if (event.defaultPrevented || event.type === 'mousedown') return;
             clearTimeout(menuHandle);
+            if (tm) remove(tm);
             menuHandle = setTimeout(function () {
                 var e = createEvent("contextmenu", true);
                 e.clientX = event.clientX;
@@ -77,8 +78,15 @@ function contextmenu(target, menuItems) {
         if (document.activeElement === this) return;
         _remove(this);
     }, 60);
+    var lastMenuTime = 0;
     on("contextmenu")(target, function (event) {
         if (event.defaultPrevented) return;
+        var now = +new Date;
+        if (lastMenuTime + 300 > now) {
+            event.preventDefault();
+            return;
+        }
+        lastMenuTime = now;
         event.preventDefault();
         if (tm) remove(tm), tm = null;
         tm = showContext(event);

package/coms/zimoli/on.js

@@ -491,24 +491,34 @@ var invoke = function (event, type, pointerType) {
     var onclick = on("click");
     var onmousedown = on("mousedown");
     var onmousemove = on("mousemove");
-    var pointerX, pointerY, lasttime_click;
+    var mouseX, mouseY, touchX, touchY, lasttime_click;
     var needFireClick = false;
     var isClickWithPointer = false;
     var touchendFired = false;
-    function clickstart(event) {
+    function clickstart() {
         needFireClick = true;
         touchendFired = false;
         isClickWithPointer = true;
         onclick.preventClick = false;
-        pointerX = event.clientX, pointerY = event.clientY;
     }
     var dis = (a, b) => a * a + b * b
     function clickcancel(event) {
-        if (!event || (event.which || event.touches) && dis(event.clientX - pointerX, event.clientY - pointerY) >= MOVELOCK_DELTA * MOVELOCK_DELTA) {
+        if (!event
+            || event.touches && dis(event.clientX - touchX, event.clientY - touchY) >= MOVELOCK_DELTA * MOVELOCK_DELTA
+            || event.which && dis(event.clientX - mouseX, event.clientY - mouseY) >= MOVELOCK_DELTA * MOVELOCK_DELTA
+        ) {
             onclick.preventClick = true;
         }
     }
-    onmousedown(window, clickstart, true);
+    function mousestart(event) {
+        clickstart();
+        mouseX = event.clientX, mouseY = event.clientY;
+    }
+    function touchstart(event) {
+        clickstart();
+        touchX = event.clientX, touchY = event.clientY;
+    }
+    onmousedown(window, mousestart, true);
 
     onmousemove(window, clickcancel, true);
     if (window.addEventListener) {
@@ -522,7 +532,7 @@ var invoke = function (event, type, pointerType) {
                 return;
             }
             extendTouchEvent(event);
-            clickstart.call(this, event);
+            touchstart.call(this, event);
         }, true);
         window.addEventListener("touchend", function (event) {
             if (event.touches.length > 1) return;

package/coms/zimoli/zimoli.js

@@ -382,11 +382,11 @@ function create(pagepath, args, from, needroles, zimolidata) {
         _pageback_listener = handler;
     };
     var _page = pg.call(state, args, from);
-    _page.realpath = state.realpath;
-    _page.basepath = state.basepath;
-    _page.pagepath = pagepath;
     if (undefined === args || null === args) args = {};
     if (_page) {
+        _page.realpath = state.realpath;
+        _page.basepath = state.basepath;
+        _page.pagepath = pagepath;
         var page_with = _with_elements.splice(_with_length, _with_elements.length - _with_length);
         if (_page.with && _page.with !== _with_elements) {
             page_with = page_with.concat(_page.with);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "4.29.0",
+    "version": "4.29.1",
     "description": "一个开发环境，提供一种自由的前端开发模式，也可作为辅助工具使用。",
     "main": "public/efront.js",
     "directories": {
@@ -10,7 +10,7 @@
         "efront": "public/efront.js"
     },
     "scripts": {
-        "prepack": "node tools/build-efront.js --node --no-target"
+        "prepack": "node tools/build-efront.js --node --no-target&node public/efront build 文件系统.html"
     },
     "repository": {
         "type": "git",