bug修改

src/layout/indexCommon.vue

@@ -592,17 +592,33 @@ const addFileTab = (data) => {
   const oldIFrameData = iFrameData.value;
   const canAdd = oldIFrameData.some((par) => par.src == ""); //是否达到上限
   if (!canAdd) return ElMessage.error("已到最大数量，请先关闭其他文件！"); 
-  const hasThis = oldIFrameData.some((par) => par.docId == data.docId);//是否已存在
-  if (hasThis) return
+  const hasThis = oldIFrameData.find((par) => par.docId == data.docId);//是否已存在
+  if (hasThis){
+    const thisPane = toRaw(hasThis)
+    console.log('hasThis',thisPane);
+    const arr = oldIFrameData.map((par) => {
+    if (par.id == thisPane.id) {
+      par.show = true
+      editableTabsValue.value = par.id// 标签跳转
+    }else{
+		par.show = false
+	}
+    return toRaw(par);
+  });
+  iFrameData.value = arr;
+  isAlive.value = false;
+    return
+  }
   const arr = oldIFrameData.map((par) => {
     if (!par.src) {
       if (thisData.docId) {
         // par.src = `${window.location.origin}/fileEdit?clickRowId=${thisData.docId}`;
         par.src = `${window.location.origin}/fileEdit?clickRowId=${thisData.docId}`;
         par.name = data.fileName;
-		par.docId = data.docId
-		par.show = true
+        par.docId = data.docId
+        par.show = true
         thisData.docId = "";
+        editableTabsValue.value = par.id// 新建时标签跳转
       }
     }else{
 		par.show = false

src/views/highSearch/HighSearch.vue

@@ -112,6 +112,7 @@ const historyPrew = ref();
 const historycopyRow = ref(false);
 const onlyView = ref(false);
 const showPreview = ref(false);
+const addFileTab = inject("addFileTab");
 const selectOptions = [
   { label: "公共文档", value: 1 },
   { label: "部门文档", value: 2 },
@@ -187,7 +188,7 @@ const setScroll = async () => {
 const addTab = inject("addTab");
 // 预览事件
 const toPreview = (item) => {
-  addTab(item.content.docInfo);
+  addFileTab(item.content.docInfo);
   console.log("item", item);
   // clickRowId.value = item.content.docInfo.docId;
   // copyRow.value = item.content.docInfo;
@@ -203,7 +204,8 @@ const toPreview = (item) => {
   overflow: hidden;
 }
 .container {
-  height: 100%;
+  // height: 100%;
+  height: calc(98vh - 48px - 8px - 32px - 8px);
   background-color: #fff;
   overflow: hidden;
 }

vite.config.js

@@ -1,77 +0,0 @@
-import {
-	defineConfig,
-	loadEnv
-} from 'vite'
-import path from 'path'
-import createVitePlugins from './vite/plugins'
-
-// https://vitejs.dev/config/
-export default defineConfig(({
-								 mode,
-								 command
-							 }) => {
-	const env = loadEnv(mode, process.cwd())
-	const {
-		VITE_APP_ENV
-	} = env
-	return {
-		// 部署生产环境和开发环境下的URL。
-		// 默认情况下，vite 会假设你的应用是被部署在一个域名的根路径上
-		// 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.ruoyi.vip/admin/，则设置 baseUrl 为 /admin/。
-		base: VITE_APP_ENV === 'production' ? '/' : '/',
-		plugins: createVitePlugins(env, command === 'build'),
-		resolve: {
-			// https://cn.vitejs.dev/config/#resolve-alias
-			alias: {
-				// 设置路径
-				'~': path.resolve(__dirname, './'),
-				// 设置别名
-				'@': path.resolve(__dirname, './src')
-			},
-			// https://cn.vitejs.dev/config/#resolve-extensions
-			extensions: ['.mjs', '.js', '.ts', '.jsx', '.tsx', '.json', '.vue']
-		},
-		// vite 相关配置
-		server: {
-			port: 80,
-			host: true,
-			open: true,
-			proxy: {
-				// https://cn.vitejs.dev/config/#server-proxy
-				'/dev-api': {
-					// target: 'http://192.168.1.28:8080/',
-					// target: 'http://192.168.1.11:8080/',
-					// target: 'http://localhost:8080/',
-					// target:'http://192.168.1.28:8080/',
-					target:'http://8.142.173.95:19527',
-					changeOrigin: true,
-					rewrite: (p) => p.replace(/^\/dev-api/, '')
-				},
-				//websocket代理
-				'/websocket': {
-					// target:'ws://localhost:8080/websocket',
-					// target:'ws://192.168.1.28:8080/websocket',
-					// target:'ws://192.168.1.11:8080/websocket',
-					target:'ws://8.142.173.95:19527/websocket',
-					changeOrigin: true,
-					rewrite: (p) => p.replace(/^\/websocket/, '')
-				}
-			}
-		},
-		//fix:error:stdin>:7356:1: warning: "@charset" must be the first rule in the file
-		css: {
-			postcss: {
-				plugins: [{
-					postcssPlugin: 'internal:charset-removal',
-					AtRule: {
-						charset: (atRule) => {
-							if (atRule.name === 'charset') {
-								atRule.remove();
-							}
-						}
-					}
-				}]
-			}
-		}
-	}
-})