Merge pull request #15969 in DESIGN/design from fbp/feature to fbp/research

* commit '2aaf6f4584a81f68ac7b40dc8040ff85911efe7b':
  REPORT-144922 【fr-fbp】设计器语言多了一个俄语
  REPORT-144922 【fr-fbp】设计器语言多了一个俄语
  REPORT-145056 【fr-fbp】直接远程保存的模板，如果数据链接不存在，想要切换数据连接失败
  fix: REPORT-144262 数据中心数据集弹窗国际化问题
  REPORT-139235 【fr-fbp冒烟】平台关闭权限控制，次管应该拥有所有数据连接的权限

designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java

@@ -45,6 +45,7 @@ import com.fr.design.mainframe.vcs.ui.VcsMovePanel;
 import com.fr.design.os.impl.SupportOSImpl;
 import com.fr.design.ui.util.UIUtil;
 import com.fr.design.unit.UnitConvertUtil;
+import com.fr.design.utils.DesignUtils;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.design.widget.FRWidgetFactory;
 import com.fr.env.SetupDataDesignerRemoteOperator;
@@ -53,7 +54,6 @@ import com.fr.general.FRFont;
 import com.fr.general.Inter;
 import com.fr.general.log.Log4jConfig;
 import com.fr.io.attr.ImageExportAttr;
-import com.fr.locale.InterProviderFactory;
 import com.fr.log.FineLoggerFactory;
 import com.fr.report.ReportConfigManager;
 import com.fr.report.ReportConfigManagerProvider;
