diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue
index 2cae8078..b02c67a6 100644
--- a/src/component/Detail/DesignDetail.vue
+++ b/src/component/Detail/DesignDetail.vue
@@ -442,6 +442,7 @@ export default defineComponent({
})()
}
+ // console.log(this.frontBack);
this.frontBack = {
front:front,
diff --git a/src/component/HomePage/Generate.vue b/src/component/HomePage/Generate.vue
index fefe56ab..5e4bc964 100644
--- a/src/component/HomePage/Generate.vue
+++ b/src/component/HomePage/Generate.vue
@@ -314,6 +314,7 @@ export default defineComponent({
this.isTest =JSON.parse(isTest)|| ''
this.uploadUrl = getUploadUrl();
this.workspace = this.store.state.Workspace.workspace
+ this.$emit('generateCheckbox',this.checkbox[0].type)
},
watch:{
driver__:{
@@ -348,7 +349,11 @@ export default defineComponent({
generageAdd(data: any) {
data.type_ = this.type_;
data.resData = JSON.parse(JSON.stringify(data))
- data.jsContent1 = this.t('uploadFile.jsContent1')
+ let maxImg = 8
+ if(this.type_.type2 == 'Sketchboard'){
+ maxImg = 20
+ }
+ data.jsContent1 = this.t('uploadFile.jsContent1',{maxImg:maxImg})
this.store.commit("addGenerateMaterialFils", data);
// console.log(this.fileList);
let moodboard = this.store.state.UploadFilesModule.moodboard
@@ -586,7 +591,11 @@ export default defineComponent({
},
deleteFile(item: any) {
if (item.type_ == "generate" || item.type_ == "material") {
- item.jsContent1 = this.t('uploadFile.jsContent1')
+ let maxImg = 8
+ if(this.type_.type2 == 'Sketchboard'){
+ maxImg = 20
+ }
+ item.jsContent1 = this.t('uploadFile.jsContent1',{maxImg:maxImg})
this.store.commit("addGenerateMaterialFils", item);
} else {
this.sketchboardList =
diff --git a/src/component/HomePage/Material.vue b/src/component/HomePage/Material.vue
index 148ff67d..f0a7ac9a 100644
--- a/src/component/HomePage/Material.vue
+++ b/src/component/HomePage/Material.vue
@@ -260,7 +260,11 @@ export default defineComponent({
this.imgList.forEach((v:any)=>{
v.categoryShow = false
})
- imgData.jsContent1 = this.t('uploadFile.jsContent1')
+ let maxImg = 8
+ if(this.selectCode == 'Sketchboard'){
+ maxImg = 20
+ }
+ imgData.jsContent1 = this.t('uploadFile.jsContent1',{maxImg:maxImg})
this.store.commit("addGenerateMaterialFils", imgData);
},
//改变页码
diff --git a/src/component/HomePage/MoodboardUpload.vue b/src/component/HomePage/MoodboardUpload.vue
index d9e8f9a7..d67edfdd 100644
--- a/src/component/HomePage/MoodboardUpload.vue
+++ b/src/component/HomePage/MoodboardUpload.vue
@@ -359,7 +359,7 @@ export default defineComponent({
deleteFile(item: any) {
if(item.type_.type1 == 'generate' || item.type_.type1 == 'material'){
- item.jsContent1 = this.t('uploadFile.jsContent1')
+ item.jsContent1 = this.t('uploadFile.jsContent1',{maxImg:8})
this.store.commit("addGenerateMaterialFils", item);
}else{
this.fileList = this.store.state.UploadFilesModule.moodboardFiles
diff --git a/src/component/HomePage/PrintboardUpload.vue b/src/component/HomePage/PrintboardUpload.vue
index 685de25e..6f3afb0a 100644
--- a/src/component/HomePage/PrintboardUpload.vue
+++ b/src/component/HomePage/PrintboardUpload.vue
@@ -325,7 +325,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')
+ item.jsContent1 = this.t('uploadFile.jsContent1',{maxImg:8})
this.store.commit("addGenerateMaterialFils", item);
}else{
this.fileList = this.store.state.UploadFilesModule.printboardFiles
@@ -716,7 +716,7 @@ export default defineComponent({
type2: 'Printboard',
},
item.resData = JSON.parse(JSON.stringify(item))
- item.jsContent1 = this.t('uploadFile.jsContent1')
+ item.jsContent1 = this.t('uploadFile.jsContent1',{maxImg:8})
this.store.commit("addGenerateMaterialFils", item);
}
}
diff --git a/src/component/HomePage/SketchboardUpload.vue b/src/component/HomePage/SketchboardUpload.vue
index 9c2b4de7..a87b1c2a 100644
--- a/src/component/HomePage/SketchboardUpload.vue
+++ b/src/component/HomePage/SketchboardUpload.vue
@@ -111,7 +111,7 @@
- {{ $t('SketchboardUpload.Maximum',{numTime:20}) }}
+ {{ $t('SketchboardUpload.Maximum',{maxImg:20}) }}
@@ -565,7 +565,7 @@ export default defineComponent({
deleteFile(item: any) {
if(item.type_.type1 == 'generate' || item.type_.type1 == 'material'){
- item.jsContent1 = this.t('uploadFile.jsContent1')
+ item.jsContent1 = this.t('uploadFile.jsContent1',{maxImg:20})
this.store.commit("addGenerateMaterialFils", item);
}else{
this.fileList = this.store.state.UploadFilesModule.sketchboardFiles
@@ -738,7 +738,7 @@ export default defineComponent({
type2: 'Sketchboard',
},
item.resData = JSON.parse(JSON.stringify(item))
- item.jsContent1 = this.t('uploadFile.jsContent1')
+ item.jsContent1 = this.t('uploadFile.jsContent1',{maxImg:20})
this.store.commit("addGenerateMaterialFils", item);
nextTick().then(()=>{
if(this.driver__.driver){
diff --git a/src/lang/cn.ts b/src/lang/cn.ts
index 4bb4dc1e..78640a21 100644
--- a/src/lang/cn.ts
+++ b/src/lang/cn.ts
@@ -138,6 +138,8 @@ export default {
Preview:'预览',
Back:'Back',
Restore:'重置',
+ System:'系统',
+ Library:'收藏',
Point:'点位',
RemovePoint:'删除点位',
mannequinHint:'模特背景图片请使用白色或者其他颜色来增强效果',
@@ -159,7 +161,7 @@ export default {
Library:'收藏',
Generate:'生成',
PIN:'PIN',
- Maximum:'最多可上传8张图片,每张图片最大2M',
+ Maximum:'最多可上传{maxImg}张图片,每张图片最大2M',
Thumbnail:'选择的服装缩略图',
inputContent1:'生成图片的标题',
maximumLength:'输入的内容超过允许输入的最大长度',
@@ -201,7 +203,6 @@ export default {
jsContent3:"您只能上传图片文件!",
jsContent4:'图片必须小于2MB',
jsContent5:"请输入正确的TCX值",
-
},
MoodboardUpload:{
Upload:'上传',
@@ -319,6 +320,6 @@ export default {
jsContent1:'以上操作没有保存,是否继续? ',
},
uploadFile:{
- jsContent1:'您最多可以选择8张图片哦',
+ jsContent1:'您最多可以选择{maxImg}张图片哦',
},
}
diff --git a/src/lang/en.ts b/src/lang/en.ts
index 1a88cd23..53b29b09 100644
--- a/src/lang/en.ts
+++ b/src/lang/en.ts
@@ -110,6 +110,10 @@ export default {
jsContent1:'Deleted successfully',
jsContent2:'Do you really want to delete this collection? ',
jsContent3:'Change successfully',
+ jsContent4:'Image must smaller than 2MB!',
+ jsContent5:'This picture has been uploaded whether to continue uploading?',
+ jsContent6:'The entered content exceeds the maximum length.',
+ jsContent7:'Please enter content',
},
ModelPlacement:{
Registration:'Registration',
@@ -157,7 +161,7 @@ export default {
Library:'Library',
Generate:'Generate',
PIN:'PIN',
- Maximum:'Maximum {numTime} images can be uploaded, Maximum 2M per image',
+ Maximum:'Maximum {maxImg} images can be uploaded, Maximum 2M per image',
Thumbnail:'Thumbnail preview of selected sketchboard',
inputContent1:'Caption generation',
maximumLength:'The entered content exceeds the maximum length.',
@@ -316,7 +320,7 @@ export default {
jsContent1:'The above changes are not saved, being sure to continue? ',
},
uploadFile:{
- jsContent1:'You can select up to 8 images',
+ jsContent1:'You can select up to {maxImg} images',
},
isTest:{
available:"This feature is not available to trial users",
diff --git a/src/lang/fr.ts b/src/lang/fr.ts
index 474f92be..c48da6d0 100644
--- a/src/lang/fr.ts
+++ b/src/lang/fr.ts
@@ -162,7 +162,7 @@ export default {
Library:'Bibliothèque',
Generate:'Générer',
PIN:'PIN',
- Maximum:'Un maximum de 8 images peuvent être téléchargées, maximum 2 M par image',
+ Maximum:'Un maximum de {maxImg} images peuvent être téléchargées, maximum 2 M par image',
Thumbnail:'Aperçu miniature du tableau de croquis sélectionné',
inputContent1:'Génération de sous-titres',
maximumLength:'Le contenu saisi dépasse la longueur maximale.',
@@ -321,6 +321,6 @@ export default {
jsContent1:'Les modifications ci-dessus ne sont pas enregistrées, assurez-vous de continuer? ',
},
uploadFile:{
- jsContent1:"Vous pouvez sélectionner jusqu'à 8 images",
+ jsContent1:"Vous pouvez sélectionner jusqu'à {maxImg} images",
},
}
diff --git a/src/lang/it.ts b/src/lang/it.ts
index 36d2fa36..cead7f52 100644
--- a/src/lang/it.ts
+++ b/src/lang/it.ts
@@ -161,7 +161,7 @@ export default {
Library:'Biblioteca',
Generate:'creare',
PIN:'PIN',
- Maximum:'È possibile caricare un massimo di 8 immagini, massimo 2 milioni per immagine',
+ Maximum:'È possibile caricare un massimo di {maxImg} immagini, massimo 2 milioni per immagine',
Thumbnail:'Anteprima in miniatura dello sketchboard selezionato',
inputContent1:'Generazione didascalie',
maximumLength:'Il contenuto inserito supera la lunghezza massima.',
@@ -320,6 +320,6 @@ export default {
jsContent1:'Le modifiche di cui sopra non vengono salvate, assicurandosi di continuare? ',
},
uploadFile:{
- jsContent1:'È possibile selezionare fino a 8 immagini',
+ jsContent1:'È possibile selezionare fino a {maxImg} immagini',
},
}
diff --git a/src/lang/ja.ts b/src/lang/ja.ts
index d8d627f2..e2a754b3 100644
--- a/src/lang/ja.ts
+++ b/src/lang/ja.ts
@@ -161,7 +161,7 @@ export default {
Library:'集める',
Generate:'生成する',
PIN:'PIN',
- Maximum:'画像は最大8枚アップロード可能、1枚あたり最大2M',
+ Maximum:'画像は最大{maxImg}枚アップロード可能、1枚あたり最大2M',
Thumbnail:'選択したスケッチボードのサムネイル プレビュー',
inputContent1:'キャプションの生成',
maximumLength:'入力した内容が最大長を超えています.',
@@ -320,6 +320,6 @@ export default {
jsContent1:'上記の変更は保存されません。続行しますか? ',
},
uploadFile:{
- jsContent1:'最大8枚の画像を選択できます',
+ jsContent1:'最大{maxImg}枚の画像を選択できます',
},
}
diff --git a/src/lang/kr.ts b/src/lang/kr.ts
index ab124adb..cb7acaf0 100644
--- a/src/lang/kr.ts
+++ b/src/lang/kr.ts
@@ -161,7 +161,7 @@ export default {
Library:'도서관',
Generate:'생성하다',
PIN:'PIN',
- Maximum:'최대 8개의 이미지를 업로드할 수 있으며, 이미지당 최대 2M',
+ Maximum:'최대 {maxImg}개의 이미지를 업로드할 수 있으며, 이미지당 최대 2M',
Thumbnail:'선택한 스케치보드의 썸네일 미리보기',
inputContent1:'캡션 생성',
maximumLength:'입력한 내용이 최대 길이를 초과했습니다.',
@@ -320,6 +320,6 @@ export default {
jsContent1:'위 변경사항이 저장되지 않았습니다. 계속하시겠습니까? ',
},
uploadFile:{
- jsContent1:'최대 8개의 이미지를 선택할 수 있습니다.',
+ jsContent1:'최대 {maxImg}개의 이미지를 선택할 수 있습니다.',
},
}
diff --git a/src/lang/ru.ts b/src/lang/ru.ts
index 7e0fc3b0..a0766981 100644
--- a/src/lang/ru.ts
+++ b/src/lang/ru.ts
@@ -161,7 +161,7 @@ export default {
Library:'Библиотека',
Generate:'Генерировать',
PIN:'PIN',
- Maximum:'Можно загрузить максимум 8 изображений, максимум 2 М на изображение.',
+ Maximum:'Можно загрузить максимум {maxImg} изображений, максимум 2 М на изображение.',
Thumbnail:'Предварительный просмотр миниатюр выбранной эскизной панели',
inputContent1:'Создание подписей',
maximumLength:'Введенный контент превышает максимальную длину.',
@@ -320,6 +320,6 @@ export default {
jsContent1:'Вышеуказанные изменения не сохраняются, обязательно продолжайте? ',
},
uploadFile:{
- jsContent1:'Вы можете выбрать до 8 изображений',
+ jsContent1:'Вы можете выбрать до {maxImg} изображений',
},
}
diff --git a/src/lang/th.ts b/src/lang/th.ts
index 6cc25709..c3bb5bd9 100644
--- a/src/lang/th.ts
+++ b/src/lang/th.ts
@@ -138,6 +138,8 @@ export default {
Preview:'ดูตัวอย่าง',
Back:'กลับ',
Restore:'คืนค่า',
+ System:'ระบบ',
+ Library:'ห้องสมุด',
Point:'จุด',
RemovePoint:'ถอดจุด',
mannequinHint:'โปรดเปลี่ยนสีขาวบริสุทธิ์ภายในหุ่นเป็นสีอื่นเพื่อเพิ่มประสบการณ์ของคุณ',
@@ -159,7 +161,7 @@ export default {
Library:'ห้องสมุด',
Generate:'กำเนิด',
PIN:'PIN',
- Maximum:'สามารถอัพโหลดภาพได้สูงสุด 8 ภาพ สูงสุด 2M ต่อภาพ',
+ Maximum:'สามารถอัพโหลดภาพได้สูงสุด {maxImg} ภาพ สูงสุด 2M ต่อภาพ',
Thumbnail:'ภาพตัวอย่างขนาดย่อของกระดานร่างภาพที่เลือก',
inputContent1:'การสร้างคำบรรยายภาพ',
maximumLength:'เนื้อหาที่ป้อนเกินความยาวสูงสุด.',
@@ -318,6 +320,6 @@ export default {
jsContent1:'การเปลี่ยนแปลงข้างต้นไม่ได้รับการบันทึก โปรดดำเนินการต่อ? ',
},
uploadFile:{
- jsContent1:'คุณสามารถเลือกได้สูงสุด 8 ภาพ',
+ jsContent1:'คุณสามารถเลือกได้สูงสุด {maxImg} ภาพ',
},
}
diff --git a/src/lang/vn.ts b/src/lang/vn.ts
index 0f41abc2..b4108569 100644
--- a/src/lang/vn.ts
+++ b/src/lang/vn.ts
@@ -161,7 +161,7 @@ export default {
Library:'Thư viện',
Generate:'Phát ra',
PIN:'PIN',
- Maximum:'Có thể tải lên tối đa 8 hình ảnh, Tối đa 2M mỗi hình ảnh',
+ Maximum:'Có thể tải lên tối đa {maxImg} hình ảnh, Tối đa 2M mỗi hình ảnh',
Thumbnail:'Xem trước hình thu nhỏ của bảng phác thảo đã chọn',
inputContent1:'Tạo phụ đề',
maximumLength:'Nội dung đã nhập vượt quá độ dài tối đa.',
@@ -320,6 +320,6 @@ export default {
jsContent1:'Những thay đổi trên không được lưu, hãy chắc chắn để tiếp tục? ',
},
uploadFile:{
- jsContent1:'Bạn có thể chọn tối đa 8 hình ảnh',
+ jsContent1:'Bạn có thể chọn tối đa {maxImg} hình ảnh',
},
}
diff --git a/src/store/uploadFile/uploadFile.ts b/src/store/uploadFile/uploadFile.ts
index ec4c0d38..0292d2b3 100644
--- a/src/store/uploadFile/uploadFile.ts
+++ b/src/store/uploadFile/uploadFile.ts
@@ -66,6 +66,10 @@ const UploadFilesModule : Module = {
addGenerateMaterialFils(state,data:any){
let file
let arr
+ let maxImg = 8
+ if(data.type_.type2 == 'Sketchboard'){
+ maxImg = 20
+ }
if(data.type_.type1 == 'generate'){//判断是generate||library
data.resData.designType = 'Generate'
if(data.type_.type2 == 'Moodboard'){
@@ -94,7 +98,7 @@ const UploadFilesModule : Module = {
}
if(file.length == 0){
- if(arr.length >= 8){
+ if(arr.length >= maxImg){
// message.warning(GO.jsContent1)
message.warning(data.jsContent1)
}else{
@@ -110,7 +114,7 @@ const UploadFilesModule : Module = {
}
}
if(str){
- if(arr.length >= 8){
+ if(arr.length >= maxImg){
message.warning(data.jsContent1)
}else{
data.checked = true