Merge remote-tracking branch 'origin/feature/x' into feature/x

designer-base/src/main/java/com/fr/design/RestartHelper.java

@@ -57,10 +57,8 @@ public class RestartHelper {
                 properties.setProperty((i + size) + "", files[i]);
             }
         }
-        try {
+        try (FileOutputStream file2DeleteOutputStream = new FileOutputStream(file)) {
-            FileOutputStream file2DeleteOutputStream = new FileOutputStream(file);
             properties.store(file2DeleteOutputStream, "save");
-            file2DeleteOutputStream.close();
         } catch (IOException e) {
             FineLoggerFactory.getLogger().error(e.getMessage(), e);
         }

designer-base/src/main/java/com/fr/design/gui/controlpane/UIListControlPane.java

@@ -34,6 +34,9 @@ public abstract class UIListControlPane extends UIControlPane implements ListCon
     private CommonShortCutHandlers commonHandlers;
     private ListControlPaneHelper helper;
 
+    // 目前被触发的事件
+    private ListDataEvent currentEvent;
+
 
     public UIListControlPane() {
         super();
@@ -96,7 +99,9 @@ public abstract class UIListControlPane extends UIControlPane implements ListCon
             nameableList.getModel().addListDataListener(new ListDataListener() {
                 @Override
                 public void intervalAdded(ListDataEvent e) {
+                    setCurrentEvent(e);
                     saveSettings();
+                    setCurrentEvent(null);
                 }
 
                 @Override
@@ -321,4 +326,11 @@ public abstract class UIListControlPane extends UIControlPane implements ListCon
 
     }
 
+    public ListDataEvent getCurrentEvent() {
+        return currentEvent;
+    }
+
+    public void setCurrentEvent(ListDataEvent currentEvent) {
+        this.currentEvent = currentEvent;
+    }
 }

designer-realize/src/main/java/com/fr/design/mainframe/HyperlinkGroupPaneActionImpl.java

@@ -18,6 +18,7 @@ import com.fr.report.cell.FloatElement;
 import com.fr.report.elementcase.TemplateElementCase;
 import com.fr.stable.Constants;
 
+import javax.swing.event.ListDataEvent;
 import java.awt.Color;
 
 /**
@@ -88,7 +89,7 @@ public class HyperlinkGroupPaneActionImpl implements HyperlinkGroupPaneActionPro
                     }
 
                     // 首次添加超链接，将文字样式默认改为蓝色下划线
-                    if (updateNameHyperlinks.size() == 1 && hyperlinkGroupPane.getSelectedIndex() == 0) {
+                    if (updateNameHyperlinks.size() == 1 && hyperlinkGroupPane.getCurrentEvent() != null && hyperlinkGroupPane.getCurrentEvent().getType() == ListDataEvent.INTERVAL_ADDED) {
                         editCellElement.setStyle(elementStyle.deriveFRFont(frFont));
                     }