mooho-base-admin-plus 2.5.34 → 2.5.36

package/history.md

@@ -128,3 +128,4 @@ mooho-base-admin-plus@2.5.31 - 修复选择框筛选布尔值的bug
 mooho-base-admin-plus@2.5.32 - 重新发布
 mooho-base-admin-plus@2.5.33 - 表单内嵌套表格change事件增加参数
 mooho-base-admin-plus@2.5.34 - 增加弹出表单change事件参数
+mooho-base-admin-plus@2.5.35 - 修复登录后菜单和页签的bug

package/package/mooho-base-admin-plus.min.esm.js

@@ -9571,7 +9571,7 @@ const res$o = "User", userlApi = {
      */
     async login({ dispatch: r }, { username: a = "", password: o = "" } = {}) {
       const s = await userlApi.login({ account: a, password: o });
-      r("admin/account/saveLoginData", s, { root: !0 });
+      await r("admin/account/saveLoginData", s, { root: !0 });
     },
     /**
      * @description 保存登录信息
@@ -9581,7 +9581,7 @@ const res$o = "User", userlApi = {
      * @param data {String} 数据
      */
     async saveLoginData({ dispatch: r }, { user: a, token: o, data: s } = {}) {
-      util$2.cookies.set("uuid", a.id), util$2.cookies.set("token", o), await r("admin/user/set", a, { root: !0 }), await r("admin/user/setData", s, { root: !0 }), await r("load"), await r("admin/menu/getMenuList", !0, { root: !0 });
+      util$2.cookies.set("uuid", a.id), util$2.cookies.set("token", o), await r("admin/user/set", a, { root: !0 }), await r("admin/user/setData", s, { root: !0 }), await r("admin/menu/getMenuList", !0, { root: !0 }), await r("load", { loadOpenedTabs: Setting.page.loadOpenedTabs });
     },
     /**
      * @description 退出登录
@@ -9613,7 +9613,7 @@ const res$o = "User", userlApi = {
      * @param {Object} loadOpenedTabs 是否加载页签信息
      */
     async load({ dispatch: r }, { loadOpenedTabs: a = !0 } = {}) {
-      await r("admin/user/load", null, { root: !0 });
+      await r("admin/user/load", null, { root: !0 }), await r("admin/page/openedLoad", { loadOpenedTabs: a }, { root: !0 });
     }
   }
 }, __vite_glob_0_0$2 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
@@ -16117,7 +16117,7 @@ const menu = {
       a("setHeader", s);
       const l = getNativeMenuSider();
       let u = o.path, c = getHeaderName(u, l);
-      if (c !== null) {
+      if (c == null && (c = "home"), c !== null) {
         a("setHeaderName", c), a("setMenuSider", l);
         const d = getMenuSider(l, c);
         a("setSider", d), a("setActivePath", o.path);
@@ -16160,35 +16160,7 @@ const menu = {
 }, __vite_glob_0_8$1 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   default: menu
-}, Symbol.toStringTag, { value: "Module" })), pre = "/dashboard/", dashboard = {
-  path: "/dashboard",
-  title: "Dashboard",
-  header: "home",
-  custom: "i-icon-demo i-icon-demo-dashboard",
-  children: [
-    {
-      path: `${pre}console`,
-      title: "主控台"
-    },
-    {
-      path: `${pre}monitor`,
-      title: "监控页"
-    },
-    {
-      path: `${pre}workplace`,
-      title: "工作台",
-      subtitle: "Workplace"
-    }
-  ]
-}, menuSider = [
-  dashboard,
-  {
-    path: "/i18n",
-    title: "menu.i18n",
-    header: "home",
-    custom: "i-icon-demo i-icon-demo-i18n"
-  }
-], isKeepAlive = (r) => lodashExports.get(r, "meta.cache", !1), page = {
+}, Symbol.toStringTag, { value: "Module" })), isKeepAlive = (r) => lodashExports.get(r, "meta.cache", !1), page = {
   namespaced: !0,
   state: {
     // 可以在多页 tab 模式下显示的页面
@@ -16224,13 +16196,16 @@ const menu = {
           const p = r.pool.find((v) => v.name === f.name);
           return f.keepMeta && (p.meta = Object.assign({}, f.meta)), d.push(p ? 1 : 0), Object.assign({}, f, p);
         }).filter((f, p) => d[p] === 1).filter((f) => {
-          const v = getAllSiderMenu(menuSider).find((y) => y.path === f.fullPath);
-          let g = !0;
-          if (v && v.auth) {
-            const y = s.admin.user.info, _ = lodashExports.cloneDeep(y.access);
-            _.push("hidden"), _ && !includeArray(v.auth, _) && (g = !1);
+          let p = s.admin.menu.menuSider;
+          const g = getAllSiderMenu(p).find((_) => _.path === f.fullPath);
+          let y = !0;
+          if (!g)
+            y = !1;
+          else if (g && g.auth) {
+            const _ = s.admin.user.info, S = lodashExports.cloneDeep(_.access);
+            S.push("hidden"), S && !includeArray(g.auth, S) && (y = !1);
           }
-          return g;
+          return y;
         }), a("keepAliveRefresh"), u();
       });
     },
