From 4c59bfeb61b0092dce7669ddb30fc02354a7be8e Mon Sep 17 00:00:00 2001
From: wangxuefeng <wangxuefeng@shiyue.com>
Date: Fri, 21 Mar 2025 13:43:17 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E4=BF=AE=E6=94=B9=E6=B8=B2=E6=9F=93?=
 =?UTF-8?q?=E5=99=A8=E4=BC=A0=E9=80=81=E6=8B=A6=E6=88=AA=E5=99=A8=E7=9A=84?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=EF=BC=8C=E5=B0=86=E9=87=87=E7=94=A8=E5=90=88?=
 =?UTF-8?q?=E5=B9=B6=E7=9A=84=E5=BD=A2=E5=BC=8F=E5=90=88=E5=B9=B6=20axios?=
 =?UTF-8?q?=20=E6=8B=A6=E6=88=AA=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/renderer/src/App.vue                     | 62 ++++++++++++++-----
 apps/renderer/src/index.ts                    | 11 ++--
 .../renderer-adapter/wujie-vue2/package.json  |  2 +-
 .../wujie-vue2/src/adapter.vue                |  1 +
 .../renderer-adapter/wujie-vue3/package.json  |  2 +-
 .../wujie-vue3/src/adapter.vue                | 24 ++-----
 6 files changed, 59 insertions(+), 43 deletions(-)

diff --git a/apps/renderer/src/App.vue b/apps/renderer/src/App.vue
index 53dd1c3..d3ed9e8 100644
--- a/apps/renderer/src/App.vue
+++ b/apps/renderer/src/App.vue
@@ -1,18 +1,20 @@
 <script setup lang="ts">
+import type { AxiosInterceptorManager, AxiosResponse } from 'axios';
+
 import { getCurrentInstance, onMounted, ref, watch } from 'vue';
 
 import { useQuery } from '@tanstack/vue-query';
 import { jsonp, request } from '@vtj/utils';
 import { createProvider } from '@vtj/web';
 import { ElLoading, ElMessage } from 'element-plus';
+import { isFn } from 'licia-es';
 
 import { LowCodeService } from './service';
 
