Merge remote-tracking branch 'origin/StableVersion' into develop

src/component/HomePage/generalMenu.vue

@@ -1,16 +1,56 @@
 <template>
 	<div class="generalMenu_printModel">
-		<div @click.stop="openPrintModel" :class="driverClass.class1">{{ item.label }}</div>
+		<div @click.stop="openPrintModel" :class="driverClass.class1">
+			<a-popover>
+				<template #content>
+					<img style="width: 10rem;height: 10rem;object-fit: contain;" :src="item.img" alt="">
+				</template>
+				<span v-if="item.label">{{ item.label }}</span>
+				<span v-else>{{ item.name }}</span>
+			</a-popover>
+		</div>
 		<ul :class="driverClass.class2" v-show="openClick">
-			<li v-for="item,index in dataList" :class="{active:deleteItem == index}" class="printModel_item" @click="setprintModel(item,index)">{{ item.label }}</li>
+			<li v-for="item,index in dataList" :class="{active:deleteItem == index}" class="printModel_item" @click="setprintModel(item,index)">
+				<a-popover placement="right">
+					<template #content>
+						<img v-if="item.img != -1" style="width: 10rem;height: 10rem;object-fit: contain;" :src="item.img" alt="">
+						<div v-else-if="item.img == -1" class="generalMenu_printModel_upload ">
+							<i class="fi fi-br-upload input_border" style="width: 8rem; height: 8rem;padding: 0;" :title="$t('Generate.uploadTitle')">
+								<a-upload
+									style="height: 100%;"
+									class="search_upImg"
+									:capture="null"
+									:action="uploadUrl + '/api/element/upload'"
+									list-type="picture-card"
+									:data="{
+										...upload,
+									}"
+									:maxCount='1'
+									:headers="{ Authorization: token }"
+									accept=".jpg,.png,.jpeg,.bmp"
+									@change="(file) => fileUploadChange(file)"
+								>
+								</a-upload>
+							</i>
+						</div>
+					</template>
+					<span v-if="item.label">{{ item.label }}</span>
+					<span v-else>{{ item.name }}</span>
+				</a-popover>
+				
+			</li>
 		</ul>
 	</div>
  </template>
  
  <script lang="ts">
  import { defineComponent,ref ,nextTick} from "vue";  
- import { Https } from "@/tool/https";
+import { useStore } from "vuex";
+import { Https } from "@/tool/https";
  import { openGuide,driverObj__ } from "@/tool/guide";
+import { getUploadUrl } from "@/tool/util";
+import { getCookie } from "@/tool/cookie";
+import { message, Upload, Modal } from "ant-design-vue";
  export default defineComponent({
 	 name:'filterComponent',
 	 props:{
@@ -37,7 +77,7 @@
 	 setup(props:any,{emit}){
 		let selectIndex = ref(0)
 		let openClick = ref(false)
-
+        let store = useStore();
 		let openPrintModel = ()=>{
 			document.addEventListener('click',removePrintModel)
 			openClick.value = true
@@ -48,7 +88,10 @@
 			})
 		}
 		let setprintModel = (item:any,index:any)=>{
+			console.log(item.img);
+			
 			if(props.deleteItem == index) return
+			if(item.img == -1) return
 			openClick.value = false
 			selectIndex = index
 			nextTick().then(()=>{
@@ -62,15 +105,69 @@
 			openClick.value = false
 			document.removeEventListener('click',removePrintModel)
 		}
+		let fileUploadChange = (data: any)=>{
+            let file = data.file;
+			let bor = true
+            if (file.status === "done") {
+                let res = JSON.parse(file.xhr.response);
+				if(res.errCode == 0){
+					file.type_ = "upload";
+					props.dataList.forEach((item:any)=>{
+						if(item.img == -1){
+							item.img = res.data.url
+							item.id = res.data.id
+						}
+					})
+				}else{
+					bor = false
+				}
+                
+            } else if (file.status === "error") {
+					bor = false
+            }
+			if(!bor){
+                let res:any = JSON.parse(file.xhr.response);
+					// props.dataList.forEach((item:any)=>{
+					// 	if(item.img == -1){
+					// 	}
+					// })
+                message.warning(res.errMsg);
+			}
+        }
 		 return {
 			selectIndex,
 			openClick,
+			store,
 			setprintModel,
 			openPrintModel,
+			fileUploadChange,
 		 }
 		 
 	 },
-	
+	 data(prop) {
+        return {
+            upload: {
+                isPin: 0,
+				gender:'',
+                level1Type: 'Sketchboard',
+                timeZone: Intl.DateTimeFormat().resolvedOptions().timeZone,
+            },
+            token: "",
+            uploadUrl: "",
+            type_: {
+                type1: "generate",
+                type2: 'Sketchboard',
+            },
+			workspaceCom:{},
+			isTextarea:false,
+			isInputFocus:false,
+        };
+    },
+    mounted() {
+        this.uploadUrl = getUploadUrl();
+        this.token = getCookie("token") || "";
+		this.upload.gender = this.store?.state?.Workspace?.workspace?.sexEnum?.value
+	}
  });
  </script>
  <style lang="less">
@@ -122,4 +219,9 @@
 			}
 		}
 	}
+	.generalMenu_printModel_upload{
+		>i{
+			justify-content: center;
+		}
+	}
  </style>