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

src/components/CloudDisk/index.vue

@@ -190,6 +190,7 @@ const setImg = (item:any) => {
 }
 
 const insertImageElement = async (files: FileList) => {
+    let name = files[0].name.split('.')
     const loadingObj = ElLoading.service({
         text:'正在上传图',
         lock:true
@@ -200,9 +201,21 @@ const insertImageElement = async (files: FileList) => {
         loadingObj.close()
         return;
     }
-
-    //TODO: 实现校验HASH值是否存在，如果不存在，才调用下面的这个方法。
-    await uoloadFileToService(files[0])
+    let parms = {
+        fname: files[0].name,
+        gid: queryObj.CloudGroupId,
+        hi: hash
+    }
+    let dataRes = await CloudDiskService.CheckCloudInfo(parms)
+    if (dataRes.data.resultCode==ApiResult.SUCCESS) {
+        queryObj.CloudGroupId = ''
+        queryObj.FileName = dataRes.data.data.SourceFileName
+        Search()
+    }else{
+        //TODO: 实现校验HASH值是否存在，如果不存在，才调用下面的这个方法。
+      if(dataRes.data.message=='不存在此文件!') await uoloadFileToService(files[0])  
+    }
+    // await uoloadFileToService(files[0])
     loadingObj.close()
 }
 

src/hooks/useAlignElementToCanvas.ts

@@ -3,7 +3,7 @@ import { useMainStore, useSlidesStore } from '@/store'
 import type { PPTElement } from '@/types/slides'
 import { ElementAlignCommands } from '@/types/edit'
 import { getElementListRange } from '@/utils/element'
-import { VIEWPORT_SIZE } from '@/configs/canvas'
+import { VIEWPORT_SIZE,VIEWPORT_VER_SIZE } from '@/configs/canvas'
 import useHistorySnapshot from './useHistorySnapshot'
 
 export default () => {
@@ -18,8 +18,8 @@ export default () => {
    * @param command 对齐方向
    */
   const alignElementToCanvas = (command: ElementAlignCommands) => {
-    const viewportWidth = VIEWPORT_SIZE.Value
-    const viewportHeight = VIEWPORT_SIZE.Value * viewportRatio.value
+    const viewportWidth = viewportRatio.value<1?VIEWPORT_SIZE.Value:VIEWPORT_VER_SIZE.Value
+    const viewportHeight = (viewportRatio.value<1?VIEWPORT_SIZE.Value:VIEWPORT_VER_SIZE.Value) * viewportRatio.value
     const { minX, maxX, minY, maxY } = getElementListRange(activeElementList.value)
   
     const newElementList: PPTElement[] = JSON.parse(JSON.stringify(currentSlide.value.elements))

src/services/CloudDiskService.ts

@@ -3,6 +3,11 @@ import Api,{ HttpResponse, Result } from './../utils/request';
 
 class CloudDiskService{
 
+    static async CheckCloudInfo(parms:any):Promise<HttpResponse>{
+        let msg = parms
+        return Api.Post("ppt_CheckCloudInfo",msg)
+    }
+
     static async RemovePPTCloudInfo(DetailsId:String):Promise<HttpResponse>{
         let msg = {DetailsId}
         return Api.Post("ppt_RemovePPTCloudInfo",msg)
@@ -10,11 +15,11 @@ class CloudDiskService{
 
     static async GetPPTCloudList(GName:String):Promise<HttpResponse>{
         let msg = {GName}
-        return Api.Post("ppt_GetPPTCloudList",msg)
+        return Api.Post("ppt_GetMyCloudList",msg)//ppt_GetPPTCloudList
     }
 
     static async GetPPTCloudInfoPage(params:any):Promise<HttpResponse>{
-        return Api.Post("ppt_GetPPTCloudInfoPage",params)
+        return Api.Post("ppt_GetMyPPTCloudInfoPage",params)//ppt_GetPPTCloudInfoPage
     }
 
     static async RemovePPTCloudGroup(Id:Number):Promise<HttpResponse>{

src/views/Editor/CanvasTool/UploadPicture.vue

@@ -350,7 +350,7 @@ getImgList()
     background: rgba(23,23,23,.5);
 }
 .UploadPicture-fromB{
-    width: 680px;
+    width: 687px;
     margin: 150px auto 0;
     background: #fff;
     padding: 20px;

src/views/Editor/CanvasTool/index.vue

@@ -51,7 +51,7 @@
         </template>
         <IconInsertTable class="handler-item" v-tooltip="'插入表格'" />
       </Popover>
-      <IconFormula class="handler-item" v-tooltip="'插入公式'" @click="latexEditorVisible = true" />
+      <!-- <IconFormula class="handler-item" v-tooltip="'插入公式'" @click="latexEditorVisible = true" /> -->
       <IconEarth class="handler-item" v-tooltip="'编辑地图'" @click="mapVisibleStatus = true" v-if="userInfo.iv||userInfo.it" />
       <!-- <Popover trigger="click" v-model:value="mediaInputVisible">
         <template #content>

src/views/Editor/Thumbnails/index.vue

@@ -83,6 +83,7 @@ import { uniqueId } from 'lodash'
 import { useUserStore } from "@/store";
 import themeColor from '@/utils/colorExtraction';
 import HtmlUtil from '@/utils/htmlutil'
+import router from '@/router'
 
 const mainStore = useMainStore()
 const slidesStore = useSlidesStore()
@@ -137,6 +138,10 @@ const acquiesceLogo = ref([
 
 const tempDatas = ({} as any)
 const colorList = ref([] as any)
+
+const param = router.currentRoute.value.params
+const viewSlideShow = param.status
+
 watch(() => slideIndex.value, () => {
   // 清除多选状态的幻灯片
   if (selectedSlidesIndex.value.length) {
@@ -403,7 +408,7 @@ const GetTripTemplate = async () =>{
     text:'正在渲染模版数据',
     lock:true
   })
-  if(!searchData.value.TempId&&!searchData.value.TempId2&&!TempId.value&&!searchData.value.sellTempId&&searchData.value.ViewSlideshow) {
+  if(!searchData.value.TempId&&!searchData.value.TempId2&&!TempId.value&&!searchData.value.sellTempId&&viewSlideShow) {
     let list = [
       {
         id: 'test-slide-1',
@@ -940,7 +945,9 @@ const contextmenusThumbnailItem = (): ContextmenuItem[] => {
 }
 
 if(searchData.value.sellId&&!searchData.value.TempId) sellGetTripTemplate()
-if(!query().ViewSlideshow) GetTripTemplate()
+if(!viewSlideShow) {
+  GetTripTemplate()
+}
   
 </script>
 

src/views/Market/Index.vue

@@ -155,7 +155,8 @@
                         
                     </div>
                 </div>
-                <div v-if="(dataList.length>0&&queryObj.pageIndex>1)||(dataList.length>0&&queryObj.pageIndex==1&&!loading)" 
+                <!-- (dataList.length>0&&queryObj.pageIndex>1)||(dataList.length>0&&queryObj.pageIndex==1&&!loading) -->
+                <div v-if="dataList.length>0" 
                     class="listBox rounded">
                     <!-- :width="260" -->
                     <Waterfall :list="dataList" 
@@ -464,7 +465,7 @@ const queryTemplateBySearchHandler = async () => {
         }
         setTimeout(()=>{
             loading.value = false
-        },300)
+        },500)
     } catch (error) {
         loading.value = false
     }