From f8ba824bb932661d175b8635a8532db5998c0577 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Mon, 18 Dec 2023 14:36:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=A0=87=E7=AD=BE=E5=90=8D?=
=?UTF-8?q?=E5=AD=97=E8=87=AA=E5=8A=A8=E8=8E=B7=E5=8F=96=E7=84=A6=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/component/HomePage/Generate.vue | 5 +--
src/component/LibraryPage/ModelPlacement.vue | 32 ++++++++++++-------
.../LibraryPage/ModelPlacementMobile.vue | 19 +++++------
src/component/LibraryPage/setLabel.vue | 20 ++++++++----
src/lang/cn.ts | 2 ++
src/lang/en.ts | 2 ++
src/lang/fr.ts | 2 ++
src/lang/it.ts | 2 ++
src/lang/ja.ts | 2 ++
src/lang/kr.ts | 2 ++
src/lang/ru.ts | 2 ++
src/lang/th.ts | 2 ++
src/lang/vn.ts | 2 ++
src/views/LibraryPage.vue | 1 +
14 files changed, 66 insertions(+), 29 deletions(-)
diff --git a/src/component/HomePage/Generate.vue b/src/component/HomePage/Generate.vue
index 02c045b8..64c1d6c9 100644
--- a/src/component/HomePage/Generate.vue
+++ b/src/component/HomePage/Generate.vue
@@ -38,7 +38,8 @@
+
{{ $t('ModelPlacement.mannequinHint') }}
@@ -277,20 +277,27 @@ export default defineComponent({
},
setCropperWH(){
let cropper:any = this.$refs.cropper
- if(cropper.h != cropper.cropH){
+ if(cropper.h != cropper.cropH && this.locationList.length < 6){
this.getDefaultPointList(this.imgBox,' ')
return
+ }else if(cropper.h == cropper.cropH){
+ cropper.cropH = cropper.scale*cropper.trueHeight
+ cropper.cropW = cropper.cropH/2.125
+ cropper.cropOffsertX = cropper.getImgAxis().x1+(cropper.scale*cropper.trueWidth/2-cropper.cropW/2)
+ cropper.cropOffsertY = cropper.getImgAxis().y1
}
- cropper.cropH = cropper.scale*cropper.trueHeight
- cropper.cropW = cropper.cropH/2.125
- cropper.cropOffsertX = cropper.getImgAxis().x1+(cropper.scale*cropper.trueWidth/2-cropper.cropW/2)
- cropper.cropOffsertY = cropper.getImgAxis().y1
+
},
realTime(data:any) {
- clearTimeout(this.cropperTime)
- this.cropperTime = setTimeout(()=>{
- this.setImageSize()
- },100)
+ let cropper:any = this.$refs.cropper
+ // if(cropper.h == cropper.cropH){
+ this.cropperTime = setTimeout(()=>{
+ this.setImageSize()
+ clearTimeout(this.cropperTime)
+
+ },100)
+ // }
+
},
setImageSize(){
@@ -544,6 +551,7 @@ export default defineComponent({
this.locationList = []
this.pointList = JSON.parse(JSON.stringify(this.oldPointList))
this.locationList = JSON.parse(JSON.stringify(this.oldLocationList))
+ // this.locationList = JSON.parse(JSON.stringify(this.locationList))
},
submitPlacement(){
diff --git a/src/component/LibraryPage/ModelPlacementMobile.vue b/src/component/LibraryPage/ModelPlacementMobile.vue
index 2939cb07..e498af94 100644
--- a/src/component/LibraryPage/ModelPlacementMobile.vue
+++ b/src/component/LibraryPage/ModelPlacementMobile.vue
@@ -27,7 +27,7 @@
{{ $t('ModelPlacement.Back') }}
-
+
{{ $t('ModelPlacement.mannequinHint') }}
@@ -277,19 +277,20 @@ export default defineComponent({
},
setCropperWH(){
let cropper:any = this.$refs.cropper
- if(cropper.h != cropper.cropH){
+ if(cropper.h != cropper.cropH && this.locationList.length < 6){
this.getDefaultPointList(this.imgBox,' ')
return
+ }else if(cropper.h == cropper.cropH){
+ cropper.cropH = cropper.scale*cropper.trueHeight
+ cropper.cropW = cropper.cropH/2.125
+ cropper.cropOffsertX = cropper.getImgAxis().x1+(cropper.scale*cropper.trueWidth/2-cropper.cropW/2)
+ cropper.cropOffsertY = cropper.getImgAxis().y1
}
- cropper.cropH = cropper.scale*cropper.trueHeight
- cropper.cropW = cropper.cropH/2.125
- cropper.cropOffsertX = cropper.getImgAxis().x1+(cropper.scale*cropper.trueWidth/2-cropper.cropW/2)
- cropper.cropOffsertY = cropper.getImgAxis().y1
},
realTime(data:any) {
- clearTimeout(this.cropperTime)
this.cropperTime = setTimeout(()=>{
this.setImageSize()
+ clearTimeout(this.cropperTime)
},100)
},
diff --git a/src/component/LibraryPage/setLabel.vue b/src/component/LibraryPage/setLabel.vue
index faf63f9a..4def3a77 100644
--- a/src/component/LibraryPage/setLabel.vue
+++ b/src/component/LibraryPage/setLabel.vue
@@ -15,7 +15,7 @@
@@ -24,12 +24,12 @@
{{ childrenItem.classificationName }}
-
+
-
+
+
@@ -37,7 +37,7 @@
@@ -91,6 +91,7 @@ export default defineComponent({
}
},
mounted(){
+ this.clearOpenType()
},
watch: {
@@ -172,7 +173,7 @@ export default defineComponent({
},
putName(index:number,v:string,item:any){
let e:any = window.event
- e.target.parentNode.
+ let input = e.target.parentNode.querySelectorAll('.inputName')[0]
let data:any
if(v == 'put'){
this.clearOpenType()
@@ -181,6 +182,9 @@ export default defineComponent({
this.itemName = item.classificationName
// this.options[index].openType = true
// this.itemName = this.workspace.workspaceList[index].workSpaceName
+ nextTick().then(()=>{
+ input.focus()
+ })
}else if(v == 'affirm'){
if(index == -1){
if(this.itemName == ''){
@@ -217,12 +221,16 @@ export default defineComponent({
newLabel(item:any,id:any){
this.itemName = ''
this.clearOpenType()
-
+ let e:any = window.event
+ let input = e.target.parentNode.querySelectorAll('.inputName')[0]
if(item){
item.addOpenType = true
}else{
this.openType = true
}
+ nextTick().then(()=>{
+ input.focus()
+ })
},
removeLabel(val:any){
let data = {
diff --git a/src/lang/cn.ts b/src/lang/cn.ts
index d44ed2b4..97ec09e9 100644
--- a/src/lang/cn.ts
+++ b/src/lang/cn.ts
@@ -74,6 +74,7 @@ export default {
maximumLength:'输入的内容超过允许输入的最大长度',
Model1:'模型1',
Model2:'模型2',
+ Model3:'模型3',
inputContent3:'输入生成图片的标题',
Cancel:'取消',
Sure:'确定',
@@ -248,6 +249,7 @@ export default {
TextImage:'图片-文字',
Model1:'模型1',
Model2:'模型2',
+ Model3:'模型3',
inputContent1:'输入生成图片的标题',
Generate:'生成',
maximumLength:'输入的内容超过允许输入的最大长度',
diff --git a/src/lang/en.ts b/src/lang/en.ts
index 00e78e79..881d4155 100644
--- a/src/lang/en.ts
+++ b/src/lang/en.ts
@@ -74,6 +74,7 @@ export default {
maximumLength:'The entered content exceeds the maximum length.',
Model1:'Model1',
Model2:'Model2',
+ Model3:'Model3',
inputContent3:'Input name',
Cancel:'Cancel',
Sure:'Sure',
@@ -248,6 +249,7 @@ export default {
TextImage:'Text-Image',
Model1:'Model1',
Model2:'Model2',
+ Model3:'Model3',
inputContent1:'Prompt input',
Generate:'Generate',
maximumLength:'The entered content exceeds the maximum length.',
diff --git a/src/lang/fr.ts b/src/lang/fr.ts
index b6597e20..82b67ca5 100644
--- a/src/lang/fr.ts
+++ b/src/lang/fr.ts
@@ -75,6 +75,7 @@ export default {
maximumLength:'Le contenu saisi dépasse la longueur maximale.',
Model1:'Modèle1',
Model2:'Modèle2',
+ Model3:'Modèle3',
inputContent3:'Saisie rapide',
Cancel:'Annuler',
Sure:'Bien sûr',
@@ -249,6 +250,7 @@ export default {
TextImage:'Texte-Image',
Model1:'Modèle1',
Model2:'Modèle2',
+ Model3:'Modèle3',
inputContent1:'Saisie rapide',
Generate:'Générer',
maximumLength:'Le contenu saisi dépasse la longueur maximale.',
diff --git a/src/lang/it.ts b/src/lang/it.ts
index c084f6de..1f072668 100644
--- a/src/lang/it.ts
+++ b/src/lang/it.ts
@@ -74,6 +74,7 @@ export default {
maximumLength:'Il contenuto inserito supera la lunghezza massima.',
Model1:'Modello1',
Model2:'Modello2',
+ Model3:'Modello3',
inputContent3:'Immissione rapida',
Cancel:'Annulla',
Sure:'Sicuro',
@@ -248,6 +249,7 @@ export default {
TextImage:'Testo-immagine',
Model1:'Modello1',
Model2:'Modello2',
+ Model3:'Modello3',
inputContent1:'Immissione rapida',
Generate:'creare',
maximumLength:'Il contenuto inserito supera la lunghezza massima.',
diff --git a/src/lang/ja.ts b/src/lang/ja.ts
index 3f2a45ee..62cc529c 100644
--- a/src/lang/ja.ts
+++ b/src/lang/ja.ts
@@ -74,6 +74,7 @@ export default {
maximumLength:'入力した内容が最大長を超えています.',
Model1:'モデル1',
Model2:'モデル2',
+ Model3:'モデル3',
inputContent3:'プロンプト入力',
Cancel:'キャンセル',
Sure:'もちろん',
@@ -248,6 +249,7 @@ export default {
TextImage:'テキスト-画像',
Model1:'モデル1',
Model2:'モデル2',
+ Model3:'モデル3',
inputContent1:'プロンプト入力',
Generate:'生成する',
Model:'モデル',
diff --git a/src/lang/kr.ts b/src/lang/kr.ts
index 9cb1dc93..4fc4fefc 100644
--- a/src/lang/kr.ts
+++ b/src/lang/kr.ts
@@ -74,6 +74,7 @@ export default {
maximumLength:'입력한 내용이 최대 길이를 초과했습니다.',
Model1:'모델1',
Model2:'모델2',
+ Model3:'모델3',
inputContent3:'프롬프트 입력',
Cancel:'취소',
Sure:'확신하는',
@@ -248,6 +249,7 @@ export default {
TextImage:'텍스트-이미지',
Model1:'모델1',
Model2:'모델2',
+ Model3:'모델3',
inputContent1:'프롬프트 입력',
Generate:'생성하다',
maximumLength:'입력한 내용이 최대 길이를 초과했습니다.',
diff --git a/src/lang/ru.ts b/src/lang/ru.ts
index fccc59af..a420224c 100644
--- a/src/lang/ru.ts
+++ b/src/lang/ru.ts
@@ -74,6 +74,7 @@ export default {
maximumLength:'Введенный контент превышает максимальную длину.',
Model1:'Модель1',
Model2:'Модель2',
+ Model3:'Модель3',
inputContent3:'Быстрый ввод',
Cancel:'Отмена',
Sure:'Конечно',
@@ -248,6 +249,7 @@ export default {
TextImage:'Текст-изображение',
Model1:'Модель1',
Model2:'Модель2',
+ Model3:'Модель3',
inputContent1:'Быстрый ввод',
Generate:'Генерировать',
maximumLength:'Введенный контент превышает максимальную длину.',
diff --git a/src/lang/th.ts b/src/lang/th.ts
index 66574fce..1f588c8c 100644
--- a/src/lang/th.ts
+++ b/src/lang/th.ts
@@ -74,6 +74,7 @@ export default {
maximumLength:'เนื้อหาที่ป้อนเกินความยาวสูงสุด.',
Model1:'แบบอย่าง1',
Model2:'แบบอย่าง2',
+ Model3:'แบบอย่าง3',
inputContent3:'ป้อนข้อมูลทันที',
Cancel:'ยกเลิก',
Sure:'ได้เลย',
@@ -248,6 +249,7 @@ export default {
TextImage:'ข้อความ-รูปภาพ',
Model1:'แบบอย่าง1',
Model2:'แบบอย่าง2',
+ Model3:'แบบอย่าง3',
inputContent1:'ป้อนข้อมูลทันที',
Generate:'กำเนิด',
maximumLength:'เนื้อหาที่ป้อนเกินความยาวสูงสุด.',
diff --git a/src/lang/vn.ts b/src/lang/vn.ts
index bea7f8c2..b51aa5fa 100644
--- a/src/lang/vn.ts
+++ b/src/lang/vn.ts
@@ -74,6 +74,7 @@ export default {
maximumLength:'Nội dung đã nhập vượt quá độ dài tối đa.',
Model1:'Người mẫu1',
Model2:'Người mẫu2',
+ Model3:'Người mẫu3',
inputContent3:'Nhập liệu nhanh chóng',
Cancel:'Hủy bỏ',
Sure:'Chắc chắn',
@@ -248,6 +249,7 @@ export default {
TextImage:'Văn bản-Hình ảnh',
Model1:'Người mẫu1',
Model2:'Người mẫu2',
+ Model3:'Người mẫu3',
inputContent1:'Nhập liệu nhanh chóng',
Generate:'Phát ra',
maximumLength:'Nội dung đã nhập vượt quá độ dài tối đa.',
diff --git a/src/views/LibraryPage.vue b/src/views/LibraryPage.vue
index ab68d985..9354c6f1 100644
--- a/src/views/LibraryPage.vue
+++ b/src/views/LibraryPage.vue
@@ -230,6 +230,7 @@
- {{ $t('LibraryPage.Model1') }}
- {{ $t('LibraryPage.Model2') }}
+ - {{ $t('LibraryPage.Model3') }}