合并代码

This commit is contained in:
X1627315083
2024-08-19 10:36:46 +08:00
parent a8ab30f30c
commit e4b3ebe88b
30 changed files with 857 additions and 472 deletions

View File

@@ -128,7 +128,7 @@
<div class="upload_color_item_bg" :style="{'background-color':`rgba(${color.rgba.r},${color.rgba.g},${color.rgba.b},${color.rgba.a})`}">
</div>
<!-- <div class="upload_color_item_text">{{ pantongNameList[index] }}</div> -->
<img src="#" :title="pantongNameList[index]">
<img :title="pantongNameList[index]">
</div>
</div>
<div class="upload_color_btn" :title="isSelectSuccessively?$t('ColorboardUpload.SelectSuccessivelyOnTitle'):$t('ColorboardUpload.SelectSuccessivelyOffTitle')" v-show="selectColorList.length>0">
@@ -150,7 +150,7 @@
<span class="get_color_des">{{ $t('ColorboardUpload.ExtractColor') }}</span>
</div>
<div v-show="getColorBg" class="get_color_bg" @click="setUplpadColor(reviewColor)" :style="{'background-color':`rgba(${getSelectRGB(reviewColor).r},${getSelectRGB(reviewColor).g},${getSelectRGB(reviewColor).b},${getSelectRGB(reviewColor).a})`}">
<img src="#" :title="pantongName">
<img :title="pantongName">
</div>
</div>
</div>

View File

