Merge remote-tracking branch 'origin/v3' into v3

src/components/IdentifyFont/IdentifyFont.vue

@@ -165,7 +165,10 @@ onMounted(async () => {
   }
   console.log("fileId", fileId);
   console.log("fileType", fileType);
-  if (fileType === ".png" || fileType === ".jpg"|| fileType === ".JPG"|| fileType === ".PNG") {
+  console.log("textData", textData.value);
+  if(textData.value){
+    thisStep.value = "end";
+  }else if (fileType === ".png" || fileType === ".jpg"|| fileType === ".JPG"|| fileType === ".PNG") {
     const imgRes = await preview(docId);
     thisStep.value = "loading";
     loadingPreview.value = false;

src/layout/indexCommon.vue

@@ -108,7 +108,7 @@
           </div>
           <div v-show="isAlive">
             <router-view v-slot="{ Component }" :key="$router.currentRoute.value.fullPath">
-              <KeepAlive :exclude="['identifyFont', 'allback', 'search']">
+              <KeepAlive :include="['identifyFont']" :exclude="[ 'allback', 'search']">
                 <component :is="Component" />
               </KeepAlive>
             </router-view>
@@ -511,7 +511,7 @@ const toUserInfo = ()=>{
 // 判断是否需要改密
 const needRepass =async ()=>{
       const infoRes = await getInfo();
-      console.log("infoRes", infoRes);
+      // console.log("infoRes", infoRes);
       if(infoRes.repass){
         userStore.logOut().then(() => {
           location.href = "/index";
@@ -922,7 +922,7 @@ const iframeSize = (par,history) => {
 // 监听和保存标签信息
 const setTabLocal = (data) => {
   // console.log('setTabLocal',data);
-  console.log('data====', data)
+  // console.log('data====', data)
   sessionStorage.setItem('tabData', JSON.stringify(data))
 }
 const setFileTabLocal = (data) => {
@@ -946,7 +946,7 @@ watch(() => iFrameData.value, (newValue, oldValue) => {
 watch(() => editableTabs.value, (newValue, oldValue) => {
   // console.log('editableTabs 发生改变了', newValue, oldValue);
   setTabLocal(toRaw(newValue))
-  console.log('editableTabs.valuewatch', editableTabs.value)
+  // console.log('editableTabs.valuewatch', editableTabs.value)
 }, {
   immediate: true,
   deep: true
@@ -955,14 +955,20 @@ watch(() => editableTabsValue.value, (newValue, oldValue) => {
   // console.log('editableTabsValue 发生改变了', newValue, oldValue);
   setEditableTabsValue(toRaw(newValue))
   let regExp = new RegExp(/^\//);
-  if (!regExp.test(editableTabsValue.value)) {
+  if (!regExp.test(editableTabsValue.value) && editableTabsValue.value != "identifyFont" && editableTabsValue.value != "search") {
     isAlive.value = false;
   }
-  console.log('first  editableTabsValue.value', editableTabsValue.value)
+  // console.log('first  editableTabsValue.value', editableTabsValue.value)
 }, {
   immediate: true,
   deep: true
 });
+// watch(() => isAlive.value, (newValue, oldValue) => {
+//   console.log('isAlive.isAlive', newValue)
+// }, {
+//   immediate: true,
+//   deep: true
+// });
 </script>
 
 <style lang="scss" scoped>

src/views/search/index.vue

@@ -187,6 +187,7 @@ const changeSearchFor = async(name) => {
     })
     total.value = res.total;
   tableData.value = res.rows
+  baseData.value = res.rows
   console.log(res,'filter',fileTypes.value);
   }else{
     let res = await flieSearch({
@@ -198,22 +199,28 @@ const changeSearchFor = async(name) => {
     })
     total.value = res.total;
   tableData.value = res.rows
+  baseData.value = res.rows
   console.log(res,'filter',fileTypes.value);
   }
+  changeSearchType(searchType.value)
 };
 // 切换搜索分类
 const changeSearchType = (name) => {
+  numnum = 1
+  numG = 1
   let baseDataObj = toRaw(baseData.value);
+  console.log('baseDataObj',baseDataObj);
   if (name == 'all') {
     tableData.value = baseDataObj
   } else {
     // 获取分类具体数据
     console.log(name, 'name');
+    console.log(searchFor.value, 'searchFor');
     const typeArr = setType(name);
     console.log(typeArr, '类型');
     tableData.value = toRaw(baseDataObj).filter((item) => {
       console.log(item, '遍历');
-      return typeArr.includes(item.fileType) && item.space.spaceType === searchFor.value;
+      return typeArr.includes(item.fileType) && (item.space.spaceType == searchFor.value || searchFor.value =='');
     });
     console.log(tableData.value, '数组');
   }
@@ -345,7 +352,6 @@ const setIcon = (fileType) => {
       break;
   }
 };
-// TODO mp3筛选不出来 离大谱，一样的写法 mp4就可以
 // 设置分类
 const setType = (fileType) => {
   switch (fileType) {
@@ -353,7 +359,7 @@ const setType = (fileType) => {
       return [".txt", ".ppt", ".pdf", ".docx", ".csv", ".wps", ".xls", '.pptxs', '.dll', '.pptx', '.doc'];
       break;
     case "img":
-      return [".png", ".jpg", ".jpeg"];
+      return [".png",".PNG", ".jpg", ".jpeg"];
       break;
     case "audio":
       return [".mp3"];