Skip to content

Commit

Permalink
兼容
Browse files Browse the repository at this point in the history
  • Loading branch information
zhijun committed Sep 19, 2019
1 parent 0828283 commit f964ff6
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions src/App.js
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ class App extends React.Component {
textAlign,
textStyle,
shadow,
angle: rotate,
//angle: rotate,
splitByGrapheme: true, //文字换行
zIndex: 2,
lineHeight,
Expand Down Expand Up @@ -361,15 +361,15 @@ class App extends React.Component {
strokeWidth: borderWidth / 1,
stroke: borderColor,
fill: background,
angle: rotate,
//angle: rotate,
shadow,
selectable: false
});
Shape = new fabric.Group([Rect, textBox], {
width,
height,
left: left + width / 2 + borderWidth, //距离画布左侧的距离,单位是像素
top: top + height / 2+ borderWidth,
left: left + width / 2, //距离画布左侧的距离,单位是像素
top: top + height / 2,
angle: rotate,
mytype: 'textGroup',
lockScalingY: true,
Expand Down
4 changes: 2 additions & 2 deletions src/optionArr.js
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ let optionArr = [
borderWidth: 1,
borderColor: '#000000',
padding: 0,
rotate: 0,
rotate: 30,
shadow: '10 10 5 #888888',
fontFamily: '' //webfont
}
Expand All @@ -39,7 +39,7 @@ let optionArr = [
type: 'rect',
name: '矩形',
css: {
background: '#ffffff', //文字区域背景色
background: 'linear-gradient(-135deg, #fedcba 0%, rgba(18, 52, 86, 1) 20%, #987 80%)',
top: 0,
left: 0,
width: 200,
Expand Down

0 comments on commit f964ff6

Please sign in to comment.