Browse Source

Merge pull request #12192 in DESIGN/design from release/11.0 to bugfix/11.0

* commit '2e49ade6177ccfe994423999311cab7170aa6eb0':
  REPORT-76564 设计器检查-国际化问题
  REPORT-76564 设计器检查-国际化问题
  REPORT-76564 设计器检查-国际化问题
bugfix/11.0
superman 2 years ago
parent
commit
b0eda09f74
  1. 14
      designer-base/src/main/java/com/fr/design/components/table/TablePanel.java
  2. 4
      designer-base/src/main/java/com/fr/env/detect/ui/EnvDetectorDialog.java

14
designer-base/src/main/java/com/fr/design/components/table/TablePanel.java

@ -162,6 +162,20 @@ public class TablePanel extends JPanel {
cellPanel.add(component); cellPanel.add(component);
} }
/**
* 为单元格Panel更新tooltip
*
* @param row 行数
* @param column 列数
* @param value tooltip值
*/
public void updateCellToolTip(int row, int column, String value) {
int x = row - 1;
int y = column - 1;
JPanel cellPanel = this.cellPanels[x][y];
cellPanel.setToolTipText(value);
}
public void updateCell(int row, int column, String value) { public void updateCell(int row, int column, String value) {
UILabel cellContent = new UILabel(value); UILabel cellContent = new UILabel(value);

4
designer-base/src/main/java/com/fr/env/detect/ui/EnvDetectorDialog.java vendored

@ -163,6 +163,7 @@ public class EnvDetectorDialog extends JDialog {
} }
}; };
detectButton.setForeground(Color.WHITE); detectButton.setForeground(Color.WHITE);
detectButton.setToolTipText(buttonStatus.getDesc());
detectButton.addActionListener(event -> { detectButton.addActionListener(event -> {
if (buttonStatus.isNotExecuting()) { if (buttonStatus.isNotExecuting()) {
startDetecting(); startDetecting();
@ -284,6 +285,7 @@ public class EnvDetectorDialog extends JDialog {
UIUtil.invokeLaterIfNeeded(() -> { UIUtil.invokeLaterIfNeeded(() -> {
// 刷新按钮 // 刷新按钮
detectButton.setText(buttonStatus.getDesc()); detectButton.setText(buttonStatus.getDesc());
detectButton.setToolTipText(detectButton.getText());
// 刷新面板 // 刷新面板
refreshBody(); refreshBody();
}); });
@ -293,6 +295,7 @@ public class EnvDetectorDialog extends JDialog {
// 刷新按钮 // 刷新按钮
detectButton.setText(buttonStatus.getDesc()); detectButton.setText(buttonStatus.getDesc());
detectButton.setToolTipText(detectButton.getText());
if (buttonStatus == EnvDetectorButtonStatus.A_NEW) { if (buttonStatus == EnvDetectorButtonStatus.A_NEW) {
this.resultSummaryPane = new JPanel(); this.resultSummaryPane = new JPanel();
this.resultSummaryPane.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 0)); this.resultSummaryPane.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 0));
@ -358,6 +361,7 @@ public class EnvDetectorDialog extends JDialog {
} }
EnvDetectorItem item = items.get(i); EnvDetectorItem item = items.get(i);
tablePanel.updateCell(row, 2, new UILabel(item.getDescription())); tablePanel.updateCell(row, 2, new UILabel(item.getDescription()));
tablePanel.updateCellToolTip(row, 2, item.getDescription());
DetectorResult result = item.getResult(); DetectorResult result = item.getResult();
int detectRow = currentDetectIndex + 1; int detectRow = currentDetectIndex + 1;

Loading…
Cancel
Save