@utogether/utils 3.0.0-beta.33 → 3.0.0-beta.34

package/dist/pkg/http/index.d.ts

@@ -17,6 +17,7 @@ declare class SuHttp {
     private static retryOriginalRequest;
     private httpInterceptorsRequest;
     private setToken;
+    private routeToLogin;
     private httpInterceptorsResponse;
     private transformConfigByMethod;
     request<T>(method: RequestMethods, url: string, param?: AxiosRequestConfig, axiosConfig?: SuHttpRequestConfig): Promise<T>;

package/dist/pkg/storage.d.ts

@@ -26,8 +26,9 @@ declare class localforageProxy implements ProxyStorage {
     removeItem(key: string): void;
     clear(): void;
 }
+/** 文档开头 */
+/** 文档结束 */
 export declare const storageSession: sessionStorageProxy;
 export declare const storageLocal: localStorageProxy;
-/** 文档结束 */
 export declare const dbstorage: localforageProxy;
 export {};

package/dist/utils.es.js

@@ -69,12 +69,7 @@ class localforageProxy {
     this.storage.clear();
   }
 }
-let window$1;
-window$1 || (window$1 = {
-  sessionStorage: {},
-  localStorage: {}
-});
-const storageSession = new sessionStorageProxy(window$1 == null ? void 0 : window$1.sessionStorage), storageLocal = new localStorageProxy(window$1 == null ? void 0 : window$1.localStorage), dbstorage = new localforageProxy();
+const storageSession = new sessionStorageProxy(sessionStorage), storageLocal = new localStorageProxy(localStorage), dbstorage = new localforageProxy();
 /*! typescript-cookie v1.0.6 | MIT */
 const encodeName = (a) => encodeURIComponent(a).replace(/%(2[346B]|5E|60|7C)/g, decodeURIComponent).replace(/[()]/g, escape), encodeValue = (a) => encodeURIComponent(a).replace(/%(2[346BF]|3[AC-F]|40|5[BDE]|60|7[BCD])/g, decodeURIComponent), decodeName = decodeURIComponent, decodeValue = (a) => (a[0] === '"' && (a = a.slice(1, -1)), a.replace(/(%[\dA-F]{2})+/gi, decodeURIComponent));
 function stringifyAttributes(a) {
@@ -1232,7 +1227,7 @@ const useRender = () => {
       placeholder: null
     }, L, S;
     isObject(c) ? (C = Object.assign(C, c), L = c.defaultValue, S = c == null ? void 0 : c.code) : S = c;
-    const I = (N = storageLocal.getItem("kLov")[S]) == null ? void 0 : N.children, D = I ? I.filter((T) => T.enabled === "1") : [];
+    const I = (N = storageLocal.getItem("kLov")[S]) == null ? void 0 : N.children, D = I ? I.filter((R) => R.enabled === "1") : [];
     return {
       name: "#select",
       optionProps: a,
@@ -1361,14 +1356,14 @@ const useRender = () => {
     const u = w(H), C = "yyyy-MM-dd HH:mm:ss", L = c == null ? void 0 : c.defaultValue;
     return { name: "VxeDatePicker", props: Object.assign({ type: "date", valueFormat: C, clearable: !0 }, c || {}), defaultValue: L, events: u };
   }, m = (c, H) => {
-    const u = w(H), C = "yyyy-MM-dd HH:mm:ss", L = c == null ? void 0 : c.startValue, S = c == null ? void 0 : c.endValue, I = c == null ? void 0 : c.startField, D = c == null ? void 0 : c.endField, T = Object.assign({ type: "date", valueFormat: C, clearable: !0 }, c || {});
+    const u = w(H), C = "yyyy-MM-dd HH:mm:ss", L = c == null ? void 0 : c.startValue, S = c == null ? void 0 : c.endValue, I = c == null ? void 0 : c.startField, D = c == null ? void 0 : c.endField, R = Object.assign({ type: "date", valueFormat: C, clearable: !0 }, c || {});
     return {
       name: "VxeDateRangePicker",
       startField: I,
       endField: D,
       startValue: L,
       endValue: S,
-      props: T,
+      props: R,
       events: u
     };
   }, s = (c, H) => {
@@ -1410,7 +1405,7 @@ const useRender = () => {
     !isFunction(c) && isObject(c) && Object.assign(u, c);
     const C = isFunction(c) ? c : H;
     return p(u, C);
-  }, k = () => ({ name: "#iconSelect" }), V = (c = [], H = {}, u) => ({ name: "#treeSelect", sourceData: c, props: H, events: u }), R = (c, H) => {
+  }, k = () => ({ name: "#iconSelect" }), V = (c = [], H = {}, u) => ({ name: "#treeSelect", sourceData: c, props: H, events: u }), E = (c, H) => {
     const u = w(H);
     return {
       name: "#area",
@@ -1430,7 +1425,7 @@ const useRender = () => {
       prefixClick: c == null ? void 0 : c.prefixClick,
       filterMethod: c == null ? void 0 : c.filterMethod
     } : c && (H = { change: c }), H;
-  }, E = (c, H) => {
+  }, T = (c, H) => {
     c = c || { fieldType: "string", mode: "image" };
     const { singleMode: u, mode: C } = c;
     return u && Object.assign(c, {
@@ -1462,8 +1457,8 @@ const useRender = () => {
     renderEnabled: A,
     renderIconSelect: k,
     renderTreeSelect: V,
-    renderArea: R,
-    renderUpload: E
+    renderArea: E,
+    renderUpload: T
   };
 }, useGlobal = () => {
   const a = getCurrentInstance();
@@ -1723,7 +1718,9 @@ const kTOKENKEY = "authorized-token", defaultConfig = {
           e.expires - i <= 0 ? (g.isRefreshing || (g.isRefreshing = !0, this.get(this.baseUrl + "/uath/refreshToken", {
             refreshToken: e.refreshToken
           }).then((v) => {
-            this.setToken(v), l.headers.Authorization = "Bearer " + v.access_token, g.requests.forEach((Z) => Z(v.access_token)), g.requests = [];
+            v != null && v.access_token ? (this.setToken(v), l.headers.Authorization = "Bearer " + v.access_token, g.requests.forEach((Z) => Z(v.access_token)), g.requests = []) : this.routeToLogin();
+          }).catch(() => {
+            this.routeToLogin();
           }).finally(() => {
             g.isRefreshing = !1;
           })), h(g.retryOriginalRequest(l))) : (l.headers.Authorization = "Bearer " + e.accessToken, h(l));
@@ -1743,6 +1740,9 @@ const kTOKENKEY = "authorized-token", defaultConfig = {
     };
     cookies.set(kTOKENKEY, JSON.stringify(e));
   }
+  routeToLogin() {
+    g.requests = [], cookies.remove("kCookies_token"), cookies.remove("authorized-token"), cookies.remove("loginer"), this.router.push({ name: "login" });
+  }
   // 响应拦截
   httpInterceptorsResponse() {
     g.axiosInstance.interceptors.response.use(
@@ -2644,11 +2644,11 @@ const http = new SuHttp(), lunarCalendar = {
     for (t = 1; t < 13 && d > 0; t++)
       v > 0 && t === v + 1 && M === !1 ? (--t, M = !0, Z = this.leapDays(s)) : Z = this.monthDays(s, t), M === !0 && t === v + 1 && (M = !1), d -= Z;
     d === 0 && v > 0 && t === v + 1 && (M ? M = !1 : (M = !0, --t)), d < 0 && (d += Z, --t);
-    const p = t, y = d + 1, A = r - 1, k = this.toGanZhiYear(s), V = this.getTerm(h, r * 2 - 1), R = this.getTerm(h, r * 2);
+    const p = t, y = d + 1, A = r - 1, k = this.toGanZhiYear(s), V = this.getTerm(h, r * 2 - 1), E = this.getTerm(h, r * 2);
     let w = this.toGanZhi((h - 1900) * 12 + r + 11);
     e >= V && (w = this.toGanZhi((h - 1900) * 12 + r + 12));
-    let E = !1, F;
-    V === e && (E = !0, F = this.solarTerm[r * 2 - 2]), R === e && (E = !0, F = this.solarTerm[r * 2 - 1]);
+    let T = !1, F;
+    V === e && (T = !0, F = this.solarTerm[r * 2 - 2]), E === e && (T = !0, F = this.solarTerm[r * 2 - 1]);
     const c = Date.UTC(h, A, 1, 0, 0, 0, 0) / 864e5 + 25567 + 10, H = this.toGanZhi(c + e - 1), u = this.toAstro(r, e), C = h + "-" + r + "-" + e, L = s + "-" + p + "-" + y, S = this.festival, I = this.lFestival, D = r + "-" + e;
     let N = p + "-" + y;
     return p === 12 && y === 29 && this.monthDays(s, p) === 29 && (N = "12-30"), {
@@ -2672,7 +2672,7 @@ const http = new SuHttp(), lunarCalendar = {
       isLeap: M,
       nWeek: b,
       ncWeek: "星期" + m,
-      isTerm: E,
+      isTerm: T,
       Term: F,
       astro: u
     };