efront 4.22.6 → 4.22.7

package/apps/pivot/home/welcome.js

@@ -29,7 +29,6 @@ function main() {
         scope.nodeVersion = a.nodeVersion;
         scope.platform = a.platform;
         scope.arch = a.arch;
-        console.log('status')
     });
     return page;
 }

package/coms/frame/route.js

@@ -119,6 +119,7 @@
         }
         return [];
     };
+    var first_opened = false;
     result.update = function (items) {
         delete result.loading_promise;
         delete result.then;
@@ -157,6 +158,7 @@
                 };
             }
         }
+        first_opened = false;
         return result;
     };
     var setActive = function (p, active) {
@@ -190,14 +192,15 @@
     });
     result.open = function (menu) {
         if (!menu) {
-            if (result.active) return;
-            menu = result[0];
+            if (first_opened && result.active) return;
+            menu = result.active || result[0];
         }
         if (!menu.path) {
             menu.closed = !menu.closed;
             return;
         }
-        if (menu === result.active) return;
+        if (first_opened && menu === result.active) return;
+        first_opened = true;
         var opened = result.opened || [];
         if (!~opened.indexOf(menu) && !getChild(menu).id) {
             opened.push(menu);

package/coms/layer/glance.js

@@ -82,7 +82,7 @@ function main(mainPath, historyName = "") {
                 appendChild.replace(topLayer, page);
                 topLayer = page;
             }
-            zimoli();
+            if (mainPath) zimoli();
         };
         if (typeof leftPath === 'string') {
             zimoli.prepare(leftPath, hook);

package/coms/zimoli/zimoli.js

@@ -424,7 +424,6 @@ function zimoli(pagepath, args, history_name, oldpagepath) {
             if (pagepath === popupHashlessPath) {
                 preventNextHashChange = true;
                 window_history.go(-1);
-                preventNextHashChange = true;
                 pagepath = pathFromHash(location.hash);
             }
             if (_history.index === 0) pagepath = '';
@@ -513,26 +512,36 @@ var getCurrentHash = function () {
 };
 
 var fixurl = function (historyDelta) {
-    preventNextHashChange = false;
     var hash = getCurrentHash();
+    preventNextHashChange = true;
     if (pagehash_reg.test(hash)) {
         hash = location.href.replace(/\#[\s\S]*$/, '') + hash;
         if (!pagehash_reg.test(location.href)) location.href = hash;
         else if (location.href !== hash) {
             if (historyDelta) {
-                preventNextHashChange = true;
                 window_history.go(historyDelta);
-                preventNextHashChange = false;
                 if (location.href !== hash) {
                     location.href = hash;
                 }
+                else {
+                    preventNextHashChange = false;
+                }
+            }
+            else if (location.href !== hash) {
+                location.href = hash;
+            }
+            else {
+                preventNextHashChange = false;
             }
-            else if (location.href !== hash) location.href = hash;
+        }
+        else {
+            preventNextHashChange = false;
         }
     }
     else if (pagehash_reg.test(location.hash)) {
-        preventNextHashChange = true;
         window_history.go(-1);
+    }
+    else {
         preventNextHashChange = false;
     }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "efront",
-    "version": "4.22.6",
+    "version": "4.22.7",
     "description": "一个开发环境，提供一种自由的前端开发模式，也可作为辅助工具使用。",
     "main": "public/efront.js",
     "directories": {