yuang-framework-ui-common 1.0.79 → 1.0.80

package/lib/config/httpConfig.ts

@@ -28,8 +28,8 @@ const http = axios.create({
     // baseURL: apiBaseUrl,
     timeout: 10000,
     headers: {},
-    // 关键：允许跨域请求携带凭证（Cookie等）
-    withCredentials: true,
+    // 允许跨域请求携带凭证（Cookie等），在本地开发与网关api不是同域，访问api会报错：各种跨域访问，比如：http://localhost:8000/gateway-server/sso-api/client/sso-user/getSsoIdentity
+    withCredentials: import.meta.env.VITE_PROFILES_ACTIVE === 'dev' ? true : false,
 })
 
 
@@ -84,7 +84,7 @@ http.interceptors.response.use(async (res: any) => {
             if (gatewayPublicKey) {
                 res.config.headers["Gateway-Public-Key"] = gatewayPublicKey;
             }
-            return axios.request(res.config);
+            return http.request(res.config);
         } else if (res?.data?.statusCode === 500815001) {
             showErrorMessage(res?.data?.message || messageMap.requestError);
             clearSsoAccessToken();
@@ -97,7 +97,7 @@ http.interceptors.response.use(async (res: any) => {
             if (ssoAccessToken) {
                 res.config.headers["Sso-Access-Token"] = ssoAccessToken;
             }
-            return axios.request(res.config);
+            return http.request(res.config);
         } else if (res?.data?.statusCode === 500815006) {
             // 这里存疑： 返回500815004 的时候获取router为null
             const fullPath = router.currentRoute.value.fullPath;

package/lib/utils/htmlUtils.ts

@@ -5,7 +5,7 @@
  * @param src
  * @param callback
  */
-const loadScript = (src, callback) => {
+const loadScript = (src: string, callback: ()=>{}) => {
     if (!src) {
         console.error("[src]为空");
         return;
@@ -21,7 +21,7 @@ const loadScript = (src, callback) => {
         }, false);
     } else if (script.attachEvent) {
         script.attachEvent('onreadystatechange', function () {
-            var target = window.event.srcElement as any;
+            var target = window.event?.srcElement as any;
             if (target.readyState == 'loaded') {
                 callback && callback();
             }
@@ -36,7 +36,7 @@ const loadScript = (src, callback) => {
  * @param src
  * @param callback
  */
-const loadLink = (href: string, callback) => {
+const loadLink = (href: string, callback: ()=>{}) => {
     if (!href) {
         console.error("[href]为空");
         return;
@@ -52,7 +52,7 @@ const loadLink = (href: string, callback) => {
         }, false);
     } else if (link.attachEvent) {
         link.attachEvent('onreadystatechange', function () {
-            var target = window.event.srcElement as any;
+            var target = window.event?.srcElement as any;
             if (target.readyState == 'loaded') {
                 callback && callback();
             }
@@ -66,7 +66,7 @@ const loadLink = (href: string, callback) => {
  * @param src
  * @param callback
  */
-const loadIframe = (src: string, callback) => {
+const loadIframe = (src: string, callback: ()=>{}) => {
     if (!src) {
         console.error("[src]为空");
         return;
@@ -82,7 +82,7 @@ const loadIframe = (src: string, callback) => {
         }, false);
     } else if (iframe.attachEvent) {
         iframe.attachEvent('onreadystatechange', function () {
-            var target = window.event.srcElement as any;
+            var target = window.event?.srcElement as any;
             if (target.readyState == 'loaded') {
                 callback && callback();
             }

package/package.json

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