mooho-base-admin-plus 2.0.28 → 2.0.30

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

@@ -12979,12 +12979,8 @@ var account = {
     authFailed({ dispatch: dispatch2 }) {
       dispatch2("logout");
     },
-    load({ dispatch: dispatch2 }, { loadOpenedTabs = true } = {}) {
-      return new Promise(async (resolve) => {
-        await dispatch2("admin/user/load", null, { root: true });
-        await dispatch2("admin/page/openedLoad", { loadOpenedTabs }, { root: true });
-        resolve();
-      });
+    async load({ dispatch: dispatch2 }, { loadOpenedTabs = true } = {}) {
+      await dispatch2("admin/user/load", null, { root: true });
     }
   }
 };
@@ -22299,12 +22295,13 @@ var page = {
         resolve();
       });
     },
-    openedUpdate({ state, dispatch: dispatch2 }, { index: index2, params, query, fullPath, meta, keepMeta = false }) {
+    openedUpdate({ state, dispatch: dispatch2 }, { index: index2, params, query, fullPath, pageName, meta, keepMeta = false }) {
       return new Promise(async (resolve) => {
         let page2 = state.opened[index2];
         page2.params = params || page2.params;
         page2.query = query || page2.query;
         page2.fullPath = fullPath || page2.fullPath;
+        page2.pageName = pageName || page2.pageName;
         page2.meta = meta || page2.meta;
         page2.keepMeta = keepMeta;
         state.opened.splice(index2, 1, page2);
@@ -22312,7 +22309,7 @@ var page = {
         resolve();
       });
     },
-    currentUpdate({ state, dispatch: dispatch2 }, { params, query, fullPath, meta, keepMeta = false }) {
+    currentUpdate({ state, dispatch: dispatch2 }, { params, query, fullPath, pageName, meta, keepMeta = false }) {
       return new Promise(async (resolve) => {
         setTimeout(async () => {
           const index2 = state.opened.findIndex((item) => item.fullPath === state.current);
@@ -22320,6 +22317,7 @@ var page = {
           page2.params = params || page2.params;
           page2.query = query || page2.query;
           page2.fullPath = fullPath || page2.fullPath;
+          page2.pageName = pageName || page2.pageName;
           page2.meta = meta || page2.meta;
           page2.keepMeta = keepMeta;
           state.opened.splice(index2, 1, page2);
@@ -22328,21 +22326,23 @@ var page = {
         }, 0);
       });
     },
-    add({ state, commit: commit2, dispatch: dispatch2 }, { tag, params, query, fullPath }) {
+    add({ state, commit: commit2, dispatch: dispatch2 }, { tag, params, query, fullPath, pageName }) {
       return new Promise(async (resolve) => {
         let newTag = tag;
         newTag.params = params || newTag.params;
         newTag.query = query || newTag.query;
         newTag.fullPath = fullPath || newTag.fullPath;
+        newTag.pageName = pageName || newTag.pageName;
         state.opened.push(newTag);
         if (isKeepAlive(newTag)) {
-          commit2("keepAlivePush", tag.name);
+          commit2("keepAliveRefresh");
         }
         await dispatch2("opened2db");
         resolve();
       });
     },
-    open({ state, commit: commit2, dispatch: dispatch2 }, { name, params, query, fullPath }) {
+    open({ state, commit: commit2, dispatch: dispatch2 }, { name, params, query, path, fullPath }) {
+      const pageName = router$1.getRoutes().find((item) => item.path == path).components.default.name;
       return new Promise(async (resolve) => {
         setTimeout(async () => {
           let opened = state.opened;
@@ -22357,7 +22357,8 @@ var page = {
               index: pageOpenedIndex,
               params,
               query,
-              fullPath
+              fullPath,
+              pageName
             });
           } else {
             let page2 = state.pool.find((t3) => t3.name === name);
@@ -22366,7 +22367,8 @@ var page = {
                 tag: Object.assign({}, page2),
                 params,
                 query,
-                fullPath
+                fullPath,
+                pageName
               });
             }
           }
@@ -22398,9 +22400,9 @@ var page = {
         }
         const index2 = state.opened.findIndex((page2) => page2.fullPath === tagName);
         if (index2 >= 0) {
-          commit2("keepAliveRemove", state.opened[index2].name);
           state.opened.splice(index2, 1);
         }
+        commit2("keepAliveRefresh");
         await dispatch2("opened2db");
         if (isCurrent) {
           const { name = "index", params = {}, query = {} } = newPage;
@@ -22425,8 +22427,9 @@ var page = {
           }
         });
         if (currentIndex > 0) {
-          state.opened.splice(1, currentIndex - 1).forEach(({ name }) => commit2("keepAliveRemove", name));
+          state.opened.splice(1, currentIndex - 1);
         }
+        commit2("keepAliveRefresh");
         state.current = pageAim;
         if (router$1.currentRoute.value.fullPath !== pageAim) {
           router$1.push(pageAim);
@@ -22444,7 +22447,8 @@ var page = {
             currentIndex = index2;
           }
         });
-        state.opened.splice(currentIndex + 1).forEach(({ name }) => commit2("keepAliveRemove", name));
+        state.opened.splice(currentIndex + 1);
+        commit2("keepAliveRefresh");
         state.current = pageAim;
         if (router$1.currentRoute.value.fullPath !== pageAim) {
           router$1.push(pageAim);
@@ -22463,11 +22467,12 @@ var page = {
           }
         });
         if (currentIndex === 0) {
-          state.opened.splice(1).forEach(({ name }) => commit2("keepAliveRemove", name));
+          state.opened.splice(1);
         } else {
-          state.opened.splice(currentIndex + 1).forEach(({ name }) => commit2("keepAliveRemove", name));
-          state.opened.splice(1, currentIndex - 1).forEach(({ name }) => commit2("keepAliveRemove", name));
+          state.opened.splice(currentIndex + 1);
+          state.opened.splice(1, currentIndex - 1);
         }
+        commit2("keepAliveRefresh");
         state.current = pageAim;
         if (router$1.currentRoute.value.fullPath !== pageAim) {
           router$1.push(pageAim);
@@ -22478,7 +22483,8 @@ var page = {
     },
     closeAll({ state, commit: commit2, dispatch: dispatch2 }) {
       return new Promise(async (resolve) => {
-        state.opened.splice(1).forEach(({ name }) => commit2("keepAliveRemove", name));
+        state.opened.splice(1);
+        commit2("keepAliveRefresh");
         await dispatch2("opened2db");
         if (router$1.currentRoute.value.name !== "index") {
           router$1.push(
@@ -22502,42 +22508,17 @@ var page = {
   },
   mutations: {
     keepAliveRefresh(state) {
-      state.keepAlive = state.opened.filter((item) => isKeepAlive(item)).map((e3) => e3.name);
-    },
-    keepAliveRemove(state, name) {
-      const list = [...state.keepAlive];
-      const index2 = list.findIndex((item) => item === name);
-      if (index2 !== -1) {
-        list.splice(index2, 1);
-        state.keepAlive = list;
-      }
-    },
-    keepAlivePush(state, name) {
-      const keep = [...state.keepAlive];
-      keep.push(name);
-      state.keepAlive = keep;
-    },
-    keepAliveClean(state) {
-      state.keepAlive = [];
+      state.keepAlive = state.opened.filter((item) => isKeepAlive(item)).map((e3) => e3.pageName);
     },
     currentSet(state, fullPath) {
       state.current = fullPath;
     },
     init(state, routes) {
       const pool = [];
-      const push2 = function(routes2) {
-        routes2.forEach((route) => {
-          if (route.children) {
-            push2(route.children);
-          } else {
-            if (!route.hidden) {
-              const { meta, name, path } = route;
-              pool.push({ meta, name, path });
-            }
-          }
-        });
-      };
-      push2(routes);
+      routes.forEach((route) => {
+        const { meta, name, path } = route;
+        pool.push({ meta, name, path });
+      });
       state.pool = pool;
     }
   }
@@ -22693,7 +22674,7 @@ var dynamic = {
             }
           });
         }
-        const child = {
+        root.children.push({
           path,
           name,
           meta: {
@@ -22707,8 +22688,7 @@ var dynamic = {
               resolve(pages2[item.templateUrl]);
             });
           }
-        };
-        root.children.push(child);
+        });
       }
     });
     router2.removeRoute("root");
@@ -22759,7 +22739,7 @@ const router = createRouter({
   routes: []
 });
 let inited = false;
-const initRouter = (pages2, layout2, routes) => {
+const initRouter = (pages2, routes) => {
   routes.forEach((route) => {
     router.addRoute(route);
   });
@@ -22771,6 +22751,7 @@ const initRouter = (pages2, layout2, routes) => {
     if (!inited) {
       await dynamic.init(router, pages2);
       store.commit("admin/page/init", router.getRoutes());
+      store.dispatch("admin/page/openedLoad", { loadOpenedTabs: true }, { root: true });
       inited = true;
       next({
         ...to,
@@ -22797,7 +22778,7 @@ const initRouter = (pages2, layout2, routes) => {
   router.afterEach((to) => {
     if (Setting.showProgressBar)
       ViewUIPlus.LoadingBar.finish();
-    if (!("meta" in to) || to.meta && !("tabs" in to.meta) || to.meta && to.meta.tabs) {
+    if (Setting.layout.tabs) {
       store.dispatch("admin/page/open", to);
     }
     window.document.title = window.$app.$t(to.meta.title) + " - " + Setting.info.title;
@@ -24317,7 +24298,6 @@ var customModelApi = {
         data: data2
       });
     } else {
-      console.log("4");
       result2 = await service({
         url: `api/${res$h}/query`,
         method: "post",
@@ -34700,6 +34680,7 @@ var __glob_44_35 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.definePr
   "default": reportPage
 }, Symbol.toStringTag, { value: "Module" }));
 const _sfc_main$I = {
+  name: "template-viewPage",
   mixins: [mixinPage],
   components: {},
   data() {
@@ -41810,9 +41791,6 @@ const _sfc_main$q = {
     }
   },
   activated() {
-    if (this.viewCode && this.autoLoad) {
-      this.loadData();
-    }
   },
   props: {
     title: {
@@ -44569,7 +44547,7 @@ function lastChild(el, selector2) {
   }
   return last || null;
 }
-function index$1(el, selector2) {
+function index$2(el, selector2) {
   var index2 = 0;
   if (!el || !el.parentNode) {
     return -1;
@@ -45191,8 +45169,8 @@ Sortable.prototype = {
     if (lastDownEl === target) {
       return;
     }
-    oldIndex = index$1(target);
-    oldDraggableIndex = index$1(target, options.draggable);
+    oldIndex = index$2(target);
+    oldDraggableIndex = index$2(target, options.draggable);
     if (typeof filter2 === "function") {
       if (filter2.call(this, evt, target, this)) {
         _dispatchEvent({
@@ -45614,8 +45592,8 @@ Sortable.prototype = {
       return completedFired = true;
     }
     function changed() {
-      newIndex = index$1(dragEl);
-      newDraggableIndex = index$1(dragEl, options.draggable);
+      newIndex = index$2(dragEl);
+      newDraggableIndex = index$2(dragEl, options.draggable);
       _dispatchEvent({
         sortable: _this,
         name: "change",
@@ -45699,7 +45677,7 @@ Sortable.prototype = {
         direction = _getSwapDirection(evt, target, targetRect, vertical, differentRowCol ? 1 : options.swapThreshold, options.invertedSwapThreshold == null ? options.swapThreshold : options.invertedSwapThreshold, isCircumstantialInvert, lastTarget === target);
         var sibling;
         if (direction !== 0) {
-          var dragIndex = index$1(dragEl);
+          var dragIndex = index$2(dragEl);
           do {
             dragIndex -= direction;
             sibling = parentEl.children[dragIndex];
@@ -45761,14 +45739,14 @@ Sortable.prototype = {
   },
   _onDrop: function _onDrop(evt) {
     var el = this.el, options = this.options;
-    newIndex = index$1(dragEl);
-    newDraggableIndex = index$1(dragEl, options.draggable);
+    newIndex = index$2(dragEl);
+    newDraggableIndex = index$2(dragEl, options.draggable);
     pluginEvent("drop", this, {
       evt
     });
     parentEl = dragEl && dragEl.parentNode;
-    newIndex = index$1(dragEl);
-    newDraggableIndex = index$1(dragEl, options.draggable);
+    newIndex = index$2(dragEl);
+    newDraggableIndex = index$2(dragEl, options.draggable);
     if (Sortable.eventCanceled) {
       this._nulling();
       return;
@@ -46089,7 +46067,7 @@ function _getSwapDirection(evt, target, targetRect, vertical, swapThreshold, inv
   return 0;
 }
 function _getInsertDirection(target) {
-  if (index$1(dragEl) < index$1(target)) {
+  if (index$2(dragEl) < index$2(target)) {
     return 1;
   } else {
     return -1;
@@ -46137,7 +46115,7 @@ Sortable.utils = {
   closest,
   toggleClass,
   clone: clone$5,
-  index: index$1,
+  index: index$2,
   nextTick: _nextTick,
   cancelNextTick: _cancelNextTick,
   detectDirection: _detectDirection,
@@ -46455,8 +46433,8 @@ function swapNodes(n1, n2) {
   var p1 = n1.parentNode, p2 = n2.parentNode, i1, i22;
   if (!p1 || !p2 || p1.isEqualNode(n2) || p2.isEqualNode(n1))
     return;
-  i1 = index$1(n1);
-  i22 = index$1(n2);
+  i1 = index$2(n1);
+  i22 = index$2(n2);
   if (p1.isEqualNode(p2) && i1 < i22) {
     i22++;
   }
@@ -46566,7 +46544,7 @@ function MultiDragPlugin() {
         multiDragSortable.multiDrag._deselectMultiDrag();
       }
       multiDragElements.forEach(function(multiDragElement) {
-        multiDragElement.sortableIndex = index$1(multiDragElement);
+        multiDragElement.sortableIndex = index$2(multiDragElement);
       });
       multiDragElements = multiDragElements.sort(function(a3, b2) {
         return a3.sortableIndex - b2.sortableIndex;
@@ -46712,7 +46690,7 @@ function MultiDragPlugin() {
             originalEvt: evt
           });
           if (evt.shiftKey && lastMultiDragSelect && sortable.el.contains(lastMultiDragSelect)) {
-            var lastIndex = index$1(lastMultiDragSelect), currentIndex = index$1(dragEl$1);
+            var lastIndex = index$2(lastMultiDragSelect), currentIndex = index$2(dragEl$1);
             if (~lastIndex && ~currentIndex && lastIndex !== currentIndex) {
               var n2, i3;
               if (currentIndex > lastIndex) {
@@ -46755,7 +46733,7 @@ function MultiDragPlugin() {
       if (dragStarted && this.isMultiDrag) {
         folding = false;
         if ((parentEl2[expando].options.sort || parentEl2 !== rootEl2) && multiDragElements.length > 1) {
-          var dragRect = getRect(dragEl$1), multiDragIndex = index$1(dragEl$1, ":not(." + this.options.selectedClass + ")");
+          var dragRect = getRect(dragEl$1), multiDragIndex = index$2(dragEl$1, ":not(." + this.options.selectedClass + ")");
           if (!initialFolding && options.animation)
             dragEl$1.thisAnimationDuration = null;
           toSortable.captureAnimationState();
@@ -46783,10 +46761,10 @@ function MultiDragPlugin() {
               }
               multiDragIndex++;
             });
-            if (oldIndex2 === index$1(dragEl$1)) {
+            if (oldIndex2 === index$2(dragEl$1)) {
               var update3 = false;
               multiDragElements.forEach(function(multiDragElement) {
-                if (multiDragElement.sortableIndex !== index$1(multiDragElement)) {
+                if (multiDragElement.sortableIndex !== index$2(multiDragElement)) {
                   update3 = true;
                   return;
                 }
@@ -46888,9 +46866,9 @@ function MultiDragPlugin() {
         if (folding && multiDragElement !== dragEl$1) {
           newIndex2 = -1;
         } else if (folding) {
-          newIndex2 = index$1(multiDragElement, ":not(." + _this3.options.selectedClass + ")");
+          newIndex2 = index$2(multiDragElement, ":not(." + _this3.options.selectedClass + ")");
         } else {
-          newIndex2 = index$1(multiDragElement);
+          newIndex2 = index$2(multiDragElement);
         }
         newIndicies.push({
           multiDragElement,
@@ -52692,7 +52670,7 @@ function _sfc_render$l(_ctx, _cache, $props, $setup, $data, $options) {
   }, 8, ["modelValue", "mask-closable", "draggable", "width", "before-close", "footer-hide", "onOnVisibleChange"]);
 }
 var ModalTable = /* @__PURE__ */ _export_sfc(_sfc_main$l, [["render", _sfc_render$l], ["__file", "D:/Project/Mooho/FrontEnd/mooho-base-admin-plus/src/components/view/modal-table.vue"]]);
-var index = "";
+var index$1 = "";
 var _default = "";
 var focus = {
   update() {
@@ -54992,23 +54970,23 @@ const _sfc_main$2 = {
   },
   methods: {
     ...mapActions("admin/page", ["close", "closeLeft", "closeRight", "closeOther", "closeAll", "updateOpened"]),
-    tabLabel(h4, page2) {
-      const title = h4("span", this.$t(page2.meta ? page2.meta.title : "\u672A\u547D\u540D") || "\u672A\u547D\u540D");
+    tabLabel(page2) {
+      const title = h("span", this.$t(page2.meta ? page2.meta.title : "\u672A\u547D\u540D") || "\u672A\u547D\u540D");
       let slot = [];
       if (this.showTabsIcon) {
         const fullPathWithoutQuery = page2.fullPath.indexOf("?") >= 0 ? page2.fullPath.split("?")[0] : page2.fullPath;
         const currentMenu = this.allSiderMenu.find((menu2) => menu2.path === fullPathWithoutQuery) || {};
         let icon;
         if (currentMenu.icon) {
-          icon = h4("Icon", {
+          icon = h("Icon", {
             type: currentMenu.icon
           });
         } else if (currentMenu.custom) {
-          icon = h4("Icon", {
+          icon = h("Icon", {
             custom: currentMenu.custom
           });
         } else if (currentMenu.img) {
-          icon = h4("img", {
+          icon = h("img", {
             src: currentMenu.img
           });
         }
@@ -55018,7 +54996,7 @@ const _sfc_main$2 = {
       } else {
         slot.push(title);
       }
-      return h4(
+      return h(
         "div",
         {
           class: "i-layout-tabs-title"
@@ -55114,7 +55092,7 @@ function _sfc_render$2(_ctx, _cache, $props, $setup, $data, $options) {
           (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.opened, (page2, index2) => {
             return openBlock(), createBlock(_component_TabPane, {
               key: index2,
-              label: (h4) => $options.tabLabel(h4, page2),
+              label: () => $options.tabLabel(page2),
               name: page2.fullPath,
               closable: page2.meta && page2.meta.closable
             }, null, 8, ["label", "name", "closable"]);
@@ -55604,7 +55582,7 @@ function _sfc_render(_ctx, _cache, $props, $setup, $data, $options) {
     _: 3
   });
 }
-var basicLayout = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__file", "D:/Project/Mooho/FrontEnd/mooho-base-admin-plus/src/layouts/basic-layout/index.vue"]]);
+var index = /* @__PURE__ */ _export_sfc(_sfc_main, [["render", _sfc_render], ["__file", "D:/Project/Mooho/FrontEnd/mooho-base-admin-plus/src/layouts/basic-layout/index.vue"]]);
 /*! *****************************************************************************
 Copyright (c) Microsoft Corporation.
 
@@ -127342,14 +127320,14 @@ const pages = {};
 Object.keys(files).forEach((key) => {
   pages[key.replace(/(\.\/pages\/)/g, "")] = files[key].default;
 });
-const created = async (app, pages2, routes, layout2 = basicLayout) => {
+const created = async (app, pages2, routes) => {
   if (window) {
     window.$app = getCurrentInstance();
     window.$app.$t = i18n$1.global.t;
     window.$app.$Message = app.config.globalProperties.$Message;
     window.$app.$Notice = app.config.globalProperties.$Notice;
   }
-  initRouter(pages2, layout2, routes);
+  initRouter(pages2, routes);
   store.dispatch("admin/i18n/load", app);
   store.commit("admin/menu/setHeader", menuHeader);
   store.dispatch("admin/account/load");
@@ -127358,4 +127336,4 @@ const created = async (app, pages2, routes, layout2 = basicLayout) => {
 const routeChanged = (to) => {
   store.dispatch("admin/menu/setMenuList", to);
 };
-export { App, applicationApi, basicLayout, created, customModelApi, dataSourceApi, API as default, i18n$1 as i18n, initRouter, lodop, mixinPage, modelApi, pages, service as request, routeChanged, router$1 as router, Setting as setting, store, taskApi, util$8 as util };
+export { App, applicationApi, index as basicLayout, created, customModelApi, dataSourceApi, API as default, i18n$1 as i18n, initRouter, lodop, mixinPage, modelApi, pages, service as request, routeChanged, router$1 as router, Setting as setting, store, taskApi, util$8 as util };