From 61faea99948fedef6d74126fd3f667a74e62898b Mon Sep 17 00:00:00 2001
From: cc500 <2014434568@qq.com>
Date: Fri, 20 Jun 2025 14:40:46 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=A7=BB=E9=99=A4qiankun=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package.json                   |   3 +-
 src/App.vue                    |   3 +-
 src/apis/server.ts             | 114 ++++++++++++++++++---------------
 src/main.ts                    |  54 +++++-----------
 src/qiankun.ts                 |  32 ---------
 src/router/index.ts            |   3 +-
 src/store/account.ts           |   6 --
 src/utils/tools.ts             |   1 +
 src/views/dialogue/Copilot.vue |   4 --
 vite.config.ts                 |   9 +--
 10 files changed, 82 insertions(+), 147 deletions(-)
 delete mode 100644 src/qiankun.ts

diff --git a/package.json b/package.json
index 55a4918..a1987f0 100644
--- a/package.json
+++ b/package.json
@@ -189,8 +189,7 @@
     "typescript-eslint": "8.17.0",
     "uuid": "^11.1.0",
     "vite": "5.4.11",
-    "vite-plugin-mock": "^3.0.2",
-    "vite-plugin-qiankun": "1.0.15"
+    "vite-plugin-mock": "^3.0.2"
   },
   "packageManager": "pnpm@10.10.0+sha512.d615db246fe70f25dcfea6d8d73dee782ce23e2245e3c4f6f888249fb568149318637dca73c2c5c8ef2a4ca0d5657fb9567188bfab47f566d1ee6ce987815c39"
 }
\ No newline at end of file
diff --git a/src/App.vue b/src/App.vue
index df8c6f2..37a8846 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,6 +1,5 @@
 <script setup lang="ts">
 import { ref, onMounted } from 'vue';
-import { qiankunWindow } from 'vite-plugin-qiankun/dist/helper';
 import LinuxTitleBar from '@/components/LinuxTitleBar.vue';
 import '@vue-flow/core/dist/style.css';
 import '@vue-flow/core/dist/theme-default.css';
@@ -19,7 +18,7 @@ onMounted(() => {
 <template>
   <div
     class="eulercopilot-main"
-    :style="{ height: qiankunWindow.__POWERED_BY_QIANKUN__ ? '100%' : '100vh' }"
+    :style="{ height: '100vh' }"
   >
     <!-- Linux平台特定的标题栏，使用绝对定位 -->
     <LinuxTitleBar v-if="isLinuxPlatform" />
diff --git a/src/apis/server.ts b/src/apis/server.ts
index 71dbdb6..a3cedac 100644
--- a/src/apis/server.ts
+++ b/src/apis/server.ts
@@ -43,62 +43,70 @@ if (import.meta.env.MODE === 'electron-production') {
   });
 }
 
-// 创建 axios 实例
-export const server = axios.create({
-  baseURL,
-  // API 请求的默认前缀
-  timeout: 60 * 1000, // 请求超时时间
-});
+let server: ReturnType<typeof axios.create>; // axios 实例
 
