Browse Source

REPORT-46683 【冒烟】数据库查询,选中表并拖动的时候,弹窗变化了

【问题原因】之前做迭代任务的时候重载了UpdateAction的setSmallIcon方法,然后原先设计器中的setSmallIcon(null)就会报错,当时想错了,以为不能传null,就给改成了UIConstant.BLACK_ICON,其实是因为重载了方法后,传入null,jdk不能判断是调用哪个方法,然后导致了一些场景里本来没图标,变成了一个空白的占位图标,因此显示发生了变化
【改动思路】把迭代任务中由null改为BLACK_ICON的地方,回退为null,再为这个null加上个Icon类型,以便于绑定方法,且与此前逻辑保持一致
feature/big-screen
Yvan 4 years ago
parent
commit
5c7f3aa792
  1. 2
      designer-base/src/main/java/com/fr/design/data/datapane/sqlpane/SQLEditPane.java
  2. 2
      designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java
  3. 3
      designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellRichTextEditor.java
  4. 3
      designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellSubReportEditor.java

2
designer-base/src/main/java/com/fr/design/data/datapane/sqlpane/SQLEditPane.java

File diff suppressed because one or more lines are too long

2
designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java

@ -260,7 +260,7 @@ public class CellDSColumnEditor extends CellQuickEditor {
condition.setEditingComponent(tc); condition.setEditingComponent(tc);
} }
//丢掉icon,修改按钮名称为编辑 //丢掉icon,修改按钮名称为编辑
condition.setSmallIcon(UIConstants.BLACK_ICON); condition.setSmallIcon((Icon) null);
condition.setName(Toolkit.i18nText("Fine-Design_Basic_Edit")); condition.setName(Toolkit.i18nText("Fine-Design_Basic_Edit"));
conditionUIButton = new UIButton(condition); conditionUIButton = new UIButton(condition);
Component[][] components = new Component[][]{ Component[][] components = new Component[][]{

3
designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellRichTextEditor.java

@ -9,6 +9,7 @@ import com.fr.design.layout.TableLayoutHelper;
import com.fr.quickeditor.CellQuickEditor; import com.fr.quickeditor.CellQuickEditor;
import javax.swing.Icon;
import javax.swing.JComponent; import javax.swing.JComponent;
import javax.swing.JPanel; import javax.swing.JPanel;
import java.awt.BorderLayout; import java.awt.BorderLayout;
@ -48,7 +49,7 @@ public class CellRichTextEditor extends CellQuickEditor {
protected void refreshDetails() { protected void refreshDetails() {
RichTextCellAction subReportCellAction = new RichTextCellAction(tc); RichTextCellAction subReportCellAction = new RichTextCellAction(tc);
subReportCellAction.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit")); subReportCellAction.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit"));
subReportCellAction.setSmallIcon(UIConstants.BLACK_ICON); subReportCellAction.setSmallIcon((Icon) null);
richTextButton.setAction(subReportCellAction); richTextButton.setAction(subReportCellAction);
} }

3
designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellSubReportEditor.java

@ -9,6 +9,7 @@ import com.fr.design.layout.TableLayoutHelper;
import com.fr.quickeditor.CellQuickEditor; import com.fr.quickeditor.CellQuickEditor;
import javax.swing.Icon;
import javax.swing.JComponent; import javax.swing.JComponent;
import javax.swing.JPanel; import javax.swing.JPanel;
import java.awt.BorderLayout; import java.awt.BorderLayout;
@ -44,7 +45,7 @@ public class CellSubReportEditor extends CellQuickEditor {
protected void refreshDetails() { protected void refreshDetails() {
SubReportCellAction subReportCellAction = new SubReportCellAction(tc); SubReportCellAction subReportCellAction = new SubReportCellAction(tc);
subReportCellAction.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit")); subReportCellAction.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit"));
subReportCellAction.setSmallIcon(UIConstants.BLACK_ICON); subReportCellAction.setSmallIcon((Icon) null);
subReportButton.setAction(subReportCellAction); subReportButton.setAction(subReportCellAction);
} }

Loading…
Cancel
Save