fix: fix node parent assignment and update settings check

alibaba · Mar 7, 2024 · 20ddbed · 20ddbed
1 parent 4c83b94
commit 20ddbed
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/packages/designer/src/document/node/node-children.ts b/packages/designer/src/document/node/node-children.ts
@@ -310,6 +310,7 @@ export class NodeChildren implements Omit<IPublicModelNodeChildren<INode>,
     let removedNode;
     if (node) {
       removedNode = this.children.splice(start, deleteCount, node);
+      node.internalSetParent(this.owner);
     } else {
       removedNode = this.children.splice(start, deleteCount);
     }

diff --git a/packages/designer/src/document/node/node.ts b/packages/designer/src/document/node/node.ts
@@ -197,7 +197,7 @@ export class Node<Schema extends IPublicTypeNodeSchema = IPublicTypeNodeSchema>
 
   isInited = false;
 
-  _settingEntry: ISettingTopEntry;
+  _settingEntry?: ISettingTopEntry;
 
   get settingEntry(): ISettingTopEntry {
     if (this._settingEntry) return this._settingEntry;
@@ -988,6 +988,7 @@ export class Node<Schema extends IPublicTypeNodeSchema = IPublicTypeNodeSchema>
     this.props.purge();
     this.settingEntry?.purge();
     this.children?.purge();
+    this._settingEntry = undefined;
   }
 
   internalPurgeStart() {

diff --git a/packages/designer/tests/document/node/node-children.test.ts b/packages/designer/tests/document/node/node-children.test.ts
@@ -111,6 +111,16 @@ describe('NodeChildren 方法测试', () => {
     expect(children.length).toBe(2);
   });
 
+  it('split add node and update node parent', () => {
+    const firstBtn = doc.getNode('node_k1ow3cbn')!;
+    const { children } = firstBtn.parent!;
+    const node = doc.createNode({ componentName: 'Button' });
+
+    children.splice(0, 0, node);
+
+    expect(node.parent).toBe(firstBtn.parent);
+  })
+
   it('map', () => {
     const firstBtn = doc.getNode('node_k1ow3cbn')!;
     const { children } = firstBtn.parent!;

diff --git a/packages/editor-skeleton/src/components/settings/settings-primary-pane.tsx b/packages/editor-skeleton/src/components/settings/settings-primary-pane.tsx
@@ -134,7 +134,7 @@ export class SettingsPrimaryPane extends Component<ISettingsPrimaryPaneProps, {
   render() {
     const { settings } = this.main;
     const editor = this.props.engineEditor;
-    if (!settings) {
+    if (!settings || !settings.first) {
       // 未选中节点，提示选中 或者 显示根节点设置
       return (
         <div className="lc-settings-main">