Merge remote-tracking branch 'origin/final/11.0' into final/11.0

designer-base/src/main/java/com/fr/design/data/datapane/TableDataPaneListPane.java

@@ -17,9 +17,12 @@ import com.fr.event.EventDispatcher;
 import com.fr.file.ProcedureConfig;
 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;
 import com.fr.log.FineLoggerFactory;
+import com.fr.rpc.ExceptionHandler;
+import com.fr.rpc.RPCInvokerExceptionInfo;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.Nameable;
 import com.fr.stable.StringUtils;
@@ -246,7 +249,13 @@ public class TableDataPaneListPane extends JListControlPane implements TableData
             tableDataBeans.add(new TableDataBean(nameObject.getName(), oldName, (TableData) nameObject.getObject()));
         }
         try {
-            WorkContext.getCurrent().get(TableDataOperator.class).saveTableData(tableDataBeans);
+            WorkContext.getCurrent().get(TableDataOperator.class, new ExceptionHandler() {
+                @Override
+                public Object callHandler(RPCInvokerExceptionInfo exceptionInfo) {
+                    // 走老的方式
+                    return saveByOldWay(tableDataBeans);
+                }
+            }).saveTableData(new ArrayList<>(tableDataConfig.getTableDatas().keySet()), tableDataBeans);
             if (!WorkContext.getCurrent().isLocal()) {
                 EventDispatcher.fire(RemoteConfigEvent.EDIT, TableDataConfig.getInstance().getNameSpace());
             }
@@ -255,6 +264,15 @@ public class TableDataPaneListPane extends JListControlPane implements TableData
         }
     }
 
+    private boolean saveByOldWay(List<TableDataBean> tableDataBean) {
+        try {
+            return TableDataOperatorImpl.getInstance().saveTableData(tableDataBean);
+        } catch (Exception e) {
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
+            return false;
+        }
+    }
+
     @Override
     public void update(TableDataSource tds) {
         tds.clearAllTableData();

designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java

@@ -16,8 +16,11 @@ 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.ConnectionOperatorImpl;
 import com.fr.general.NameObject;
 import com.fr.log.FineLoggerFactory;
+import com.fr.rpc.ExceptionHandler;
+import com.fr.rpc.RPCInvokerExceptionInfo;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.Nameable;
 import com.fr.stable.StringUtils;
@@ -170,7 +173,12 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh
             connectionBeans.add(new ConnectionBean(nameObject.getName(), oldName, (Connection) nameObject.getObject()));
         }
         try {
-            WorkContext.getCurrent().get(ConnectionOperator.class).saveConnection(connectionBeans);
+            WorkContext.getCurrent().get(ConnectionOperator.class, new ExceptionHandler() {
+                @Override
+                public Object callHandler(RPCInvokerExceptionInfo exceptionInfo) {
+                    return saveByOldWay(connectionBeans);
+                }
+            }).saveConnection(new ArrayList<>(connectionConfig.getConnections().keySet()), connectionBeans);
             if (!WorkContext.getCurrent().isLocal()) {
                 EventDispatcher.fire(RemoteConfigEvent.EDIT, ConnectionConfig.getInstance().getNameSpace());
             }
@@ -179,6 +187,15 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh
         }
     }
 
+    private boolean saveByOldWay(List<ConnectionBean> connectionBeans) {
+        try {
+            return ConnectionOperatorImpl.getInstance().saveConnection(connectionBeans);
+        } catch (Exception e) {
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
+            return false;
+        }
+    }
+
     public static void showDialog(Window parent) {
         final ConnectionConfig connectionConfig = ConnectionConfig.getInstance();
         final ConnectionManagerPane connectionManagerPane = new ConnectionManagerPane() {