aidlab/aida_front
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
X1627315083
2024-10-14 18:21:11 +08:00
parent d11c043983
commit 00e5393ec6
1 changed files with 38 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/component/modules/generalMiniCanvas.vue
View File

@@ -2,7 +2,18 @@
<div class="generalMiniCanvas"> <div class="generalMiniCanvas">
<div class="addDetails_canvasCenter"> <div class="addDetails_canvasCenter">
<div class="generalMiniCanvas_input generalMiniCanvas_item" :class="{spread:spreadState}"> <div class="generalMiniCanvas_input generalMiniCanvas_item" :class="{spread:spreadState}">
<div class="generalMiniCanvas_input_item" v-show="(canvasState != 'move' && canvasState != 'liquidation' && canvasState != 'movePosition' && canvasState != 'zoomIn' && canvasState != 'zoomOut')"> <div class="generalMiniCanvas_input_item brushwork" v-show="canvasState == 'pencil'">
<span >{{ $t('exportModel.Brushwork') }}:</span>
<a-select ref="select" class="label_select" size="small" v-model:value="brushworkValue"
style="width: 20rem"
@change="brushworkChange"
>
<a-select-option class="label_select_item" v-for="item in brushList" :value="item.value">
<img :src="item.url" alt="">
</a-select-option>
</a-select>
</div>
<div class="generalMiniCanvas_input_item" v-show="(canvasState != 'move' && canvasState != 'liquidation' && canvasState != 'movePosition' && canvasState != 'zoomIn' && canvasState != 'zoomOut' && brushworkValue != 'RibbonBrush' && brushworkValue != 'LongfurBrush')">
<span>{{ $t('exportModel.Size') }}</span> <span>{{ $t('exportModel.Size') }}</span>
<input type="range" @input="setPencilWidth" min="1" max="50" v-model="canvasPencilWidth[canvasState]"> <input type="range" @input="setPencilWidth" min="1" max="50" v-model="canvasPencilWidth[canvasState]">
</div> </div>
@@ -18,17 +29,7 @@
<span>{{ $t('exportModel.Color') }}</span> <span>{{ $t('exportModel.Color') }}</span>
<input type="color" @input="setPencilColor" v-model="canvasPencilColor"> <input type="color" @input="setPencilColor" v-model="canvasPencilColor">
</div> </div>
<div class="generalMiniCanvas_input_item brushwork" v-show="canvasState == 'pencil'">
<span >{{ $t('exportModel.Brushwork') }}:</span>
<a-select ref="select" class="label_select" size="small" v-model:value="brushworkValue"
style="width: 20rem"
@change="brushworkChange"
>
<a-select-option class="label_select_item" v-for="item in brushList" :value="item.value">
<img :src="item.url" alt="">
</a-select-option>
</a-select>
</div>
</div> </div>
<div class="exportCanvasBox_center_data"> <div class="exportCanvasBox_center_data">
<div class="generalMiniCanvas_btn generalMiniCanvas_item" :class="{spread:spreadState}"> <div class="generalMiniCanvas_btn generalMiniCanvas_item" :class="{spread:spreadState}">
@@ -488,6 +489,8 @@ export default defineComponent({
pencilbtnStyle.value.width = canvasBtn.canvasPencilWidth[canvasBtn.canvasState]+'px' pencilbtnStyle.value.width = canvasBtn.canvasPencilWidth[canvasBtn.canvasState]+'px'
if(brushworkValue.value == 'RibbonBrush' || brushworkValue.value == 'LongfurBrush'){ if(brushworkValue.value == 'RibbonBrush' || brushworkValue.value == 'LongfurBrush'){
canvas.freeDrawingBrush.width = 1; canvas.freeDrawingBrush.width = 1;
pencilbtnStyle.value.height = 1+'px'
pencilbtnStyle.value.width = 1+'px'
} }
},300) },300)
} }
@@ -553,7 +556,8 @@ export default defineComponent({
} }
let setSubmit = (liquefation)=>{ let setSubmit = (liquefation)=>{
return new Promise((resolve,reject)=>{ return new Promise((resolve,reject)=>{
var allObjects = canvas.getObjects('path'); var allObjects = canvas.getObjects();
// return
// if(allObjects.length == 0){ // if(allObjects.length == 0){
// return message.info(t('addDetails.jsContent1')) // return message.info(t('addDetails.jsContent1'))
// } // }
@@ -577,17 +581,29 @@ export default defineComponent({
if(item.type == 'circle')return if(item.type == 'circle')return
let obj let obj
item.clone((cloned)=>{ item.clone((cloned)=>{
console.log(cloned);
obj = cloned obj = cloned
}) console.log(obj);
obj.set( if(obj.set){
{ obj.set(
scaleX:(item.scaleX?item.scaleX:1)*scale, {
scaleY:(item.scaleY?item.scaleY:1)*scale, scaleX:(item.scaleX?item.scaleX:1)*scale,
left:item.left*scale, scaleY:(item.scaleY?item.scaleY:1)*scale,
top:item.top*scale, left:item.left*scale,
top:item.top*scale,
}
)
}else{
obj.width = (item.width?item.width:1)*scale
obj.height = (item.height?item.height:1)*scale
obj.left = item.left*scale
obj.top = item.top*scale
} }
)
exportCanvas.add(obj) exportCanvas.add(obj)
})
}) })
let position = JSON.parse(JSON.stringify(canvas.viewportTransform)) let position = JSON.parse(JSON.stringify(canvas.viewportTransform))
position[4] *= scale position[4] *= scale