From d585184ad26f877eac123a9e0e86acaa184c9e86 Mon Sep 17 00:00:00 2001
From: Harrison <Harrison@fanruan.com>
Date: Tue, 9 Jan 2024 13:53:38 +0800
Subject: [PATCH] =?UTF-8?q?feature:=20REPORT-106900=E3=80=90=E8=BF=9C?=
 =?UTF-8?q?=E7=A8=8B=E8=AE=BE=E8=AE=A1=E6=80=A7=E8=83=BD=E3=80=91=E8=BF=9C?=
 =?UTF-8?q?=E7=A8=8B=E8=AE=BE=E8=AE=A1=E5=8D=8F=E8=AE=AE=E9=87=8D=E6=9E=84?=
 =?UTF-8?q?=20-=20=E5=A4=84=E7=90=86=E6=AE=8B=E7=95=99=E7=9A=84=20tabledat?=
 =?UTF-8?q?a\connection?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fr/design/data/datapane/TableDataPaneListPane.java   | 7 ++++---
 .../design/data/datapane/connect/ConnectionListPane.java | 9 +++++----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataPaneListPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataPaneListPane.java
index ea368bbfcd..7264b852c6 100644
--- a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataPaneListPane.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataPaneListPane.java
@@ -14,8 +14,9 @@ import com.fr.design.gui.ilist.ListModelElement;
 import com.fr.design.i18n.Toolkit;
 import com.fr.event.EventDispatcher;
 import com.fr.file.ProcedureConfig;
+import com.fr.file.ServerTableDataService;
+import com.fr.file.TableDataChanges;
 import com.fr.file.TableDataConfig;
-import com.fr.file.TableDataOperator;
 import com.fr.file.TableDataOperatorImpl;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.NameObject;
@@ -238,13 +239,13 @@ public class TableDataPaneListPane extends JListControlPane implements TableData
     public void update(TableDataConfig tableDataConfig) {
         List<TableDataBean> tableDataBeans = getUpdateTableDataBeans();
         try {
-            WorkContext.getCurrent().get(TableDataOperator.class, new ExceptionHandler() {
+            WorkContext.getCurrent().get(ServerTableDataService.class, new ExceptionHandler() {
                 @Override
                 public Object callHandler(RPCInvokerExceptionInfo exceptionInfo) {
                     // 走老的方式
                     return saveByOldWay(tableDataBeans);
                 }
-            }).saveTableData(new ArrayList<>(tableDataConfig.getTableDatas().keySet()), tableDataBeans);
+            }).apply(new TableDataChanges(new ArrayList<>(tableDataConfig.getTableDatas().keySet()), tableDataBeans));
             if (!WorkContext.getCurrent().isLocal()) {
                 EventDispatcher.fire(RemoteConfigEvent.EDIT, TableDataConfig.getInstance().getNameSpace());
             }
diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java
index 6bfd0a37f0..99a598a8e5 100644
--- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java
+++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java
@@ -9,7 +9,6 @@ import com.fr.data.impl.JNDIDatabaseConnection;
 import com.fr.data.metric.utils.DatabaseConnectionMetricHandler;
 import com.fr.data.operator.DataOperator;
 import com.fr.design.ExtraDesignClassManager;
-import com.fr.general.MapCompareUtils;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.fun.ConnectionProvider;
 import com.fr.design.gui.controlpane.JListControlPane;
@@ -19,7 +18,9 @@ import com.fr.design.gui.ilist.ListModelElement;
 import com.fr.design.i18n.Toolkit;
 import com.fr.event.EventDispatcher;
 import com.fr.file.ConnectionConfig;
-import com.fr.file.ConnectionOperator;
+import com.fr.file.ConnectionService;
+import com.fr.file.ConnectionsChange;
+import com.fr.general.MapCompareUtils;
 import com.fr.general.NameObject;
 import com.fr.license.database.DBTypes;
 import com.fr.license.database.DataBaseTypePointManager;
@@ -332,8 +333,8 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh
     private void alterConnections(List<String> removedConnNames, List<ConnectionBean> addedOrUpdatedConnections) {
 
         try {
-            WorkContext.getCurrent().get(ConnectionOperator.class, exceptionInfo -> saveByOldWay(removedConnNames, addedOrUpdatedConnections))
-                    .saveConnection(removedConnNames, addedOrUpdatedConnections);
+            WorkContext.getCurrent().get(ConnectionService.class, exceptionInfo -> saveByOldWay(removedConnNames, addedOrUpdatedConnections))
+                    .apply(new ConnectionsChange(removedConnNames, addedOrUpdatedConnections));
 
             // hades：远程环境时，由于时直接RPC调用远程修改，因此设计器本地配置需要失效
             if (!WorkContext.getCurrent().isLocal()) {