Merge branch 'dev' of https://git.cloud.tencent.com/joylink/jl-nclient into dev
This commit is contained in:
commit
5612cfc06e
@ -52,9 +52,9 @@ export default class key extends Group {
|
|||||||
z: model.z,
|
z: model.z,
|
||||||
shape: {
|
shape: {
|
||||||
x1: model.width+2,
|
x1: model.width+2,
|
||||||
y1: 10,
|
y1: model.width/361*336/2,
|
||||||
x2: model.width+12,
|
x2: model.width+12,
|
||||||
y2: 10
|
y2: model.width/361*336/2
|
||||||
},
|
},
|
||||||
style: {
|
style: {
|
||||||
lineWidth: 3,
|
lineWidth: 3,
|
||||||
@ -67,9 +67,9 @@ export default class key extends Group {
|
|||||||
draggable: false,
|
draggable: false,
|
||||||
shape: {
|
shape: {
|
||||||
y1: model.width/361*336+2,
|
y1: model.width/361*336+2,
|
||||||
x1: 10,
|
x1: model.width/2,
|
||||||
y2: model.width/361*336+12,
|
y2: model.width/361*336+12,
|
||||||
x2: 10
|
x2: model.width/2
|
||||||
},
|
},
|
||||||
style: {
|
style: {
|
||||||
lineWidth: 3,
|
lineWidth: 3,
|
||||||
@ -81,7 +81,7 @@ export default class key extends Group {
|
|||||||
zlevel: model.zlevel,
|
zlevel: model.zlevel,
|
||||||
z: model.z,
|
z: model.z,
|
||||||
style: {
|
style: {
|
||||||
x: 10,
|
x: model.width/2,
|
||||||
y: model.width/361*336+12,
|
y: model.width/361*336+12,
|
||||||
fontWeight: 600,
|
fontWeight: 600,
|
||||||
fontSize: 10,
|
fontSize: 10,
|
||||||
@ -100,7 +100,7 @@ export default class key extends Group {
|
|||||||
z: model.z,
|
z: model.z,
|
||||||
style: {
|
style: {
|
||||||
x: model.width+14,
|
x: model.width+14,
|
||||||
y: 5,
|
y: model.width/361*336/2-4,
|
||||||
fontWeight: 600,
|
fontWeight: 600,
|
||||||
fontSize: 10,
|
fontSize: 10,
|
||||||
fontFamily: model.fontFamily,
|
fontFamily: model.fontFamily,
|
||||||
|
Loading…
Reference in New Issue
Block a user