@@ -148,7 +148,7 @@ export default defineComponent({
cropper.getCropData((data:any) => {
// 转换为File对象
let file = base64toFile(data,this.cropperFileData.name);
this.$emit('handleCropperSuccess',{file:file, fileData:this.cropperFileData})
this.$emit('handleCropperSuccess',{file:file, fileData:this.cropperFileData,base64:data})
})
},

View File

@@ -8,6 +8,7 @@
:centered="true"
:closable="false"
:keyboard="false"
:destroyOnClose="true"
>
<div class="UpgradePlan_closeIcon generalModelOperate_closeIcon ">
<i class="fi fi-rr-cross-small" @click.stop="cancelDsign()"></i>
@@ -362,8 +363,13 @@ export default defineComponent({
let normalCanvasState = ref([])//存放canvas操作
let isLoadCanvas = false//撤回或者反撤回false为撤回
let userlikeGroupId = 0
let submitCanvasContent = null
let init = (productData) => {
userlikeGroupId = productData.userlikeGroupId
clearTimeout(submitCanvasContent)
canvasWH.value.height = 100
normalCanvasState.value = []
reverseCanvasState.value = []
@@ -446,16 +452,42 @@ export default defineComponent({
userLikeGroupId:userlikeGroupId
}
isShowMark.value = true
let oldExportCanvas = await new Promise((resolve, reject) => {
Https.axiosPost(Https.httpUrls.exportSearch, data)
.then((rv) => {
resolve(rv)
})
.catch((rv) => {
let oldExportCanvas
let localCanvas = localStorage.getItem('canvasContent')
let localUserlikeGroupId = localStorage.getItem('userlikeGroupId')
oldExportCanvas = await new Promise((resolve, reject) => {
if(localUserlikeGroupId == userlikeGroupId){
Modal.confirm({
title: useI18.t('exportModel.jsContent8'),
okText: 'Yes',
cancelText: 'No',
mask:false,
centered:true,
onOk() {
localCanvas = localCanvas?JSON.parse(localCanvas):null
resolve(localCanvas)
},
onCancel(){
resolve(null)
}
});
}else{
resolve(null)
});
}
})
if(!oldExportCanvas){
oldExportCanvas = await new Promise((resolve, reject) => {
Https.axiosPost(Https.httpUrls.exportSearch, data)
.then((rv) => {
resolve(rv)
})
.catch((rv) => {
resolve(null)
});
})
}
console.log(oldExportCanvas);
// arr.forEach((item,index)=>{
if(oldExportCanvas){
canvasWH.value.height = oldExportCanvas.canvasHeight
@@ -579,6 +611,16 @@ export default defineComponent({
updateCanvasState('')//加载完成后记录一下
setOperation('move')
closeNav.value.tool = true
submitCanvasContent = setInterval(()=>{
let data = setCanvasContent(true)
if(data.objects.length == 0){
clearTimeout(submitCanvasContent)
return
}
data.canvasHeight = canvasWH.value.height
localStorage.setItem('canvasContent',JSON.stringify(data))
localStorage.setItem('userlikeGroupId',userlikeGroupId)
},3000)
if(driver__.value.driver){
driverObj__.moveNext()
}
@@ -1864,7 +1906,7 @@ export default defineComponent({
publishModal.init(data)
}
let setSubmit = ()=>{
let data = setCanvasContent()
let data = setCanvasContent(false)
data.canvasHeight = canvasWH.value.height
let blob = new Blob([JSON.stringify(data)], { type: "application/json" });
let formData = new FormData();
@@ -1875,14 +1917,16 @@ export default defineComponent({
message.success(t('exportModel.jsContent7'))
})
}
let setCanvasContent = ()=>{
let setCanvasContent = (isSaveImg)=>{
var json = canvas.toJSON(['imgId','minioUrl']);
// console.log(JSON.stringify(json));
json.objects.forEach(item=>{
if(item.type == 'image'){
delete item.src
}
})
if(!isSaveImg){
json.objects.forEach(item=>{
if(item.type == 'image'){
delete item.src
}
})
}
return json
}
let textDataShow = ref(false)
@@ -1921,6 +1965,7 @@ export default defineComponent({
]
textFontFamilyList.value = arr
fontFamily.value = arr[0].value
});
return {
toSvg,

View File

@@ -13,7 +13,7 @@
</div> -->
</div>
<div class="input_border" >
<div class="input_box Guide_1_5" :class="[inputShow?'active':'',]">
<div class="input_box Guide_1_5" :class="[inputShow?'active':'',driver__.driver?'showEvents':'']" >
<div class="input_box_btnBox">
<div class="upload_item">
<div
@@ -87,7 +87,7 @@
v-model="searchPictureName"
></textarea>
<!-- <div class="generage_btn started_btn" @click.stop="getgenerate">{{ $t('Generate.Generate') }}</div> -->
<div v-show="!isGenerate" class="generage_btn started_btn" @click.stop="getgenerate">
<div v-show="!isGenerate" class="generage_btn started_btn " @click.stop="getgenerate">
{{ $t('Generate.Generate') }}
<!-- <div v-show="isGenerate"><a-spin size="large" /></div> -->
</div>
@@ -139,7 +139,7 @@
</div>
</div>
</div> -->
<div class="generage_img Guide_1_6" :style="[isGenerate?'overflow:hidden':'']">
<div class="generage_img Guide_1_6" :style="[isGenerate?'overflow:hidden':'']" :class="[driver__.driver?'showEvents':'']">
<div
class="generage_img_item"
v-for="(item, index) in fileList"

View File

@@ -444,6 +444,7 @@ export default defineComponent({
},
async layout(){
if(this.loadingShow)return
this.loadingShow = true
this.store.commit("setDisposeMoodboard", []);
@@ -469,7 +470,6 @@ export default defineComponent({
}else{
this.moodb_className = this.moodb_[arr.length-1][random]
}
this.layoutOpen = true
//提交模板
// this.loadingShow = true
@@ -493,6 +493,19 @@ export default defineComponent({
img.imgUrl = rv.url
img.resData = JSON.parse(JSON.stringify(img))
this.store.commit("setDisposeMoodboard", img);
let obj = {
imgStyle:[],
domStyle:[],
borStyle:[],
rototeStyle:[],
translateStyle:[],
angleTRStyle:[],
angleTLStyle:[],
angleBRStyle:[],
angleBLStyle:[],
class:this.moodb_className,
}
this.store.commit("setDisposeMoodboardPosition", obj);
this.loadingShow = false
}
).catch(rv=>{

View File

@@ -125,13 +125,21 @@ export default defineComponent({
draggable
},
setup(prop) {
let store = useStore()
let layout: any = ref(false);
let templateFileList: any = ref([]);
let openClick: any = ref(1);
let drag = false;
let layoutList:any = ref([])
const content = ref<HTMLElement | null>(null);
const content:any = ref<HTMLElement | null>(null);
let loadingShow = ref(false)
let styleObj = computed(()=>{
return store.state.UploadFilesModule.disposeMoodboardPostition
})
let domObj = {
dom:['img','ul','.layout_rotote','.layout_translate','.layout_angle_tr','.layout_angle_tl','.layout_angle_br','.layout_angle_bl'],
domStyle:['imgStyle','borStyle','rototeStyle','translateStyle','angleTRStyle','angleTLStyle','angleBRStyle','angleBLStyle'],
}
return {
layout,
templateFileList,
@@ -139,7 +147,9 @@ export default defineComponent({
drag,
layoutList,
content,
loadingShow
loadingShow,
styleObj,
domObj,
};
},
data() {
@@ -348,6 +358,20 @@ export default defineComponent({
el.parentNode.addEventListener('mousemove', (e:MouseEvent) => {
el.parentNode.addEventListener('mousewheel',(e:MouseEvent) => {
if(timeSwitch){
if(angle == 0){
function getRotationAngle(transformDom:any) {
if (!transformDom || transformDom === 'none') return null;
let transform = window.getComputedStyle(transformDom).transform;
const values = transform?.match(/matrix\(([^)]+)\)/);
if (values) {
const matrix = values[1].split(',').map(Number);
const angle = Math.atan2(matrix[1], matrix[0]) * (180 / Math.PI);
return angle >= 0 ? angle : angle + 360; // 确保角度为正值
}
return null;
}
angle = getRotationAngle(elParent.firstElementChild);
}
timeSwitch = false
if((e as WheelEvent).deltaY > 0){
if(num <= 1){
@@ -571,7 +595,9 @@ export default defineComponent({
this.layoutList = parentList
this.moodbList = this.moodb[parentList.length-1]
this.moodbClassName = this.moodb_className
this.moodbClassName = this.styleObj.class
this.initDomStyle()
},
cancelDsign(){
this.layout = false
@@ -604,6 +630,65 @@ export default defineComponent({
changeTemplateModal(){
this.layout = !this.layout
},
setIndex(arr:any){
const nums = arr.map((obj:any) => obj.num);
const sortedNums = [...nums].sort((a, b) => a - b);
GO.zIndex = sortedNums[sortedNums.length - 1] + 1
const numToNewValue = new Map();
sortedNums.forEach((num, index) => numToNewValue.set(num, index + 1));
arr.forEach((obj:any) => {
obj.num = numToNewValue.get(obj.num);
});
return arr
},
initDomStyle(){
nextTick(()=>{
this.content.forEach((item:any,index:any) => {
if(this.styleObj.domStyle[index]){
item.classList.add('active')
this.initStyle(item,this.styleObj.domStyle[index])
}
this.domObj.dom.forEach((domName:any,domStyle:any) => {
let dom,style
if(this.styleObj[this.domObj.domStyle[index]]){
style = this.styleObj[this.domObj.domStyle[domStyle]][index]
dom = item.querySelector(domName)
this.initStyle(dom,style)
}
})
});
})
},
clearStyleObj(){
this.styleObj.domStyle = []
this.domObj.domStyle.forEach((item:any)=>{
if(this.styleObj[item])this.styleObj[item] = []
})
},
initStyle(dom:any,style:any){
if(!style)return
for (const [property, value] of Object.entries(style)) {
dom.style.setProperty(property, value);
}
},
setDomStyle(){
this.clearStyleObj()
this.content.forEach((item:any) => {
this.styleObj.domStyle.push(this.setStyle(item.style))
this.domObj.dom.forEach((domName:any,index:any) => {
let style = this.domObj.domStyle[index]
let dom = item.querySelector(domName)
this.styleObj[style].push(this.setStyle(dom.style))
})
});
},
setStyle(domStyle:any){
let style:any = {}
for (let property of domStyle) {
style[property] = domStyle.getPropertyValue(property);
}
return style
},
//提交模板
submitTemplate() {
this.loadingShow = true
@@ -628,6 +713,11 @@ export default defineComponent({
this.layout = false
this.loadingShow = false
this.store.commit("setDisposeMoodboard", rv);
this.setDomStyle()
this.setIndex(this.styleObj.domStyle)//index统一排序设置值
this.store.commit("setDisposeMoodboardPosition", this.styleObj);
}
).catch(rv=>{
this.loadingShow = false

View File

@@ -132,14 +132,22 @@ export default defineComponent({
draggable
},
setup(prop) {
let store = useStore()
let layout: any = ref(false);
let templateFileList: any = ref([]);
let openClick: any = ref(1);
let drag = false;
let layoutList:any = ref([])
const content = ref<HTMLElement | null>(null);
const content:any = ref<HTMLElement | null>(null);
let loadingShow = ref(false)
let styleObj = computed(()=>{
return store.state.UploadFilesModule.disposeMoodboardPostition
})
let moodItemScale = ref(0)
let domObj = {
dom:['img','ul','.layoutMobile_rotote','.layoutMobile_translate','.layoutMobile_angle_tr','.layoutMobile_angle_tl','.layoutMobile_angle_br','.layoutMobile_angle_bl'],
domStyle:['imgStyle','borStyle','rototeStyle','translateStyle','angleTRStyle','angleTLStyle','angleBRStyle','angleBLStyle'],
}
return {
layout,
templateFileList,
@@ -148,7 +156,9 @@ export default defineComponent({
layoutList,
content,
loadingShow,
moodItemScale
moodItemScale,
styleObj,
domObj,
};
},
data() {
@@ -582,7 +592,9 @@ export default defineComponent({
this.moodIndex = 0
this.moodbList = this.moodb[parentList.length-1]
this.moodbClassName = this.moodb_className
this.moodbClassName = this.styleObj.class
this.initDomStyle()
},
cancelDsign(){
this.layout = false
@@ -635,6 +647,65 @@ export default defineComponent({
changeTemplateModal(){
this.layout = !this.layout
},
setIndex(arr:any){
const nums = arr.map((obj:any) => obj.num);
const sortedNums = [...nums].sort((a, b) => a - b);
GO.zIndex = sortedNums[sortedNums.length - 1] + 1
const numToNewValue = new Map();
sortedNums.forEach((num, index) => numToNewValue.set(num, index + 1));
arr.forEach((obj:any) => {
obj.num = numToNewValue.get(obj.num);
});
return arr
},
initDomStyle(){
nextTick(()=>{
this.content.forEach((item:any,index:any) => {
if(this.styleObj.domStyle[index]){
item.classList.add('active')
this.initStyle(item,this.styleObj.domStyle[index])
}
this.domObj.dom.forEach((domName:any,domStyle:any) => {
let dom,style
if(this.styleObj[this.domObj.domStyle[index]]){
style = this.styleObj[this.domObj.domStyle[domStyle]][index]
dom = item.querySelector(domName)
this.initStyle(dom,style)
}
})
});
})
},
clearStyleObj(){
this.styleObj.domStyle = []
this.domObj.domStyle.forEach((item:any)=>{
if(this.styleObj[item])this.styleObj[item] = []
})
},
initStyle(dom:any,style:any){
if(!style)return
for (const [property, value] of Object.entries(style)) {
dom.style.setProperty(property, value);
}
},
setDomStyle(){
this.clearStyleObj()
this.content.forEach((item:any) => {
this.styleObj.domStyle.push(this.setStyle(item.style))
this.domObj.dom.forEach((domName:any,index:any) => {
let style = this.domObj.domStyle[index]
let dom = item.querySelector(domName)
this.styleObj[style].push(this.setStyle(dom.style))
})
});
},
setStyle(domStyle:any){
let style:any = {}
for (let property of domStyle) {
style[property] = domStyle.getPropertyValue(property);
}
return style
},
//提交模板
submitTemplate() {
this.loadingShow = true
@@ -659,6 +730,10 @@ export default defineComponent({
this.layout = false
this.loadingShow = false
this.store.commit("setDisposeMoodboard", rv);
this.setDomStyle()
this.setIndex(this.styleObj.domStyle)//index统一排序设置值
this.store.commit("setDisposeMoodboardPosition", this.styleObj);
}
).catch(rv=>{
this.loadingShow = false