重命名调整接口

src/services/ConfigService.ts

@@ -6,17 +6,10 @@ import Api,{ HttpResponse, Result } from './../utils/request';
 class ConfigService{
 
     /**
-     * 删除文件夹
+     * 行程广告重命名
      */
-     static async RemoveTripFolder(params : any):Promise<HttpResponse>{
-        return Api.Post("triptemplate_RemoveTripFolder",params)
-    }
-
-    /**
-     * 我的云文档列表（行程、广告）
-     */
-     static async GetMyTripFolderPage(params : any):Promise<HttpResponse>{
-        return Api.Post("triptemplate_GetMyTripFolderPage",params)
+     static async ReNameTripOther(params : any):Promise<HttpResponse>{
+        return Api.Post("triptemplate_ReNameTripOther",params)
     }
      
     /**

src/services/FolderService.ts

@@ -2,6 +2,19 @@ import Api,{ HttpResponse, Result } from './../utils/request';
 
 
 class FolderService{
+    /**
+     * 删除文件夹
+     */
+     static async RemoveTripFolder(params : any):Promise<HttpResponse>{
+        return Api.Post("triptemplate_RemoveTripFolder",params)
+    }
+
+    /**
+     * 我的云文档列表（行程、广告）
+     */
+     static async GetMyTripFolderPage(params : any):Promise<HttpResponse>{
+        return Api.Post("triptemplate_GetMyTripFolderPage",params)
+    }
 
     static async SetFolderAsync(FolderId:number,FolderName:string,ParendFolderId:number,FolderType:number):Promise<HttpResponse>{
         let msg = {

src/views/SellTemplate/components/HistoricalVersion.vue

@@ -100,7 +100,7 @@ import ConfigService from '@/services/ConfigService';
         pageIndex: 1,
         pageSize: 20,
         pageCount: 0, //总页数
-        Id: props.details.Id,
+        FileId: props.details.FileId,
         TemplateType: props.details.TemplateType,
     })
     const dataList=ref([])

src/views/SellTemplate/components/journeyAds.vue

@@ -63,10 +63,12 @@
                                 <img v-else @click.stop="editDelete(item,2)" class="q-px-md" :src="datas.adsImg" 
                                 style="height: 25px;" />
                             </td>
-                            <td class="journeyAds-title wrap row" @click.stop="editDelete(item,2)">
-                                <div v-if="!item.editTitle" class="col">
-                                    <el-tooltip @click.stop="OffEdit()"
-                                    placement="top-start">
+                            <td class="journeyAds-title wrap row">
+                                <div v-if="!item.editTitle" class="col" @click.stop="item.FileType?OffEdit():editDelete(item,2)">
+                                    <el-tooltip
+                                    class="box-item"
+                                    effect="dark"
+                                    placement="top">
                                         <template #content><div style="max-width: 600px;">{{item.FileName}}</div></template>
                                         <div class="journeyAds-TitleCenter">{{item.FileName}}
                                             <span v-if="item.FileName.length>70">...</span>
@@ -84,8 +86,8 @@
                                     v-if="item.editTitle"
                                     @blur="handleUpdateTitle(item)"/>
                             </td>
-                            <td class="text-center" @click.stop="OffEdit"><span>{{item.Day?item.Day+'天前':item.UpdateTime}}</span></td>
-                            <td class="text-center" @click.stop="OffEdit"><span>{{item.CreateName}}</span></td>
+                            <td class="text-center" @click.stop="item.FileType?OffEdit():editDelete(item,2)"><span>{{item.Day?item.Day+'天前':item.UpdateTime}}</span></td>
+                            <td class="text-center" @click.stop="item.FileType?OffEdit():editDelete(item,2)"><span>{{item.CreateName}}</span></td>
                             <td class="text-center">
                                 <div class="hoverShow row items-center just-center q-pt-sm">
                                     <el-button type="primary" :icon="Edit" size="small" @click.stop="editDelete(item)">编辑</el-button>
@@ -95,7 +97,7 @@
                                    <el-dropdown-menu class="q-pa-md" @click.stop="OffEdit">
                                     <el-dropdown-item v-if="item.FileType" icon="EditPen" @click.stop="startEditTitle(item)">重命名</el-dropdown-item>
                                     <el-dropdown-item v-if="item.FileType" icon="Clock" @click.stop="history(item)">历史版本</el-dropdown-item>
-                                    <el-dropdown-item v-if="item.FileType" icon="Position" @click="()=>shareId=item.Id">分享</el-dropdown-item>
+                                    <el-dropdown-item v-if="item.FileType" icon="Position" @click="()=>shareId=item.FileId">分享</el-dropdown-item>
                                     <el-dropdown-item icon="Delete" @click="editDelete(item,1)">删除</el-dropdown-item>
                                    </el-dropdown-menu>
                                   </template>
@@ -122,7 +124,7 @@
     @close="()=>folderObj.id=-1" @success="()=>{folderObj.id=-1;refreshHandler()}"></Folder>
 
     <HistoricalVersion :details="journeyAdsDetails" 
-    v-if="journeyAdsDetails.Id>0" 
+    v-if="journeyAdsDetails.FileId>0" 
     @close="()=>journeyAdsDetails={}"></HistoricalVersion>
 </template>
 <script setup lang="ts">
@@ -130,12 +132,14 @@
     import { ElLoading, ElMessage, ElMessageBox } from "element-plus";
     import { MoreFilled,Edit,ArrowLeft } from '@element-plus/icons-vue'
     import ConfigService from '@/services/ConfigService'
+    import FolderService from '@/services/FolderService';
     import { injectKeyTemplate } from '@/types/injectKey'
     import { getDaysBetween } from '@/utils/common'
     import { useSellTemplateStore, useScreenStore, useSlidesStore } from '@/store'
     import ShareForm from './ShareForm.vue';
     import Folder from './Folder.vue';
     import HistoricalVersion from './HistoricalVersion.vue';
+    import Draggable from 'vuedraggable'
     
     const SalesEditorStore = useSellTemplateStore()
     const marketStore = useScreenStore()
@@ -180,7 +184,20 @@
     //datas.journeyAds = inject('journeyAds')
     const loading = ref(false as any)
     const SellTemplateRef = ref<any>()
-
+    
+    // 长按鼠标
+    const handleFileDrop = (event) =>    {
+      event.preventDefault();
+          const files = event.dataTransfer.files;
+      this.uploadFiles(files);
+    }
+    const uploadFiles = (files:any) => {
+        console.log(files,'=====files')
+    }
+    const LongPressMouse = (row:any) => {
+        // console.log(row,'-----')
+    }
+    // 历史版本
     const history = (row:any) => {
         journeyAdsDetails.value = row
     }
@@ -189,66 +206,33 @@
     const OffEdit = () => {
         for(let i=0;i<dataList.value.length;i++){
             dataList.value[i].editTitle = false
-            if(editObj.value&&editObj.value.Id
-            &&dataList.value[i].Id==editObj.value.Id) {
-                dataList.value[i].Title = editObj.value.Title
+            if(editObj.value&&editObj.value.FileId
+            &&dataList.value[i].FileId==editObj.value.FileId) {
+                dataList.value[i].FileName = editObj.value.FileName
             }
         }
     }
     const handleUpdateTitle = (row:any) => {
-        if(!row.Title) return ElMessage({
-                                    showClose: true,
-                                    message: '文档名称不能为空',
-                                    type: 'warning',
-                                })
+        if(!row.FileName) row.FileName = editObj.value.FileName
         row.editTitle = false
-        if(row.Title!=editObj.value.Title) {
-            editObj.value.Title = row.Title
+        if(row.FileName!=editObj.value.FileName) {
+            editObj.value.FileName = row.FileName
             SetSellTemplate(row)
         }
     }
     const startEditTitle = (row:any) => {
-        for(let i=0;i<dataList.value.length;i++){
-            dataList.value[i].editTitle = false
-            if(dataList.value[i].Id==row.Id) {
-                row.editTitle = true
-                sellGetTripTemplate(row)
-            }
-        }
-        
-    }
-    // 销售模版数据
-    const sellGetTripTemplate = async (row:any) =>{
-        try {
-            let queryMsg = {
-                Id: row.Id
-            }
-            let dataRes = await ConfigService.sellGetTemplateDetails(queryMsg);
-            if (dataRes.data.resultCode == 1) {
-                editObj.value = dataRes.data.data
-            }
-        } catch (error) {
-            
-        }
+        row.editTitle = true
+        editObj.value = JSON.parse(JSON.stringify(row))
     }
+    
     // 保存重命名
     const SetSellTemplate = async (row:any) => {
         try {
-            let TempId = row.TempId
-            let Id = row.Id
             let queryMsg = {
-                Id: Id,
-                TempId: TempId,
-                TempData: editObj.value.TempData,
-                Title: editObj.value.Title,
-                OWidth: 0,
-                OHeight: 0,
-            }
-            if(editObj.value.TemplateType==2){
-                queryMsg.OWidth = editObj.value.Width
-                queryMsg.OHeight = editObj.value.Height
+                FileId: row.FileId,
+                Title: editObj.value.FileName
             }
-            let TemplateRes = await ConfigService.sellSetTemplate(queryMsg);
+            let TemplateRes = await ConfigService.ReNameTripOther(queryMsg);
             if (TemplateRes.data.resultCode == 1) {
                 ElMessage({
                     showClose: true,
@@ -269,7 +253,7 @@
     const clickSelectAll = () => {
         if(datas.selectAll) {
             datas.selectedDatas = dataList.value.map(x=>{
-                return x.Id
+                return x.FileId
             })
         }else {
             datas.selectedDatas = []
@@ -285,11 +269,11 @@
     }
     const singleChoice = (row:any) => {
         if(!row.singleChoice){
-            datas.selectedDatas.push(row.Id)
+            datas.selectedDatas.push(row.FileId)
         }else {
             let index
             for(let i=0;i<datas.selectedDatas.length;i++){
-                if(datas.selectedDatas[i] == row.Id) index = i
+                if(datas.selectedDatas[i] == row.FileId) index = i
             }
             datas.selectedDatas.splice(index,1)
         }
@@ -327,7 +311,7 @@
                     lock:true,
                     text:'正在处理'
                 })
-                let pageRes = await ConfigService.RemoveTripFolder(queryMsg);
+                let pageRes = await FolderService.RemoveTripFolder(queryMsg);
                 if (pageRes.data.resultCode == 1) {
                     ElMessage({
                         showClose: true,
@@ -418,7 +402,7 @@
                     Navigation.value = row
                     refreshHandler()
                 }else{
-                    folderObj.value.id=row.FileId
+                    folderObj.value.FileId=row.FileId
                     folderObj.value.name=row.FileName
                     folderObj.value.type=row.FileType
                 }
@@ -430,7 +414,7 @@
         loading.value = true
         try {
             if(queryObj.pageIndex == 1) dataList.value =[]
-            let pageRes = await ConfigService.GetMyTripFolderPage(queryObj);
+            let pageRes = await FolderService.GetMyTripFolderPage(queryObj);
             if (pageRes.data.resultCode == 1) {
                 let arrList = function(list){
                     list.forEach(x => {
@@ -438,8 +422,8 @@
                         x.singleChoice = false
                         if(datas.selectAll) {
                             x.singleChoice = true
-                            datas.selectedDatas.push(x.Id)
-                        }else if(datas.selectedDatas.length>0&&datas.selectedDatas.indexOf(x.Id)!=-1) x.singleChoice = true
+                            datas.selectedDatas.push(x.FileId)
+                        }else if(datas.selectedDatas.length>0&&datas.selectedDatas.indexOf(x.FileId)!=-1) x.singleChoice = true
                         const date1 = new Date();
                         const date2 = new Date(x.UpdateTime);
                         x.Day = getDaysBetween(date1, date2)
@@ -473,7 +457,7 @@
         querySearchHandler()
     }
     const operaFolder = (id:number,name:string)=>{
-        folderObj.value.id=id
+        folderObj.value.FileId=id
         folderObj.value.name=name
         folderObj.value.type=queryObj.FileType
         console.log(folderObj.value)
@@ -505,7 +489,7 @@
      }
      .journeyAds-TitleCenter{
         width: 100%;
-        height: 18px;
+        height: 21px;
         overflow: hidden; /* 隐藏超出部分 */
         text-overflow: ellipsis; /* 显示省略号 */
         white-space: wrap; /* 不换行 */