Update UiObjectConstructor.js
This commit is contained in:
1 parent
a37da2a044
commit
abb523d84a
1 file changed
+58
-51
@@ -75,39 +75,15 @@ function newUiObjectConstructor () {
|
||||
|
||||
if (userAddingNew === true) {
|
||||
let definition = APP_SCHEMA_MAP.get(payload.parentNode.type)
|
||||
for (let i = 0; i < definition.properties.length; i++) {
|
||||
let property = definition.properties[i]
|
||||
if (property.childType === payload.node.type) {
|
||||
if (property.type === 'array') {
|
||||
let parentNode = payload.parentNode
|
||||
let parentNodeArray = parentNode[property.name]
|
||||
if (parentNodeArray.length > 1) { // the new node was already added
|
||||
let closestSibling = parentNodeArray[parentNodeArray.length - 2]
|
||||
if (closestSibling !== undefined) {
|
||||
floatingObject.angleToParent = closestSibling.payload.floatingObject.angleToParent
|
||||
floatingObject.distanceToParent = closestSibling.payload.floatingObject.distanceToParent
|
||||
floatingObject.arrangementStyle = closestSibling.payload.floatingObject.arrangementStyle
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
if (floatingObject.angleToParent === undefined) {
|
||||
for (let j = i - 1; j >= 0; j--) {
|
||||
let siblingProperty = definition.properties[j]
|
||||
if (definition.properties !== undefined) {
|
||||
for (let i = 0; i < definition.properties.length; i++) {
|
||||
let property = definition.properties[i]
|
||||
if (property.childType === payload.node.type) {
|
||||
if (property.type === 'array') {
|
||||
let parentNode = payload.parentNode
|
||||
let parentNodeProperty = parentNode[siblingProperty.name]
|
||||
if (siblingProperty.type === 'array') {
|
||||
if (parentNodeProperty.length > 0) {
|
||||
let closestSibling = parentNodeProperty[parentNodeProperty.length - 1]
|
||||
if (closestSibling !== undefined) {
|
||||
floatingObject.angleToParent = closestSibling.payload.floatingObject.angleToParent
|
||||
floatingObject.distanceToParent = closestSibling.payload.floatingObject.distanceToParent
|
||||
floatingObject.arrangementStyle = closestSibling.payload.floatingObject.arrangementStyle
|
||||
break
|
||||
}
|
||||
}
|
||||
} else {
|
||||
let closestSibling = parentNodeProperty
|
||||
let parentNodeArray = parentNode[property.name]
|
||||
if (parentNodeArray.length > 1) { // the new node was already added
|
||||
let closestSibling = parentNodeArray[parentNodeArray.length - 2]
|
||||
if (closestSibling !== undefined) {
|
||||
floatingObject.angleToParent = closestSibling.payload.floatingObject.angleToParent
|
||||
floatingObject.distanceToParent = closestSibling.payload.floatingObject.distanceToParent
|
||||
@@ -116,33 +92,64 @@ function newUiObjectConstructor () {
|
||||
}
|
||||
}
|
||||
}
|
||||
for (let j = i + 1; j < definition.properties.length; j++) {
|
||||
let siblingProperty = definition.properties[j]
|
||||
let parentNode = payload.parentNode
|
||||
let parentNodeProperty = parentNode[siblingProperty.name]
|
||||
if (siblingProperty.type === 'array') {
|
||||
if (parentNodeProperty.length > 0) {
|
||||
let closestSibling = parentNodeProperty[parentNodeProperty.length - 1]
|
||||
if (closestSibling !== undefined) {
|
||||
floatingObject.angleToParent = closestSibling.payload.floatingObject.angleToParent
|
||||
floatingObject.distanceToParent = closestSibling.payload.floatingObject.distanceToParent
|
||||
floatingObject.arrangementStyle = closestSibling.payload.floatingObject.arrangementStyle
|
||||
break
|
||||
if (floatingObject.angleToParent === undefined) {
|
||||
for (let j = i - 1; j >= 0; j--) {
|
||||
let siblingProperty = definition.properties[j]
|
||||
let parentNode = payload.parentNode
|
||||
let parentNodeProperty = parentNode[siblingProperty.name]
|
||||
if (parentNodeProperty !== undefined) {
|
||||
if (siblingProperty.type === 'array') {
|
||||
if (parentNodeProperty.length > 0) {
|
||||
let closestSibling = parentNodeProperty[parentNodeProperty.length - 1]
|
||||
if (closestSibling !== undefined) {
|
||||
floatingObject.angleToParent = closestSibling.payload.floatingObject.angleToParent
|
||||
floatingObject.distanceToParent = closestSibling.payload.floatingObject.distanceToParent
|
||||
floatingObject.arrangementStyle = closestSibling.payload.floatingObject.arrangementStyle
|
||||
break
|
||||
}
|
||||
}
|
||||
} else {
|
||||
let closestSibling = parentNodeProperty
|
||||
if (closestSibling !== undefined) {
|
||||
floatingObject.angleToParent = closestSibling.payload.floatingObject.angleToParent
|
||||
floatingObject.distanceToParent = closestSibling.payload.floatingObject.distanceToParent
|
||||
floatingObject.arrangementStyle = closestSibling.payload.floatingObject.arrangementStyle
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
let closestSibling = parentNodeProperty
|
||||
if (closestSibling !== undefined) {
|
||||
floatingObject.angleToParent = closestSibling.payload.floatingObject.angleToParent
|
||||
floatingObject.distanceToParent = closestSibling.payload.floatingObject.distanceToParent
|
||||
floatingObject.arrangementStyle = closestSibling.payload.floatingObject.arrangementStyle
|
||||
break
|
||||
}
|
||||
for (let j = i + 1; j < definition.properties.length; j++) {
|
||||
let siblingProperty = definition.properties[j]
|
||||
let parentNode = payload.parentNode
|
||||
let parentNodeProperty = parentNode[siblingProperty.name]
|
||||
if (parentNodeProperty !== undefined) {
|
||||
if (siblingProperty.type === 'array') {
|
||||
if (parentNodeProperty.length > 0) {
|
||||
let closestSibling = parentNodeProperty[parentNodeProperty.length - 1]
|
||||
if (closestSibling !== undefined) {
|
||||
floatingObject.angleToParent = closestSibling.payload.floatingObject.angleToParent
|
||||
floatingObject.distanceToParent = closestSibling.payload.floatingObject.distanceToParent
|
||||
floatingObject.arrangementStyle = closestSibling.payload.floatingObject.arrangementStyle
|
||||
break
|
||||
}
|
||||
}
|
||||
} else {
|
||||
let closestSibling = parentNodeProperty
|
||||
if (closestSibling !== undefined) {
|
||||
floatingObject.angleToParent = closestSibling.payload.floatingObject.angleToParent
|
||||
floatingObject.distanceToParent = closestSibling.payload.floatingObject.distanceToParent
|
||||
floatingObject.arrangementStyle = closestSibling.payload.floatingObject.arrangementStyle
|
||||
break
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (floatingObject.angleToParent === undefined) {
|
||||
floatingObject.angleToParent = payload.parentNode.payload.floatingObject.angleToParent
|
||||
floatingObject.distanceToParent = payload.parentNode.payload.floatingObject.distanceToParent
|
||||
|
||||
Reference in new issue
Block a user