-// 定义 wujie props 的类型
 interface WujieProps {
   interceptors?: {
-    request?: (config: any) => any;
-    response?: (response: any) => any;
+    request: AxiosInterceptorManager<InternalAxiosRequestConfig>;
+    response: AxiosInterceptorManager<AxiosResponse>;
   };
   // 必填参数
   fileId: string;
@@ -23,6 +25,17 @@ interface WujieProps {
   [key: string]: any;
 }
 
+declare global {
+  interface Window {
+    $wujie?: {
+      bus: {
+        $emit: (event: string, data?: any) => void;
+      };
+      props: WujieProps;
+    };
+  }
+}
+
 // 定义必要的初始化参数
 interface InitParams {
   // 必填参数
@@ -40,7 +53,7 @@ const isLoading = ref(false);
 const provider = ref(null);
 const loadingInstance = ref(null);
 const errorMessage = ref('');
-const initParams = ref<InitParams | null>(null);
+const initParams = ref<InitParams | null | WujieProps>(null);
 
 // 判断是否为wujie子应用
 const isWujieSubApp = window.$wujie !== undefined;
@@ -57,13 +70,11 @@ const getParamsFromUrl = (): Partial<InitParams> => {
 
 // 按优先级获取初始化参数
 const getInitParams = (): InitParams | null => {
-  // 1. 优先从wujie props获取
   if (isWujieSubApp && window.$wujie?.props) {
-    const props = window.$wujie.props;
-    // 确保必填参数存在
+    const props: WujieProps = window.$wujie.props;
     if (props.fileId && props.projectId) {
-      console.log('使用wujie props初始化渲染器');
-      return props as InitParams;
+      console.log('使用无界初始化渲染器');
+      return props as WujieProps;
     }
   }
 
@@ -87,15 +98,32 @@ const isValidParams = (params: InitParams | null): params is InitParams => {
 
 // 初始化请求配置
 const initRequestConfig = () => {
-  // 处理请求拦截器
-  if (initParams.value?.interceptors?.request) {
-    request.useRequest(initParams.value.interceptors.request);
-  }
+  if (!isWujieSubApp) return console.log('不是无界渲染模式，不进行拦截器合并');
+  const props = window.$wujie.props;
+  const mergeRequestInterceptors = () => {
+    const requestHandlers = props.interceptors?.request?.handlers || [];
+    requestHandlers.forEach((handler) => {
+      if (isFn(handler?.fulfilled)) {
+        request.useRequest(
+          handler.fulfilled,
+          handler.rejected,
+          handler.options,
+        );
+      }
+    });
+  };
 
-  // 处理响应拦截器
-  if (initParams.value?.interceptors?.response) {
-    request.useResponse(initParams.value.interceptors.response);
-  }
+  const mergeResponseInterceptors = () => {
+    const responseHandlers = props.interceptors?.response?.handlers || [];
+    responseHandlers.forEach((handler) => {
+      if (isFn(handler?.fulfilled)) {
+        request.useResponse(handler.fulfilled, handler.rejected);
+      }
+    });
+  };
+
+  mergeRequestInterceptors();
+  mergeResponseInterceptors();
 };
 
 // 显示加载中
diff --git a/apps/renderer/src/index.ts b/apps/renderer/src/index.ts
index 9b645fb..604e5ba 100644
--- a/apps/renderer/src/index.ts
+++ b/apps/renderer/src/index.ts
@@ -23,12 +23,11 @@ Sentry.init({
     // 异常端信息追踪
     Sentry.browserTracingIntegration(),
     // 异常反馈
-    Sentry.feedbackIntegration({
-      // Additional SDK configuration goes in here, for example:
-      colorScheme: 'system',
-      isNameRequired: true,
-      isEmailRequired: true,
-    }),
+    // Sentry.feedbackIntegration({
+    //   colorScheme: 'system',
+    //   isNameRequired: true,
+    //   isEmailRequired: true,
+    // }),
   ],
   // Session Replay
   replaysSessionSampleRate: 0.1, // This sets the sample rate at 10%. You may want to change it to 100% while in development and then sample at a lower rate in production.
diff --git a/packages/renderer-adapter/wujie-vue2/package.json b/packages/renderer-adapter/wujie-vue2/package.json
index 1e784a9..8e9bec8 100644
--- a/packages/renderer-adapter/wujie-vue2/package.json
+++ b/packages/renderer-adapter/wujie-vue2/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sy/wujie-vue2-renderer-adapter",
-  "version": "1.0.0-alpha.3",
+  "version": "1.0.0-alpha.4",
   "description": "wujie-vue2 ycode renderer adapter",
   "type": "module",
   "scripts": {
diff --git a/packages/renderer-adapter/wujie-vue2/src/adapter.vue b/packages/renderer-adapter/wujie-vue2/src/adapter.vue
index 3d900a4..89b6db2 100644
--- a/packages/renderer-adapter/wujie-vue2/src/adapter.vue
+++ b/packages/renderer-adapter/wujie-vue2/src/adapter.vue
@@ -113,5 +113,6 @@ export default defineComponent({
     :props="subAppProps"
     :before-load="beforeLoad"
     :after-mount="afterMount"
+    :interceptors="interceptors"
   />
 </template>
diff --git a/packages/renderer-adapter/wujie-vue3/package.json b/packages/renderer-adapter/wujie-vue3/package.json
index dcf182e..9c4af39 100644
--- a/packages/renderer-adapter/wujie-vue3/package.json
+++ b/packages/renderer-adapter/wujie-vue3/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@sy/wujie-vue3-renderer-adapter",
-  "version": "1.0.0-alpha.4",
+  "version": "1.0.0-alpha.5",
   "description": "wujie-vue3 ycode renderer adapter",
   "type": "module",
   "scripts": {
diff --git a/packages/renderer-adapter/wujie-vue3/src/adapter.vue b/packages/renderer-adapter/wujie-vue3/src/adapter.vue
index 50858af..ae61219 100644
--- a/packages/renderer-adapter/wujie-vue3/src/adapter.vue
+++ b/packages/renderer-adapter/wujie-vue3/src/adapter.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import type { AxiosResponse, InternalAxiosRequestConfig } from 'axios';
+import type { AxiosInterceptorManager } from 'axios';
 
 import type { Router, RouteRecordRaw } from 'vue-router';
 
@@ -10,29 +10,16 @@ import WujieVue from 'wujie-vue3';
 // @ts-ignore ignore the type error
 import { version } from '/package.json';
 
-// 定义拦截器类型
-interface AxiosInterceptors {
-  request?: {
-    onFulfilled?: (
-      config: InternalAxiosRequestConfig,
-    ) => InternalAxiosRequestConfig | Promise<InternalAxiosRequestConfig>;
-    onRejected?: (error: any) => any;
-  };
-  response?: {
-    onFulfilled?: (
-      response: AxiosResponse,
-    ) => AxiosResponse | Promise<AxiosResponse>;
-    onRejected?: (error: any) => any;
-  };
-}
-
 const props = withDefaults(
   defineProps<{
     [key: string]: any;
     applicationId: number;
     degrade?: boolean;
     fileId: number | string;
-    interceptors?: AxiosInterceptors;
+    interceptors?: {
+      request?: AxiosInterceptorManager<any>;
+      response?: AxiosInterceptorManager<any>;
+    };
     name?: string;
     // 传递给子应用的参数 payload
     payload?: Record<string, any>;
@@ -132,5 +119,6 @@ onBeforeUnmount(() => {
     :props="subAppProps"
     :before-load="beforeLoad"
     :after-mount="afterMount"
+    :interceptors="interceptors"
   />
 </template>