@@ -792,7 +792,7 @@ public class PreferencePane extends BasicPane {
     }
 
     private UIDictionaryComboBox<Locale> createLanguageComboBox() {
-        Map<Locale, String> map = InterProviderFactory.getProvider().getSupportLocaleMap();
+        Map<Locale, String> map = DesignUtils.getAvailableLanguages();
         int size = map.size();
         Locale[] keys = new Locale[size];
         String[] values = new String[size];

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

@@ -38,6 +38,7 @@ import com.fr.general.NameObject;
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StringUtils;
 import com.fr.workspace.WorkContext;
+import com.fr.workspace.server.repository.connection.ConnectionRepository;
 
 import javax.swing.AbstractButton;
 import javax.swing.Action;
@@ -471,11 +472,11 @@ public abstract class BasicTableDataTreePane extends DockingView implements Resp
                         new SwingWorker<Boolean, Void>() {
                             @Override
                             protected Boolean doInBackground() throws Exception {
-                                // 获取无权限连接名称集合
+                                // 获取有权限的连接名称集合
-                                Collection<String> noAuthConnections = TableDataAuthHelper.getNoAuthConnections();
+                                Collection<String> authConnections = ConnectionRepository.getInstance().getConnNames();
                                 // 获取当前数据集对应的数据连接名称
                                 String connectionName = TableDataAuthHelper.getConnectionNameByDBTableData((DBTableData) wrapper.getTableData());
-                                return !noAuthConnections.contains(connectionName);
+                                return authConnections.contains(connectionName);
                             }
 
                             @Override

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

@@ -1,9 +1,7 @@
 package com.fr.design.data.datapane;
 
-import com.fanruan.config.impl.data.ConnectionConfigProviderFactory;
 import com.fr.base.TableData;
 import com.fr.data.core.DataCoreUtils;
-import com.fr.data.core.db.DBUtils;
 import com.fr.data.core.db.TableProcedure;
 import com.fr.data.core.db.dialect.Dialect;
 import com.fr.data.core.db.dialect.DialectFactory;
@@ -39,14 +37,9 @@ import com.fr.general.IOUtils;
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StringUtils;
 import com.fr.workspace.WorkContext;
-import com.fr.workspace.server.repository.authority.RemoteAuthorityRepository;
 import com.fr.workspace.server.repository.connection.ConnectionRepository;
 
-import javax.swing.JList;
+import javax.swing.*;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JTree;
-import javax.swing.SwingWorker;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 import javax.swing.event.PopupMenuEvent;
@@ -56,21 +49,14 @@ import javax.swing.tree.DefaultTreeCellRenderer;
 import javax.swing.tree.DefaultTreeModel;
 import javax.swing.tree.TreeCellRenderer;
 import javax.swing.tree.TreePath;
-import java.awt.BorderLayout;
+import java.awt.*;
-import java.awt.Component;
-import java.awt.Dimension;
 import java.awt.event.FocusAdapter;
 import java.awt.event.FocusEvent;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
-import java.util.Set;
 import java.util.concurrent.CancellationException;
 
 /**
@@ -339,20 +325,7 @@ public class ChoosePane extends BasicBeanPane<DataBaseItems> implements Refresha
     }
 
     private List<String> getHasAuthConnections() {
-        List<String> authConnections = new ArrayList<>();
+        return ConnectionRepository.getInstance().getConnNames();
-        Set<String> allConnections = new HashSet<>(ConnectionRepository.getInstance().getConnNames());
-        // 待实现
-        Collection<String> noAuthConnections = RemoteAuthorityRepository.getInstance().getNoAuthConnections();
-        if (noAuthConnections == null) {
-            return authConnections;
-        }
-
-        for (String name : allConnections) {
-            if (!noAuthConnections.contains(name)) {
-                authConnections.add(name);
-            }
-        }
-        return authConnections;
     }
 
     /**

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

@@ -71,6 +71,7 @@ import com.fr.plugin.observer.PluginEventListener;
 import com.fr.stable.StringUtils;
 import com.fr.stable.core.PropertyChangeAdapter;
 import com.fr.workspace.WorkContext;
+import com.fr.workspace.server.repository.connection.ConnectionRepository;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.Icon;
@@ -1056,11 +1057,11 @@ public class TableDataTreePane extends BasicTableDataTreePane {
                 new SwingWorker<Boolean, Void>() {
                     @Override
                     protected Boolean doInBackground() throws Exception {
-                        // 获取无权限连接名称集合
+                        // 获取有权限的连接名称集合
-                        Collection<String> noAuthConnections = TableDataAuthHelper.getNoAuthConnections();
+                        Collection<String> authConnections = ConnectionRepository.getInstance().getConnNames();
                         // 获取当前数据集对应的数据连接名称
                         String connectionName = TableDataAuthHelper.getConnectionNameByDBTableData((DBTableData) wrapper.getTableData());
-                        return !noAuthConnections.contains(connectionName);
+                        return authConnections.contains(connectionName);
                     }
 
                     @Override

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

@@ -6,11 +6,6 @@ import com.fr.data.impl.DBTableData;
 import com.fr.data.impl.NameDatabaseConnection;
 import com.fr.stable.StringUtils;
 import com.fr.workspace.WorkContext;
-import com.fr.workspace.server.connection.DBConnectAuth;
-import com.fr.workspace.server.repository.authority.RemoteAuthorityRepository;
-
-import java.util.Collection;
-import java.util.Collections;
 
 /**
  * 数据连接权限相关的工具类
@@ -28,16 +23,6 @@ public class TableDataAuthHelper {
         return !WorkContext.getCurrent().isLocal() && tableData instanceof DBTableData;
     }
 
-    /**
-     * 获取无权限数据连接集合
-     * 远程下需要调用RPC，为耗时操作，谨慎使用
-     * @return
-     */
-    public static Collection<String> getNoAuthConnections() {
-        // 获取无权限连接集合
-        Collection<String> noAuthConnections = RemoteAuthorityRepository.getInstance().getNoAuthConnections();
-        return noAuthConnections == null ? Collections.emptyList() : noAuthConnections;
-    }
 
     /**
      * 通过数据集获取其数据连接的名称

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

@@ -13,7 +13,6 @@ import com.fr.design.gui.ibutton.UILockButton;
 import com.fr.report.LockItem;
 import com.fr.stable.StringUtils;
 import com.fr.workspace.WorkContext;
-import com.fr.workspace.server.repository.authority.RemoteAuthorityRepository;
 
 import javax.swing.SwingUtilities;
 import java.awt.Dimension;
@@ -22,7 +21,6 @@ import java.awt.event.ActionListener;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
@@ -80,19 +78,10 @@ public class ConnectionComboBoxPanel extends ItemEditableComboBoxPanel {
      * 刷新ComboBox.items
      */
     protected Iterator<String> items() {
-        Collection<String> noAuthConnections = RemoteAuthorityRepository.getInstance().getNoAuthConnections();
-
         nameList = new ArrayList<>();
-
-        if (noAuthConnections == null) {
-            return nameList.iterator();
-        }
         final Map<String, Connection> connectionMap = ConnectionInfoBeanHelper.getCurrentConnectionMap();
         for (Map.Entry<String, Connection> connectionEntry : connectionMap.entrySet()) {
             String conName = connectionEntry.getKey();
-            if (noAuthConnections.contains(conName)) {
-                continue;
-            }
             filterConnection(connectionEntry.getValue(), conName, nameList);
         }
         return nameList.iterator();

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

@@ -40,6 +40,7 @@ import com.fr.workspace.server.repository.WorkplaceConstants;
 import com.fr.workspace.server.repository.connection.ConnectionCacheEvent;
 import com.fr.workspace.server.repository.connection.ConnectionRepository;
 import com.fr.workspace.server.repository.tabledata.DataEncryptionHelper;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -123,8 +124,12 @@ public class ConnectionInfoBeanHelper {
     /**
      * 根据bean创建连接
      */
+    @Nullable
     public static Connection createConnection(ConnectionInfoBean infoBean) {
         try {
+            if (infoBean == null) {
+                return null;
+            }
             Connection connection = cache.get(VALUE).get(infoBean.getConnectionName());
             if (connection != null) {
                 connection.setConnectionName(infoBean.getConnectionName());

designer-base/src/main/java/com/fr/design/i18n/DesignExtendLanguageConfig.java

@@ -0,0 +1,56 @@
+package com.fr.design.i18n;
+
+import com.fr.config.ConfigContext;
+import com.fr.config.DefaultConfiguration;
+import com.fr.config.Identifier;
+import com.fr.config.holder.factory.Holders;
+import com.fr.config.holder.impl.MapConf;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 设计器语言扩展配置
+ *
+ * @author obo
+ * @since 11.0
+ * Created on 2024/09/26
+ */
+public class DesignExtendLanguageConfig extends DefaultConfiguration {
+
+    private static volatile DesignExtendLanguageConfig designExtendLanguageConfig = null;
+
+    /**
+     * 获取实例
+     */
+    public static DesignExtendLanguageConfig getInstance() {
+        if (designExtendLanguageConfig == null) {
+            designExtendLanguageConfig = ConfigContext.getConfigInstance(DesignExtendLanguageConfig.class);
+        }
+        return designExtendLanguageConfig;
+    }
+
+    /**
+     * 设计器扩展的语言
+     * key为localeString，例如en_US或en；value为改语言对应的国际化翻译key
+     */
+    @Identifier("extendDesignLocales")
+    private MapConf<Map<String, String>> extendDesignLocales = Holders.map(new HashMap<>(), String.class, String.class);
+
+    public Map<String, String> getExtendedDesignLocales() {
+        return Collections.unmodifiableMap(extendDesignLocales.get());
+    }
+
+    public void setExtendedDesignLocales(Map<String, String> map) {
+        extendDesignLocales.set(map);
+    }
+
+    @Override
+    public Object clone() throws CloneNotSupportedException {
+        DesignExtendLanguageConfig cloned = (DesignExtendLanguageConfig) super.clone();
+        cloned.extendDesignLocales = ( MapConf<Map<String, String>>) extendDesignLocales.clone();
+        return cloned;
+    }
+
+}

designer-base/src/main/java/com/fr/design/utils/DesignUtils.java

@@ -13,6 +13,7 @@ import com.fr.design.deeplink.DeepLinkCore;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.fun.DefaultValueAdjustProvider;
 import com.fr.design.fun.DesignerEnvProcessor;
+import com.fr.design.i18n.DesignExtendLanguageConfig;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.ui.util.UIUtil;
@@ -21,10 +22,13 @@ import com.fr.file.FileFILE;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.FRFont;
 import com.fr.general.GeneralContext;
+import com.fr.general.LocaleType;
+import com.fr.general.SupportLocale;
 import com.fr.log.FineLoggerFactory;
 import com.fr.plugin.injectable.PluginModule;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.CommonCodeUtils;
+import com.fr.stable.CommonUtils;
 import com.fr.stable.StableUtils;
 import com.fr.stable.StringUtils;
 import com.fr.stable.bridge.ObjectHolder;
@@ -52,7 +56,10 @@ import java.net.ServerSocket;
 import java.net.Socket;
 import java.net.URI;
 import java.nio.charset.StandardCharsets;
+import java.util.Collections;
+import java.util.LinkedHashMap;
 import java.util.Locale;
+import java.util.Map;
 import java.util.Set;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutorService;
@@ -491,4 +498,16 @@ public class DesignUtils {
         return Utils.getAvailableFontFamilyNames4Report();
     }
 
+    /**
+     * 获取设计器可用的开放的语言配置，包括默认开放的五种语言和finedb扩展项
+     * @return Locale和翻译对应的key
+     */
+    public static Map<Locale, String> getAvailableLanguages() {
+        Map<Locale, String> map = new LinkedHashMap<>(SupportLocale.getInstance().getLocaleMap());
+        map.remove(LocaleType.RU.getLocale());
+        for (Map.Entry<String, String> entry : DesignExtendLanguageConfig.getInstance().getExtendedDesignLocales().entrySet()) {
+            map.put(CommonUtils.stringToLocale(entry.getKey()), entry.getValue());
+        }
+        return Collections.unmodifiableMap(map);
+    }
 }

designer-realize/src/main/java/com/fanruan/boot/env/function/app/DesignAppComponent.java

@@ -10,7 +10,6 @@ import com.fr.design.mainframe.App;
 import com.fr.design.mainframe.AppGroup;
 import com.fr.design.mainframe.JTemplateFactory;
 import com.fr.nx.app.designer.CptxApp;
-import com.fr.workspace.server.repository.authority.RemoteAuthorityRepository;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -44,7 +43,6 @@ public class DesignAppComponent {
      */
     @Stop
     public void stop() {
-        RemoteAuthorityRepository.getInstance().invalidCache();
         List<App> appList = new ArrayList<>(Carina.getApplicationContext().group(AppGroup.class).getAll());
         for (App app : appList) {
             JTemplateFactory.remove(app);