@@ -41203,13 +41178,24 @@ const _sfc_main$n = {
         this.$refs.filterSetting.open(this.tableView, this.copy(this.tableView.filterColumns));
       });
     },
-    // 选中变化
-    onSelectionChange(r) {
-      this.getDataWithChildren(this.data).forEach((o) => {
-        const s = this.selectedData.findIndex((l) => l.id == o.id);
-        r.some((l) => l.id == o.id) ? s == -1 && (o._checked = !0, this.selectedData.push(o)) : s != -1 && (o._checked = !1, this.selectedData.splice(s, 1));
+    onSelect(r, a) {
+      a._checked = !0, this.selectedData.push(a), this.$emit("on-select-change");
+    },
+    onSelectCancel(r, a) {
+      const o = this.selectedData.findIndex((s) => s.id == a.id);
+      a._checked = !1, this.selectedData.splice(o, 1), this.$emit("on-select-change");
+    },
+    onSelectAll(r) {
+      let a = this.getDataWithChildren(this.data);
+      this.selectedData.length = 0, a.forEach((o) => {
+        o._checked = !0, this.selectedData.push(o);
       }), this.$emit("on-select-change");
     },
+    onSelectAllCancel(r) {
+      this.getDataWithChildren(this.data).forEach((o) => {
+        o._checked = !1;
+      }), this.selectedData.length = 0, this.$emit("on-select-change");
+    },
     // 键盘事件
     onKeyup(r) {
       if (r) {
@@ -41718,7 +41704,10 @@ function _sfc_render$n(r, a, o, s, l, u) {
         "highlight-row": o.highlightRow,
         onOnColumnWidthResize: u.columnWidthResize,
         onOnSortChange: u.sortChange,
-        onOnSelectionChange: u.onSelectionChange,
+        onOnSelect: u.onSelect,
+        onOnSelectCancel: u.onSelectCancel,
+        onOnSelectAll: u.onSelectAll,
+        onOnSelectAllCancel: u.onSelectAllCancel,
         onOnDragDrop: a[4] || (a[4] = (X, Y) => this.$emit("on-drag-drop", X, Y)),
         onOnCurrentChange: a[5] || (a[5] = (X, Y) => r.$emit("on-current-change", X, Y))
       }, {
@@ -42116,7 +42105,7 @@ function _sfc_render$n(r, a, o, s, l, u) {
           createElementVNode("div", null, toDisplayString$2(l.size * (l.current - 1) + X + 1), 1)
         ]),
         _: 3
-      }, 8, ["update-show-children", "columns", "data", "max-height", "load-data", "draggable", "span-method", "border", "show-summary", "summary-method", "page-size-opts", "row-class-name", "highlight-row", "onOnColumnWidthResize", "onOnSortChange", "onOnSelectionChange"]),
+      }, 8, ["update-show-children", "columns", "data", "max-height", "load-data", "draggable", "span-method", "border", "show-summary", "summary-method", "page-size-opts", "row-class-name", "highlight-row", "onOnColumnWidthResize", "onOnSortChange", "onOnSelect", "onOnSelectCancel", "onOnSelectAll", "onOnSelectAllCancel"]),
       createElementVNode("div", _hoisted_10$1, [
         o.settingEnable && r.allow("permission/tableView") ? (openBlock(), createBlock(f, {
           key: 0,
@@ -42256,7 +42245,7 @@ function _sfc_render$n(r, a, o, s, l, u) {
     ], 2)
   ], 2);
 }
-const viewTable = /* @__PURE__ */ _export_sfc(_sfc_main$n, [["render", _sfc_render$n], ["__scopeId", "data-v-5d63499f"]]), __vite_glob_1_32 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
+const viewTable = /* @__PURE__ */ _export_sfc(_sfc_main$n, [["render", _sfc_render$n], ["__scopeId", "data-v-ce7edcd8"]]), __vite_glob_1_32 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
   __proto__: null,
   default: viewTable
 }, Symbol.toStringTag, { value: "Module" })), _sfc_main$m = {
@@ -44654,7 +44643,35 @@ function _sfc_render$3(r, a, o, s, l, u) {
     }, 8, ["modelValue"])
   ]);
 }
-const iHeaderSetting = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["render", _sfc_render$3]]);
+const iHeaderSetting = /* @__PURE__ */ _export_sfc(_sfc_main$3, [["render", _sfc_render$3]]), pre = "/dashboard/", dashboard = {
+  path: "/dashboard",
+  title: "Dashboard",
+  header: "home",
+  custom: "i-icon-demo i-icon-demo-dashboard",
+  children: [
+    {
+      path: `${pre}console`,
+      title: "主控台"
+    },
+    {
+      path: `${pre}monitor`,
+      title: "监控页"
+    },
+    {
+      path: `${pre}workplace`,
+      title: "工作台",
+      subtitle: "Workplace"
+    }
+  ]
+}, menuSider = [
+  dashboard,
+  {
+    path: "/i18n",
+    title: "menu.i18n",
+    header: "home",
+    custom: "i-icon-demo i-icon-demo-i18n"
+  }
+];
 function random$1(r = 32) {
   const a = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890", o = a.length;
   let s = "";