@okiss/oms 0.0.9 → 0.0.12

package/dist/index.es.js

@@ -21,12 +21,12 @@ import { defineComponent, onBeforeMount, provide, resolveComponent, openBlock, c
 import { ElConfigProvider, ElBreadcrumbItem, ElBreadcrumb, ElRow, ElMain, ElAside, ElContainer, ElDivider, ElButton, ElOption, ElSelect, ElFormItem, ElForm, ElCol, ElDrawer, ElDropdownItem, ElDropdownMenu, ElDropdown, ElMenuItem, ElSubMenu, ElOptionGroup, ElMenu, ElScrollbar, ElBacktop, ElMessage as ElMessage$1, ElAlert, ElTree, ElCard } from "element-plus/es";
 import "element-plus/es/components/config-provider/style/css";
 import locale from "element-plus/lib/locale/lang/zh-cn";
-import { globalVariables, addNewStyle, addNewStyleTag, queryParams, logGroup, isString, compactObject, showEleByClassName, Cache, isExternal, getQueryParam, strVarReplace, createIFrame, obj2Param, isObject, effectDataTrans, isArray } from "@okiss/utils";
+import { addNewStyle, addNewStyleTag, queryParams, logGroup, isString, compactObject, showEleByClassName, Cache, isExternal, getQueryParam, strVarReplace, createIFrame, obj2Param, isObject, effectDataTrans, isArray } from "@okiss/utils";
+import { useStore, createStore, mapGetters } from "vuex";
 import Mock from "mockjs";
 import _, { cloneDeep, merge, get, unset } from "lodash";
 import axios from "axios";
 import Cookies from "js-cookie";
-import { createStore, useStore, mapGetters } from "vuex";
 import ElementPlus, { ElMessage, ElMessageBox } from "element-plus";
 import "element-plus/dist/index.css";
 import "dayjs/locale/zh-cn";
@@ -79,7 +79,7 @@ const _sfc_main$t = /* @__PURE__ */ defineComponent({
   __name: "App",
   setup(__props) {
     var _a, _b, _c, _d;
-    console.log(123, globalVariables());
+    console.log(12, useStore());
     onBeforeMount(() => {
       const loading = document.getElementById("preloader");
       if (loading !== null) {
@@ -782,7 +782,7 @@ const defaultSettings = {
   title: "oms",
   fixedHeader: false,
   sidebarLogo: true,
-  logo: "https://gitee.com/daodao97/asset/raw/master/imgs/logo.png",
+  logo: "http://assest.daodao.run/logo.png",
   closeNavNotice: false,
   navBarNotice: "",
   hasNewMessage: true,
@@ -797,7 +797,7 @@ const defaultSettings = {
   nav: [],
   whiteRoutes: ["/login"],
   tokenExpire: 7 * 24 * 60 * 60 * 1e3,
-  defaultAvatar: "https://gitee.com/daodao97/asset/raw/master/imgs/U0u4Ko.jpg"
+  defaultAvatar: "http://assest.daodao.run/avatar.jpg"
 };
 const defaultOptions = {
   axios: defaultAxios,
@@ -3735,7 +3735,7 @@ const _sfc_main$m = {
     const show = ref(false);
     const key = ref(1);
     const direction = "rtl";
-    const route = useRoute();
+    const route = useRoute$1();
     const pageSchema = computed(() => {
       return store.state.app.pages[route.path];
     });
@@ -4834,13 +4834,18 @@ function getToken() {
 }
 function permission(router2) {
   router2.beforeEach(async (to, form2, next) => {
+    var _a, _b;
     if (getWhiteRoutes().indexOf(to.path) !== -1) {
       next();
       return;
     }
     const token = getToken();
     if (token) {
-      next();
+      if ((_a = to.query) == null ? void 0 : _a.redirect) {
+        next((_b = to.query) == null ? void 0 : _b.redirect);
+      } else {
+        next();
+      }
       return;
     }
     const redirect = to.query.redirect || to.path;