Merge branch '1.2.0' of http://gitlab.oytour.com/viitto/pptist into 1.2.0

src/views/SellTemplate/components/journeyAdsList.vue

@@ -35,10 +35,10 @@
                         </div>
                         <div class="temp-tr col q-ml-md file-name" :class="{'cusor-pointer':scope.row.FileType==0}">
                             <el-tooltip v-if="!scope.row.editTitle" effect="dark" :content="scope.row.FileName">
-                                <template v-if="scope.row.Highlight">
+                                <!-- <template v-if="scope.row.Highlight">
                                     <span class='text-waring' @click.stop="scope.row.FileType?OffEdit():editDelete(scope.row,2)">{{scope.row.FileName}}</span>
-                                </template>
-                                <div v-else class="file-name" v-html="queryObj.FileName!=''?(scope.row.FileName.replaceAll(queryObj.FileName,`<span class='text-waring'>${queryObj.FileName}</span>`)):scope.row.FileName"
+                                </template> -->
+                                <div class="file-name" v-html="queryObj.FileName!=''?(scope.row.FileName.replaceAll(queryObj.FileName,`<span class='text-waring'>${queryObj.FileName}</span>`)):scope.row.FileName"
                                     @click.stop="scope.row.FileType?OffEdit():editDelete(scope.row,2)"></div>
                             </el-tooltip>
                             <el-input
@@ -243,6 +243,7 @@ import CopyFile from "./CopyFile.vue";
     const editObj = reactive({});
     const filterFileNameStatus = ref(false)
     const showItemId = ref(0)
+    const dataTableRef = ref()
     if(props.currentMenu==0){
         datas.Title = '最近浏览'
         datas.emptyTitle = '没有最近浏览文档'
@@ -597,10 +598,19 @@ import CopyFile from "./CopyFile.vue";
             emit('refreshHandler',obj)
         }
     }
+    const setCurrentRow = ()=>{
+        setTimeout(()=>{
+            let tempRow = dataList.value.find(x=>x.Highlight)
+            if(tempRow){
+                dataTableRef.value.setCurrentRow(tempRow)
+            }
+        },500)
+    }
     watch(() => props.list, (n,o) => {
         if (props.list) {
             nextTick(() => {
                 dataList.value = props.list
+                setCurrentRow()
             })
         }
     })
@@ -608,7 +618,7 @@ import CopyFile from "./CopyFile.vue";
     watch(() => props.navigations, (n,o) => {
         Navigations.value = n
     })
-
+    setCurrentRow()
 </script>
 <style lang="scss">
     .el-table .el-table__cell{