efront 4.22.9 → 4.22.10

package/coms/frame/route.js

@@ -133,13 +133,12 @@
         historys.forEach((a, i) => map[a] = i + 1);
         result.splice(0, result.length);
         var actived, actived_value = 0;
-        var zimoilPath = zimoli.getInitPath();
         var a = function (menu) {
             var res = checkroles(user.roles, menu.roles);
             if (res) {
                 if (savedChildren[menu.id] instanceof Array) menu.children = savedChildren[menu.id].filter(a);
                 if (menu.path) {
-                    if (!firstMenu || menu.path === zimoilPath) firstMenu = menu;
+                    if (!firstMenu) firstMenu = menu;
                     if (map[menu.path] > actived_value) {
                         actived = menu;
                         actived_value = map[menu.path];
@@ -165,6 +164,19 @@
         first_opened = false;
         return result;
     };
+    var findMenu = function (path) {
+        if (!path) return;
+        var run = function (list) {
+            for (var o of list) {
+                if (o.path === path) return o;
+                if (o.children) {
+                    o = run(o.children);
+                    if (o) return o;
+                }
+            }
+        };
+        return run(result);
+    }
     var setActive = function (p, active) {
         while (p) {
             p.active = active;
@@ -198,7 +210,8 @@
     result.open = function (menu) {
         if (!menu) {
             if (first_opened && result.active) return;
-            menu = result.active || firstMenu;
+            var zimoilPath = zimoli.getInitPath();
+            menu = result.active || findMenu(zimoilPath) || firstMenu;
             if (!menu?.path) return;
             first_opened = true;
             zimoli.switch(null, null, menu);

package/coms/zimoli/zimoli.js

@@ -379,7 +379,7 @@ function create(pagepath, args, from, needroles) {
         return alert(i18n`没有权限！`, 0);
     }
     if (!pg) return;
-    history[current_history].wardable = true;
+    if (history[current_history]) history[current_history].wardable = true;
     var _with_length = _with_elements.length;
     state.onback = function (handler) {
         _pageback_listener = handler;
@@ -687,6 +687,8 @@ var _switch = zimoli.switch = function (history_name = default_history, target_b
             setZimoliParams(pagepath, { roles, data: args, id, options });
             emptyState = pagepath;
         }
+    }
+    if (isString(emptyState)) {
         if (!history[current_history]) root_path = (history[current_history] = createEmptyHistory(emptyState))[0];
         else {
             var _history = history[current_history];
@@ -749,6 +751,7 @@ zimoli.createState = createState;
 // 家中进了贼，我们是把家让给它，还是找机会把贼杀了。
 var getInitPath = zimoli.getInitPath = function () {
     var h = history[current_history];
+    if (!h) return locationInitHash;
     if (h.length < 2) return pathFromHash(locationInitHash);
     return h[0];
 };

package/package.json

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