From e9c6a3bb2fd5b3b4cecffcedef47a020dba0fde2 Mon Sep 17 00:00:00 2001
From: roymondchen <roymondchen@tencent.com>
Date: Fri, 17 Jan 2025 19:48:02 +0800
Subject: [PATCH] =?UTF-8?q?fix(editor):=20=E4=BF=AE=E6=94=B9=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=BA=90=E5=8F=AF=E8=83=BD=E9=80=A0=E6=88=90=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=8D=A1=E6=AD=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/editor/src/initService.ts | 60 ++++++++++++++++++++++--------
 1 file changed, 45 insertions(+), 15 deletions(-)

diff --git a/packages/editor/src/initService.ts b/packages/editor/src/initService.ts
index cbc7ea24..a932e7b3 100644
--- a/packages/editor/src/initService.ts
+++ b/packages/editor/src/initService.ts
@@ -265,10 +265,6 @@ export const initServiceEvents = (
     if (app.dsl) {
       app.dsl.dataSources = root.dataSources;
     }
-
-    if (root.dataSources) {
-      app.dataSourceManager?.updateSchema(root.dataSources);
-    }
   };
 
   const dsDepCollectedHandler = async () => {
@@ -459,13 +455,39 @@ export const initServiceEvents = (
   const dataSourceAddHandler = async (config: DataSourceSchema) => {
     initDataSourceDepTarget(config);
     const app = await getTMagicApp();
-    app?.dataSourceManager?.addDataSource(config);
+
+    if (!app?.dataSourceManager) {
+      return;
+    }
+
+    app.dataSourceManager.addDataSource(config);
+
+    const newDs = app.dataSourceManager.get(config.id);
+
+    if (newDs) {
+      app.dataSourceManager.init(newDs);
+    }
   };
 
   const dataSourceUpdateHandler = async (
     config: DataSourceSchema,
     { changeRecords }: { changeRecords: ChangeRecord[] },
   ) => {
+    const updateDsData = async () => {
+      const app = await getTMagicApp();
+
+      if (!app?.dataSourceManager) {
+        return;
+      }
+
+      const ds = app.dataSourceManager.get(config.id);
+
+      if (!ds) return;
+
+      ds.setFields(config.fields);
+      ds.setData(config.mocks?.find((mock) => mock.useInEditor)?.data || ds.getDefaultData());
+    };
+
     let needRecollectDep = false;
     let isModifyField = false;
     let isModifyMock = false;
@@ -515,12 +537,12 @@ export const initServiceEvents = (
         }
         Promise.all(collectIdlePromises).then(() => {
           updateDataSourceSchema();
+          updateDsData();
           updateStageNodes(root.items);
         });
       }
     } else if (root?.dataSources) {
-      const app = await getTMagicApp();
-      app?.dataSourceManager?.updateSchema(root.dataSources);
+      updateDsData();
     }
   };
 
@@ -530,20 +552,28 @@ export const initServiceEvents = (
     depService.removeTarget(id, DepTargetType.DATA_SOURCE_METHOD);
   };
 
-  const dataSourceRemoveHandler = (id: string) => {
+  const dataSourceRemoveHandler = async (id: string) => {
     const root = editorService.get('root');
-    const nodeIds = Object.keys(root?.dataSourceDeps?.[id] || {});
-    const nodes = getNodes(nodeIds, root?.items);
 
-    Promise.all([
+    if (!root) {
+      return;
+    }
+
+    const nodeIds = Object.keys(root.dataSourceDeps?.[id] || {});
+    const nodes = getNodes(nodeIds, root.items);
+
+    await Promise.all([
       collectIdle(nodes, false, DepTargetType.DATA_SOURCE),
       collectIdle(nodes, false, DepTargetType.DATA_SOURCE_COND),
       collectIdle(nodes, false, DepTargetType.DATA_SOURCE_METHOD),
-    ]).then(() => {
-      updateDataSourceSchema();
-      updateStageNodes(nodes);
-    });
+    ]);
 
+    updateDataSourceSchema();
+
+    const app = await getTMagicApp();
+    app?.dataSourceManager?.removeDataSource(id);
+
+    updateStageNodes(nodes);
     removeDataSourceTarget(id);
   };