Ma/ueblueprint
1
0
Fork 0
mirror of https://github.com/barsdeveloper/ueblueprint.git synced 2026-05-23 22:57:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix node rename and link coherence

Browse Source
This commit is contained in:
barsdeveloper
2024-10-16 22:02:31 +02:00
parent a8d78483d5
commit 2352d866a6
6 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
dist/ueblueprint.js vendored
View File

@@ -9881,7 +9881,7 @@ class NodeElement extends ISelectableDraggableElement {
} }
/** @param {String} name */ /** @param {String} name */
#redirectLinksAfterRename(name) { #redirectLinksBeforeRename(name) {
for (let sourcePinElement of this.getPinElements()) { for (let sourcePinElement of this.getPinElements()) {
for (let targetPinReference of sourcePinElement.getLinks()) { for (let targetPinReference of sourcePinElement.getLinks()) {
this.blueprint.getPin(targetPinReference).redirectLink( this.blueprint.getPin(targetPinReference).redirectLink(
@@ -9916,9 +9916,9 @@ class NodeElement extends ISelectableDraggableElement {
"Name", "Name",
/** @param {InstanceType<typeof ObjectEntity.attributes.Name>} newName */ /** @param {InstanceType<typeof ObjectEntity.attributes.Name>} newName */
newName => { newName => {
this.#redirectLinksBeforeRename(newName.value);
this.nodeTitle = newName.value; this.nodeTitle = newName.value;
this.nodeDisplayName = nodeTitle(entity); this.nodeDisplayName = nodeTitle(entity);
this.#redirectLinksAfterRename(newName.value);
} }
); );
} }
@@ -10033,7 +10033,7 @@ class BlueprintEntity extends ObjectEntity {
/** @param {ObjectEntity} entity */ /** @param {ObjectEntity} entity */
getHomonymObjectEntity(entity) { getHomonymObjectEntity(entity) {
const name = entity.getObjectName(false); const name = entity.getObjectName();
return this.#objectEntities.find(entity => entity.getObjectName() == name) return this.#objectEntities.find(entity => entity.getObjectName() == name)
} }
@@ -11255,8 +11255,9 @@ class Blueprint extends IElement {
const name = element.entity.getObjectName(); const name = element.entity.getObjectName();
const homonym = this.entity.getHomonymObjectEntity(element.entity); const homonym = this.entity.getHomonymObjectEntity(element.entity);
if (homonym) { if (homonym) {
homonym.Name.value = this.entity.takeFreeName(name); const newName = this.entity.takeFreeName(name);
homonym.Name = homonym.Name; // @ts-expect-error
homonym.Name = new (homonym.Name.constructor)(newName);
} }
this.nodes.push(element); this.nodes.push(element);
this.entity.addObjectEntity(element.entity); this.entity.addObjectEntity(element.entity);
@@ -12783,7 +12784,7 @@ class PinElement extends IElement {
fromAttribute: (value, type) => value fromAttribute: (value, type) => value
? GuidEntity.grammar.parse(value) ? GuidEntity.grammar.parse(value)
: null, : null,
toAttribute: (value, type) => /** @type {String} */(value?.toString()), toAttribute: (value, type) => value?.toString(),
}, },
attribute: "data-id", attribute: "data-id",
reflect: true, reflect: true,
@@ -12855,6 +12856,7 @@ class PinElement extends IElement {
this.isLinked = false; this.isLinked = false;
this.connectable = !entity.bNotConnectable?.valueOf(); this.connectable = !entity.bNotConnectable?.valueOf();
super.initialize(entity, template); super.initialize(entity, template);
this.pinId = this.entity.PinId;
this.pinType = this.entity.getType(); this.pinType = this.entity.getType();
this.defaultValue = this.entity.getDefaultValue(); this.defaultValue = this.entity.getDefaultValue();
this.color = PinElement.properties.color.converter.fromAttribute(this.getColor().toString()); this.color = PinElement.properties.color.converter.fromAttribute(this.getColor().toString());
@@ -12993,7 +12995,7 @@ class PinElement extends IElement {
&& pinReference.pinGuid.toString() == originalPinElement.entity.PinId.toString() && pinReference.pinGuid.toString() == originalPinElement.entity.PinId.toString()
); );
if (index >= 0) { if (index >= 0) {
this.entity.LinkedTo[index] = newReference; this.entity.LinkedTo.valueOf()[index] = newReference;
return true return true
} }
return false return false

4
dist/ueblueprint.min.js vendored
View File

File diff suppressed because one or more lines are too long

5
js/Blueprint.js
View File

@@ -420,8 +420,9 @@ export default class Blueprint extends IElement {
const name = element.entity.getObjectName() const name = element.entity.getObjectName()
const homonym = this.entity.getHomonymObjectEntity(element.entity) const homonym = this.entity.getHomonymObjectEntity(element.entity)
if (homonym) { if (homonym) {
homonym.Name.value = this.entity.takeFreeName(name) const newName = this.entity.takeFreeName(name)
homonym.Name = homonym.Name // @ts-expect-error
homonym.Name = new (homonym.Name.constructor)(newName)
} }
this.nodes.push(element) this.nodes.push(element)
this.entity.addObjectEntity(element.entity) this.entity.addObjectEntity(element.entity)

4
js/element/NodeElement.js
View File

@@ -100,7 +100,7 @@ export default class NodeElement extends ISelectableDraggableElement {
} }
/** @param {String} name */ /** @param {String} name */
#redirectLinksAfterRename(name) { #redirectLinksBeforeRename(name) {
for (let sourcePinElement of this.getPinElements()) { for (let sourcePinElement of this.getPinElements()) {
for (let targetPinReference of sourcePinElement.getLinks()) { for (let targetPinReference of sourcePinElement.getLinks()) {
this.blueprint.getPin(targetPinReference).redirectLink( this.blueprint.getPin(targetPinReference).redirectLink(
@@ -135,9 +135,9 @@ export default class NodeElement extends ISelectableDraggableElement {
"Name", "Name",
/** @param {InstanceType<typeof ObjectEntity.attributes.Name>} newName */ /** @param {InstanceType<typeof ObjectEntity.attributes.Name>} newName */
newName => { newName => {
this.#redirectLinksBeforeRename(newName.value)
this.nodeTitle = newName.value this.nodeTitle = newName.value
this.nodeDisplayName = nodeTitle(entity) this.nodeDisplayName = nodeTitle(entity)
this.#redirectLinksAfterRename(newName.value)
} }
) )
} }

5
js/element/PinElement.js
View File

@@ -23,7 +23,7 @@ export default class PinElement extends IElement {
fromAttribute: (value, type) => value fromAttribute: (value, type) => value
? GuidEntity.grammar.parse(value) ? GuidEntity.grammar.parse(value)
: null, : null,
toAttribute: (value, type) => /** @type {String} */(value?.toString()), toAttribute: (value, type) => value?.toString(),
}, },
attribute: "data-id", attribute: "data-id",
reflect: true, reflect: true,
@@ -95,6 +95,7 @@ export default class PinElement extends IElement {
this.isLinked = false this.isLinked = false
this.connectable = !entity.bNotConnectable?.valueOf() this.connectable = !entity.bNotConnectable?.valueOf()
super.initialize(entity, template) super.initialize(entity, template)
this.pinId = this.entity.PinId
this.pinType = this.entity.getType() this.pinType = this.entity.getType()
this.defaultValue = this.entity.getDefaultValue() this.defaultValue = this.entity.getDefaultValue()
this.color = PinElement.properties.color.converter.fromAttribute(this.getColor().toString()) this.color = PinElement.properties.color.converter.fromAttribute(this.getColor().toString())
@@ -233,7 +234,7 @@ export default class PinElement extends IElement {
&& pinReference.pinGuid.toString() == originalPinElement.entity.PinId.toString() && pinReference.pinGuid.toString() == originalPinElement.entity.PinId.toString()
) )
if (index >= 0) { if (index >= 0) {
this.entity.LinkedTo[index] = newReference this.entity.LinkedTo.valueOf()[index] = newReference
return true return true
} }
return false return false

2
js/entity/BlueprintEntity.js
View File

@@ -15,7 +15,7 @@ export default class BlueprintEntity extends ObjectEntity {
/** @param {ObjectEntity} entity */ /** @param {ObjectEntity} entity */
getHomonymObjectEntity(entity) { getHomonymObjectEntity(entity) {
const name = entity.getObjectName(false) const name = entity.getObjectName()
return this.#objectEntities.find(entity => entity.getObjectName() == name) return this.#objectEntities.find(entity => entity.getObjectName() == name)
} }