Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
8f123e8356
@ -747,8 +747,8 @@ export const useTrestle = () => {
|
||||
let width = widthArr.reduce((acc, num) => acc + num, 0) / widthArr.length + horizontal
|
||||
let height = heightArr.reduce((acc, num) => acc + num, 0) / heightArr.length + vertical
|
||||
|
||||
let maxX = 2 + horizontal * 3
|
||||
let maxY = 2 + vertical * 3
|
||||
let maxX = 2 + (horizontal / 10) * 3
|
||||
let maxY = 2 + (vertical / 10) * 3
|
||||
|
||||
let result
|
||||
switch (direction) {
|
||||
@ -795,8 +795,8 @@ export const useTrestle = () => {
|
||||
|
||||
let result
|
||||
let topLeftPoint
|
||||
let maxX = 2 + horizontal * 3
|
||||
let maxY = 2 + vertical * 3
|
||||
let maxX = 2 + (horizontal / 10) * 3
|
||||
let maxY = 2 + (vertical / 10) * 3
|
||||
|
||||
switch (direction) {
|
||||
case 'south': {
|
||||
@ -854,8 +854,8 @@ export const useTrestle = () => {
|
||||
let result
|
||||
let topRightPoint
|
||||
|
||||
let maxX = 2 + horizontal * 3
|
||||
let maxY = 2 + vertical * 3
|
||||
let maxX = 2 + (horizontal / 10) * 3
|
||||
let maxY = 2 + (vertical / 10) * 3
|
||||
|
||||
switch (direction) {
|
||||
case 'south': {
|
||||
@ -2381,8 +2381,8 @@ export const useTrestle = () => {
|
||||
const horizontal = ['south', 'north'].includes(direction) ? moduleIntvlHor : moduleIntvlVer
|
||||
|
||||
const vertical = ['south', 'north'].includes(direction) ? moduleIntvlVer : moduleIntvlHor
|
||||
const maxX = 2 + horizontal * 3
|
||||
const maxY = 2 + vertical * 3
|
||||
const maxX = 2 + (horizontal / 10) * 3
|
||||
const maxY = 2 + (vertical / 10) * 3
|
||||
let { widthArr, heightArr } = centerPoints[0]
|
||||
let width = widthArr.reduce((acc, num) => acc + num, 0) / widthArr.length
|
||||
let height = heightArr.reduce((acc, num) => acc + num, 0) / heightArr.length
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user