diff --git a/designer-base/src/main/java/com/fr/design/roleAuthority/ReportAndFSManagePane.java b/designer-base/src/main/java/com/fr/design/roleAuthority/ReportAndFSManagePane.java index dd3c86c720..a87d6977bc 100644 --- a/designer-base/src/main/java/com/fr/design/roleAuthority/ReportAndFSManagePane.java +++ b/designer-base/src/main/java/com/fr/design/roleAuthority/ReportAndFSManagePane.java @@ -109,7 +109,7 @@ public class ReportAndFSManagePane extends DockingView implements Prepare4DataSo cell(scrollPane).weight(1) ).getComponent()); this.add(jPanel, BorderLayout.CENTER); - jPanel.setBorder(new ScaledEmptyBorder(0, 4, 4, 4)); + jPanel.setBorder(new ScaledEmptyBorder(0, 12, 4, 4)); registerDSChangeListener(); } diff --git a/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java b/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java index 1751fa98f4..562de89f43 100644 --- a/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java +++ b/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java @@ -754,7 +754,7 @@ public class DBManipulationPane extends BasicBeanPane { return super.stopCellEditing(); } }); - ((DefaultCellEditor) column1.getCellEditor()).setClickCountToStart(1); + ((DefaultCellEditor) column1.getCellEditor()).setClickCountToStart(2); //设置Column 2的Editor column2.setCellEditor(new ColumnValueEditor()); @@ -963,12 +963,12 @@ public class DBManipulationPane extends BasicBeanPane { } /* - * 单击以编辑 + * 双击以编辑 */ @Override public boolean isCellEditable(EventObject anEvent) { if (anEvent instanceof MouseEvent) { - return ((MouseEvent) anEvent).getClickCount() >= 1; + return ((MouseEvent) anEvent).getClickCount() >= 2; } return true; } diff --git a/designer-base/src/main/resources/com/fine/theme/icon/formExport.svg b/designer-base/src/main/resources/com/fine/theme/icon/formExport.svg new file mode 100644 index 0000000000..ffb6e34f7c --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/formExport.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/saveFile.svg b/designer-base/src/main/resources/com/fine/theme/icon/saveFile.svg index 6da83ea77d..afc98ac260 100644 --- a/designer-base/src/main/resources/com/fine/theme/icon/saveFile.svg +++ b/designer-base/src/main/resources/com/fine/theme/icon/saveFile.svg @@ -1,3 +1,3 @@ - + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/saveFile_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/saveFile_disable.svg index cdc9c4b08d..7e033c84fa 100644 --- a/designer-base/src/main/resources/com/fine/theme/icon/saveFile_disable.svg +++ b/designer-base/src/main/resources/com/fine/theme/icon/saveFile_disable.svg @@ -1,3 +1,3 @@ - + diff --git a/designer-base/src/main/resources/com/fine/theme/light/ui/fine_light.icon.json b/designer-base/src/main/resources/com/fine/theme/light/ui/fine_light.icon.json index 475c24d733..4cfeeb7521 100644 --- a/designer-base/src/main/resources/com/fine/theme/light/ui/fine_light.icon.json +++ b/designer-base/src/main/resources/com/fine/theme/light/ui/fine_light.icon.json @@ -7,6 +7,7 @@ "cut": "cut.svg", "save": "save.svg", "saveFile": "saveFile.svg", + "formExport": "formExport.svg", "copy": "copy.svg", "formatBrush": "formatBrush.svg", "paste": "paste.svg", diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartTypeButtonPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartTypeButtonPane.java index ef4a4d788f..1ebc487fc4 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartTypeButtonPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChartTypeButtonPane.java @@ -457,7 +457,7 @@ public class ChartTypeButtonPane extends BasicBeanPane implemen private class ChartChangeButton extends UIToggleButton { - private final double DEL_WIDTH = scale(9); + private final double DEL_WIDTH = scale(10); private final double DOWN_HEIGHT = scale(1); private final Icon closeIcon = new LazyIcon("closeTag", 8); private boolean isMoveOn = false; diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/ChartImagePane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/ChartImagePane.java index 5bbea51697..cb9e9614c0 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/ChartImagePane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/ChartImagePane.java @@ -48,7 +48,8 @@ public class ChartImagePane extends ChartSelectDemoPane { super.paint(g); BufferedImage image1 = IOUtils.readImageWithCache(fullIconPath); - g.drawImage(image1, 0, 0, scale(IMAGE_WIDTH), scale(IMAGE_HIGTH), null); + int x = (this.getWidth() - scale(IMAGE_WIDTH)) / 2; + g.drawImage(image1, x, 0, scale(IMAGE_WIDTH), scale(IMAGE_HIGTH), null); } }; diff --git a/designer-realize/src/main/java/com/fr/design/actions/file/newReport/NewPolyReportAction.java b/designer-realize/src/main/java/com/fr/design/actions/file/newReport/NewPolyReportAction.java index 95115cd04b..9524ed9a65 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/file/newReport/NewPolyReportAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/file/newReport/NewPolyReportAction.java @@ -6,6 +6,7 @@ import java.awt.event.KeyEvent; import javax.swing.KeyStroke; +import com.fine.theme.icon.LazyIcon; import com.fr.base.svg.IconUtils; import com.fr.design.actions.UpdateAction; import com.fr.design.mainframe.DesignerContext; @@ -19,7 +20,7 @@ public class NewPolyReportAction extends UpdateAction { public NewPolyReportAction() { this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_New_Multi_Report")); this.setMnemonic('F'); - this.setSmallIcon("/com/fr/design/images/m_file/formExport"); + this.setSmallIcon(new LazyIcon("formExport")); this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_M, DEFAULT_MODIFIER)); }