-// request interceptor
-server.interceptors.request.use(
-  (
-    config: InternalAxiosRequestConfig<any>,
-  ):
-    | InternalAxiosRequestConfig<any>
-    | Promise<InternalAxiosRequestConfig<any>> => {
-    return handleChangeRequestHeader(config);
-  },
-  (error) => {
-    return Promise.reject(error);
-  },
-);
+export const initServer = async () => {
+  const baseURL = await getBaseProxyUrl();
+  server = axios.create({
+    baseURL,
+    // API 请求的默认前缀
+    timeout: 60 * 1000, // 请求超时时间
+  });
 
-// response interceptor
-server.interceptors.response.use(
-  (response: AxiosResponse): AxiosResponse | Promise<AxiosResponse> => {
-    if (response.status !== 200) {
-      ElMessage({
-        showClose: true,
-        message: response.statusText,
-        icon: IconError,
-        customClass: 'o-message--error',
-        duration: 3000,
-      });
-      return Promise.reject(new Error(response.statusText));
-    }
-    return Promise.resolve(response);
-  },
-  async (error: AxiosError) => {
-    if (error.status !== 401 && error.status !== 403 && error.status !== 409) {
-      ElMessage({
-        showClose: true,
-        message:
-          ((error as any)?.response?.data?.message as string) || error.message,
-        icon: IconError,
-        customClass: 'o-message--error',
-        duration: 3000,
-      });
-    }
-    if (error.status === 409) {
-      // 处理错误码为409的情况
-      successMsg('已是最新对话');
-      return Promise.reject(error as any);
-    }
-    return await handleStatusError(error);
-  },
-);
+  // request interceptor
+  server.interceptors.request.use(
+    (
+      config: InternalAxiosRequestConfig<any>,
+    ):
+      | InternalAxiosRequestConfig<any>
+      | Promise<InternalAxiosRequestConfig<any>> => {
+      return handleChangeRequestHeader(config);
+    },
+    (error) => {
+      return Promise.reject(error);
+    },
+  );
 
+  // response interceptor
+  server.interceptors.response.use(
+    (response: AxiosResponse): AxiosResponse | Promise<AxiosResponse> => {
+      if (response.status !== 200) {
+        ElMessage({
+          showClose: true,
+          message: response.statusText,
+          icon: IconError,
+          customClass: 'o-message--error',
+          duration: 3000,
+        });
+        return Promise.reject(new Error(response.statusText));
+      }
+      return Promise.resolve(response);
+    },
+    async (error: AxiosError) => {
+      if (
+        error.status !== 401 &&
+        error.status !== 403 &&
+        error.status !== 409
+      ) {
+        ElMessage({
+          showClose: true,
+          message:
+            ((error as any)?.response?.data?.message as string) ||
+            error.message,
+          icon: IconError,
+          customClass: 'o-message--error',
+          duration: 3000,
+        });
+      }
+      if (error.status === 409) {
+        // 处理错误码为409的情况
+        successMsg('已是最新对话');
+        return Promise.reject(error as any);
+      }
+      return await handleStatusError(error);
+    },
+  );
+};
 /**
  * request with get
  * @param url
diff --git a/src/main.ts b/src/main.ts
index bdb6d18..7afec0d 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -20,17 +20,11 @@ import 'src/assets/styles/element/index.scss';
 import opendesign2 from '@computing/opendesign2';
 import '@computing/opendesign2/themes/es/css';
 import zhCn from 'element-plus/es/locale/lang/zh-cn';
-import { qiankunMounted } from './qiankun';
 import piniaPluginPersistedstate from 'pinia-plugin-persistedstate';
 
 import App from './App.vue';
 import router from './router';
-
-import {
-  renderWithQiankun,
-  qiankunWindow,
-  QiankunProps,
-} from 'vite-plugin-qiankun/dist/helper';
+import { initServer } from 'src/apis/server.ts';
 
 // 添加平台检测逻辑，为HTML添加平台特定类名
 const setPlatformClass = () => {
@@ -53,37 +47,19 @@ const render = (props: any = {}) => {
     selector = (container && container.querySelector('#app')) || '#app';
   }
   const pinia = createPinia().use(piniaPluginPersistedstate);
-  app = createApp(App);
-  app
-    .use(pinia)
-    .use(router)
-    .use(ElementPlus, {
-      locale: zhCn,
-    })
-    .use(opendesign2)
-    .use(i18n)
-    .mount(selector);
-};
-
-const initQianKun = () => {
-  renderWithQiankun({
-    bootstrap() {},
-    mount(props: QiankunProps) {
-      render(props);
-      if (props) {
-        qiankunMounted(props);
-      }
-    },
-    unmount() {
-      if (app) {
-        app.unmount();
-        const appContainer = app._container as HTMLElement;
-        appContainer.innerHTML = '';
-        app = null;
-      }
-    },
-    update() {},
-  });
+  (async () => {
+    await initServer();
+    app = createApp(App);
+    app
+      .use(pinia)
+      .use(router)
+      .use(ElementPlus, {
+        locale: zhCn,
+      })
+      .use(opendesign2)
+      .use(i18n)
+      .mount(selector);
+  })();
 };
 
-qiankunWindow.__POWERED_BY_QIANKUN__ ? initQianKun() : render();
+render();
diff --git a/src/qiankun.ts b/src/qiankun.ts
deleted file mode 100644
index 8d13fd8..0000000
--- a/src/qiankun.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-import { QiankunProps } from 'vite-plugin-qiankun/dist/helper';
-import i18n from 'src/i18n';
-import { useAccountStore } from 'src/store';
-
-export function qiankunMounted(props: QiankunProps) {
-  const { theme, lang } = props.inittailData;
-  const language = lang;
-  localStorage.setItem('localeLang', language);
-  localStorage.setItem('theme', theme);
-  i18n.global.locale.value = language;
-  props.onGlobalStateChange((state: any) => {
-    onQiankunGlobalChange(state);
-  });
-}
-
-function onQiankunGlobalChange(globalState: any) {
-  if (globalState.logout) {
-    const { logout } = useAccountStore();
-    logout();
-  }
-
-  if (globalState.lang) {
-    const language = globalState.lang;
-    localStorage.setItem('localeLang', language);
-    i18n.global.locale.value = language;
-  }
-
-  if (globalState.theme) {
-    localStorage.setItem('theme', globalState.theme);
-    document.body.setAttribute('theme', globalState.theme);
-  }
-}
diff --git a/src/router/index.ts b/src/router/index.ts
index 0cc1a10..4d77594 100644
--- a/src/router/index.ts
+++ b/src/router/index.ts
@@ -9,7 +9,6 @@
 // See the Mulan PSL v2 for more details.
 import { createRouter, createWebHashHistory, RouteRecordRaw } from 'vue-router';
 import NotFoundComponent from '@/views/404.vue';
-import { qiankunWindow } from 'vite-plugin-qiankun/dist/helper';
 import { dynamicRoutes } from './route';
 import { isElectron } from '@/utils/electron';
 
@@ -77,7 +76,7 @@ const routes = [...staticRoutes, ...dynamic];
 
 const router = createRouter({
   history: createWebHashHistory(
-    qiankunWindow.__POWERED_BY_QIANKUN__ ? '/eulercopilot/' : '/',
+    '/',
   ),
   routes,
 });
diff --git a/src/store/account.ts b/src/store/account.ts
index 1c5f82c..fe7ab5e 100644
--- a/src/store/account.ts
+++ b/src/store/account.ts
@@ -14,7 +14,6 @@ import { useRouter } from 'vue-router';
 import { LOGOUT_CALLBACK_URL } from 'src/views/dialogue/constants';
 import { successMsg } from 'src/components/Message';
 import i18n from 'src/i18n';
-import { qiankunWindow } from 'vite-plugin-qiankun/dist/helper';
 
 export const useAccountStore = defineStore('account', () => {
   const router = useRouter();
@@ -85,11 +84,6 @@ export const useAccountStore = defineStore('account', () => {
       userinfo.revsionNumber = null;
       sessionStorage.removeItem('csrftk');
       successMsg(i18n.global.t('Login.logout'));
-      if (!qiankunWindow.__POWERED_BY_QIANKUN__) {
-        setTimeout(() => {
-          window.open(LOGOUT_CALLBACK_URL, '_self');
-        }, 500);
-      }
     }
   };
   /**
diff --git a/src/utils/tools.ts b/src/utils/tools.ts
index c483027..dcfd9a6 100644
--- a/src/utils/tools.ts
+++ b/src/utils/tools.ts
@@ -89,6 +89,7 @@ export async function getBaseProxyUrl(): Promise<string> {
       if (typeof window.eulercopilot.config?.get === 'function') {
         const config = await window.eulercopilot.config.get();
         if (config?.base_url) {
+          console.log('Base URL from config:', config.base_url);
           return config.base_url;
         }
       }
diff --git a/src/views/dialogue/Copilot.vue b/src/views/dialogue/Copilot.vue
index fe4d070..9dc3a91 100644
--- a/src/views/dialogue/Copilot.vue
+++ b/src/views/dialogue/Copilot.vue
@@ -4,7 +4,6 @@ import { ARGEEMENT_VERSION } from 'src/conf/version';
 import DialogueAside from './components/DialogueAside.vue';
 import DialogueSession from './components/DialogueSession.vue';
 import EulerDialog from 'src/components/EulerDialog.vue';
-import { qiankunWindow } from 'vite-plugin-qiankun/dist/helper';
 import { storeToRefs } from 'pinia';
 import { useRouter, useRoute } from 'vue-router';
 import { useSessionStore, useAccountStore } from 'src/store';
@@ -111,9 +110,6 @@ onMounted(async () => {
 <template>
   <div
     class="copilot-container"
-    :class="
-      qiankunWindow.__POWERED_BY_QIANKUN__ ? 'micro-copilot-container' : ''
-    "
   >
     <div class="copilot-container-main">
       <DialogueAside />
diff --git a/vite.config.ts b/vite.config.ts
index 016c7c0..44566fb 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -11,7 +11,6 @@ import { defineConfig, loadEnv } from 'vite';
 import vue from '@vitejs/plugin-vue';
 import vueJsx from '@vitejs/plugin-vue-jsx';
 
-import Qiankun from 'vite-plugin-qiankun';
 import { viteMockServe } from 'vite-plugin-mock';
 
 import { resolve } from 'path';
@@ -21,9 +20,8 @@ import type { UserConfigExport } from 'vite';
 // https://vitejs.dev/config/
 export default ({ mode }): UserConfigExport => {
   const env = loadEnv(mode, process.cwd());
-  const { VITE_BASE_URL } = env;
-
-  const baseUrl = mode === 'micro' ? VITE_BASE_URL : './';
+  
+  const baseUrl = './';
   return defineConfig({
     base: baseUrl,
     resolve: {
@@ -37,9 +35,6 @@ export default ({ mode }): UserConfigExport => {
     plugins: [
       vue(),
       vueJsx(),
-      Qiankun('copilot', {
-        useDevMode: mode === 'development',
-      }),
       viteMockServe({
         mockPath: 'mock',
         enable: mode !== 'production',
-- 
Gitee


From 98fdb09fef71802859173006792175b3f01acabd Mon Sep 17 00:00:00 2001
From: cc500 <2014434568@qq.com>
Date: Fri, 20 Jun 2025 15:18:07 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fixed:=E8=AF=A6=E6=83=85=E9=A1=B5=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=E5=86=85=E5=AE=B9=E6=97=A0=E6=B3=95=E6=BB=91=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Upload/index.vue | 8 ++++++--
 src/views/api/index.vue         | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/components/Upload/index.vue b/src/components/Upload/index.vue
index 924aa22..d41bb73 100644
--- a/src/components/Upload/index.vue
+++ b/src/components/Upload/index.vue
@@ -313,8 +313,8 @@ onMounted(() => {
     />
     </div>
   </div>
-  <div class="json-container" v-if="uploadtype === 'get'">
     <span class="serviceName" v-if="getServiceName">{{ getServiceName }}</span>
+  <div class="json-container" v-if="uploadtype === 'get'">
     <div class="collapse-container">
     <el-collapse
       v-model="activeServiceNameList"
@@ -394,7 +394,6 @@ onMounted(() => {
 }
 .json-container {
   max-height: calc(100% - 8px);
-  overflow-y: hidden;
 }
 .v-codemirror {
   height: 100%;
@@ -539,6 +538,11 @@ onMounted(() => {
     border-bottom-color: var(--el-collapse-border) !important;
     border-radius: 0px !important;
   }
+  :deep(.el-collapse-item__title) {
+    height: 56px;
+    text-overflow: ellipsis;
+    overflow: hidden;
+  }
   .collapse-container{
     max-height: calc(100% - 48px);
     overflow-y: auto;
diff --git a/src/views/api/index.vue b/src/views/api/index.vue
index c09efc5..a768b32 100644
--- a/src/views/api/index.vue
+++ b/src/views/api/index.vue
@@ -612,8 +612,8 @@ onBeforeUnmount(() => {
   }
 }
 .drawerContent {
-  overflow-y: auto;
-  height: calc(100% - 32px);
+  overflow-y: scroll;
+  height: calc(100% - 40px);
 }
 .apiCenterCardSingle {
   position: relative;
-- 
Gitee