Merge pull request #7299 in DESIGN/design from feature/10.0 to feature/big-screen

* commit '1a646b754cccfb00c0ad34ce5f116624d7fc0acf':
  CHART-22211 甘特图用文件数据集日期显示异常
  CHART-21877 fix:fvs.cpt 批量设置单元格背景颜色后 单元格字体是黑色
  CHART-22076 fix:fvs.cpt 单元格设置超链删除超链 文本白色
  update
  CHART-22090 条件属性-颜色控件残留

designer-base/src/main/java/com/fr/design/gui/style/BorderPane.java

@@ -17,14 +17,19 @@ import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.style.color.NewColorSelectBox;
-
+import com.fr.design.utils.gui.AdjustWorkBookDefaultStyleUtils;
 import com.fr.stable.Constants;
 import com.fr.stable.CoreConstants;
 
-import javax.swing.*;
+import javax.swing.Icon;
+import javax.swing.JPanel;
+import javax.swing.SwingConstants;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.GridLayout;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
@@ -198,7 +203,7 @@ public class BorderPane extends AbstractBasicStylePane implements GlobalNameObse
     public Style update(Style style) {
 
         if (style == null) {
-            style = Style.DEFAULT_STYLE;
+            style = AdjustWorkBookDefaultStyleUtils.adjustCellElement(Style.DEFAULT_STYLE);
         }
 
         if (backgroundPane.currentPane.isBackgroundChange()) {

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

@@ -17,6 +17,7 @@ public class AdjustWorkBookDefaultStyleUtils {
 
     private static final Color TEMPLATE_BACKGROUND = new Color(16, 11, 43);
     private static final Color CELL_ELEMENT_BORDER = new Color(110, 110, 110);
+    private static final Color CELL_ELEMENT_FONT_FOREGROUND = Color.WHITE;
 
     private static Color currentStoryBack = null;
 
@@ -31,13 +32,24 @@ public class AdjustWorkBookDefaultStyleUtils {
     public static void adjustCellElement(CellElement cellElement) {
         if (DesignModeContext.isDuchampMode()) {
             Style style = cellElement.getStyle();
-            style = style.deriveFRFont(style.getFRFont().applyForeground(Color.WHITE));
+            style = adjustCellElement(style);
+            cellElement.setStyle(style);
+        }
+    }
+
+    public static Style adjustCellElement(Style style) {
+        if (DesignModeContext.isDuchampMode()) {
+            style = style.deriveFRFont(style.getFRFont().applyForeground(CELL_ELEMENT_FONT_FOREGROUND));
             style = style.deriveBorder(0, CELL_ELEMENT_BORDER,
                     0, CELL_ELEMENT_BORDER,
                     0, CELL_ELEMENT_BORDER,
                     0, CELL_ELEMENT_BORDER);
-            cellElement.setStyle(style);
         }
+        return style;
+    }
+
+    public static Color adjustCellElementFontForeground(Color color) {
+        return DesignModeContext.isDuchampMode() ? CELL_ELEMENT_FONT_FOREGROUND : color;
     }
 
     public static void adjustFloatElement(FloatElement floatElement) {

designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartUIListControlPane.java

@@ -25,6 +25,7 @@ import java.awt.BorderLayout;
 import java.awt.Component;
 import java.awt.FlowLayout;
 import java.awt.Point;
+import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
@@ -210,6 +211,16 @@ public abstract class VanChartUIListControlPane extends UIListControlPane implem
         public void doCancel() {
             setVisible(false);
         }
+
+        @Override
+        public void setVisible(boolean b) {
+            super.setVisible(b);
+
+            //把一些可能没隐藏的子弹框隐藏 比如 边框-颜色弹框
+            for (Window window : getOwnedWindows()) {
+                window.setVisible(false);
+            }
+        }
     }
 
 }

designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/data/component/GanttTableDataContentPane.java

@@ -93,13 +93,13 @@ public class GanttTableDataContentPane extends AbstractTableDataContentPane{
         ganttDefinition.setEndTime(endTime == null ? StringUtils.EMPTY : String.valueOf(endTime));
 
         Object markTime = markerTimeComboBox.getSelectedItem();
-        ganttDefinition.setMarkTime(isNoneObject(markTime) ? StringUtils.EMPTY : String.valueOf(markTime));
+        ganttDefinition.setMarkTime(isNoneObject(markTime) ? null : String.valueOf(markTime));
 
         Object process = processComboBox.getSelectedItem();
-        ganttDefinition.setProgress(isNoneObject(process) ? StringUtils.EMPTY : String.valueOf(process));
+        ganttDefinition.setProgress(isNoneObject(process) ? null : String.valueOf(process));
 
         Object taskID = taskIDComboBox.getSelectedItem();
-        ganttDefinition.setLinkID(isNoneObject(taskID) ? StringUtils.EMPTY : String.valueOf(taskID));
+        ganttDefinition.setLinkID(isNoneObject(taskID) ? null : String.valueOf(taskID));
     }
 
     private boolean isNoneObject(Object markTime) {
@@ -117,9 +117,9 @@ public class GanttTableDataContentPane extends AbstractTableDataContentPane{
             seriesComboBox.setSelectedItem(ganttDefinition.getSeriesName());
             startTimeComboBox.setSelectedItem(ganttDefinition.getStartTime());
             endTimeComboBox.setSelectedItem(ganttDefinition.getEndTime());
-            markerTimeComboBox.setSelectedItem(StringUtils.isEmpty(ganttDefinition.getMarkTime()) ? NONE : ganttDefinition.getMarkTime());
+            markerTimeComboBox.setSelectedItem(ganttDefinition.getMarkTime() == null ? NONE : ganttDefinition.getMarkTime());
-            processComboBox.setSelectedItem(StringUtils.isEmpty(ganttDefinition.getProgress()) ? NONE : ganttDefinition.getProgress());
+            processComboBox.setSelectedItem(ganttDefinition.getProgress() == null ? NONE : ganttDefinition.getProgress());
-            taskIDComboBox.setSelectedItem(StringUtils.isEmpty(ganttDefinition.getLinkID()) ? NONE : ganttDefinition.getLinkID());
+            taskIDComboBox.setSelectedItem(ganttDefinition.getLinkID() == null ? NONE : ganttDefinition.getLinkID());
         }
 
     }

designer-realize/src/main/java/com/fr/design/actions/utils/ReportActionUtils.java

@@ -4,6 +4,7 @@ import com.fr.base.Style;
 import com.fr.design.actions.cell.style.StyleActionInterface;
 import com.fr.design.mainframe.DesignOperationEvent;
 import com.fr.design.mainframe.ElementCasePane;
+import com.fr.design.utils.gui.AdjustWorkBookDefaultStyleUtils;
 import com.fr.event.EventDispatcher;
 import com.fr.grid.selection.CellSelection;
 import com.fr.grid.selection.FloatSelection;
@@ -15,7 +16,7 @@ import com.fr.report.cell.TemplateCellElement;
 import com.fr.report.elementcase.ElementCase;
 import com.fr.report.elementcase.TemplateElementCase;
 
-import java.awt.*;
+import java.awt.Rectangle;
 
 public class ReportActionUtils {
 	private ReportActionUtils() {
@@ -113,7 +114,7 @@ public class ReportActionUtils {
 
 		CellElement editCellElement = report.getCellElement(((CellSelection) sel).getColumn(), ((CellSelection) sel).getRow());
 		if (editCellElement == null) {
-			return Style.DEFAULT_STYLE;
+			return AdjustWorkBookDefaultStyleUtils.adjustCellElement(Style.DEFAULT_STYLE);
 		}
 
 		//peter:直接返回当前编辑元素的Style

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

@@ -6,6 +6,7 @@ import com.fr.design.designer.TargetComponent;
 import com.fr.design.file.HistoryTemplateListCache;
 import com.fr.design.gui.frpane.HyperlinkGroupPane;
 import com.fr.design.gui.frpane.HyperlinkGroupPaneActionProvider;
+import com.fr.design.utils.gui.AdjustWorkBookDefaultStyleUtils;
 import com.fr.general.FRFont;
 import com.fr.grid.selection.CellSelection;
 import com.fr.grid.selection.FloatSelection;
@@ -82,7 +83,7 @@ public class HyperlinkGroupPaneActionImpl implements HyperlinkGroupPaneActionPro
                         frFont = frFont.applyForeground(Color.blue);
                         frFont = frFont.applyUnderline(Constants.LINE_THIN);
                     } else {
-                        frFont = frFont.applyForeground(Color.black);
+                        frFont = frFont.applyForeground(AdjustWorkBookDefaultStyleUtils.adjustCellElementFontForeground(Color.black));
                         frFont = frFont.applyUnderline(Constants.LINE_NONE);
                     }
                     editCellElement.setStyle(elementStyle.deriveFRFont(frFont));

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

@@ -2,6 +2,7 @@ package com.fr.design.mainframe.cell.settingpane;
 
 import com.fr.design.mainframe.AbstractAttrPane;
 import com.fr.design.mainframe.ElementCasePane;
+import com.fr.design.utils.gui.AdjustWorkBookDefaultStyleUtils;
 import com.fr.grid.selection.CellSelection;
 import com.fr.grid.selection.FloatSelection;
 import com.fr.report.cell.DefaultTemplateCellElement;
@@ -53,6 +54,7 @@ public abstract class AbstractCellAttrPane extends AbstractAttrPane {
 		TemplateCellElement cellElement = elementCase.getTemplateCellElement(cs.getColumn(), cs.getRow());
 		if (cellElement == null) {
 			cellElement = new DefaultTemplateCellElement(cs.getColumn(), cs.getRow());
+			AdjustWorkBookDefaultStyleUtils.adjustCellElement(cellElement);
 		}
 		this.cellElement = cellElement;
 		elementCase.addCellElement(this.cellElement);

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

@@ -5,16 +5,18 @@ import com.fr.design.actions.utils.ReportActionUtils;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.mainframe.cell.settingpane.style.StylePane;
 import com.fr.design.style.BorderUtils;
+import com.fr.design.utils.gui.AdjustWorkBookDefaultStyleUtils;
 import com.fr.design.utils.gui.GUICoreUtils;
-
 import com.fr.report.cell.DefaultTemplateCellElement;
 import com.fr.report.cell.TemplateCellElement;
 import com.fr.report.elementcase.TemplateElementCase;
 
-import javax.swing.*;
+import javax.swing.JFrame;
+import javax.swing.JPanel;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.Rectangle;
 
 /**
  * @author zhou
@@ -101,12 +103,12 @@ public class CellStylePane extends AbstractCellAttrPane {
                         TemplateCellElement cellElement = elementCase.getTemplateCellElement(column, row);
                         if (cellElement == null) {
                             cellElement = new DefaultTemplateCellElement(column, row);
+                            AdjustWorkBookDefaultStyleUtils.adjustCellElement(cellElement);
                             elementCase.addCellElement(cellElement);
                         }
                         Style style = cellElement.getStyle();
                         if (style == null) {
-                            style = Style.DEFAULT_STYLE;
+                            style = AdjustWorkBookDefaultStyleUtils.adjustCellElement(Style.DEFAULT_STYLE);
-
                         }
                         style = stylePane.updateStyle(style);
                         cellElement.setStyle(style);