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

src/App.vue

@@ -121,11 +121,20 @@ const sellHistoryTripTemplate = async (sellId:any,LogId:any) => {
     lock:true
   })
   try {
-      let queryMsg = {
+      let queryMsg 
+      let dataRes
+      if(LogId){
+        queryMsg = {
+          Id: sellId,
+        }
+        dataRes = await ConfigService.sellGetTemplateDetails(queryMsg);
+      }else{
+        queryMsg = {
           LogId: LogId,
           FileId: sellId,
         }
-      let dataRes = await ConfigService.GetHistoryInfo(queryMsg);
+        dataRes = await ConfigService.GetHistoryInfo(queryMsg);
+      }
       if (dataRes.data.resultCode==ApiResult.SUCCESS) {
         loadingObj.close()
         loading.value = false

src/views/SellTemplate/BrowsingHistory.vue

 <template>
-    <div class="q-px-md q-pt-lg">
+    <div class="q-px-md q-pt-lg column full-height">
       <div class="q-pl-lg row q-mb-lg">
         <div class="col row items-center q-pl-md">
           <h5 class="row items-center">
@@ -47,45 +47,19 @@
           </el-dropdown> -->
         </div>
       </div>
-    </div>
-    <div
-      ref="SellTemplateRef"
-      class="journeyAds-container"
-      style="height: 100%; overflow: auto"
-    >
-      <el-scrollbar @scroll="scrollingHandler" class="q-px-md" style="height: 100%;">
+      <div ref="SellTemplateRef" class="col full-width q-ml-md">
         <journeyAdsList 
                   :current-menu="currentMenu" 
+                  :position="position"
+                  :set-file-list="datas.setFileList"
                   :list="dataList"
                   :msg="queryObj"
+                  :navigations="Navigations"
+                  :selected-datas="datas.selectedDatas"
                   @UpdateData="UpdateData"
                   @success="success"
                   @refreshHandler="refreshHandler"></journeyAdsList>
-        <div
-          v-if="dataList.length == 0 && !loading"
-          class="q-mt-lg bg-white rounded"
-          style="padding: 30px 10px 30px 10px"
-        >
-          <el-empty description="暂无数据" />
         </div>
-        <el-divider
-          class="no-bg q-mt-lg"
-          v-if="queryObj.pageCount == queryObj.pageIndex && !loading && queryObj.pageCount != 1"
-        >
-          <span
-            class="text-small bg-white"
-            style="padding: 0 10px; color: #a3a3a3"
-            >已加载完成所有数据</span
-          >
-        </el-divider>
-        <div
-          style="height: 40px"
-          class="q-mt-md no-bg"
-          background="transparent"
-          v-loading="loading"
-          element-loading-text="正在加载中"
-        ></div>
-      </el-scrollbar>
     </div>
   
   </template>

src/views/SellTemplate/RecycleBin.vue

 <template>
-    <div class="q-px-md q-pt-lg">
+    <div class="q-px-md q-pt-lg column full-height">
       <div class="q-pl-lg row q-mb-lg">
         <div class="col row items-center q-pl-md">
           <h5 class="row items-center">
@@ -30,13 +30,7 @@
             
         </div>
       </div>
-    </div>
-    <div
-      ref="SellTemplateRef"
-      class="journeyAds-container"
-      style="height: 100%; overflow: auto"
-    >
-      <el-scrollbar @scroll="scrollingHandler" class="q-px-md" style="height: 100%;">
+      <div ref="SellTemplateRef" class="col full-width q-ml-md">
         <journeyAdsList 
                   :current-menu="currentMenu" 
                   :position="position"
@@ -48,33 +42,10 @@
                   @UpdateData="UpdateData"
                   @success="success"
                   @refreshHandler="refreshHandler"></journeyAdsList>
-        <div
-          v-if="dataList.length == 0 && !loading"
-          class="q-mt-lg bg-white rounded"
-          style="padding: 30px 10px 30px 10px"
-        >
-          <el-empty description="暂无数据" />
         </div>
-        <el-divider
-          class="no-bg q-mt-lg"
-          v-if="queryObj.pageCount == queryObj.pageIndex && !loading && queryObj.pageCount != 1"
-        >
-          <span
-            class="text-small bg-white"
-            style="padding: 0 10px; color: #a3a3a3"
-            >已加载完成所有数据</span
-          >
-        </el-divider>
-        <div
-          style="height: 40px"
-          class="q-mt-md no-bg"
-          background="transparent"
-          v-loading="loading"
-          element-loading-text="正在加载中"
-        ></div>
-      </el-scrollbar>
     </div>
     
+    
   </template>
   <script setup lang="ts">
   import { ref, reactive, provide, watch, inject, onMounted, PropType } from "vue";

src/views/SellTemplate/Share.vue

@@ -237,7 +237,7 @@ const openCopyHandler = (item:any)=>{
     copyObject.value = item
 }
 const sortHandler = (val:any)=>{
-    queryObj.OrderByType = val=='descending'?2:1
+    queryObj.OrderByType = val.order=='descending'?2:1
     refreshHandler()
 }
 const setFilterNameHandler = (t:0|1)=>{

src/views/SellTemplate/StarTarget.vue

 <template>
-    <div class="q-px-md q-pt-lg">
+    <div class="q-px-md q-pt-lg column full-height">
       <div class="q-pl-lg row q-mb-lg">
         <div class="col row items-center q-pl-md">
           <h5 class="row items-center">
@@ -52,13 +52,7 @@
           </el-dropdown> -->
         </div>
       </div>
-    </div>
-    <div
-      ref="SellTemplateRef"
-      class="journeyAds-container"
-      style="height: 100%; overflow: auto"
-    >
-      <el-scrollbar @scroll="scrollingHandler" class="q-px-md" style="height: 100%;">
+      <div ref="SellTemplateRef" class="col full-width q-ml-md">
         <journeyAdsList 
                   :current-menu="currentMenu" 
                   :position="position"
@@ -70,31 +64,7 @@
                   @UpdateData="UpdateData"
                   @success="success"
                   @refreshHandler="refreshHandler"></journeyAdsList>
-        <div
-          v-if="dataList.length == 0 && !loading"
-          class="q-mt-lg bg-white rounded"
-          style="padding: 30px 10px 30px 10px"
-        >
-          <el-empty description="暂无数据" />
         </div>
-        <el-divider
-          class="no-bg q-mt-lg"
-          v-if="queryObj.pageCount == queryObj.pageIndex && !loading && queryObj.pageCount != 1"
-        >
-          <span
-            class="text-small bg-white"
-            style="padding: 0 10px; color: #a3a3a3"
-            >已加载完成所有数据</span
-          >
-        </el-divider>
-        <div
-          style="height: 40px"
-          class="q-mt-md no-bg"
-          background="transparent"
-          v-loading="loading"
-          element-loading-text="正在加载中"
-        ></div>
-      </el-scrollbar>
     </div>
     <Folder
       :folder-id="folderObj?.id"

src/views/SellTemplate/components/HistoricalVersion.vue

@@ -46,7 +46,7 @@
                             <td class="text-light text-5B5D62"><span>{{item.FileSize}}KB</span></td>
                             <td class="text-light">
                                 <span :class="[item.NewTitle?'active':'text-5B5D62']">
-                                {{item.NewTitle?item.NewTitle:item.Title}}</span>
+                                {{item.NewTitle?item.NewTitle:''}}</span>
                             </td>
                             <td class="text-center">
                                 <span class="hoverShow">
@@ -56,7 +56,7 @@
                                       <template #dropdown>
                                           <el-dropdown-menu class="q-pa-md" @click.stop="OffEdit">
                                             <el-dropdown-item icon="Promotion" @click.stop="clickControls(item,1)">另存</el-dropdown-item>
-                                            <el-dropdown-item icon="Switch" @click.stop="clickControls(item,2)">替换</el-dropdown-item>
+                                            <el-dropdown-item v-if="!item.NewTitle" icon="Switch" @click.stop="clickControls(item,2)">替换</el-dropdown-item>
                                         </el-dropdown-menu>
                                       </template>
                                    </el-dropdown>
@@ -126,6 +126,7 @@ import CopyFile from "./CopyFile.vue";
     const loading = ref(true)
     const HistoricalVersion = ref<any>()
     const copyDataList = ref([] as Array<any>);
+    const deleteLoading = ref<any>(null);
     const queryObj = reactive({
         pageIndex: 1,
         pageSize: 30,
@@ -139,15 +140,62 @@ import CopyFile from "./CopyFile.vue";
 
     const clickControls = (row:any,type:any) => {
         if(type){
-            datas.type = type
             journeyAdsDetails.value = row
+            if(type==1){
                 isCopyTo.value = true
+                datas.type = type
+            }else{
+                ElMessageBox.confirm(
+                    `此操作将替换到当前版本，是否确定?`,
+                    "提示",
+                    {
+                        confirmButtonText: "确定",
+                        cancelButtonText: "取消",
+                        type: "warning",
+                    }
+                )
+                    .then(async () => {
+                        try {
+                            SaveOverlay()
+                        } catch (error) { }
+                    })
+                    .catch(() => { });
+            }
         }else {
             let param = query()
             const url = `${process.env.VUE_APP_SHARE_URL}/?uid=${param.uid}&sellId=${row.FileId}&LogId=${row.LogId}&ViewSlideshow=1`
             window.open(url);
         }
     }
+    const SaveOverlay = async () => {
+        let queryMsg = {
+            LogId: journeyAdsDetails.value.LogId,
+            FileId: journeyAdsDetails.value.FileId,
+            UpdateType: 2,
+            FolderId: '',
+        };
+        deleteLoading.value = ElLoading.service({
+            lock: true,
+            text: "正在处理",
+        });
+        let pageRes = await ConfigService.UpdateOtherByHistory(queryMsg);
+        if (pageRes.data.resultCode == ApiResult.SUCCESS) {
+            ElMessage({
+                showClose: true,
+                message: `替换文件${props.details.FileType ? "" : "夹"}成功`,
+                type: "success",
+            });
+            refreshHandler()
+        } else {
+            ElMessage({
+                showClose: true,
+                message: `替换文件${props.details.FileType ? "" : "夹"}失败`,
+                type: "warning",
+            });
+        }
+        deleteLoading.value.close();
+        deleteLoading.value = null;
+    };
     const closedhandler=()=>{
         emit('close')
     }

src/views/SellTemplate/journeyAds.vue

 <template>
-  <div class="q-px-md q-pt-lg">
+  <div class="q-px-md q-pt-lg column full-height">
     <div class="q-pl-lg row q-mb-lg">
       <div class="col row items-center q-pl-md">
         <h5 class="row items-center">
@@ -63,13 +63,14 @@
         </el-dropdown>
       </div>
     </div>
-  </div>
+    <!-- 
     <div
       ref="SellTemplateRef"
-    class="journeyAds-container"
-    style="height: 100%; overflow: auto"
-  >
+      class="journeyAds-container" v-if="false">
       <el-scrollbar @scroll="scrollingHandler" class="q-px-md" style="height: 100%;"> 
+      </el-scrollbar>
+    </div> -->
+    <div ref="SellTemplateRef" class="col full-width q-ml-md">
     <journeyAdsList 
               :current-menu="currentMenu" 
               :position="position"
@@ -81,32 +82,9 @@
               @UpdateData="UpdateData"
               @success="success"
               @refreshHandler="refreshHandler"></journeyAdsList>
-      <div
-        v-if="dataList.length == 0 && !loading"
-        class="q-mt-lg bg-white rounded"
-        style="padding: 30px 10px 30px 10px"
-      >
-        <el-empty description="暂无数据" />
     </div>
-      <el-divider
-        class="no-bg q-mt-lg"
-        v-if="queryObj.pageCount == queryObj.pageIndex && !loading && queryObj.pageCount != 1"
-      >
-        <span
-          class="text-small bg-white"
-          style="padding: 0 10px; color: #a3a3a3"
-          >已加载完成所有数据</span
-        >
-      </el-divider>
-      <div
-        style="height: 40px"
-        class="q-mt-md no-bg"
-        background="transparent"
-        v-loading="loading"
-        element-loading-text="正在加载中"
-      ></div>
-    </el-scrollbar>
   </div>
+  
   <Folder
     :folder-id="folderObj?.id"
     :folder-name="folderObj?.name"
@@ -364,86 +342,5 @@ querySearchHandler();
 
 </script>
 <style lang="scss" scoped>
-@import url("@/assets/styles/common.css");
-.SelectAllBox {
-  position: relative;
-  top: 3px;
-}
-.journeyAds-title {
-}
-.journeyAds-TitleCenter {
-  width: 100%;
-  height: 18px;
-  margin-bottom: 3px;
-  overflow: hidden; /* 隐藏超出部分 */
-  text-overflow: ellipsis; /* 显示省略号 */
-  white-space: wrap; /* 不换行 */
-  position: relative;
-  padding-right: 20px;
-}
-.journeyAds-TitleCenter span {
-  position: absolute;
-  right: 16px;
-  top: 0px;
-}
-.journeyAds-Input {
-  padding-right: 20px;
-  position: relative;
-  margin-bottom: 2px;
-  ::v-deep(.el-textarea__inner) {
-    padding: 5px;
-    background: #f5f5f5;
-  }
-}
-.journeyAds-container {
-  position: relative;
-  overflow: auto;
-}
-.journeyAds-container th {
-  background: #fff;
-  position: sticky;
-  top: 0px;
-  z-index: 2;
-}
-.journeyAdsple-table td > div {
-  display: flex;
-}
-.journeyAdsple-table td,
-.journeyAds-container th {
-  border-bottom: 1px solid #f6f6f6;
-}
-.journeyAdsple-table td:first-child,
-.journeyAdsple-table td:nth-child(2),
-.journeyAds-container th:first-child {
-  border: 0;
-}
-.journeyAdsple-table td {
-  padding-bottom: 6px;
-}
-.journeyAdsple-table td:nth-child(2) {
-  padding-bottom: 0;
-}
-.hoverShow {
-  opacity: 0;
-}
-.journeyAdsple-table:hover .hoverShow {
-  opacity: 1;
-}
-.share-icon-box{
-  position: relative;
-}
-.share-icon-box::after{
-  display: block;
-  position: absolute;
-  bottom: -4px;
-  right: 6px;
-  content: " ";
-  background: url('@/assets/img/share.png');
-  width: 14px;
-  height: 14px;
-  z-index: 2;
-}
-.active {
-  color: $themeColor;
-}
+
 </style>