fix
This commit is contained in:
@@ -100,13 +100,15 @@ li {
|
||||
padding: 0 1rem;
|
||||
}
|
||||
.started_btn {
|
||||
padding: calc(0.4rem*1.2) calc(1.8rem*1.2);
|
||||
padding: 0 calc(1.8rem*1.2);
|
||||
display: inline-block;
|
||||
border-radius: calc(2rem*1.2);
|
||||
font-size: calc(1.2rem*1.2);
|
||||
color: #fff;
|
||||
background-color: #39215b;
|
||||
cursor: pointer;
|
||||
height: 3.3rem;
|
||||
line-height: 3.3rem;
|
||||
zoom: 1;
|
||||
}
|
||||
.el-cascader {
|
||||
|
||||
@@ -115,13 +115,15 @@ input:focus{
|
||||
}
|
||||
//started公共按钮样式
|
||||
.started_btn{
|
||||
padding: calc(.4rem*1.2) calc(1.8rem*1.2);
|
||||
padding: 0 calc(1.8rem*1.2);
|
||||
display: inline-block;
|
||||
border-radius: calc(2rem*1.2);
|
||||
font-size: calc(1.2rem*1.2);
|
||||
color: #fff;
|
||||
background-color: #39215b;
|
||||
cursor: pointer;
|
||||
height: 3.3rem;
|
||||
line-height: 3.3rem;
|
||||
zoom: 1;
|
||||
}
|
||||
|
||||
|
||||
@@ -196,6 +196,7 @@
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<!-- <div @click="toSvg">12312312312</div> -->
|
||||
<div class="exportCanvasBox_center">
|
||||
</div>
|
||||
<!-- <div class="exportCanvasBox_right">
|
||||
@@ -285,6 +286,8 @@ import { openGuide,driverObj__ } from "@/tool/guide";
|
||||
const FileSaver = require("file-saver");
|
||||
import { exportSele,JSRectUpdata,JSchangeType,JScanvasMouseDown,JScanvasMouseMove,JScreateCheck,JSSetTexture } from "@/tool/canvasDrawing";
|
||||
import { useI18n } from "vue-i18n";
|
||||
import {isMoible} from '@/tool/util'
|
||||
|
||||
export default defineComponent({
|
||||
components: {
|
||||
scaleImage,
|
||||
@@ -1008,6 +1011,7 @@ export default defineComponent({
|
||||
}else if(str == 'eraser'){
|
||||
setEraser()
|
||||
}else if(str == 'text'){
|
||||
setMove()
|
||||
setText()
|
||||
JSchangeType(canvas,'init')
|
||||
}else{
|
||||
@@ -1229,7 +1233,6 @@ export default defineComponent({
|
||||
if(operation.value != 'text'){
|
||||
return
|
||||
}
|
||||
|
||||
var clickedObject = e.target;
|
||||
if (clickedObject instanceof fabric.Textbox) {
|
||||
}else{
|
||||
@@ -1251,10 +1254,18 @@ export default defineComponent({
|
||||
|
||||
}
|
||||
let setText = ()=>{
|
||||
canvas.on('mouse:dblclick',setTextFun)
|
||||
if(isMoible()){
|
||||
canvas.on('mouse:down',setTextFun)
|
||||
}else{
|
||||
canvas.on('mouse:dblclick',setTextFun)
|
||||
}
|
||||
}
|
||||
let removeSetText = ()=>{
|
||||
canvas.off('mouse:dblclick',setTextFun)
|
||||
if(isMoible()){
|
||||
canvas.off('mouse:down',setTextFun)
|
||||
}else{
|
||||
canvas.off('mouse:dblclick',setTextFun)
|
||||
}
|
||||
}
|
||||
// let setTextStyle = (x,y)=>{
|
||||
// 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(() => {});
|
||||
return {
|
||||
toSvg,
|
||||
t,
|
||||
showUpgradePlan,//当前弹窗是否打开
|
||||
canvasWH,//画布初始宽高
|
||||
|
||||
@@ -213,12 +213,14 @@
|
||||
@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">
|
||||
<!-- <div v-show="!isGenerate">{{ $t('LibraryPage.Generate') }}</div> -->
|
||||
<div v-show="!isGenerate" class="generage_btn started_btn" @click.stop="getgenerate">
|
||||
{{ $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>
|
||||
<!-- <div v-show="isGenerate"><a-spin size="large" /></div> -->
|
||||
</div>
|
||||
|
||||
<span ref="inputShowText"></span>
|
||||
</div>
|
||||
</div>
|
||||
@@ -1644,9 +1646,24 @@ export default defineComponent({
|
||||
cursor: no-drop;
|
||||
}
|
||||
}
|
||||
.fi-br-loading{
|
||||
animation: whirl 1s infinite linear;
|
||||
|
||||
.started_btn{
|
||||
}
|
||||
.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{
|
||||
margin: 0 3rem;
|
||||
|
||||
Reference in New Issue
Block a user