push Develop

This commit is contained in:
X1627315083
2024-06-17 09:39:01 +08:00
parent c93483e36f
commit 363b880276
55 changed files with 5880 additions and 1359 deletions

View File

@@ -39,6 +39,9 @@
</div>
</div>
</div>
<a-popover title="Seed">
<input class="search_seed" v-show="scene?.value == 'Logo'" @input="ifSeedValue" v-model="searchPictureSeed" type="Number" placeholder='Seed' min="0">
</a-popover>
<input
class="search_input"
@input="ifMaximumLength"
@@ -139,7 +142,7 @@
:class="[item.status != 'Success'?'hideEvents':'',item?.checked?'active':'']"
>
<img v-lazy="item.imgUrl" @click.stop="generageAdd(item)">
<sketchCategory v-if="type_.type2 == 'Sketchboard'" :disignTypeList="sketchCatecoryList" :generateList="fileList" :item="item" :driver__="driver__.driver" :driverClass="{class1: 'Guide_1_13',class2:'Guide_1_13_1'}"></sketchCategory>
<sketchCategory v-if="type_.type2 == 'Sketchboard' || type_.type2 == 'Printboard'" :isSpread="type_.type2 == 'Printboard'" :disignTypeList="sketchCatecoryList" :generateList="fileList" :item="item" :driver__="driver__.driver" :driverClass="{class1: 'Guide_1_13',class2:'Guide_1_13_1'}"></sketchCategory>
<div
class="delete_like_file_block left1"
:class="[driver__.driver?'hideEvents':'',]"
@@ -212,6 +215,7 @@ export default defineComponent({
label:useI18n().t('Generate.Model1')
})
let searchPictureName = ref("");
let searchPictureSeed:any = ref(0);
let store = useStore();
let fileList: any = ref([
@@ -233,9 +237,9 @@ export default defineComponent({
let generateProceedList = ref([])
let remGenerate:any = ref(false)
let remGenerateTime:any = ref()
let scene:any = props.scene
return {
searchPictureName,
searchPictureSeed,
store,
fileList,
sketchboardList,
@@ -243,7 +247,6 @@ export default defineComponent({
printModel,
printModelList,
isGenerate,
scene,
// printBoards,
// moodboarList,
@@ -373,7 +376,7 @@ export default defineComponent({
if (!isJpgOrPng) {
message.info(this.t('Generate.jsContent1'));
}
const isLt2M = file.size / 1024 / 1024 < 2;
const isLt2M = file.size / 1024 / 1024 < 5;
if (!isLt2M) {
message.info(this.t('Generate.jsContent2'));
}
@@ -383,6 +386,7 @@ export default defineComponent({
this.printModel = value
},
getgenerate(){
if(this.isGenerate)return
clearInterval(this.remGenerateTime)
if(this.searchPictureName){
let arr = this.searchPictureName.split(/\s+/).length
@@ -415,7 +419,6 @@ export default defineComponent({
}
if(this.upload.level1Type == "Sketchboard"){
console.log(this.sketchboardList);
}else if(this.upload.level1Type == "Printboard"){
level2Type = this.scene?.value
}
@@ -426,14 +429,18 @@ export default defineComponent({
level1Type:this.upload.level1Type,
level2Type:level2Type,
text:this.searchPictureName,
seed:this.searchPictureSeed,
userId:this?.userInfo?.userId,
timeZone:Intl.DateTimeFormat().resolvedOptions().timeZone,
version:1,//为1就是Print
isTestUser:this.driver__.driver?false:this.isTest,
gender:this.workspace.sexEnum.name,
base64:base64,
sloganBase64:base64,
}
this.isGenerate = true
this.remGenerateTime = setTimeout(()=>{
this.remGenerate = true
},10000)
Https.axiosPost(Https.httpUrls.generatePrepare, data).then(
(rv) => {
if(data.isTestUser){
@@ -456,17 +463,21 @@ export default defineComponent({
}
).catch(res=>{
this.isGenerate = false
clearInterval(this.remGenerateTime)
this.remGenerate = false
});
},
setGenerate(dataList:any){
this.remGenerateTime = setTimeout(()=>{
this.remGenerate = true
},10000)
let data = dataList
let dataNum = dataList.length
let state = true
this.generateTime = setInterval(()=>{
if(!state)return
state = false
Https.axiosPost(Https.httpUrls.generateResult, data).then(
(rv) => {
state = true
if(this.isGenerate){//防止取消后有正在执行的获取状态
this.generateProceedList = rv.filter((item:any)=>item.status != 'Success' && item.status != 'Fail' && item.status != 'Invalid')
rv.forEach((element:any) => {
@@ -475,12 +486,14 @@ export default defineComponent({
element.id_ = GO.id++
this.fileList.unshift(element)
data = data.filter((item:any) => item !== element.taskId);
this.sketchCatecoryList.forEach((itemCategory:any) => {
if(itemCategory.value == element.category){
element.categoryValue = itemCategory?.name
element.category = itemCategory?.value
}
});
element.categoryValue = this.scene?.name
element.category = this.scene?.value
// this.sketchCatecoryList.forEach((itemCategory:any) => {
// if(itemCategory.value == element.category){
// element.categoryValue = itemCategory?.name
// element.category = itemCategory?.value
// }
// });
}
});
if((data.length == 0)|| (rv.filter((item:any)=>item.status == 'Invalid').length ==data.length)){
@@ -533,6 +546,11 @@ export default defineComponent({
}
this.searchPictureName += str + value
},
ifSeedValue(e:any){
if(this.searchPictureSeed == ''){
this.searchPictureSeed = 0
}
},
ifMaximumLength(){
clearTimeout(this.inputTime)
let inputBox = document.getElementsByClassName('generate')[0].getElementsByClassName('input_box')[0]
@@ -635,8 +653,6 @@ export default defineComponent({
},
likeFile(item:any,str:string){
if(str == 'like'){
console.log();
let level2Type = ''
if(this.upload.level1Type == "Sketchboard"){
level2Type = item.category
@@ -724,7 +740,7 @@ export default defineComponent({
top: 0;
background: #fff;
padding-bottom: calc(2rem*1.2);
z-index: 2;
z-index: 3;
}
.generate_checkbox {
}