Merge branch 'liuqiang' into v3

src/views/collect/index.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="container">
+  <div class="container" v-if="!showPreview">
     <div class="statistics">
       <div class="left_box">
         <div class="dataNum">共查询到个相关结果</div>
@@ -261,12 +261,22 @@
       <span>删除</span>
     </div>
   </div>
+    <div v-else class="preview">
+    <FileEdit
+      :docId="clickRowId"
+      :copyRow="copyRow"
+      :historyPrew="historyPrew"
+      :historycopyRow="historycopyRow"
+      :onlyView="onlyView"
+    ></FileEdit>
+  </div>
 </template>
 
 <script setup>
 import Sortable from "sortablejs";
 // import { setIcon } from "@/utils/index.js";
 import draggable from "vuedraggable";
+import FileEdit from "@/views/myfile/components/FileEdit.vue";
 import { onMounted, ref, watch, nextTick } from "vue";
 import { toRaw } from "@vue/reactivity";
 import {
@@ -293,6 +303,7 @@ const isChangeTabName = ref(0); //存放修改状标签的id
 const folderArr = ref(); //文件夹数组
 const fileArr = ref(); //文件数组
 const isList = ref(false); //控制显示方式
+const showPreview = ref(false);//预览
 //----引入图片----
 import file_DOC from "../../assets/images/fileType/file_DOC.png";
 import file_pdf from "../../assets/images/fileType/file_pdf.png";

src/views/highSearch/HighSearch.vue

@@ -80,7 +80,7 @@
       </div>
     </div>
   </div>
-  <divv v-else class="preview">
+  <div v-else class="preview">
     <FileEdit
       :docId="clickRowId"
       :copyRow="copyRow"
@@ -88,7 +88,7 @@
       :historycopyRow="historycopyRow"
       :onlyView="onlyView"
     ></FileEdit>
-  </divv>
+  </div>
 </template>
 
 <script setup>