Merge branch 'feature/x' of https://code.fineres.com/scm/~bruce.deng/design into feature/x

build.gradle

@@ -1,4 +1,5 @@
 import org.gradle.plugins.ide.idea.model.IdeaLanguageLevel
+import org.gradle.internal.os.OperatingSystem
 
 plugins {
     id 'java'
@@ -65,11 +66,7 @@ allprojects {
         implementation 'com.fr.cbb:fine-universal-skeleton:' + cbbVersion
         implementation 'com.install4j:install4j-runtime:8.0.4'
         implementation 'com.fr.third:jxbrowser:6.23'
-        implementation 'com.fr.third:jxbrowser-mac:6.23'
-        implementation 'com.fr.third:jxbrowser-win64:6.23'
         implementation 'com.fr.third:jxbrowser-v7:7.22'
-        implementation 'com.fr.third:jxbrowser-mac-v7:7.22'
-        implementation 'com.fr.third:jxbrowser-win64-v7:7.22'
         implementation 'com.fr.third:jxbrowser-swing-v7:7.22'
         implementation 'com.fr.third.server:servlet-api:3.0'
         implementation 'org.swingexplorer:swexpl:2.0.1'
@@ -94,4 +91,16 @@ allprojects {
         testImplementation 'org.powermock:powermock-api-easymock:1.7.1'
         testImplementation 'junit:junit:4.12'
     }
+
+    if (OperatingSystem.current().isMacOsX()) {
+        dependencies {
+            implementation 'com.fr.third:jxbrowser-mac:6.23'
+            implementation 'com.fr.third:jxbrowser-mac-v7:7.22'
+        }
+    } else if (OperatingSystem.current().isWindows()) {
+        dependencies {
+            implementation 'com.fr.third:jxbrowser-win64:6.23'
+            implementation 'com.fr.third:jxbrowser-win64-v7:7.22'
+        }
+    }
 }

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

@@ -37,9 +37,6 @@ public class ConnectionListDialogActionAdapter extends DialogActionAdapter {
             return;
         }
         try {
-            // 校验数据库类型
-            connectionManagerPane.validateDatabaseType(connectionConfig);
-
             connectionManagerPane.update(connectionConfig);
         } catch (Exception e) {
             connectionListDialog.setDoOKSucceed(false);

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

@@ -21,6 +21,9 @@ import com.fr.event.EventDispatcher;
 import com.fr.file.ConnectionConfig;
 import com.fr.file.ConnectionOperator;
 import com.fr.general.NameObject;
+import com.fr.license.database.BaseDataBaseTypePoint;
+import com.fr.license.database.DBTypes;
+import com.fr.license.exception.DataBaseNotSupportedException;
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.Nameable;
@@ -30,17 +33,21 @@ import com.fr.transaction.Configurations;
 import com.fr.transaction.WorkerFacade;
 import com.fr.workspace.WorkContext;
 import com.fr.workspace.server.database.DataBaseTypeOperator;
+import org.jetbrains.annotations.NotNull;
 
+import javax.swing.SwingWorker;
 import java.awt.Window;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 import java.util.UUID;
+import java.util.concurrent.ExecutionException;
 
 /**
  * Connection List Pane.
@@ -50,6 +57,7 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh
     private boolean isNamePermitted = true;
     private final HashMap<String, String> renameMap = new HashMap<>();
     private final Map<String, Connection> populatedConnectionsSnapshot = new LinkedHashMap<>();
+    private static List<String> supportedDatabaseTypes = new ArrayList<>();
 
     public ConnectionListPane() {
         renameMap.clear();
@@ -63,6 +71,30 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh
                 rename(selectedName, getEditingName());
             }
         });
+
+        getSupportedTypes();
+    }
+
+    /**
+     * 获取本地、远程环境lic中未受限制的数据库类型信息
+     */
+    private static void getSupportedTypes() {
+        SwingWorker<List<String>, Void> getSupportedTypesWorker = new SwingWorker<List<String>, Void>() {
+            @Override
+            protected List<String> doInBackground() {
+                return WorkContext.getCurrent().get(DataBaseTypeOperator.class).getSupportedDatabaseTypes();
+            }
+
+            @Override
+            protected void done() {
+                try {
+                    supportedDatabaseTypes = get();
+                } catch (InterruptedException | ExecutionException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        };
+        getSupportedTypesWorker.execute();
     }
 
     @Override
@@ -232,10 +264,56 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh
             }
         });
 
+        this.validateDatabaseType(addedOrUpdatedConnections);
         this.validateConnections(addedOrUpdatedConnections);
         this.alterConnections(removedConnNames, addedOrUpdatedConnections);
     }
 
