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

src/components/CloudDisk/index.vue

@@ -158,7 +158,8 @@ const GroupList = ref([] as any)
 const setLoading = ref(false)
 const deleteLoading = ref<any>(null)
 const props = defineProps({
-    active: '' as any
+    active: '' as any,
+    show: false as Boolean
 })
 
 const emit = defineEmits<{
@@ -168,6 +169,9 @@ const emit = defineEmits<{
 watch(() => props.active, () => {
     if(props.active!=2) ImgId.value = ''
 })
+watch(() => props.show, () => {
+    if(!props.show) ImgId.value = ''
+})
 const setImg = (item:any) => {
     ImgId.value = item.DetailsId
     emit('getImg',item.FilePath)
@@ -295,12 +299,12 @@ const querySearchGroup = async () =>{
             for(let i=0;i<datasRes.data.data.length;i++){
                 total+=datasRes.data.data[i].RecordNum
             }
-            console.log(total,'-----')
             GroupList.value.unshift({
                 Id: '',
                 GName: '全部',
-                RecordNum: total
+                RecordNum: 0
             })
+            querySearchHandler()
         }
     } catch (error) {
         
@@ -328,6 +332,7 @@ const querySearchHandler = async () =>{
             dataList.value = pageRes.data.data.pageData //dataList.value.concat(pageRes.data.data.pageData);
             queryObj.pageCount = pageRes.data.data.pageCount;
             queryObj.total = pageRes.data.data.count;
+            if(!GName.value&&!GroupList.value[0].RecordNum) GroupList.value[0].RecordNum =  pageRes.data.data.count
         }
         setTimeout(()=>{
             loading.value = false
@@ -357,7 +362,6 @@ const handleCurrentChange = (val: number) => {
 }
 
 querySearchGroup()
-querySearchHandler()
 onMounted(()=>{
     // imgDiskRef.value.addEventListener("scroll", scrollingHandler);
 })

src/views/Editor/CanvasTool/UploadPicture.vue

@@ -58,7 +58,7 @@
                     </div>
                 </el-tab-pane>
                 <el-tab-pane label="本地图" name="2">
-                    <!-- <FileInput @change="files => insertImageElement(files)">
+                    <FileInput @change="files => insertImageElement(files)">
                         <div class="upload-box">
                             <img v-if="imgPath" :src="imgPath" style="height: 200px;"/>
                             <div v-else>
@@ -68,8 +68,8 @@
                                 <p><em>点击上传图片</em></p>
                             </div>
                         </div>
-                    </FileInput> -->
-                    <CloudDisk :active="activeName" @getImg="getImg"></CloudDisk>
+                    </FileInput>
+                    <!-- <CloudDisk :show="showVisible" :active="activeName" @getImg="getImg"></CloudDisk> -->
                 </el-tab-pane>
                 <el-tab-pane label="图片地址" name="3">
                     <div class="row wrap q-mt-md">
@@ -91,7 +91,7 @@
     </div>
 </template>
 <script lang="ts" setup>
-import { ref, reactive, inject } from 'vue'
+import { ref, reactive, inject, watch } from 'vue'
 import { storeToRefs } from 'pinia'
 import { type UploadProps, type UploadUserFile,type UploadInstance, ElMessage, ElLoading } from 'element-plus'
 import useCreateElement from '@/hooks/useCreateElement'
@@ -158,6 +158,11 @@ const slidesStore = useSlidesStore()
 const { slides, currentSlide, slideIndex, layoutSlides } = storeToRefs(slidesStore)
 const { handleElement, handleElementId } = storeToRefs(mainStore)
 const handleImageElement = handleElement as Ref<PPTImageElement>
+const { imgPoolVisible } = storeToRefs(useScreenStore())
+
+watch(() => imgPoolVisible.value, () => {
+    if(imgPoolVisible.value) showVisible.value = true
+})
 
 const handleSizeChange = (val: number) => {
 }
@@ -297,7 +302,7 @@ const handleClick = (tab: TabsPaneContext, event: Event) => {
 }
 
 const close = () =>{
-    // showVisible.value = false
+    showVisible.value = false
     imgVisibleStore.setImgPoolVisible(false)
     imgVisibleStore.setImgReplaceVisible(false)
 }