Merge pull request #2168 in DESIGN/design from release/10.0 to bugfix/10.0

* commit '4add5e35421578861928c12d6ff47292ca511787':
  REPORT-37924【共创】远程时，同时拖入多个模板出现问题
  REPORT-37168 FineQuality客户端-designer.bat启动，开始录制无效

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

@@ -50,6 +50,7 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
@@ -74,7 +75,7 @@ public abstract class DesignTableDataManager {
     private static java.util.Map<String, String> dsNameChangedMap = new HashMap<String, String>();
     private static List<ChangeListener> globalDsListeners = new ArrayList<>();
 
-    private static Map<String, List<ChangeListener>> dsListenersMap = new HashMap<String, List<ChangeListener>>();
+    private static Map<String, List<ChangeListener>> dsListenersMap = new ConcurrentHashMap<>();
 
 
     public static String NO_PARAMETER = "no_paramater_pane";
@@ -96,8 +97,8 @@ public abstract class DesignTableDataManager {
      */
     private static void fireDsChanged() {
         fireDsChanged(globalDsListeners);
-        for (Entry<String, List<ChangeListener>> listenerEntry : dsListenersMap.entrySet()) {
-            List<ChangeListener> dsListeners = listenerEntry.getValue();
+        for (Iterator<Entry<String, List<ChangeListener>>> entryIterator = dsListenersMap.entrySet().iterator(); entryIterator.hasNext();) {
+            List<ChangeListener> dsListeners = entryIterator.next().getValue();
             fireDsChanged(dsListeners);
         }
     }

designer-realize/src/main/java/com/fr/start/DesignerJavaRuntime.java

@@ -44,6 +44,7 @@ public class DesignerJavaRuntime extends AbstractJavaRuntime {
     private static final String DOCK_NAME_OPTIONS = "-Xdock:name=" + FineDesigner.class.getSimpleName();
     private static final String WIN_VM_OPTIONS_PATH =  StableUtils.pathJoin(BIN_HOME, "designer.vmoptions");
     private static final String[] DEBUG_OPTIONS = new String[]{"-Dfile.encoding=UTF-8", "-Xmx2048m"};
+    private static final String WIN_SERVER_PATH = "../server/lib";
 
     static {
         try {
@@ -110,7 +111,7 @@ public class DesignerJavaRuntime extends AbstractJavaRuntime {
         if (isInstallVersion()) {
             String[] options = super.getJvmOptions();
             // win下环境变量 存在错误的设置会导致问题 直接读vmoptions
-            if (SupportOSImpl.VM_OPTIONS_ADAPTER.support()) {
+            if (SupportOSImpl.VM_OPTIONS_ADAPTER.support() && !getClassPath().contains(WIN_SERVER_PATH)) {
                 List<String> optionList = new ArrayList<>();
                 try (BufferedReader reader = new BufferedReader(new FileReader(new File(WIN_VM_OPTIONS_PATH)))) {
                     String option = null;