+    /**
+     * 校验是否支持所有新增和修改数据连接的数据库类型
+     */
+    public void validateDatabaseType(@NotNull List<ConnectionBean> addedOrUpdatedConnections) {
+        Set<String> notSupportedConnections = new HashSet<>();
+        if (!addedOrUpdatedConnections.isEmpty()) {
+            for (ConnectionBean bean : addedOrUpdatedConnections) {
+                Connection connection = bean.getConnection();
+                // 仅校验jdbc连接，其他插件数据连接不进行校验
+                if (connection instanceof JDBCDatabaseConnection) {
+                    BaseDataBaseTypePoint dataBaseTypePoint = BaseDataBaseTypePoint.getDataBaseTypePoint(connection.getDriver(), connection.feature());
+
+                    if (connectionIsNotSupported(connection, dataBaseTypePoint)) {
+                        notSupportedConnections.addAll(dataBaseTypePoint.getDataBaseType());
+                    }
+                }
+            }
+        }
+
+        if (!notSupportedConnections.isEmpty()) {
+            throw new DataBaseNotSupportedException(notSupportedConnections, supportedDatabaseTypes);
+        }
+    }
+
+    /**
+     * 校验当前数据连接是否被限制
+     */
+    private static boolean connectionIsNotSupported(Connection connection, BaseDataBaseTypePoint dataBaseTypePoint) {
+        return !validateFRDemo(connection.getDriver(), connection.feature()) &&
+                (dataBaseTypePoint != null && !supportedDatabaseTypes.containsAll(dataBaseTypePoint.getDatabaseType()));
+    }
+
+    /**
+     * 校验当前是否为FRDemo，不对其进行限制
+     */
+    private static boolean validateFRDemo(String driver, String url) {
+        if (DBTypes.Sqlite.getDriver().equals(driver) && url.contains(DBTypes.Sqlite.getUrlKey())) {
+            // 产品：对sqlite类型只允许示例连接FRDemo
+            String databaseName = url.substring(url.lastIndexOf("/") + 1);
+            return StringUtils.equals("FRDemo.db", databaseName);
+        }
+
+        return false;
+    }
+
 
     private void validateConnections(List<ConnectionBean> addedOrUpdatedConnections) throws Exception {
 

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

@@ -1,17 +1,8 @@
 package com.fr.design.data.datapane.connect;
 
-import com.fr.data.impl.Connection;
-import com.fr.data.impl.JDBCDatabaseConnection;
 import com.fr.design.gui.frpane.LoadingBasicPane;
-import com.fr.design.gui.ilist.ListModelElement;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.file.ConnectionConfig;
-import com.fr.general.NameObject;
-import com.fr.license.exception.DataBaseNotSupportedException;
-import com.fr.stable.Nameable;
-import com.fr.workspace.WorkContext;
-import com.fr.workspace.server.database.DataBaseTypeOperator;
-import com.fr.workspace.server.database.DatabaseResultBean;
 
 import javax.swing.JPanel;
 import java.awt.BorderLayout;
@@ -69,22 +60,4 @@ public class ConnectionManagerPane extends LoadingBasicPane implements Connectio
         return connectionListPane.isNamePermitted();
     }
 
-    /**
-     * 校验是否支持当前选中连接的数据库类型
-     */
-    public void validateDatabaseType(ConnectionConfig connectionConfig) {
-        ListModelElement selectedValue = this.connectionListPane.getSelectedValue();
-        if (selectedValue != null) {
-            Nameable wrapper = selectedValue.wrapper;
-            Connection connection = (Connection) ((NameObject) wrapper).getObject();
-            // 仅校验jdbc连接，其他插件数据连接不进行校验
-            if (connection instanceof JDBCDatabaseConnection) {
-                DatabaseResultBean bean = WorkContext.getCurrent().get(DataBaseTypeOperator.class).validateDatabaseType(connection.getDriver(), connection.feature());
-                if (bean.equals(DatabaseResultBean.DefaultBean())) {
-                    throw new DataBaseNotSupportedException(bean.getMsg());
-                }
-            }
-        }
-    }
-
 }

