commit 8.5

This commit is contained in:
WangXiaoDong
2023-08-05 12:52:56 +08:00
parent 913b100ac9
commit b28d6585fa
21 changed files with 2020 additions and 772 deletions

View File

@@ -1,26 +1,23 @@
<template>
<div>
<a-modal class="my_material_modal"
<div class="my_material_modal">
<!-- <a-modal class="my_material_modal"
v-model:visible="myMaterialModalShow"
:footer="null"
width="80%"
:maskClosable="false"
:centered="true"
>
> -->
<div class="my_material_header">
<div class="my_material_title">My Library</div>
<div class="my_material_header_right">
<div class="content_search_block">
<input class="search_input" placeholder="Please input" v-model="searchPictureName" @keydown.enter="getLibraryList()">
<div class="search_icon_block" @click="getLibraryList()"><span class="icon iconfont icon-sousuo"></span></div>
</div>
<div class="icon iconfont icon-guanbi icon_close" @click="closeModal"></div>
</div>
</div>
<div class="my_material_content">
<div class="material_content_top">
<!-- <div class="material_content_top">
<div class="material_content_top_title"></div>
<div class="material_content_top_right">
<div class="select_block" v-show="selectCode == 'Sketchboard' || selectCode == 'MarketingSketch'">
@@ -45,35 +42,22 @@
<div>all</div>
</div>
</div>
</div>
</div> -->
<div class="material_content_body scroll_style">
<div class="content_img_item" v-for="(img) in imgList" :key="img.id" @click="selectImgItem(img)">
<div :class="['content_img_item_block', selectImgListIds.indexOf(img.id) > -1 ? 'select_item_img' :'']">
<img :class="[selectCode == 'Moodboard' || selectCode == 'Printboard' ? 'print_content_img' : 'content_img']" v-lazy="img.url" :key="img.url"/>
<div class="content_img_item_block" :class="{active:img?.checked}">
<img :class="[selectCode == 'Moodboard' || selectCode == 'Printboard' ? 'print_content_img' : 'content_img']" v-lazy="img.url" :key="img.url" :alt="img.name"/>
</div>
<div class="content_img_name">{{img.name}}</div>
</div>
<div class="no_data_block" v-show="!imgList.length && !isShowLoading">
<img src="@/assets/images/homePage/null_img.png">
<!-- <div class="content_img_name">{{img.name}}</div> -->
</div>
</div>
<div class="no_data_block loading_block" v-show="isShowLoading">
<a-spin size="large"></a-spin>
</div>
<div class="material_confirm" @click="confirmSelect()" v-show="imgList.length">Confirm</div>
<div class="table_pagination" v-show="imgList.length">
<a-pagination
v-model:current="currentPage"
v-model:pageSize="pageSize"
:total="total"
:showSizeChanger="false"
:showQuickJumper="true"
@change="changePage"
/>
</div>
</div>
</a-modal>
<!-- </a-modal> -->
</div>
</template>
@@ -81,12 +65,14 @@
import { defineComponent, ref} from 'vue'
import { Https } from "@/tool/https";
import { message } from 'ant-design-vue';
import { useStore } from "vuex";
import GO from '@/tool/GO';
export default defineComponent({
setup() {
let myMaterialModalShow = ref(false)
let imgList = ref([])
let selectImgList:any = ref([])
let selectImgListIds:any = ref([])
let store = useStore()
let isShowLoading:any = ref(false)
let selectCode:any = ref('')
let currentPage:any = ref(1)
@@ -126,8 +112,7 @@ export default defineComponent({
return{
myMaterialModalShow,
imgList,
selectImgList,
selectImgListIds,
store,
isShowLoading,
selectCode,
currentPage,
@@ -144,20 +129,24 @@ export default defineComponent({
init(code:any){
this.selectCode = code
this.myMaterialModalShow = true
this.getLibraryList()
// this.myMaterialModalShow = true
if(this.imgList.length == 0){
this.getLibraryList()
}
},
selectImgItem(imgData:any){
this.selectImgListIds = this.selectImgList.map((v:any)=>v.id)
if(this.selectImgListIds.indexOf(imgData.id) === -1){
this.selectImgList.push(imgData)
this.selectImgListIds.push(imgData.id)
}else{
let index = this.selectImgListIds.indexOf(imgData.id)
this.selectImgList.splice(index,1)
this.selectImgListIds.splice(index,1)
}
// this.selectImgListIds = this.selectImgList.map((v:any)=>v.id)
// if(this.selectImgListIds.indexOf(imgData.id) === -1){
// this.selectImgList.push(imgData)
// this.selectImgListIds.push(imgData.id)
// }else{
// let index = this.selectImgListIds.indexOf(imgData.id)
// this.selectImgList.splice(index,1)
// this.selectImgListIds.splice(index,1)
// }
imgData.type_ = 'material'
this.store.commit("addGenerateMaterialFils", imgData);
},
@@ -173,20 +162,12 @@ export default defineComponent({
},
//选择所有的图片
selectAllImg(){
if(this.selectImgListIds.length == this.imgList.length){
this.selectImgListIds = []
this.selectImgList = []
}else{
this.selectImgListIds = this.imgList.map((v:any) => v.id)
this.selectImgList = this.imgList
}
},
getLibraryList(){
let data = {
level1Type:this.selectCode,
level2Type:this.designType,
// level2Type:this.designType,
page:this.currentPage,
pictureName:this.searchPictureName,
size:this.pageSize,
@@ -194,7 +175,17 @@ export default defineComponent({
this.isShowLoading = true
Https.axiosPost(Https.httpUrls.queryLibraryPage,data).then(
(rv: any) => {
this.imgList = rv.content
let aa:any = []
this.imgList = rv.content
rv.content.forEach((item:any) => {
if(!item.id_){
item.id_ = GO.id++
aa.push(item)
}else{
aa.push(item)
}
});
this.imgList = aa
this.total = rv.total
this.isShowLoading = false
}
@@ -203,21 +194,11 @@ export default defineComponent({
});
},
confirmSelect(){
if(!this.selectImgList.length){
message.error('Please select at least one image')
return
}
this.$emit('confirmSelect',this.selectImgList)
this.closeModal()
},
closeModal(){
this.myMaterialModalShow = false
this.searchPictureName = ''
this.designType = null
this.selectImgList = []
this.selectImgListIds = []
this.imgList = []
this.currentPage = 1
this.pageSize = 10
@@ -228,7 +209,10 @@ export default defineComponent({
</script>
<style lang="less">
.my_material_modal{
height: 30rem;
overflow-x: hidden;
border-right: 1px solid #e5e5e5;
&.my_material_modal::-webkit-scrollbar{display: none;}
.ant-modal-close{
width: 3.6rem;
height: 3.6rem;
@@ -250,20 +234,17 @@ export default defineComponent({
}
.my_material_header{
display: flex;
justify-content: space-between;
display: flex;
justify-content: flex-end;
align-items: center;
width: 100%;
height: 6.6rem;
background: #F7F7F7;
padding: 0 3.4rem 0 3.1rem;
.my_material_title{
font-size: 1.8rem;
color: #030303;
font-weight: 500;
}
height: auto;
padding: 0;
padding-top: 2.5rem;
padding-bottom: 2rem;
background-color: #fff;
position: sticky;
top: 0;
.my_material_header_right{
display: flex;
justify-content: space-between;
@@ -274,14 +255,16 @@ export default defineComponent({
display: flex;
.search_input{
width: 30rem;
width: 15rem;
padding-left: 1.5rem;
height: 4rem;
line-height: 3.8rem;
background: #FFFFFF;
// height: 4rem;
// line-height: 3.8rem;
// background: #FFFFFF;
border: 0.1rem solid #F1F1F1;
font-size: 1.6rem;
// font-size: 1.6rem;
font-size: 1.2rem;
font-weight: 400;
height: 3rem;
&::placeholder {
color: #C2C2C2;
@@ -289,9 +272,9 @@ export default defineComponent({
}
.search_icon_block{
width: 6rem;
height: 4rem;
line-height: 4rem;
width: 5rem;
height: 3rem;
line-height: 3rem;
text-align: center;
background: #343579;
cursor: pointer;
@@ -314,7 +297,8 @@ export default defineComponent({
}
.my_material_content{
padding: 0 3rem 3.5rem 3rem;
// padding: 0 3rem 3.5rem 3rem;
padding: 0;
height: calc(100% - 6.6rem);
position: relative;
@@ -377,28 +361,38 @@ export default defineComponent({
.material_content_body{
width: 100%;
height: calc(100% - 19rem);
// height: calc(100% - 19rem);
height: 100%;
overflow-y: auto;
position: relative;
&.generate::-webkit-scrollbar{display: none;}
.content_img_item{
display: inline-block;
vertical-align: top;
padding: 0 1.4rem;
margin-bottom: 2.8rem;
// padding: 0 1.4rem;
// margin-bottom: 2.8rem;
margin: 0 2rem 2rem 0;
padding: 0;
.content_img_item_block{
border: 0.1rem solid transparent;
width: 16.5rem;
height: 16.5rem;
// border: 0.1rem solid transparent;
width: 10rem;
height: 10rem;
display: flex;
align-items: center;
justify-content: center;
position: relative;
cursor: pointer;
&.active{
opacity: .5;
img{
transform: scale(.9);
}
}
&.select_item_img{
border-color: #343579;
// border-color: #343579;
}
.print_content_img{