This commit is contained in:
X1627315083
2024-04-25 17:16:34 +08:00
parent 2c08adbfbe
commit 9562ae4225
4 changed files with 47 additions and 11 deletions

View File

@@ -100,13 +100,15 @@ li {
padding: 0 1rem; padding: 0 1rem;
} }
.started_btn { .started_btn {
padding: calc(0.4rem*1.2) calc(1.8rem*1.2); padding: 0 calc(1.8rem*1.2);
display: inline-block; display: inline-block;
border-radius: calc(2rem*1.2); border-radius: calc(2rem*1.2);
font-size: calc(1.2rem*1.2); font-size: calc(1.2rem*1.2);
color: #fff; color: #fff;
background-color: #39215b; background-color: #39215b;
cursor: pointer; cursor: pointer;
height: 3.3rem;
line-height: 3.3rem;
zoom: 1; zoom: 1;
} }
.el-cascader { .el-cascader {

View File

@@ -115,13 +115,15 @@ input:focus{
} }
//started公共按钮样式 //started公共按钮样式
.started_btn{ .started_btn{
padding: calc(.4rem*1.2) calc(1.8rem*1.2); padding: 0 calc(1.8rem*1.2);
display: inline-block; display: inline-block;
border-radius: calc(2rem*1.2); border-radius: calc(2rem*1.2);
font-size: calc(1.2rem*1.2); font-size: calc(1.2rem*1.2);
color: #fff; color: #fff;
background-color: #39215b; background-color: #39215b;
cursor: pointer; cursor: pointer;
height: 3.3rem;
line-height: 3.3rem;
zoom: 1; zoom: 1;
} }

View File

@@ -196,6 +196,7 @@
</div> </div>
</div> </div>
<!-- <div @click="toSvg">12312312312</div> -->
<div class="exportCanvasBox_center"> <div class="exportCanvasBox_center">
</div> </div>
<!-- <div class="exportCanvasBox_right"> <!-- <div class="exportCanvasBox_right">
@@ -285,6 +286,8 @@ import { openGuide,driverObj__ } from "@/tool/guide";
const FileSaver = require("file-saver"); const FileSaver = require("file-saver");
import { exportSele,JSRectUpdata,JSchangeType,JScanvasMouseDown,JScanvasMouseMove,JScreateCheck,JSSetTexture } from "@/tool/canvasDrawing"; import { exportSele,JSRectUpdata,JSchangeType,JScanvasMouseDown,JScanvasMouseMove,JScreateCheck,JSSetTexture } from "@/tool/canvasDrawing";
import { useI18n } from "vue-i18n"; import { useI18n } from "vue-i18n";
import {isMoible} from '@/tool/util'
export default defineComponent({ export default defineComponent({
components: { components: {
scaleImage, scaleImage,
@@ -1008,6 +1011,7 @@ export default defineComponent({
}else if(str == 'eraser'){ }else if(str == 'eraser'){
setEraser() setEraser()
}else if(str == 'text'){ }else if(str == 'text'){
setMove()
setText() setText()
JSchangeType(canvas,'init') JSchangeType(canvas,'init')
}else{ }else{
@@ -1229,7 +1233,6 @@ export default defineComponent({
if(operation.value != 'text'){ if(operation.value != 'text'){
return return
} }
var clickedObject = e.target; var clickedObject = e.target;
if (clickedObject instanceof fabric.Textbox) { if (clickedObject instanceof fabric.Textbox) {
}else{ }else{
@@ -1251,10 +1254,18 @@ export default defineComponent({
} }
let setText = ()=>{ let setText = ()=>{
canvas.on('mouse:dblclick',setTextFun) if(isMoible()){
canvas.on('mouse:down',setTextFun)
}else{
canvas.on('mouse:dblclick',setTextFun)
}
} }
let removeSetText = ()=>{ let removeSetText = ()=>{
canvas.off('mouse:dblclick',setTextFun) if(isMoible()){
canvas.off('mouse:down',setTextFun)
}else{
canvas.off('mouse:dblclick',setTextFun)
}
} }
// let setTextStyle = (x,y)=>{ // let setTextStyle = (x,y)=>{
// var group = new fabric.Group([rect.color, rect.text, rect.text1],{ // var group = new fabric.Group([rect.color, rect.text, rect.text1],{
@@ -1599,8 +1610,12 @@ export default defineComponent({
}); });
} }
let toSvg = () =>{
console.log(canvas.toSVG());
}
onMounted(() => {}); onMounted(() => {});
return { return {
toSvg,
t, t,
showUpgradePlan,//当前弹窗是否打开 showUpgradePlan,//当前弹窗是否打开
canvasWH,//画布初始宽高 canvasWH,//画布初始宽高

View File

@@ -213,12 +213,14 @@
@keydown.enter="getgenerate" :readonly="checkbox[0].type && selectCode != 'Moodboard'" @keydown.enter="getgenerate" :readonly="checkbox[0].type && selectCode != 'Moodboard'"
:placeholder="$t('LibraryPage.inputContent2')" :placeholder="$t('LibraryPage.inputContent2')"
v-model="captionGeneration"> v-model="captionGeneration">
<div class="generage_btn started_btn" @click.stop="getgenerate"> <div v-show="!isGenerate" class="generage_btn started_btn" @click.stop="getgenerate">
<!-- <div v-show="!isGenerate">{{ $t('LibraryPage.Generate') }}</div> --> {{ $t('LibraryPage.Generate') }}
<!-- <div v-show="isGenerate"><a-spin size="large" /></div> -->
</div>
<div v-show="isGenerate" class="generage_btn started_btn" @click.stop="getgenerate">
<i class="fi fi-br-loading"></i> <i class="fi fi-br-loading"></i>
<!-- <div v-show="isGenerate"><a-spin size="large" /></div> --> <!-- <div v-show="isGenerate"><a-spin size="large" /></div> -->
</div> </div>
<span ref="inputShowText"></span> <span ref="inputShowText"></span>
</div> </div>
</div> </div>
@@ -1644,9 +1646,24 @@ export default defineComponent({
cursor: no-drop; cursor: no-drop;
} }
} }
.fi-br-loading{ .started_btn{
animation: whirl 1s infinite linear; }
.fi-br-loading::before{
transition: all .5s;
display: inline-block;
animation: whirl 1s linear infinite;
}
@keyframes whirl {
0%{
transform: rotate(0deg);
}
50%{
transform: rotate(180deg);
}
100%{
transform: rotate(360deg);
}
} }
.generage_btn{ .generage_btn{
margin: 0 3rem; margin: 0 3rem;