designer-base/src/main/java/com/fr/design/data/datapane/preview/desensitization/view/rule/DesensitizationRuleChoosePane.java

@@ -275,18 +275,25 @@ public class DesensitizationRuleChoosePane extends JPanel {
 
             @Override
             public void actionPerformed(ActionEvent e) {
-                // 获取当前选中规则
-                DesensitizationRule selectedValue = getSelectedValue();
+                // 获取当前选中规则的副本
+                DesensitizationRule selectedValue = null;
+                try {
+                    selectedValue = (DesensitizationRule) getSelectedValue().clone();
+                } catch (CloneNotSupportedException ex) {
+                    throw new RuntimeException(ex);
+                }
                 DesensitizationRuleEditPane editPane = new DesensitizationRuleEditPane(getCurrentExistRuleNames(selectedValue.getRuleName()));
                 editPane.populateBean(selectedValue);
+                final DesensitizationRule finalRule = selectedValue;
                 BasicDialog basicDialog = editPane.showWindowWithCustomSize(SwingUtilities.getWindowAncestor(parent), new DialogActionAdapter() {
                     @Override
                     public void doOk() {
                         DesensitizationRule rule = editPane.updateBean();
                         // 修改同步到RuleManager中
                         if (DesensitizationRule.valid(rule)) {
-                            DesensitizationRuleManager.getInstance().updateRule(rule);
+                            DesensitizationRuleManager.getInstance().updateRule(finalRule, rule);
                         }
+                        setSelectedValue(rule);
                         fireTableDataChanged();
                     }
 

designer-base/src/main/java/com/fr/design/data/datapane/preview/desensitization/view/setting/TableDataDesensitizationTableModel.java

@@ -250,6 +250,8 @@ public class TableDataDesensitizationTableModel extends UITableModelAdapter<Tabl
         private ActionListener chooseRuleListener = new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
+                // 重新获取一下本地规则缓存
+                refreshCustomRuleCache();
                 DesensitizationRulePane rulePane = new DesensitizationRulePane(latestRules);
                 TableDataDesensitizationItem desensitizationItem = getCurrentSelectBean();
                 int selectedRow = table.getSelectedRow();
@@ -606,4 +608,12 @@ public class TableDataDesensitizationTableModel extends UITableModelAdapter<Tabl
                 DesensitizationRuleManager.getInstance().getRuleStatus(rule, latestRules) != DesensitizationRuleStatus.NORMAL;
     }
 
+    /**
+     * 刷新当前页面的本地规则缓存，查询最新本地规则的逻辑也是使用了缓存，因此无需考虑耗时
+     */
+    private void refreshCustomRuleCache() {
+        Map<String, DesensitizationRule> customRules = DesensitizationRuleManager.getInstance().getRulesBySource(DesensitizationRuleSource.CUSTOM);
+        latestRules.put(DesensitizationRuleSource.CUSTOM, customRules);
+    }
+
 }

designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellOtherSetPane.java

@@ -148,6 +148,7 @@ public class CellOtherSetPane extends AbstractCellAttrPane {
         // VerticalFlowLayout 与 实现的滚动条有冲突，因此再加一层panel
         JPanel jPanel = new JPanel();
         jPanel.add(contentPane);
+        initAllNames();
         return jPanel;
     }
 

designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/desensitization/CellDesensitizationGroupsPane.java

@@ -121,7 +121,19 @@ public class CellDesensitizationGroupsPane extends JPanel {
      */
     public void populate(List<CellDesensitizationBean> desensitizationBeans) {
         if (Objects.nonNull(desensitizationBeans)) {
+            // 记录埋点数据
+            if (!desensitizationBeans.isEmpty()) {
+                recordDesensitization(desensitizationBeans);
+            }
+
             editorPane.populate(desensitizationBeans.toArray(new CellDesensitizationBean[]{}));
         }
     }
+
+    /**
+     * 记录预览导出脱敏埋点
+     */
+    private int recordDesensitization(List<CellDesensitizationBean> desensitizationBeans) {
+        return desensitizationBeans.size();
+    }
 }