Merge branch 'v3' of http://94.191.59.107:3000/houwenfeng/cloudfile-ui into v3

.env.development

@@ -5,5 +5,4 @@ VITE_APP_TITLE = 聚合智慧文档
 VITE_APP_ENV = 'development'
 
 # 聚合智慧文档/开发环境
-# VITE_APP_BASE_API = '/dev-api'
-VITE_APP_BASE_API = 'http://8.142.173.95:19527'
+VITE_APP_BASE_API = '/dev-api'

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

@@ -40,19 +40,16 @@ export default defineConfig(({
 				// 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://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://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/, '')
 				}