2023-10-31-2-dist
This commit is contained in:
@@ -487,7 +487,7 @@ export default defineComponent({
|
||||
justify-content: space-between;
|
||||
}
|
||||
.modal_img{
|
||||
width: 45rem;
|
||||
width: 50rem;
|
||||
// width: 40rem;
|
||||
height: 5rem;
|
||||
overflow-x: hidden;
|
||||
|
||||
@@ -166,10 +166,11 @@
|
||||
<i v-else class="fi fi-sr-heart" @click.stop="likeFile(item,'noLike')"></i>
|
||||
</div>
|
||||
</div>
|
||||
<div class="mark_loading" v-show="loadingShow">
|
||||
<a-spin size="large" />
|
||||
</div>
|
||||
</div>
|
||||
<div class="mark_loading" v-show="loadingShow">
|
||||
<a-spin size="large" />
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</template>
|
||||
<script lang="ts">
|
||||
@@ -314,6 +315,7 @@ export default defineComponent({
|
||||
generageAdd(data: any) {
|
||||
data.type_ = this.type_;
|
||||
data.resData = JSON.parse(JSON.stringify(data))
|
||||
data.jsContent1 = this.t('uploadFile.jsContent1')
|
||||
this.store.commit("addGenerateMaterialFils", data);
|
||||
},
|
||||
|
||||
@@ -500,6 +502,7 @@ export default defineComponent({
|
||||
},
|
||||
deleteFile(item: any) {
|
||||
if (item.type_ == "generate" || item.type_ == "material") {
|
||||
item.jsContent1 = this.t('uploadFile.jsContent1')
|
||||
this.store.commit("addGenerateMaterialFils", item);
|
||||
} else {
|
||||
this.sketchboardList =
|
||||
@@ -565,6 +568,8 @@ export default defineComponent({
|
||||
flex: 1;
|
||||
// height: 30rem;
|
||||
// overflow-x: hidden;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
border-right: 1px solid #e5e5e5;
|
||||
&.generate::-webkit-scrollbar {
|
||||
display: none;
|
||||
@@ -629,7 +634,16 @@ export default defineComponent({
|
||||
}
|
||||
.generage_img {
|
||||
display: flex;
|
||||
position: relative;
|
||||
flex-wrap: wrap;
|
||||
align-content: flex-start;
|
||||
flex: 1;
|
||||
.mark_loading{
|
||||
position: absolute;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
z-index: 99;
|
||||
}
|
||||
.generage_img_item {
|
||||
cursor: pointer;
|
||||
margin: 0 2rem 2rem 0;
|
||||
|
||||
@@ -84,6 +84,7 @@ import { Https } from "@/tool/https";
|
||||
import { message } from 'ant-design-vue';
|
||||
import { useStore } from "vuex";
|
||||
import GO from '@/tool/GO';
|
||||
import { useI18n } from 'vue-i18n';
|
||||
|
||||
export default defineComponent({
|
||||
props: ["msg",'disignTypeList'],
|
||||
@@ -103,6 +104,8 @@ export default defineComponent({
|
||||
|
||||
// ])
|
||||
let workspace:any = ref({})
|
||||
|
||||
let {t} = useI18n()
|
||||
return{
|
||||
myMaterialModalShow,
|
||||
imgList,
|
||||
@@ -115,7 +118,8 @@ export default defineComponent({
|
||||
searcMaterialhName,
|
||||
designType,
|
||||
// disignTypeList,
|
||||
workspace
|
||||
workspace,
|
||||
t
|
||||
}
|
||||
},
|
||||
data (prop) {
|
||||
@@ -259,6 +263,7 @@ export default defineComponent({
|
||||
this.imgList.forEach((v:any)=>{
|
||||
v.categoryShow = false
|
||||
})
|
||||
imgData.jsContent1 = this.t('uploadFile.jsContent1')
|
||||
this.store.commit("addGenerateMaterialFils", imgData);
|
||||
},
|
||||
//改变页码
|
||||
|
||||
@@ -334,6 +334,7 @@ export default defineComponent({
|
||||
|
||||
deleteFile(item: any) {
|
||||
if(item.type_.type1 == 'generate' || item.type_.type1 == 'material'){
|
||||
item.jsContent1 = this.t('uploadFile.jsContent1')
|
||||
this.store.commit("addGenerateMaterialFils", item);
|
||||
|
||||
}else{
|
||||
|
||||
@@ -117,12 +117,13 @@
|
||||
<a-checkbox v-model:checked="item.pin">{{ $t('PrintboardUpload.PIN') }}</a-checkbox>
|
||||
</div>
|
||||
</div>
|
||||
<div class="mark_loading" v-show="loadingShow">
|
||||
<a-spin size="large" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="mark_loading" v-show="loadingShow">
|
||||
<a-spin size="large" />
|
||||
</div>
|
||||
|
||||
<Cropper ref="Cropper" @handleCropperSuccess="handleCropperSuccess" @closeCropper="deletUploadFile()" :cropperFileData="cropperFileData" :isUpload="isUpload"></Cropper>
|
||||
</div>
|
||||
</template>
|
||||
@@ -277,6 +278,7 @@ export default defineComponent({
|
||||
// this.fileList.splice(item, 1)
|
||||
// this.store.commit('setPrintboardFile',this.fileList)
|
||||
if(item.type_.type1 == 'generate' || item.type_.type1 == 'material'){
|
||||
item.jsContent1 = this.t('uploadFile.jsContent1')
|
||||
this.store.commit("addGenerateMaterialFils", item);
|
||||
}else{
|
||||
this.fileList = this.store.state.UploadFilesModule.printboardFiles
|
||||
@@ -498,7 +500,7 @@ export default defineComponent({
|
||||
let data = {
|
||||
generateType:generateType,
|
||||
designType:'',
|
||||
collectionElementId:generage.collectionElementid,
|
||||
collectionElementId:generage?.collectionElementid,
|
||||
level1Type:generage.upload.level1Type,
|
||||
level2Type:'',
|
||||
text:this.captionGeneration,
|
||||
@@ -507,7 +509,7 @@ export default defineComponent({
|
||||
gender:'',
|
||||
}
|
||||
if(generateType == 'image'||generateType == 'text-image'){
|
||||
if(generage.collectionElementid){
|
||||
if(generage?.collectionElementid){
|
||||
|
||||
}else{
|
||||
message.warning(
|
||||
@@ -543,8 +545,8 @@ export default defineComponent({
|
||||
let arr
|
||||
rv.generatedCollectionItems.forEach((v:any,index:number)=>{
|
||||
arr = {
|
||||
id:rv.generatedCollectionItems[index].generateItemId,
|
||||
imgUrl:rv.generatedCollectionItems[index].generateItemUrl,
|
||||
id:v.generateItemId,
|
||||
imgUrl:v.generateItemUrl,
|
||||
id_:GO.id++
|
||||
}
|
||||
this.generateList.push(arr)
|
||||
@@ -562,6 +564,7 @@ export default defineComponent({
|
||||
type2: 'Printboard',
|
||||
},
|
||||
item.resData = JSON.parse(JSON.stringify(item))
|
||||
item.jsContent1 = this.t('uploadFile.jsContent1')
|
||||
this.store.commit("addGenerateMaterialFils", item);
|
||||
}
|
||||
}
|
||||
@@ -834,6 +837,15 @@ export default defineComponent({
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
justify-content: flex-start;
|
||||
position: relative;
|
||||
align-content: flex-start;
|
||||
|
||||
.mark_loading{
|
||||
position: absolute;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
z-index: 99;
|
||||
}
|
||||
.modal_imgItem{
|
||||
margin: 0 2rem 5rem 0;
|
||||
display: inline-block;
|
||||
|
||||
@@ -235,12 +235,13 @@
|
||||
<a-checkbox v-model:checked="item.pin">{{ $t('SketchboardUpload.PIN') }}</a-checkbox>
|
||||
</div>
|
||||
</div>
|
||||
<div class="mark_loading" v-show="loadingShow">
|
||||
<a-spin size="large" />
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="mark_loading" v-show="loadingShow">
|
||||
<a-spin size="large" />
|
||||
</div>
|
||||
|
||||
<!-- <layout ref="layout" :moodb_className="moodb_className" :flex_direction="flex_direction" @setmoodbClass="setmoodbClass"></layout> -->
|
||||
|
||||
|
||||
@@ -475,6 +476,7 @@ export default defineComponent({
|
||||
|
||||
deleteFile(item: any) {
|
||||
if(item.type_.type1 == 'generate' || item.type_.type1 == 'material'){
|
||||
item.jsContent1 = this.t('uploadFile.jsContent1')
|
||||
this.store.commit("addGenerateMaterialFils", item);
|
||||
}else{
|
||||
this.fileList = this.store.state.UploadFilesModule.sketchboardFiles
|
||||
@@ -569,7 +571,7 @@ export default defineComponent({
|
||||
let data = {
|
||||
generateType:generateType,
|
||||
designType:'',
|
||||
collectionElementId:generage.collectionElementid,
|
||||
collectionElementId:generage?.collectionElementid,
|
||||
level1Type:generage.upload.level1Type,
|
||||
level2Type:generage.level2Type,
|
||||
text:this.captionGeneration,
|
||||
@@ -578,7 +580,7 @@ export default defineComponent({
|
||||
gender:this.workspace.sex,
|
||||
}
|
||||
if(generateType == 'image'||generateType == 'text-image'){
|
||||
if(generage.collectionElementid){
|
||||
if(generage?.collectionElementid){
|
||||
}else{
|
||||
message.warning(
|
||||
this.t('SketchboardUpload.jsContent5')
|
||||
@@ -613,8 +615,8 @@ export default defineComponent({
|
||||
let arr
|
||||
rv.generatedCollectionItems.forEach((v:any,index:number)=>{
|
||||
arr = {
|
||||
id:rv.generatedCollectionItems[index].generateItemId,
|
||||
imgUrl:rv.generatedCollectionItems[index].generateItemUrl,
|
||||
id:v.generateItemId,
|
||||
imgUrl:v.generateItemUrl,
|
||||
category:generage.level2Type,
|
||||
id_:GO.id++
|
||||
}
|
||||
@@ -633,6 +635,7 @@ export default defineComponent({
|
||||
type2: 'Sketchboard',
|
||||
},
|
||||
item.resData = JSON.parse(JSON.stringify(item))
|
||||
item.jsContent1 = this.t('uploadFile.jsContent1')
|
||||
this.store.commit("addGenerateMaterialFils", item);
|
||||
}
|
||||
},
|
||||
@@ -896,6 +899,14 @@ export default defineComponent({
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
justify-content: flex-start;
|
||||
align-content: flex-start;
|
||||
position: relative;
|
||||
.mark_loading{
|
||||
position: absolute;
|
||||
width: 100%;
|
||||
height: 100%;
|
||||
z-index: 99;
|
||||
}
|
||||
.modal_imgItem{
|
||||
margin: 0 2rem 4rem 0;
|
||||
display: inline-block;
|
||||
|
||||
@@ -16,7 +16,10 @@
|
||||
<div v-show="collectionStep === 3">{{ $t('collectionModal.Colorboard') }}</div>
|
||||
<div v-show="collectionStep === 4">{{ $t('collectionModal.Sketchboard') }}</div>
|
||||
<!-- <div v-show="collectionStep === 5">Markets Sketch</div> -->
|
||||
<div class="collection_title_text_intro">{{ $t('collectionModal.collection') }}</div>
|
||||
<div class="collection_title_text_intro" v-show="collectionStep === 1">{{ $t('collectionModal.MoodCollection') }}</div>
|
||||
<div class="collection_title_text_intro" v-show="collectionStep === 2">{{ $t('collectionModal.PrinCollection') }}</div>
|
||||
<div class="collection_title_text_intro" v-show="collectionStep === 3">{{ $t('collectionModal.ColorCollection') }}</div>
|
||||
<div class="collection_title_text_intro" v-show="collectionStep === 4">{{ $t('collectionModal.SketchCollection') }}</div>
|
||||
</div>
|
||||
<div class="collection_progress">
|
||||
<a-progress :strokeWidth= 13 strokeColor="#341e57" type="circle" :percent="collectionStep*25" :format="percent => `${collectionStep}/4`" />
|
||||
|
||||
Reference in New Issue
Block a user