yuang-framework-ui-common 1.0.43 → 1.0.45

package/lib/utils/messageBoxUtils.ts

@@ -4,12 +4,12 @@ import { ElMessageBox } from 'element-plus/es';
 
 
 
-const alertMessageBox = ({title, message, confirmButtonText, callback}) => {
+const alertMessageBox = ({title, message, confirmButtonText, callback}: {title: string, message: string, confirmButtonText: string, callback: (param:string)=>{}}) => {
     if(isPc()) {
         ElMessageBox.close();
         ElMessageBox.alert(message, title, {
             confirmButtonText: confirmButtonText,
-            callback: (action) => {
+            callback: (action: string) => {
                 callback && callback(action);
             },
             type: 'warning',

package/lib/utils/messageUtils.ts

@@ -4,28 +4,28 @@ import {ElMessage} from 'element-plus'
 import {showNotify} from 'vant';
 
 
-const showSuccessMessage = (message) => {
+const showSuccessMessage = (message: string) => {
     showMessage({
         type: 'success',
         message: message,
     });
 }
 
-const showWarningMessage = (message) => {
+const showWarningMessage = (message: string) => {
     showMessage({
         type: 'warning',
         message: message,
     });
 }
 
-const showInfoMessage = (message) => {
+const showInfoMessage = (message: string) => {
     showMessage({
         type: 'info',
         message: message,
     });
 }
 
-const showErrorMessage = (message) => {
+const showErrorMessage = (message: string) => {
     showMessage({
         type: 'error',
         message: message,
@@ -37,7 +37,7 @@ const showErrorMessage = (message) => {
  * @param type 'success' | 'warning' | 'info' | 'error'
  * @param message
  */
-const showMessage = ({type, message}) => {
+const showMessage = ({type, message}: {type: any, message: any}) => {
     if (isPc()) {
         ElMessage({
             type: type,

package/lib/utils/ssoUtils.ts

@@ -33,17 +33,17 @@ const getSsoLogoutUrl = (ssoRedirectUrl = '') => {
 }
 
 /**
- * 获取sso登录路由路径
+ * 获取sso认证路由路径
  * @param ssoRedirectRoutePath
  */
-const getSsoLoginRoutePath = (ssoRedirectRoutePath = '') => {
-    let ssoLoginRoutePath = '/sso/login/index';
+const getSsoAuthRoutePath = (ssoRedirectRoutePath = '') => {
+    let ssoAuthRoutePath = '/sso/auth/index';
     if (!ssoRedirectRoutePath) {
-        ssoLoginRoutePath += `?ssoRedirectRoutePath=${encodeURIComponent('/sso/login/login-success')}`;
+        ssoAuthRoutePath += `?ssoRedirectRoutePath=${encodeURIComponent('/sso/auth/auth-success')}`;
     } else {
-        ssoLoginRoutePath += `?ssoRedirectRoutePath=${encodeURIComponent(ssoRedirectRoutePath)}`;
+        ssoAuthRoutePath += `?ssoRedirectRoutePath=${encodeURIComponent(ssoRedirectRoutePath)}`;
     }
-    return ssoLoginRoutePath;
+    return ssoAuthRoutePath;
 }
 
 /**
@@ -160,7 +160,7 @@ const logoutSso = () => {
 export {
     getSsoLoginUrl,
     getSsoLogoutUrl,
-    getSsoLoginRoutePath,
+    getSsoAuthRoutePath,
 
     getSsoEncrypt,
     getSsoEncryptList,

package/lib/utils/urlUtils.ts

@@ -1,44 +1,11 @@
 
-/**
- * 删除url中的指定参数
- * @param url
- * @param parameter
- * @return {string}
- */
-const removeUrlParameter = (url: string, parameter: string) => {
-    if (!url) {
-        return console.error('参数[url]为空');
-    }
-    if (!parameter) {
-        return console.error('参数[parameter]为空');
-    }
-    let urlObj;
-    let isFullUrl = url.startsWith('http');
-    if (isFullUrl) {
-        urlObj = new URL(url);
-    } else {
-        urlObj = new URL(url, window.location.origin);
-    }
-    urlObj.searchParams.delete(parameter);
-    let result = urlObj.pathname + urlObj.search;
-    if (url.includes('#')) {
-        result += '#' + url.split('#')[1];
-    }
-    if (isFullUrl) {
-        result = urlObj.origin + result;
-    }
-    return result;
-};
-
-
-
 /**
  * 获取url的参数
  * @param name 参数名
  * @param url，如果不传递，就使用当前url
  * @returns {string|null}
  */
-const getParameter = (name: string, url: string) => {
+const getParameter = (name: string, url?: string) => {
     url = url || window.location.search;
     var reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
     var r = url.substr(1).match(reg);
@@ -51,7 +18,7 @@ const getParameter = (name: string, url: string) => {
  * @param url，如果不传递，就使用当前url
  * @returns {map|null}
  */
-const getParameterMap = (url: string) => {
+const getParameterMap = (url?: string) => {
     url = url || window.location.search;
 
     let arrObj = url.split("?") as any;
@@ -66,13 +33,42 @@ const getParameterMap = (url: string) => {
     return params;
 }
 
+/**
+ * 删除url中的指定参数
+ * @param url，如果不传递，就使用当前url
+ * @param parameter
+ * @return {string}
+ */
+const removeParameter = (name: string, url?: string) => {
+    if (!name) {
+        return console.error('参数[name]为空');
+    }
+    url = url || location.href;
+    let urlObj;
+    let isFullUrl = url.startsWith('http');
+    if (isFullUrl) {
+        urlObj = new URL(url);
+    } else {
+        urlObj = new URL(url, window.location.origin);
+    }
+    urlObj.searchParams.delete(name);
+    let result = urlObj.pathname + urlObj.search;
+    if (url.includes('#')) {
+        result += '#' + url.split('#')[1];
+    }
+    if (isFullUrl) {
+        result = urlObj.origin + result;
+    }
+    return result;
+};
+
 
 /**
  * 获取平台基础url
- * @param url
+ * @param url，如果不传递，就使用当前url
  * @returns {string}
  */
-const getBaseUrl = (url: string) => {
+const getBaseUrl = (url?: string) => {
     url = url || location.href;
     let arr = url.split('/');
     if (arr.length > 3) {
@@ -90,4 +86,4 @@ const getBaseUrl = (url: string) => {
     }
 };
 
-export { removeUrlParameter, getParameter, getParameterMap, getBaseUrl };
+export { getParameter, getParameterMap, removeParameter, getBaseUrl };

package/package.json

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

package/src/router/index.ts

@@ -1,7 +1,7 @@
 import {createRouter, createWebHistory} from 'vue-router'
 import {getExceptionRoutes} from '../../lib/utils/vueRouterUtils'
 
-import { getSsoAccessToken, getSsoLoginRoutePath } from '../../lib/utils/ssoUtils';
+import { getSsoAccessToken, getSsoAuthRoutePath } from '../../lib/utils/ssoUtils';
 
 
 const router = createRouter({
@@ -53,7 +53,7 @@ const router = createRouter({
 router.beforeEach(async (to) => {
     if (!getSsoAccessToken()) {
         if (!to.meta?.isAnonymous) {
-            return getSsoLoginRoutePath(to.fullPath);
+            return getSsoAuthRoutePath(to.fullPath);
         }
         return;
     }

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

@@ -7,7 +7,7 @@
   import { useRouter } from 'vue-router';
 
   import { getSsoLoginUrl, setSsoAccessToken } from '../../../../lib/utils/ssoUtils';
-  import { removeUrlParameter } from '../../../../lib/utils/urlUtils';
+  import { removeParameter } from '../../../../lib/utils/urlUtils';
 
   const router = useRouter();
 
@@ -25,7 +25,7 @@
       setSsoAccessToken(res.data.data);
       let ssoRedirectRoutePath = router.currentRoute.value.query.ssoRedirectRoutePath as string;
       ssoRedirectRoutePath = (ssoRedirectRoutePath && decodeURIComponent(ssoRedirectRoutePath)) || ('/sso/login/login-success' as any);
-      ssoRedirectRoutePath = removeUrlParameter(ssoRedirectRoutePath, 'ssoAuthCode');
+      ssoRedirectRoutePath = removeParameter('ssoAuthCode', ssoRedirectRoutePath) || '';
       router.push(ssoRedirectRoutePath);
     });
   });