This commit is contained in:
X1627315083
2023-12-28 10:36:48 +08:00
parent e5c1b510bd
commit edf86ce906
16 changed files with 144 additions and 93 deletions

View File

@@ -1,3 +1,4 @@
NODE_ENV = 'development'
VUE_APP_BASE_URL = 'http://18.167.251.121:10088'
# VUE_APP_BASE_URL = 'http://18.167.251.121:10086'
# VUE_APP_BASE_URL = 'http://192.168.1.7:5567'

View File

@@ -235,7 +235,7 @@ export default defineComponent({
let printModel = ref({
num:'',
optype:false,
name:useI18n().t('Generate.Model')+'1'
name:useI18n().t('Generate.Model'+1)
})
let printBoards:any = computed(()=>{return store.state.UploadFilesModule.printboard})
// let sketchCatecoryList:any = ref([])
@@ -435,7 +435,7 @@ export default defineComponent({
this.printModel = {
num : num,
optype:false,
name:this.t('Generate.Model')+num
name:this.t('Generate.Model'+num)
}
}
nextTick().then(()=>{
@@ -734,17 +734,21 @@ export default defineComponent({
}
.printModel{
>div{
width: 7rem;
display: flex;
width: 13rem;
// display: flex;
display: block;
justify-content: center;
border-radius: 1rem;
margin: 0;
border: 2px solid;
cursor: pointer;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
ul{
position: absolute;
width: 7rem;
width: 13rem;
text-align: center;
margin-top: .3rem;
border-radius: 1rem;
@@ -753,6 +757,10 @@ export default defineComponent({
background: rgba(0,0,0,.2);
line-height: 2;
cursor: pointer;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
padding: 0 1rem;
&.printModel_item:hover{
background: rgba(0,0,0,.4);
}

View File

@@ -105,7 +105,7 @@ export default defineComponent({
let newArr:any = []
oldVal.forEach((item:any,index:any) => {
oldArr.push(item.id?item.id:item.sketchBoardId)
newArr.push(newVal[index].id?newVal[index].id:newVal[index].sketchBoardIdd)
newArr.push(newVal?.[index]?.id?newVal?.[index]?.id:newVal?.[index]?.sketchBoardIdd)
});
if(JSON.stringify(newArr)!=JSON.stringify(oldArr)){
this.setSketch()

View File

@@ -41,7 +41,7 @@
<i @click.stop="putName(-1,'affirm','')" v-show="openType" class="fi fi-br-check"></i>
<div class="addLabel" v-show="!openType" @click.stop="newLabel('','')">+</div>
</div>
<div class="started_btn" @click="removeLabel(options)">Delete</div>
<div class="started_btn" :class="{active:labelBor}" @click="removeLabel(options)">Delete</div>
</li>
</ul>
</div>
@@ -73,6 +73,7 @@ export default defineComponent({
let openType = ref(false)
let itemName = ref('')
let {t} = useI18n()
let labelBor = ref(false)//判断是否选中标签
return {
multiple,
indeterminate,
@@ -82,7 +83,8 @@ export default defineComponent({
openType,
type,
itemName,
t
t,
labelBor
}
},
data(){
@@ -94,7 +96,6 @@ export default defineComponent({
this.clearOpenType()
},
watch: {
},
directives:{
mousewheel:{
@@ -136,8 +137,8 @@ export default defineComponent({
}else{
this.multiple = true
}
this.clearOpenType()
this.options = data
this.clearOpenType()
},
clearSetLabel(){
this.clearOpenType()
@@ -150,14 +151,16 @@ export default defineComponent({
item.checkAll = value.checkAll
});
}
this.deleteShow(this.options)
},
onCheckAllchildrenItem(value:any){
let boor = value?.childList.every( (item:any) => item.checkAll )
if(boor){
value.checkAll = true
// value.checkAll = true
}else{
value.checkAll = false
}
this.deleteShow(this.options)
},
clearOpenType(){
this.openType = false
@@ -324,6 +327,20 @@ export default defineComponent({
"userId": ''
}
return data
},
deleteShow(value:any){
// this.options
this.labelBor = false
for(let index = 0; index<value.length; index++){
if(value[index].checkAll){
this.labelBor = true
// break
return
}
if(value[index].childList != null){
this.deleteShow(value[index].childList)
}
}
}
}
})
@@ -520,6 +537,12 @@ export default defineComponent({
position: sticky;
top: 0;
z-index: 999;
opacity: .4;
pointer-events: none;
&.active{
pointer-events: auto;
opacity: 1;
}
// margin-right: auto;
}
}

View File

@@ -74,9 +74,9 @@ export default {
TextImage:'图片-文字',
inputContent2:'输入生成图片的标题',
maximumLength:'输入的内容超过允许输入的最大长度',
Model1:'模型1',
Model2:'模型2',
Model3:'模型3',
Model1:'笔墨画风',
Model2:'插画画风',
Model3:'真实画风',
Name:'名字:',
inputContent3:'输入生成图片的标题',
Cancel:'取消',
@@ -94,7 +94,7 @@ export default {
jsContent6:'输入的内容超过允许输入的最大长度',
jsContent7:'请输入内容~',
jsContent8:'上传失败',
jsContent9:'请输入内容~',
jsContent9:'选择一张图片~',
},
HistoryPage:{
History:'历史',
@@ -250,9 +250,9 @@ export default {
ImageOnly:'图片',
TextOnly:'文字',
TextImage:'图片-文字',
Model1:'模型1',
Model2:'模型2',
Model3:'模型3',
Model1:'笔墨画风',
Model2:'插画画风',
Model3:'真实画风',
inputContent1:'输入生成图片的标题',
Generate:'生成',
maximumLength:'输入的内容超过允许输入的最大长度',

View File

@@ -74,9 +74,9 @@ export default {
TextImage:'Text-Image',
inputContent2:'Input prompt',
maximumLength:'The entered content exceeds the maximum length.',
Model1:'Model1',
Model2:'Model2',
Model3:'Model3',
Model1:'Painting Style',
Model2:'Illustration Style',
Model3:'Real Style',
Name:'Name:',
inputContent3:'Enter a new name',
Cancel:'Cancel',
@@ -94,7 +94,7 @@ export default {
jsContent6:'The entered content exceeds the maximum length.',
jsContent7:'Please enter content',
jsContent8:'upload failed',
jsContent9:'Please enter content',
jsContent9:'Please select a picture',
},
HistoryPage:{
History:'History',
@@ -250,9 +250,9 @@ export default {
ImageOnly:'Image Only',
TextOnly:'Text Only',
TextImage:'Text-Image',
Model1:'Model1',
Model2:'Model2',
Model3:'Model3',
Model1:'Painting Style',
Model2:'Illustration Style ',
Model3:'Real Style',
inputContent1:'Input prompt',
Generate:'Generate',
maximumLength:'The entered content exceeds the maximum length.',

View File

@@ -75,9 +75,9 @@ export default {
TextImage:'Texte-Image',
inputContent2:'Saisie rapide',
maximumLength:'Le contenu saisi dépasse la longueur maximale.',
Model1:'Modèle1',
Model2:'Modèle2',
Model3:'Modèle3',
Model1:'Style de peinture',
Model2:"Style d'illustration",
Model3:'Style réel',
Name:'Nom:',
inputContent3:'Saisie rapide',
Cancel:'Annuler',
@@ -95,7 +95,7 @@ export default {
jsContent6:'Le contenu saisi dépasse la longueur maximale.',
jsContent7:'Veuillez saisir le contenu',
jsContent8:'échec du téléchargement',
jsContent9:'Veuillez saisir le contenu',
jsContent9:'Veuillez sélectionner une image',
},
HistoryPage:{
History:'Histoire',
@@ -251,9 +251,9 @@ export default {
ImageOnly:'Image uniquement',
TextOnly:'Texte seulement',
TextImage:'Texte-Image',
Model1:'Modèle1',
Model2:'Modèle2',
Model3:'Modèle3',
Model1:'Style de peinture',
Model2:"Style d'illustration",
Model3:'Style réel',
inputContent1:'Saisie rapide',
Generate:'Générer',
maximumLength:'Le contenu saisi dépasse la longueur maximale.',

View File

@@ -74,9 +74,9 @@ export default {
TextImage:'Testo-immagine',
inputContent2:'Immissione rapida',
maximumLength:'Il contenuto inserito supera la lunghezza massima.',
Model1:'Modello1',
Model2:'Modello2',
Model3:'Modello3',
Model1:'Stile pittorico',
Model2:'Stile di illustrazione',
Model3:'Stile reale',
Name:'Nome:',
inputContent3:'Immissione rapida',
Cancel:'Annulla',
@@ -94,7 +94,7 @@ export default {
jsContent6:'Il contenuto inserito supera la lunghezza massima.',
jsContent7:'Inserisci il contenuto',
jsContent8:'caricamento fallito',
jsContent9:'Inserisci il contenuto',
jsContent9:"Seleziona un'immagine",
},
HistoryPage:{
History:'Storia',
@@ -250,9 +250,9 @@ export default {
ImageOnly:'Solo immagine',
TextOnly:'Solo testo',
TextImage:'Testo-immagine',
Model1:'Modello1',
Model2:'Modello2',
Model3:'Modello3',
Model1:'Stile pittorico',
Model2:'Stile di illustrazione',
Model3:'Stile reale',
inputContent1:'Immissione rapida',
Generate:'creare',
maximumLength:'Il contenuto inserito supera la lunghezza massima.',

View File

@@ -74,9 +74,9 @@ export default {
TextImage:'テキスト-画像',
inputContent2:'プロンプト入力',
maximumLength:'入力した内容が最大長を超えています.',
Model1:'モデル1',
Model2:'モデル2',
Model3:'モデル3',
Model1:'絵画のスタイル',
Model2:'イラストのスタイル',
Model3:'リアルなスタイル',
Name:'名前:',
inputContent3:'プロンプト入力',
Cancel:'キャンセル',
@@ -94,7 +94,7 @@ export default {
jsContent6:'入力した内容が最大長を超えています.',
jsContent7:'内容を入力してください',
jsContent8:'アップロードに失敗しました',
jsContent9:'内容を入力してください',
jsContent9:'写真を選択してください',
},
HistoryPage:{
History:'歴史',
@@ -250,9 +250,9 @@ export default {
ImageOnly:'画像のみ',
TextOnly:'テキストのみ',
TextImage:'テキスト-画像',
Model1:'モデル1',
Model2:'モデル2',
Model3:'モデル3',
Model1:'絵画のスタイル',
Model2:'イラストのスタイル',
Model3:'リアルなスタイル',
inputContent1:'プロンプト入力',
Generate:'生成する',
Model:'モデル',

View File

@@ -74,9 +74,9 @@ export default {
TextImage:'텍스트-이미지',
inputContent2:'프롬프트 입력',
maximumLength:'입력한 내용이 최대 길이를 초과했습니다.',
Model1:'모델1',
Model2:'모델2',
Model3:'모델3',
Model1:'그림 스타일',
Model2:'일러스트 스타일',
Model3:'리얼 스타일',
Name:'이름:',
inputContent3:'프롬프트 입력',
Cancel:'취소',
@@ -94,7 +94,7 @@ export default {
jsContent6:'입력한 내용이 최대 길이를 초과했습니다.',
jsContent7:'내용을 입력해주세요',
jsContent8:'업로드 실패',
jsContent9:'내용을 입력해주세요',
jsContent9:'사진을 선택해주세요',
},
HistoryPage:{
History:'역사',
@@ -250,9 +250,9 @@ export default {
ImageOnly:'이미지만',
TextOnly:'텍스트만',
TextImage:'텍스트-이미지',
Model1:'모델1',
Model2:'모델2',
Model3:'모델3',
Model1:'그림 스타일',
Model2:'일러스트 스타일',
Model3:'리얼 스타일',
inputContent1:'프롬프트 입력',
Generate:'생성하다',
maximumLength:'입력한 내용이 최대 길이를 초과했습니다.',

View File

@@ -74,9 +74,9 @@ export default {
TextImage:'Текст-изображение',
inputContent2:'Быстрый ввод',
maximumLength:'Введенный контент превышает максимальную длину.',
Model1:'Модель1',
Model2:'Модель2',
Model3:'Модель3',
Model1:'Стиль живописи',
Model2:'Стиль иллюстрации',
Model3:'Реалистический стиль',
Name:'Имя:',
inputContent3:'Быстрый ввод',
Cancel:'Отмена',
@@ -94,7 +94,7 @@ export default {
jsContent6:'Введенный контент превышает максимальную длину.',
jsContent7:'Пожалуйста, введите содержание',
jsContent8:'Загрузка не удалась',
jsContent9:'Пожалуйста, введите содержание',
jsContent9:'Пожалуйста, выберите изображение',
},
HistoryPage:{
History:'История',
@@ -250,9 +250,9 @@ export default {
ImageOnly:'Только изображение',
TextOnly:'Только текст',
TextImage:'Текст-изображение',
Model1:'Модель1',
Model2:'Модель2',
Model3:'Модель3',
Model1:'Стиль живописи',
Model2:'Стиль иллюстрации',
Model3:'Реалистический стиль',
inputContent1:'Быстрый ввод',
Generate:'Генерировать',
maximumLength:'Введенный контент превышает максимальную длину.',

View File

@@ -74,9 +74,9 @@ export default {
TextImage:'ข้อความ-รูปภาพ',
inputContent2:'ป้อนข้อมูลทันที',
maximumLength:'เนื้อหาที่ป้อนเกินความยาวสูงสุด.',
Model1:'แบบอย่าง1',
Model2:'แบบอย่าง2',
Model3:'แบบอย่าง3',
Model1:'สไตล์การวาดรูป',
Model2:'สไตล์การวาดภาพประกอบ',
Model3:'สไตล์แบบจริง',
Name:'ชื่อ:',
inputContent3:'ป้อนข้อมูลทันที',
Cancel:'ยกเลิก',
@@ -94,7 +94,7 @@ export default {
jsContent6:'เนื้อหาที่ป้อนเกินความยาวสูงสุด.',
jsContent7:'กรุณากรอกเนื้อหา',
jsContent8:'การอัพโหลดล้มเหลว',
jsContent9:'กรุณากรอกเนื้อหา',
jsContent9:'กรุณาเลือกรูปภาพ',
},
HistoryPage:{
History:'ประวัติความเป็นมา',
@@ -250,9 +250,9 @@ export default {
ImageOnly:'รูปภาพเท่านั้น',
TextOnly:'ข้อความเท่านั้น',
TextImage:'ข้อความ-รูปภาพ',
Model1:'แบบอย่าง1',
Model2:'แบบอย่าง2',
Model3:'แบบอย่าง3',
Model1:'สไตล์การวาดรูป',
Model2:' สไตล์การวาดภาพประกอบ',
Model3:'สไตล์แบบจริง',
inputContent1:'ป้อนข้อมูลทันที',
Generate:'กำเนิด',
maximumLength:'เนื้อหาที่ป้อนเกินความยาวสูงสุด.',

View File

@@ -74,9 +74,9 @@ export default {
TextImage:'Văn bản-Hình ảnh',
inputContent2:'Nhập liệu nhanh chóng',
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',
Model1:'Phong cách vẽ tranh',
Model2:'Phong cách minh họa',
Model3:'Phong cách thực tế',
Name:'Tên:',
inputContent3:'Nhập liệu nhanh chóng',
Cancel:'Hủy bỏ',
@@ -94,7 +94,7 @@ export default {
jsContent6:'Nội dung đã nhập vượt quá độ dài tối đa.',
jsContent7:'Vui lòng nhập nội dung',
jsContent8:'Tải lên thất bại',
jsContent9:'Vui lòng nhập nội dung',
jsContent9:"Vui lòng chọn một hình ảnh",
},
HistoryPage:{
History:'Lịch sử',
@@ -250,9 +250,9 @@ export default {
ImageOnly:'Chỉ hình ảnh',
TextOnly:'Chỉ văn bản',
TextImage:'Văn bản-Hình ảnh',
Model1:'Người mẫu1',
Model2:'Người mẫu2',
Model3:'Người mẫu3',
Model1:'Phong cách vẽ tranh',
Model2:'Phong cách minh họa',
Model3:'Phong cách thực tế',
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.',

View File

@@ -203,7 +203,7 @@ const openGuide = () =>{
if(isBeginnerNum){
driverObj__.drive(isBeginnerNum);
}else{
driverObj__.drive();
driverObj__.drive(0);
}
data = {
index:driverIndex__,

View File

@@ -441,18 +441,19 @@ export default defineComponent({
//判断模特和当前start的sketch是否匹配
isMannequin(){
this.isMannequinShow = false
let isSketchItem:any
let num = 0
this.allBoardData?.sketchboardFiles?.forEach((sketchItem:any) => {
isSketchItem = true
this.workspacePosition.forEach((positionItem:any) => {
if(positionItem.name == sketchItem.category){
isSketchItem = false
num ++
// console.log(num,this.allBoardData?.sketchboardFiles.length);
}
});
if(isSketchItem){
this.isMannequinShow = true
}
});
if(num != this.allBoardData?.sketchboardFiles?.length){
this.isMannequinShow = true
}
},
formatter(value: number) {
return `${value}%`;

View File

@@ -221,7 +221,14 @@
</div>
<div class="input_box" :class="{active:inputShow}">
<input class="search_input" @input="ifMaximumLength" :maxlength='inputShow?0:9999' :class="{active:checkbox[0].type}" @keydown.enter="getgenerate" :readonly="checkbox[0].type" :placeholder="$t('LibraryPage.inputContent2')" v-model="captionGeneration">
<input
class="search_input"
@input="ifMaximumLength"
:maxlength='inputShow?0:9999'
:class="{active:checkbox[0].type && selectCode != 'Moodboard'}"
@keydown.enter="getgenerate" :readonly="checkbox[0].type && selectCode != 'Moodboard'"
:placeholder="$t('LibraryPage.inputContent2')"
v-model="captionGeneration">
<div class="generage_btn started_btn" @click.stop="getgenerate">{{ $t('LibraryPage.Generate') }}</div>
<span>{{ $t('LibraryPage.maximumLength') }}</span>
</div>
@@ -256,7 +263,7 @@
<div
class="upload_component upload_file_item"
v-show="selectGenerateList.length <= 3"
v-show="selectGenerateList.length <= 2"
>
<a-upload
:action="uploadUrl + '/api/element/upload'"
@@ -269,6 +276,7 @@
:headers="{Authorization:token}"
v-model:file-list="selectGenerateList"
multiple
:maxCount="3"
accept=".jpg,.png,.jpeg,.bmp"
@change="generateFileUploadChange"
>
@@ -454,7 +462,7 @@ export default defineComponent({
let printModel = ref({
num:1,
optype:false,
name:useI18n().t('LibraryPage.model')+'1'
name:useI18n().t('LibraryPage.Model1')
})
let {t} = useI18n()
const options:any = ref([
@@ -1133,7 +1141,7 @@ export default defineComponent({
this.printModel = {
num : num,
optype:false,
name:this.t('LibraryPage.model')+num
name:this.t('LibraryPage.Model'+num)
}
},
getgenerate(){
@@ -1145,6 +1153,9 @@ export default defineComponent({
return
}
let generateType = this.checkbox.filter((v:any)=>v.type)[0].name
if(this.selectCode == 'Moodboard'){
generateType = this.checkbox[1].name
}
let generageImg = this.selectGenerateList.filter((v:any)=>v.checked)[0]
let data = {
generateType:generateType,
@@ -1161,7 +1172,7 @@ export default defineComponent({
if(generageImg?.id){
data.text = ''
}else{
message.warning(
message.info(
this.t('LibraryPage.jsContent9')
);
return
@@ -1173,7 +1184,7 @@ export default defineComponent({
if(this.captionGeneration){
let arr = this.captionGeneration.split(/\s+/).length
if(arr > 75){
message.warning(
message.info(
this.t('LibraryPage.jsContent6')
);
return
@@ -1191,7 +1202,7 @@ export default defineComponent({
if(this.captionGeneration){
let arr = this.captionGeneration.split(/\s+/).length
if(arr > 75){
message.warning(
message.info(
this.t('LibraryPage.jsContent6')
);
return
@@ -1204,7 +1215,7 @@ export default defineComponent({
return
}
}else{
message.warning(
message.info(
this.t('LibraryPage.jsContent9')
);
return
@@ -1648,18 +1659,21 @@ export default defineComponent({
font-size: 1.4rem;
font-weight: 500;
>div{
width: 7rem;
display: flex;
width: 13rem;
// display: flex;
display: block;
justify-content: center;
border-radius: 1rem;
margin: 0;
border: 2px solid;
cursor: pointer;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
}
ul{
position: absolute;
width: 7rem;
width: 13rem;
text-align: center;
margin-top: .3rem;
border-radius: 1rem;
@@ -1669,6 +1683,10 @@ export default defineComponent({
background: #c5c4c8;
line-height: 2;
cursor: pointer;
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
padding: 0 1rem;
&.printModel_item:hover{
background: #949396;
}