Pull request #7086: 无jira任务， release/10.0 合 release/11.0

Merge in DESIGN/design from ~ZHENG/c-design:release/11.0 to release/11.0

* commit '915e971afa97e76c767aa6dbd80a6c74df419d98':
  REPORT-64013 社区url修正（添加锚点标致）
  CHART-22213 fix:新增警戒线 默认应该是9px12px 不是9px
  REPORT-63505 图表进入编辑状态后创建组件预览图不渲染图表
  REPORT-60161 【组件背景分离】设置九点图的线在边界上后，其他操作回来发现恢复成默认井字型
  REPORT-56014 & REPORT-56015 【组件背景分离】【下个版本】组件复用-组件边框点九图，如果线重叠了的话，web端显示有问题
  REPORT-63322 决策报表及聚合报表，无法拖动组件
  REPORT-62691 11.0版本产出的组件，在10.0下正常安装，但复用时模板保存失败

designer-chart/src/main/java/com/fr/van/chart/config/DefaultStyleConstants.java

@@ -18,35 +18,35 @@ import java.awt.Font;
  * Created by shine on 2021/6/25
  */
 public class DefaultStyleConstants {
-    static final FRFont TITLE = FRFont.getInstance(ChartBaseUtils.getLocalDefaultFont("Microsoft YaHei"), Font.BOLD, 14, new Color(241, 246, 255));
+    static final FRFont TITLE = FRFont.getInstance(ChartBaseUtils.getLocalDefaultFont("Microsoft YaHei"), Font.BOLD, 19, new Color(241, 246, 255));
-    static final FRFont LEGEND = FRFont.getInstance(ChartBaseUtils.getLocalDefaultFont("Microsoft YaHei"), Font.PLAIN, 9, new Color(159, 173, 191));
+    static final FRFont LEGEND = FRFont.getInstance(ChartBaseUtils.getLocalDefaultFont("Microsoft YaHei"), Font.PLAIN, 12, new Color(159, 173, 191));
 
-    static final FRFont AXIS_LABEL = FRFont.getInstance(ChartBaseUtils.getLocalDefaultFont("Microsoft YaHei"), Font.PLAIN, 9, new Color(159, 173, 191));
+    static final FRFont AXIS_LABEL = FRFont.getInstance(ChartBaseUtils.getLocalDefaultFont("Microsoft YaHei"), Font.PLAIN, 12, new Color(159, 173, 191));
-    static final FRFont AXIS_TITLE = FRFont.getInstance(ChartBaseUtils.getLocalDefaultFont("Microsoft YaHei"), Font.PLAIN, 9, new Color(200, 211, 228));
+    static final FRFont AXIS_TITLE = FRFont.getInstance(ChartBaseUtils.getLocalDefaultFont("Microsoft YaHei"), Font.PLAIN, 12, new Color(200, 211, 228));
     static final Color AXIS_LINE = new Color(46, 75, 102);
     static final Color GRID_LINE = new Color(30, 55, 78);
 
-    static final FRFont ALERT_FONT = FRFont.getInstance(ChartBaseUtils.getLocalDefaultFont("Microsoft YaHei"), Font.PLAIN, 9, new Color(255, 0, 0));
+    static final FRFont ALERT_FONT = FRFont.getInstance(ChartBaseUtils.getLocalDefaultFont("Microsoft YaHei"), Font.PLAIN, 12, new Color(255, 0, 0));
 
-    static final FRFont DATA_SHEET = FRFont.getInstance(ChartBaseUtils.getLocalDefaultFont("Microsoft YaHei"), Font.PLAIN, 9, new Color(159, 173, 191));
+    static final FRFont DATA_SHEET = FRFont.getInstance(ChartBaseUtils.getLocalDefaultFont("Microsoft YaHei"), Font.PLAIN, 12, new Color(159, 173, 191));
     static final Color DATA_SHEET_BORDER = new Color(46, 75, 102);
 
     static final Color BORDER = Color.BLACK;
     static final int BORDER_WIDTH = Constants.LINE_NONE;
     static final int SPECIAL_BORDER_WIDTH = Constants.LINE_THIN;
 
-    static final FRFont PIE_CATEGORY_LABEL = FRFont.getInstance(ChartBaseUtils.getLocalDefaultFont("Microsoft YaHei"), Font.PLAIN, 10, new Color(232, 232, 232));
+    static final FRFont PIE_CATEGORY_LABEL = FRFont.getInstance(ChartBaseUtils.getLocalDefaultFont("Microsoft YaHei"), Font.PLAIN, 13, new Color(232, 232, 232));
 
     static final Color GAUGE_PANE_BACK_COLOR = null;
     static final Color GAUGE_HINGE = null;
     static final Color GAUGE_PANE_BACK_COLOR_4_RING = new Color(72, 73, 79);
     static final Color GAUGE_SLOT_BACKGROUND_COLOR = new Color(72, 73, 79);
     private static final String FONT_NAME = ChartBaseUtils.getLocalDefaultFont("verdana");
-    static final FRFont THERMOMETER_LABEL_FONT = FRFont.getInstance(FONT_NAME, Font.BOLD, 9, new Color(232, 232, 232));//试管仪表盘标签的默认样式
+    static final FRFont THERMOMETER_LABEL_FONT = FRFont.getInstance(FONT_NAME, Font.BOLD, 12, new Color(232, 232, 232));//试管仪表盘标签的默认样式
-    static final FRFont THERMOMETER_AXIS_LABEL = FRFont.getInstance(FONT_NAME, Font.PLAIN, 8, new Color(159, 173, 191));
+    static final FRFont THERMOMETER_AXIS_LABEL = FRFont.getInstance(FONT_NAME, Font.PLAIN, 11, new Color(159, 173, 191));
     static final FRFont RING_VALUE_LABEL_FONT = FRFont.getInstance(FONT_NAME, Font.PLAIN, ChartConstants.AUTO_FONT_SIZE, new Color(232, 232, 232));//百分比圆环仪表盘值标签的默认样式
     static final FRFont POINTER_VALUE_LABEL_FONT = FRFont.getInstance(FONT_NAME, Font.PLAIN, ChartConstants.AUTO_FONT_SIZE, new Color(232, 232, 232));//多指针仪表盘值标签的默认样式
-    static final FRFont POINTER_CATE_LABEL_FONT = FRFont.getInstance(FONT_NAME, Font.PLAIN, 10, new Color(232, 232, 232));//多指针仪表盘分类标签的默认样式
+    static final FRFont POINTER_CATE_LABEL_FONT = FRFont.getInstance(FONT_NAME, Font.PLAIN, 13, new Color(232, 232, 232));//多指针仪表盘分类标签的默认样式
 
     static final Color MAP_NULL_VALUE_COLOR = new Color(168, 168, 168);
     static final Color MAP_BORDER = Color.BLACK;
@@ -56,12 +56,6 @@ public class DefaultStyleConstants {
     static final Color DRILL_MAP_DRILL_TOOLS_BACK = Color.BLACK;
     static final float DRILL_MAP_DRILL_TOOLS_BACK_OPACITY = 0.8f;
 
-    //todo vancharts
-    private static final Color GANTT_OUT_LINE = GRID_LINE;
-    private static final FRFont GANTT_LABEL = FRFont.getInstance(ChartBaseUtils.getLocalDefaultFont("Microsoft YaHei"), Font.PLAIN, 8, new Color(217, 217, 217));
-    private static final Color GANTT_BORDER_LINE = new Color(30, 36, 58);
-    private static final Color GAUGE_TICK = new Color(39, 49, 71);
-
     static final Background BACK = null;
 
     //新特新

designer-form/src/main/java/com/fr/design/mainframe/FormCreatorDropTarget.java

@@ -18,6 +18,7 @@ import com.fr.design.designer.creator.XLayoutContainer;
 import com.fr.design.designer.creator.XWAbsoluteLayout;
 import com.fr.design.designer.creator.XWFitLayout;
 import com.fr.design.designer.creator.XWParameterLayout;
+import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.form.util.XCreatorConstants;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.icon.IconPathConstants;
@@ -31,12 +32,15 @@ import com.fr.form.share.SharableWidgetProvider;
 import com.fr.form.share.ShareLoader;
 import com.fr.form.share.editor.SharableEditorProvider;
 import com.fr.form.ui.Widget;
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.Constants;
 import com.fr.stable.StringUtils;
 
 import javax.swing.BorderFactory;
+import javax.swing.JOptionPane;
 import javax.swing.JWindow;
 import javax.swing.SwingUtilities;
+import javax.swing.UIManager;
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.Point;
@@ -316,6 +320,24 @@ public class FormCreatorDropTarget extends DropTarget {
      */
     @Override
     public synchronized void drop(DropTargetDropEvent dtde) {
+
+        try {
+            dropXCreator(dtde);
+        } catch (Exception e) {
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
+            if (addingModel.getXCreator().isShared()) {
+                FineJOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(),
+                        com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Share_Drag_Component_Error_Info"),
+                        com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Error"),
+                        JOptionPane.ERROR_MESSAGE,
+                        UIManager.getIcon("OptionPane.errorIcon")
+                );
+            }
+            dtde.rejectDrop();
+        }
+    }
+
+    private void dropXCreator(DropTargetDropEvent dtde) {
         Point loc = dtde.getLocation();
         this.adding(designer.getRelativeX(loc.x), designer.getRelativeY(loc.y));
         // 放到事件末尾执行

designer-form/src/main/java/com/fr/design/mainframe/share/action/CreateComponentAction.java

@@ -10,7 +10,9 @@ import com.fr.data.impl.NameTableData;
 import com.fr.data.impl.TableDataDictionary;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.data.DesignTableDataManager;
+import com.fr.design.designer.creator.XChartEditor;
 import com.fr.design.designer.creator.XCreator;
+import com.fr.design.designer.creator.XWTitleLayout;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.dialog.FineJOptionPane;
@@ -33,6 +35,7 @@ import com.fr.form.ui.ChartEditor;
 import com.fr.form.ui.DataControl;
 import com.fr.form.ui.DictionaryContainer;
 import com.fr.form.ui.ElementCaseEditor;
+import com.fr.form.ui.PaddingMargin;
 import com.fr.form.ui.Widget;
 import com.fr.general.IOUtils;
 import com.fr.log.FineLoggerFactory;
@@ -56,6 +59,7 @@ import javax.swing.Action;
 import javax.swing.UIManager;
 import java.awt.Color;
 import java.awt.Component;
+import java.awt.Dimension;
 import java.awt.Graphics2D;
 import java.awt.Image;
 import java.awt.Rectangle;
@@ -263,6 +267,17 @@ public class CreateComponentAction extends UpdateAction {
         g2d.setColor(Color.WHITE);
         g2d.fillRect(0, 0 , rect.width, rect.height);
         comp.paint(im.getGraphics());
+        if (comp instanceof XWTitleLayout) {
+            XCreator body = ((XWTitleLayout) comp).getBodyCreator();
+            if (body instanceof XChartEditor) {
+                XChartEditor chartEditor = (XChartEditor) body;
+                Dimension size = chartEditor.getSize();
+                BufferedImage chartImage = new BufferedImage(size.width, size.height, BufferedImage.TYPE_INT_ARGB);
+                PaddingMargin margin = chartEditor.toData().getMargin();
+                chartEditor.getDesignerEditor().paintEditor(chartImage.getGraphics(), size, margin);
+                im.getGraphics().drawImage(chartImage, 0, chartEditor.getY(), null);
+            }
+        }
         return im;
     }