@okiss/oms 0.0.18 → 0.0.21

package/dist/index.es.js

@@ -22,11 +22,11 @@ import { ElConfigProvider, ElBreadcrumbItem, ElBreadcrumb, ElRow, ElMain, ElAsid
 import "element-plus/es/components/config-provider/style/css";
 import locale from "element-plus/lib/locale/lang/zh-cn";
 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,6 @@ const _sfc_main$t = /* @__PURE__ */ defineComponent({
   __name: "App",
   setup(__props) {
     var _a, _b, _c, _d;
-    console.log(12, useStore());
     onBeforeMount(() => {
       const loading = document.getElementById("preloader");
       if (loading !== null) {
@@ -1190,10 +1189,10 @@ const baseRequestInterceptor = {
 };
 const baseResponseInterceptor = {
   onFulfilled(response) {
-    var _a, _b, _c, _d;
-    const notHoldApiErr = response.config.notHoldApiErr !== void 0 && response.config.notHoldApiErr === true;
+    var _a, _b, _c, _d, _e, _f, _g;
+    const notHoldApiErr = ((_a = response.config) == null ? void 0 : _a.notHoldApiErr) !== void 0 && ((_b = response.config) == null ? void 0 : _b.notHoldApiErr) === true;
     if (!notHoldApiErr && response.data.code !== 0) {
-      const message = response.data.message || `\u63A5\u53E3\u8BF7\u6C42\u9519\u8BEF ${response.config.method}::${response.config.url}`;
+      const message = response.data.message || `\u63A5\u53E3\u8BF7\u6C42\u9519\u8BEF ${response.config.method}::${(_c = response.config.url) == null ? void 0 : _c.split("?")[0]}`;
       if (response.data.code === 401) {
         MessageBox.alert("\u767B\u5F55\u4FE1\u606F\u5DF2\u8FC7\u671F\u6216\u672A\u767B\u5F55, \u662F\u5426\u8DF3\u8F6C\u767B\u5F55", "\u64CD\u4F5C\u63D0\u9192", {
           showClose: false,
@@ -1218,11 +1217,11 @@ const baseResponseInterceptor = {
       }
       return Promise.reject(message);
     }
-    let _message_box = (_b = (_a = response.data) == null ? void 0 : _a.data) == null ? void 0 : _b._message_box;
+    let _message_box = (_e = (_d = response.data) == null ? void 0 : _d.data) == null ? void 0 : _e._message_box;
     if (_message_box !== void 0) {
       if (isString(_message_box)) {
         _message_box = {
-          message: (_d = (_c = response.data) == null ? void 0 : _c.data) == null ? void 0 : _d._message_box
+          message: (_g = (_f = response.data) == null ? void 0 : _f.data) == null ? void 0 : _g._message_box
         };
       }
       MessageBox(__spreadValues({
@@ -1233,11 +1232,12 @@ const baseResponseInterceptor = {
     return response.data;
   },
   onRejected(error) {
+    var _a;
     if (axios.isCancel(error)) {
       return Promise.reject("");
     }
     Message({
-      message: `${error.message} ${error.config.method}::${error.config.url}`,
+      message: `${error.message} ${error.config.method}::${(_a = error.config.url) == null ? void 0 : _a.split("?")[0]}`,
       type: "error",
       duration: 5 * 1e3
     });
@@ -4809,8 +4809,9 @@ const router = createRouter({
 });
 NProgress.configure({ showSpinner: false });
 function nprogress(router2) {
-  router2.beforeEach((to, form2, next) => {
+  router2.beforeEach((to, from, next) => {
     NProgress.start();
+    to.preHash = location.hash.replace("#", "");
     next();
   });
   router2.afterEach((to) => {
@@ -6014,7 +6015,6 @@ function createAdmin(omsOptions) {
   store.dispatch("settings/updateSettings", omsOptions == null ? void 0 : omsOptions.settings).then();
   app2.config.globalProperties.$http = http;
   app2.config.globalProperties.$router = router;
-  app2.provide("axios", app2.config.globalProperties.$http);
   window.App = app2;
   window.OmsOptions = options;
   setUploadHeaderHandle(() => {