Browse Source

REPORT-75093 运营产品化二期

pr修改
feature/x
Link.Zhao 2 years ago
parent
commit
ce6b666d6a
  1. 4
      designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineConfigPane.java
  2. 8
      designer-realize/src/main/java/com/fr/design/mainframe/alphafine/component/RecommendSearchPane.java
  3. 7
      designer-realize/src/main/java/com/fr/design/mainframe/alphafine/component/TemplateResourcePanel.java
  4. 8
      designer-realize/src/main/java/com/fr/design/mainframe/alphafine/preview/TemplateResourceDetailPane.java

4
designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineConfigPane.java

@ -37,7 +37,7 @@ import java.awt.event.MouseEvent;
public class AlphaFineConfigPane extends BasicPane { public class AlphaFineConfigPane extends BasicPane {
private static final String TYPE = "pressed"; private static final String TYPE = "pressed";
private static final String DISPLAY_TYPE = "+"; private static final String DISPLAY_TYPE = "+";
private static final Color LABEL_TEXT = new Color(0x919193);
private static final double COLUMN_WIDTH = 150; private static final double COLUMN_WIDTH = 150;
private static final double ROW_HEIGHT = 25; private static final double ROW_HEIGHT = 25;
@ -177,7 +177,7 @@ public class AlphaFineConfigPane extends BasicPane {
northPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Open") + ":")); northPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Open") + ":"));
northPane.add(shortcutsField); northPane.add(shortcutsField);
UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_AlphaFine_SetShortcuts")); UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_AlphaFine_SetShortcuts"));
label.setForeground(new Color(0x919193)); label.setForeground(LABEL_TEXT);
northPane.add(label); northPane.add(label);
contentPane.add(northPane); contentPane.add(northPane);
} }

8
designer-realize/src/main/java/com/fr/design/mainframe/alphafine/component/RecommendSearchPane.java

@ -16,12 +16,16 @@ import java.util.List;
public class RecommendSearchPane extends TemplateResourcePanel { public class RecommendSearchPane extends TemplateResourcePanel {
private static final Color BORDER_WHITE = new Color(0xe8e8e9);
private static final Color RECOMMEND_SEARCH_KEY_BLUE = new Color(0x419bf9);
public RecommendSearchPane(TemplateResource templateResource) { public RecommendSearchPane(TemplateResource templateResource) {
super(); super();
setTemplateResource(templateResource); setTemplateResource(templateResource);
initComponent(); initComponent();
this.setLayout(new BorderLayout()); this.setLayout(new BorderLayout());
this.setBorder(BorderFactory.createLineBorder(new Color(0xe8e8e9), 1));
this.setBorder(BorderFactory.createLineBorder(BORDER_WHITE, 1));
this.add(getNorthPane(), BorderLayout.NORTH); this.add(getNorthPane(), BorderLayout.NORTH);
this.add(getSouthPane(), BorderLayout.SOUTH); this.add(getSouthPane(), BorderLayout.SOUTH);
} }
@ -55,7 +59,7 @@ public class RecommendSearchPane extends TemplateResourcePanel {
this.searchKey = searchKey; this.searchKey = searchKey;
setText(searchKey); setText(searchKey);
setBackground(Color.WHITE); setBackground(Color.WHITE);
setForeground(new Color(0x419bf9)); setForeground(RECOMMEND_SEARCH_KEY_BLUE);
addMouseListener(new MouseAdapter() { addMouseListener(new MouseAdapter() {
@Override @Override
public void mouseClicked(MouseEvent e) { public void mouseClicked(MouseEvent e) {

7
designer-realize/src/main/java/com/fr/design/mainframe/alphafine/component/TemplateResourcePanel.java

@ -22,6 +22,9 @@ public class TemplateResourcePanel extends JPanel {
private JPanel southPane; private JPanel southPane;
private TemplateResource templateResource; private TemplateResource templateResource;
private static final Color PANEL_BORDER_COLOR = new Color(0xe8e8e9);
private static final Color DEMO_LABEL_FOREGROUND = new Color(0x419bf9);
protected TemplateResourcePanel() { protected TemplateResourcePanel() {
} }
@ -30,7 +33,7 @@ public class TemplateResourcePanel extends JPanel {
this.templateResource = templateResource; this.templateResource = templateResource;
initComponent(); initComponent();
this.setLayout(new BorderLayout()); this.setLayout(new BorderLayout());
this.setBorder(BorderFactory.createLineBorder(new Color(0xe8e8e9), 1)); this.setBorder(BorderFactory.createLineBorder(PANEL_BORDER_COLOR, 1));
this.add(northPane, BorderLayout.NORTH); this.add(northPane, BorderLayout.NORTH);
this.add(southPane, BorderLayout.SOUTH); this.add(southPane, BorderLayout.SOUTH);
addAction(); addAction();
@ -93,7 +96,7 @@ public class TemplateResourcePanel extends JPanel {
JLabel demoLabel = new JLabel(); JLabel demoLabel = new JLabel();
if (templateResource.hasDemoUrl()) { if (templateResource.hasDemoUrl()) {
demoLabel.setText(Toolkit.i18nText("Fine-Design_Report_AlphaFine_Template_Resource_Demo")); demoLabel.setText(Toolkit.i18nText("Fine-Design_Report_AlphaFine_Template_Resource_Demo"));
demoLabel.setForeground(new Color(0x419bf9)); demoLabel.setForeground(DEMO_LABEL_FOREGROUND);
demoLabel.addMouseListener(new MouseAdapter() { demoLabel.addMouseListener(new MouseAdapter() {
@Override @Override
public void mouseClicked(MouseEvent e) { public void mouseClicked(MouseEvent e) {

8
designer-realize/src/main/java/com/fr/design/mainframe/alphafine/preview/TemplateResourceDetailPane.java

@ -53,6 +53,10 @@ public class TemplateResourceDetailPane extends JPanel {
private static final String RMB = "¥"; private static final String RMB = "¥";
private static final Color INFO_PANE_BACKGROUND = new Color(0xf9f9f9);
private static final Color INFO_PANE_FOREGROUND = new Color(0x5b5b5c);
public TemplateResourceDetailPane(TemplateResourceDetail detail) { public TemplateResourceDetailPane(TemplateResourceDetail detail) {
this.data = detail; this.data = detail;
initComponent(); initComponent();
@ -147,8 +151,8 @@ public class TemplateResourceDetailPane extends JPanel {
sb.append(data.getInfo()); sb.append(data.getInfo());
sb.append("</p></body></html>"); sb.append("</p></body></html>");
content.setText(sb.toString()); content.setText(sb.toString());
content.setBackground(new Color(0xf9f9f9)); content.setBackground(INFO_PANE_BACKGROUND);
content.setForeground(new Color(0x5b5b5c)); content.setForeground(INFO_PANE_FOREGROUND);
content.setPreferredSize(new Dimension(SCROLL_PANE_WIDTH - 10, TEXT_SCROLL_PANE_HEIGHT)); content.setPreferredSize(new Dimension(SCROLL_PANE_WIDTH - 10, TEXT_SCROLL_PANE_HEIGHT));
infoScrollPane = new UIScrollPane(content); infoScrollPane = new UIScrollPane(content);
infoScrollPane.setPreferredSize(new Dimension(SCROLL_PANE_WIDTH, SCROLL_PANE_HEIGHT - 25)); infoScrollPane.setPreferredSize(new Dimension(SCROLL_PANE_WIDTH, SCROLL_PANE_HEIGHT - 25));

Loading…
Cancel
Save