yuang-framework-ui-common 1.0.92 → 1.0.94

package/dist/yuang-framework-ui-common.es.js

@@ -0,0 +1,4 @@
+const e = {};
+export {
+  e as default
+};

package/dist/yuang-framework-ui-common.umd.js

@@ -0,0 +1 @@
+(function(e,n){typeof exports=="object"&&typeof module<"u"?module.exports=n():typeof define=="function"&&define.amd?define(n):(e=typeof globalThis<"u"?globalThis:e||self,e["yuang-framework-ui-common"]=n())})(this,function(){"use strict";return{}});

package/lib/config/httpConfig.ts

@@ -102,7 +102,7 @@ http.interceptors.response.use(async (res: any) => {
         } else if (res?.data?.statusCode === 500815006) {
             // 这里存疑： 返回500815004 的时候获取router为null
             const fullPath = router.currentRoute.value.fullPath;
-            router.push(`/sso/sso-auth/index?ssoRedirectRoutePath=${encodeURIComponent(fullPath)}`);
+            router.push(`/sso/client/sso-auth/index?ssoRedirectRoutePath=${encodeURIComponent(fullPath)}`);
             return;
         } else if (res?.data?.statusCode === 500815003) {
             showErrorMessage(res?.data?.message || messageMap.requestError);

package/lib/hooks/framework/frameworkGroup.ts

@@ -1,5 +1,6 @@
 import { nextTick } from 'vue';
 import { http } from '../../../lib/config/httpConfig';
+import { application } from '../../../lib/config/applicationConfig';
 
 /**
  * 处理分组树默认展开节点，由于树组件的默认展开节点是异步的，所以需要手动处理默认展开节点
@@ -9,7 +10,7 @@ const handleFrameworkGroupTreeDefaultExpandNode = async ({ id, treeId }) => {
         console.error(`参数[treeId]不存在`);
         return;
     }
-    const res = await http.post('/uims-api/core/framework-group/selectAncestorList', { idForEqual: id, isReverseAncestorList: true });
+    const res = await http.post(`${application.gatewayServerBaseUrl}/framework-api/core/framework-group/selectAncestorList`, { idForEqual: id, isReverseAncestorList: true });
     const ancestorList = res.data.data;
     expandNodeImpl({ ancestorList, index: 0, treeId });
 };

package/lib/hooks/uims/uimsApplication.ts

@@ -28,8 +28,9 @@ const queryUimsApplicationTreeData = ({ applicationName }) => {
         parentIdField: 'parentId'
       });
       resolve({ treeData });
-    }).catch(() => {
+    }).catch((ex) => {
       reject();
+      console.error(ex);
     });
   });
 };

package/lib/utils/ssoUtils.ts

@@ -12,7 +12,7 @@ import { getIsDebug } from '../utils/htmlUtils';
  * @param ssoRedirectUrl
  */
 const getSsoLoginUrl = (ssoRedirectUrl = '') => {
-    if(getIsDebug) {
+    if(getIsDebug()) {
         debugger;
     }
     let gatewayServerBaseUrl = application.gatewayServerBaseUrl;
@@ -36,7 +36,7 @@ const getSsoLoginUrl = (ssoRedirectUrl = '') => {
  * @param ssoRedirectUrl
  */
 const getSsoAuthUrl = (ssoRedirectUrl = '') => {
-    if(getIsDebug) {
+    if(getIsDebug()) {
         debugger;
     }
     let gatewayServerBaseUrl = application.gatewayServerBaseUrl;
@@ -60,7 +60,7 @@ const getSsoAuthUrl = (ssoRedirectUrl = '') => {
  * @param ssoRedirectUrl
  */
 const getSsoLogoutUrl = (ssoRedirectUrl = '') => {
-    if(getIsDebug) {
+    if(getIsDebug()) {
         debugger;
     }
     let gatewayServerBaseUrl = application.gatewayServerBaseUrl;
@@ -84,16 +84,16 @@ const getSsoLogoutUrl = (ssoRedirectUrl = '') => {
  * @param ssoRedirectRoutePath
  */
 const getSsoAuthRoutePath = (ssoRedirectRoutePath = '') => {
-    if(getIsDebug) {
+    if(getIsDebug()) {
         debugger;
     }
-    let ssoAuthRoutePath = '/sso/sso-auth/index';
+    let ssoAuthRoutePath = '/sso/client/sso-auth/index';
     if (!ssoRedirectRoutePath) {
-        ssoAuthRoutePath += `?ssoRedirectRoutePath=${encodeURIComponent('/sso/sso-auth/auth-success')}`;
+        ssoAuthRoutePath += `?ssoRedirectRoutePath=${encodeURIComponent('/sso/client/sso-auth/auth-success')}`;
     } else {
         ssoAuthRoutePath += `?ssoRedirectRoutePath=${encodeURIComponent(ssoRedirectRoutePath)}`;
     }
-    if(getIsDebug) {
+    if(getIsDebug()) {
         console.log('ssoAuthRoutePath', ssoAuthRoutePath);
     }
     return ssoAuthRoutePath;

package/package.json

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

package/src/router/index.ts

@@ -8,16 +8,16 @@ const router = createRouter({
     history: createWebHistory(import.meta.env.BASE_URL),
     routes: [
         {
-            path: '/sso/sso-auth/index',
-            component: () => import('@/views/sso/sso-auth/index.vue'),
+            path: '/sso/client/sso-auth/index',
+            component: () => import('@/views/sso/client/sso-auth/index.vue'),
             meta: {
                 title: '认证',
-                isSsoExcluded: true
+                isSsoClientExcluded: true
             }
         },
         {
-            path: '/sso/sso-auth/auth-success',
-            component: () => import('@/views/sso/sso-auth/auth-success.vue'),
+            path: '/sso/client/sso-auth/auth-success',
+            component: () => import('@/views/sso/client/sso-auth/auth-success.vue'),
             meta: {
                 title: '认证成功',
             }
@@ -46,21 +46,21 @@ const router = createRouter({
             path: '/utils/gateway-utils',
             component: () => import('@/views/utils/gateway-utils.vue'),
             meta: {
-                isSsoExcluded: true
+                isSsoClientExcluded: true
             }
         },
         {
             path: '/utils/http-utils',
             component: () => import('@/views/utils/http-utils.vue'),
             meta: {
-                isSsoExcluded: true
+                isSsoClientExcluded: true
             }
         },
         {
             path: '/hooks/framework/framework-sse-client',
             component: () => import('@/views/hooks/framework/framework-sse-client.vue'),
             meta: {
-                isSsoExcluded: false
+                isSsoClientExcluded: false
             }
         },
 
@@ -79,7 +79,7 @@ const router = createRouter({
 /* 路由守卫 */
 router.beforeEach(async (to) => {
     if (!getSsoAccessToken()) {
-        if (!to.meta?.isSsoExcluded) {
+        if (!to.meta?.isSsoClientExcluded) {
             return getSsoAuthRoutePath(to.fullPath);
         }
         return;

package/src/views/sso/{sso-auth → client/sso-auth}/index.vue

@@ -26,7 +26,7 @@
     http.get(`${application.gatewayServerBaseUrl}/sso-api/client/sso-auth/getSsoAccessToken`, { params: { ssoAuthCode: ssoAuthCode } }).then((res: any) => {
       setSsoAccessToken(res.data.data);
       let ssoRedirectRoutePath = router.currentRoute.value.query.ssoRedirectRoutePath as string;
-      ssoRedirectRoutePath = (ssoRedirectRoutePath && decodeURIComponent(ssoRedirectRoutePath)) || ('/sso/sso-auth/auth-success' as any);
+      ssoRedirectRoutePath = (ssoRedirectRoutePath && decodeURIComponent(ssoRedirectRoutePath)) || ('/sso/client/sso-auth/auth-success' as any);
       ssoRedirectRoutePath = removeParameter('ssoAuthCode', ssoRedirectRoutePath) || '';
       router.push(ssoRedirectRoutePath);
     });