yuang-framework-ui-common 1.0.32 → 1.0.34

package/lib/config/httpConfig.ts

@@ -63,24 +63,24 @@ http.interceptors.response.use(async (res: any) => {
                 }
             });
             return Promise.reject(new Error(res?.data?.message));
-        } else if (res?.data?.statusCode === 822001) {
+        } else if (res?.data?.statusCode === 500822001) {
             clearGatewayConfig();
             showErrorMessage(messageMap.requestError || messageMap.requestError);
             return Promise.reject(new Error(res?.data?.message));
-        } else if (res?.data?.statusCode === 815001) {
+        } else if (res?.data?.statusCode === 500815001) {
             showErrorMessage(res?.data?.message || messageMap.requestError);
             clearSsoAccessToken();
             window.location.href = getSsoLoginUrl() || '';
             return Promise.reject(new Error(res?.data?.message));
-        } else if (res?.data?.statusCode === 815002) {
+        } else if (res?.data?.statusCode === 500815005) {
             await refreshSsoAccessToken(res);
             // 重发请求
             return axios.request(res.config);
-        }  else if (res?.data?.statusCode === 815004) {
+        } else if (res?.data?.statusCode === 500815006) {
             const fullPath = router.currentRoute.value.fullPath;
-            router.push(`/sso/login/index?redirectRoutePath=${fullPath}`);
+            router.push(`/sso/login/index?redirectRoutePath=${encodeURIComponent(fullPath)}`);
             return;
-        } else if (res?.data?.statusCode === 815003) {
+        } else if (res?.data?.statusCode === 500815003) {
             showErrorMessage(res?.data?.message || messageMap.requestError);
             return Promise.reject(new Error(res?.data?.message));
         }
@@ -95,7 +95,7 @@ http.interceptors.response.use(async (res: any) => {
         if (statusCode !== 200) {
             errorMessage = message;
         }
-       errorMessage = errorMessage || messageMap.requestError
+        errorMessage = errorMessage || messageMap.requestError
     } else {
         errorMessage = error?.message || messageMap.requestError;
     }

package/lib/utils/objectUtils.ts

@@ -1,5 +1,45 @@
-import { cloneDeep } from 'lodash';
+
+/**
+ * 浅度克隆对象
+ * @param obj
+ * @returns {{}|*}
+ */
+const shallowClone = (obj) => {
+    return Object.assign({}, obj);
+}
+
+
+/**
+ * 深度克隆对象
+ * @param obj
+ * @returns {{}|*}
+ */
+const deepClone = (obj) => {
+    let result;
+    const type = typeOf(obj);
+    if (type === 'Object') result = {};
+    else if (type === 'Array') result = [];
+    else return obj;
+    Object.keys(obj).forEach(key => {
+        const copy = obj[key], cType = typeOf(copy);
+        if (cType === 'Object' || cType === 'Array') result[key] = deepClone(copy);
+        else result[key] = obj[key];
+    });
+    return result;
+}
+/**
+ * 获取变量类型
+ * @param obj
+ * @returns {string}
+ */
+const typeOf = (obj) => {
+    if (obj === null) return 'Null';
+    if (obj === undefined) return 'Undefined';
+    return Object.prototype.toString.call(obj).slice(8, -1);
+};
 
 export {
-    cloneDeep
+    shallowClone,
+    deepClone,
+    typeOf,
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "yuang-framework-ui-common",
-  "version": "1.0.32",
+  "version": "1.0.34",
   "private": false,
   "type": "module",
   "scripts": {

package/src/views/sso/login/index.vue

@@ -22,9 +22,8 @@
 
     proxy.$http.get('/sso-api/client/auth/getSsoAccessToken', { params: { code: code } }).then((res: any) => {
       setSsoAccessToken(res.data.data);
-      let redirectRoutePath = router.currentRoute.value.query.redirectRoutePath ?? ('/sso/login/login-success' as any);
-      redirectRoutePath = removeParameter(redirectRoutePath, 'code');
-
+      let redirectRoutePath = router.currentRoute.value.query.redirectRoutePath as string;
+      redirectRoutePath = decodeURIComponent(redirectRoutePath) || ('/sso/login/login-success' as any);
       router.push(redirectRoutePath);
     });
   });