efront 4.22.5 → 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

@@ -16,15 +16,11 @@ var isFirstTimeLoad = sessionInitHash === null;
 var isSimpleRefresh = sessionInitHash === locationInitHash;
 var preventNextHashChange = false;
 window_history.scrollRestoration = 'manual';
+var popupHashlessPath = '/';
 var pathFromHash = function (targetHash) {
     var targetHashIndex = targetHash.indexOf("#" + current_history);
     if (targetHashIndex < 0) return;
     var targetpath = targetHash.slice(targetHashIndex + current_history.replace(/\/$/, '').length + 1);
-    if (targetpath === '/') {
-        preventNextHashChange = true;
-        window_history.go(-1);
-        return;
-    }
     targetpath = decodeURI(targetpath);
     return targetpath;
 }
@@ -38,6 +34,10 @@ onhashchange(window, function (event) {
         var currentHash = getCurrentHash();
         if (currentHash && currentHash === targetHash) return;
         var targetpath = pathFromHash(targetHash);
+        if (pathFromHash(currentHash) === popupHashlessPath) {
+            backward();
+            return;
+        }
         forward(targetpath);
         return;
     }
@@ -420,8 +420,13 @@ function zimoli(pagepath, args, history_name, oldpagepath) {
         root_path = _history[0];
         pagepath = location.hash;
         if (pagepath) {
-            if (_history.index > 0) pagepath = pathFromHash(pagepath);
-            else pagepath = '';
+            pagepath = pathFromHash(pagepath);
+            if (pagepath === popupHashlessPath) {
+                preventNextHashChange = true;
+                window_history.go(-1);
+                pagepath = pathFromHash(location.hash);
+            }
+            if (_history.index === 0) pagepath = '';
         }
         if (!pagepath) pagepath = _history[_history.index];
         try {
@@ -498,7 +503,7 @@ var popstate = function (path_name, history_name) {
 var getCurrentHash = function () {
     var history_name = current_history.replace(/\/$/, '');
     if (rootElements.length) {
-        return `#${history_name}/`;
+        return `#${history_name}${popupHashlessPath}`;
     }
     var _historylist = history[current_history];
     if (!_historylist || _historylist.index < 1) return "";
@@ -507,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 location.replace(hash);
+            else if (location.href !== hash) {
+                location.href = hash;
+            }
+            else {
+                preventNextHashChange = false;
+            }
+        }
+        else {
+            preventNextHashChange = false;
         }
     }
     else if (pagehash_reg.test(location.hash)) {
-        preventNextHashChange = true;
         window_history.go(-1);
+    }
+    else {
         preventNextHashChange = false;
     }
 };
@@ -553,7 +568,10 @@ var forward = function (pgpath) {
         go(1);
     }
     else if (hty[hty.index - 1] === pgpath) {
-        go(-1);
+        backward();
+    }
+    else {
+        go(pgpath);
     }
 };
 var backward = function () {

package/package.json

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