2023-11-16-dist

This commit is contained in:
X1627315083
2023-11-16 17:23:17 +08:00
parent 5be355374e
commit 2ed15a165b
53 changed files with 970 additions and 327 deletions

View File

@@ -477,7 +477,7 @@ export default defineComponent({
// return `rgb(${r}, ${g}, ${b})`;
// box.style.backgroundColor = label.textContent = result.sRGBHex;
} catch (e) {
message.warning(this.t('DesignDetailAlter.jsContent1'))
message.info(this.t('DesignDetailAlter.jsContent1'))
}
})
},
@@ -557,7 +557,7 @@ export default defineComponent({
(v) => v.status === "done"
);
if (this.uploadList.length >= 8) {
message.warning(this.t('DesignDetailAlter.jsContent2'));
message.info(this.t('DesignDetailAlter.jsContent2'));
} else {
// this.store.commit("setSketchboardFile", fileList);
this.uploadList = fileList
@@ -697,11 +697,11 @@ export default defineComponent({
beforeUpload(file){
const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png' || file.type === 'image/jpg' || file.type === 'image/bmp';
if (!isJpgOrPng) {
message.warning(this.t('DesignDetailAlter.jsContent4'));
message.info(this.t('DesignDetailAlter.jsContent4'));
}
const isLt2M = file.size / 1024 / 1024 < 5;
if (!isLt2M) {
message.warning(this.t('DesignDetailAlter.jsContent5'));
message.info(this.t('DesignDetailAlter.jsContent5'));
}
return (isJpgOrPng && isLt2M) || Upload.LIST_IGNORE;
},
@@ -785,11 +785,11 @@ export default defineComponent({
this.setColorboardList(colorList)
this.getColorBg = true
}else{
message.warning(this.t('DesignDetailAlter.jsContent6'))
message.info(this.t('DesignDetailAlter.jsContent6'))
}
})
}else{
message.warning(this.t('ColorboardUpload.jsContent5'))
message.info(this.t('ColorboardUpload.jsContent5'))
}
},

View File

@@ -179,7 +179,7 @@ export default defineComponent({
let DesignPrintOperation = this.$refs.DesignPrintOperation
DesignPrintOperation.init()
}else{
message.warning(this.t('DesignDetailEnd.jsContent1'));
message.info(this.t('DesignDetailEnd.jsContent1'));
}
},

View File

@@ -438,7 +438,8 @@ export default defineComponent({
this.getworkspace()
}
}
})
}).catch((res)=>{
});
},
deleteWorkspace(data:any){
Https.axiosDelete(Https.httpUrls.workspaceRemove,data).then((rv: any) => {
@@ -495,7 +496,7 @@ export default defineComponent({
// this.deleteWorkspace(data)
}else{
if(this.workspaceItemName == ''){
message.warning(this.t('Habit.jsContent2'));
message.info(this.t('Habit.jsContent2'));
}else{
if(index == -1){
let data = {

View File

@@ -227,7 +227,7 @@ export default defineComponent({
// return `rgb(${r}, ${g}, ${b})`;
// box.style.backgroundColor = label.textContent = result.sRGBHex;
} catch (e) {
message.warning(this.t('ColorboardUpload.jsContent1'))
message.info(this.t('ColorboardUpload.jsContent1'))
}
})
this.clearSelectColor()
@@ -286,11 +286,11 @@ export default defineComponent({
this.setColorboardList(colorList)
this.getColorBg = true
}else{
message.warning(this.t('ColorboardUpload.jsContent2'))
message.info(this.t('ColorboardUpload.jsContent2'))
}
})
}else{
message.warning(this.t('ColorboardUpload.jsContent5'))
message.info(this.t('ColorboardUpload.jsContent5'))
}
},
@@ -396,11 +396,11 @@ export default defineComponent({
beforeUpload(file){
const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png' || file.type === 'image/jpg' || file.type === 'image/bmp';
if (!isJpgOrPng) {
message.warning(this.t('ColorboardUpload.jsContent3'));
message.info(this.t('ColorboardUpload.jsContent3'));
}
const isLt2M = file.size / 1024 / 1024 < 5;
if (!isLt2M) {
message.warning(this.t('ColorboardUpload.jsContent4'));
message.info(this.t('ColorboardUpload.jsContent4'));
}
return (isJpgOrPng && isLt2M) || Upload.LIST_IGNORE;
},

View File

@@ -333,7 +333,6 @@ 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);
},
@@ -344,11 +343,11 @@ export default defineComponent({
file.type === "image/jpg" ||
file.type === "image/bmp";
if (!isJpgOrPng) {
message.warning(this.t('Generate.jsContent1'));
message.info(this.t('Generate.jsContent1'));
}
const isLt2M = file.size / 1024 / 1024 < 2;
if (!isLt2M) {
message.warning(this.t('Generate.jsContent2'));
message.info(this.t('Generate.jsContent2'));
}
return (isJpgOrPng && isLt2M) || Upload.LIST_IGNORE;
},
@@ -396,13 +395,13 @@ export default defineComponent({
},
getgenerate(){
if(this.isTest){//试用用户禁止使用
message.warning(
message.info(
this.t('isTest.available')
);
return
}
if(!this.searchPictureName){
message.warning(
message.info(
this.t('Generate.jsContent3')
);
return
@@ -410,13 +409,13 @@ export default defineComponent({
if(this.searchPictureName){
let arr = this.searchPictureName.split(/\s+/).length
if(arr > 75){
message.warning(
message.info(
this.t('Generate.jsContent4')
);
return
}
}else{
message.warning(
message.info(
this.t('Generate.jsContent5')
);
return
@@ -484,7 +483,7 @@ export default defineComponent({
);
let arr = this.store.state.UploadFilesModule.sketchboard;
if (arr.length >= 8) {
message.warning(this.t('Generate.jsContent6'));
message.info(this.t('Generate.jsContent6'));
} else {
this.sketchboardList = fileList
}
@@ -498,7 +497,7 @@ export default defineComponent({
if (index > -1) {
this.sketchboardList.splice(index, 1);
}
message.error(file.name + this.t('Generate.jsContent5'));
message.warning(file.name + this.t('Generate.jsContent7'));
}
},
showFileCategory(file: any) {
@@ -536,7 +535,6 @@ 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 =

View File

@@ -246,7 +246,7 @@ export default defineComponent({
emailNextStepFun() {
if (!isEmail(this.email)) {
message.warning(this.t('Header.jsContent1'));
message.info(this.t('Header.jsContent1'));
return;
}
let data = {

View File

@@ -308,7 +308,7 @@ export default defineComponent({
);
let arr = this.store.state.UploadFilesModule.moodboard
if(arr.length >= 8){
message.warning(this.t('MoodboardUpload.jsContent1'))
message.info(this.t('MoodboardUpload.jsContent1'))
}else{
this.store.commit("setMoodboardFile", fileList);
}
@@ -334,18 +334,17 @@ export default defineComponent({
file.type === "image/jpg" ||
file.type === "image/bmp";
if (!isJpgOrPng) {
message.warning(this.t('MoodboardUpload.jsContent3'));
message.info(this.t('MoodboardUpload.jsContent3'));
}
const isLt2M = file.size / 1024 / 1024 < 2;
if (!isLt2M) {
message.warning(this.t('MoodboardUpload.jsContent4'));
message.info(this.t('MoodboardUpload.jsContent4'));
}
return (isJpgOrPng && isLt2M) || Upload.LIST_IGNORE;
},
deleteFile(item: any) {
if(item.type_.type1 == 'generate' || item.type_.type1 == 'material'){
item.jsContent1 = this.t('uploadFile.jsContent1')
this.store.commit("addGenerateMaterialFils", item);
}else{
@@ -406,7 +405,7 @@ export default defineComponent({
// layout.init('moodboard')
layout.init()
}else{
message.warning(this.t('MoodboardUpload.jsContent5'))
message.info(this.t('MoodboardUpload.jsContent5'))
}
},

View File

@@ -268,11 +268,11 @@ export default defineComponent({
beforeUpload(file:any,fileList:any){
const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png' || file.type === 'image/jpg' || file.type === 'image/bmp';
if (!isJpgOrPng) {
message.warning(this.t('PrintboardUpload.jsContent1'));
message.info(this.t('PrintboardUpload.jsContent1'));
}
const isLt2M = file.size / 1024 / 1024 < 2;
if (!isLt2M) {
message.warning(this.t('PrintboardUpload.jsContent2'));
message.info(this.t('PrintboardUpload.jsContent2'));
}
if(isJpgOrPng && isLt2M){
this.currentFileNum = fileList.length
@@ -286,7 +286,6 @@ 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
@@ -503,12 +502,12 @@ export default defineComponent({
},500)
},
getgenerate(){
if(this.isTest){//试用用户禁止使用
message.warning(
this.t('isTest.available')
);
return
}
// if(this.isTest){//试用用户禁止使用
// message.warning(
// this.t('isTest.available')
// );
// return
// }
//如果是通过moodboard随即图片生成
let generage:any = this.$refs.Generate
let generateType = generage.checkbox.filter((v:any)=>v.type)[0].name
@@ -531,7 +530,7 @@ export default defineComponent({
if(generage?.collectionElementid){
}else{
message.warning(
message.info(
this.t('PrintboardUpload.jsContent4')
);
return
@@ -543,14 +542,14 @@ export default defineComponent({
if(this.captionGeneration){
let arr = this.captionGeneration.split(/\s+/).length
if(arr > 75){
message.warning(
message.info(
this.t('PrintboardUpload.jsContent5')
);
return
}
}else{
message.warning(
message.info(
this.t('PrintboardUpload.jsContent6')
);
return
@@ -649,14 +648,16 @@ export default defineComponent({
Https.axiosPost(Https.httpUrls.elementGeneratePrint, data).then((rv) =>{
if(rv){
console.log(rv);
// let data = {
// imgUrl:rv.url,
// resData:rv
// }
// this.printImgList.push(data)
// this.store.commit('setGeneratePrintFile',this.printImgList)
// this.loadingShow = false
this.generateList = []
let value = {
id:rv.generateItemId,
imgUrl:rv.generateItemUrl,
id_:GO.id++,
like:rv.isLiked
}
this.generateList.push(value)
this.loadingShow = false
}
}).catch(res=>{
this.loadingShow = false
@@ -670,7 +671,6 @@ export default defineComponent({
type2: 'Printboard',
},
item.resData = JSON.parse(JSON.stringify(item))
item.jsContent1 = this.t('uploadFile.jsContent1')
this.store.commit("addGenerateMaterialFils", item);
}
}

View File

@@ -157,7 +157,7 @@ export default defineComponent({
roborSend (){
this.clearTimer()
if(!this.chatCentent){
message.warning(this.t('RobotAssist.jsContent1'));
message.info(this.t('RobotAssist.jsContent1'));
return
}
this.record.push({

View File

@@ -422,11 +422,11 @@ export default defineComponent({
file.type === "image/jpg" ||
file.type === "image/bmp";
if (!isJpgOrPng) {
message.warning(this.t('SketchboardUpload.jsContent2'));
message.info(this.t('SketchboardUpload.jsContent2'));
}
const isLt2M = file.size / 1024 / 1024 < 2;
if (!isLt2M) {
message.warning(this.t('SketchboardUpload.jsContent3'));
message.info(this.t('SketchboardUpload.jsContent3'));
}
return (isJpgOrPng && isLt2M) || Upload.LIST_IGNORE;
},
@@ -484,7 +484,6 @@ 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
@@ -597,7 +596,7 @@ export default defineComponent({
if(generateType == 'image'||generateType == 'text-image'){
if(generage?.collectionElementid){
}else{
message.warning(
message.info(
this.t('SketchboardUpload.jsContent5')
);
return
@@ -609,13 +608,13 @@ export default defineComponent({
if(this.captionGeneration){
let arr = this.captionGeneration.split(/\s+/).length
if(arr > 75){
message.warning(
message.info(
this.t('SketchboardUpload.jsContent6')
);
return
}
}else{
message.warning(
message.info(
this.t('SketchboardUpload.jsContent7')
);
@@ -651,7 +650,6 @@ export default defineComponent({
type2: 'Sketchboard',
},
item.resData = JSON.parse(JSON.stringify(item))
item.jsContent1 = this.t('uploadFile.jsContent1')
this.store.commit("addGenerateMaterialFils", item);
}
},

View File

@@ -89,11 +89,11 @@ export default defineComponent({
beforeUpload(file:any){
const isJpgOrPng = file.type === 'image/jpeg' || file.type === 'image/png' || file.type === 'image/jpg' || file.type === 'image/bmp';
if (!isJpgOrPng) {
message.warning(this.t('Upload.jsContent2'));
message.info(this.t('Upload.jsContent1'));
}
const isLt2M = file.size / 1024 / 1024 < 2;
if (!isLt2M) {
message.warning(this.t('Upload.jsContent2'));
message.info(this.t('Upload.jsContent2'));
}
return (isJpgOrPng && isLt2M) || Upload.LIST_IGNORE;
},
@@ -115,7 +115,7 @@ export default defineComponent({
if(index > -1){
this.fileList.splice(index, 1)
}
message.error(file.name + this.t('Upload.jsContent3'))
message.warning(file.name + this.t('Upload.jsContent3'))
}
},
deleteFile(index:any){

View File

@@ -91,18 +91,28 @@ export default defineComponent({
},
methods:{
nextStep(){
let colorBoards = this.store.state.UploadFilesModule.colorBoards
if(this.collectionStep == 1){
let disposeMoodboard = this.store.state.UploadFilesModule.disposeMoodboard
let moodboard = this.store.state.UploadFilesModule.moodboard
if(moodboard.length > 1){
if (!disposeMoodboard || disposeMoodboard.length == 0) {
message.warning(this.$t('collectionModal.jsContent1'))
message.info(this.$t('collectionModal.jsContent1'))
return
}
}
}
this.collectionStep = this.collectionStep + 1
if(this.collectionStep == 3){
if(colorBoards.length >= 1){
}else{
message.info(this.$t('collectionModal.jsContent3'))
return
}
}
this.collectionStep = this.collectionStep + 1
},
lastStep(){
@@ -149,7 +159,7 @@ export default defineComponent({
let colorBoards = this.store.state.UploadFilesModule.colorBoards
if(!colorBoards || colorBoards?.length < 1){
message.warning(this.$t('collectionModal.jsContent3'))
message.info(this.$t('collectionModal.jsContent3'))
return
}
this.store.commit('clearAllId')

View File

@@ -51,6 +51,7 @@
import { defineComponent,ref,createVNode,watch,nextTick,inject} from 'vue'
import { Https } from "@/tool/https";
import {dataURLtoFile,base64toFile} from "@/tool/util"
import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
import { getCookie } from "@/tool/cookie";
import 'vue-cropper/dist/index.css'
import { VueCropper } from "vue-cropper";
@@ -181,6 +182,7 @@ export default defineComponent({
if(index == -1){
if(this.itemName == ''){
message.warning(this.t('Habit.jsContent2'));
return
}else{
if(item){
@@ -264,6 +266,25 @@ export default defineComponent({
this.getClass()
}
).catch((res)=>{
if(res.errCode === 1){
let _this = this
Modal.confirm({
title: res.errMsg,
icon: createVNode(ExclamationCircleOutlined),
okText: 'Yes',
cancelText: 'No',
mask:false,
zIndex:99999,
// centered:true,
onOk() {
data.deleteConfirm = 1
_this.deleteClass(data)
},
onCancel(){
}
});
}
});
},
getClass(){