Browse Source

Pull request #7097: REPORT-63505 解决10.0合11.0导致的逻辑冲突

Merge in DESIGN/design from ~TOMMY/design:release/11.0 to release/11.0

* commit '027b84bf62fd27182aaf592b9f8834adbc186943':
  REPORT-63505 解决10.0合11.0导致的逻辑冲突
bugfix/11.0
Tommy 3 years ago
parent
commit
4fe9b0b460
  1. 4
      designer-form/src/main/java/com/fr/design/mainframe/share/action/CreateComponentAction.java

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

@ -35,7 +35,6 @@ import com.fr.form.ui.ChartEditor;
import com.fr.form.ui.DataControl; import com.fr.form.ui.DataControl;
import com.fr.form.ui.DictionaryContainer; import com.fr.form.ui.DictionaryContainer;
import com.fr.form.ui.ElementCaseEditor; import com.fr.form.ui.ElementCaseEditor;
import com.fr.form.ui.PaddingMargin;
import com.fr.form.ui.Widget; import com.fr.form.ui.Widget;
import com.fr.general.IOUtils; import com.fr.general.IOUtils;
import com.fr.log.FineLoggerFactory; import com.fr.log.FineLoggerFactory;
@ -62,6 +61,7 @@ import java.awt.Component;
import java.awt.Dimension; import java.awt.Dimension;
import java.awt.Graphics2D; import java.awt.Graphics2D;
import java.awt.Image; import java.awt.Image;
import java.awt.Insets;
import java.awt.Rectangle; import java.awt.Rectangle;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
@ -273,7 +273,7 @@ public class CreateComponentAction extends UpdateAction {
XChartEditor chartEditor = (XChartEditor) body; XChartEditor chartEditor = (XChartEditor) body;
Dimension size = chartEditor.getSize(); Dimension size = chartEditor.getSize();
BufferedImage chartImage = new BufferedImage(size.width, size.height, BufferedImage.TYPE_INT_ARGB); BufferedImage chartImage = new BufferedImage(size.width, size.height, BufferedImage.TYPE_INT_ARGB);
PaddingMargin margin = chartEditor.toData().getMargin(); Insets margin = chartEditor.getInsets();;
chartEditor.getDesignerEditor().paintEditor(chartImage.getGraphics(), size, margin); chartEditor.getDesignerEditor().paintEditor(chartImage.getGraphics(), size, margin);
im.getGraphics().drawImage(chartImage, 0, chartEditor.getY(), null); im.getGraphics().drawImage(chartImage, 0, chartEditor.getY(), null);
} }

Loading…
Cancel
Save