Commit 9dbf5780 by Nepxion

增加图形化灰度发布功能

parent 8314df06
...@@ -448,10 +448,14 @@ public class ServiceTopology extends AbstractTopology { ...@@ -448,10 +448,14 @@ public class ServiceTopology extends AbstractTopology {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private JBasicTextField dynamicVersionTextField; private JBasicTextField dynamicVersionTextField;
private JPanel dynamicVersionPanel;
private JBasicTextField localVersionTextField; private JBasicTextField localVersionTextField;
private JPanel localVersionPanel;
private JBasicTabbedPane versionTabbedPane;
private JBasicTextArea dynamicRuleTextArea; private JBasicTextArea dynamicRuleTextArea;
private JBasicTextArea localRuleTextArea; private JBasicTextArea localRuleTextArea;
private JBasicTabbedPane ruleTabbedPane;
public GrayPanel() { public GrayPanel() {
setLayout(new BorderLayout()); setLayout(new BorderLayout());
...@@ -461,22 +465,22 @@ public class ServiceTopology extends AbstractTopology { ...@@ -461,22 +465,22 @@ public class ServiceTopology extends AbstractTopology {
private JPanel createVersionPanel() { private JPanel createVersionPanel() {
dynamicVersionTextField = new JBasicTextField(); dynamicVersionTextField = new JBasicTextField();
JPanel dynamicVersionPanel = new JPanel(); dynamicVersionPanel = new JPanel();
dynamicVersionPanel.setBorder(BorderFactory.createEmptyBorder(5, 0, 5, 0)); dynamicVersionPanel.setBorder(BorderFactory.createEmptyBorder(5, 0, 5, 0));
dynamicVersionPanel.setLayout(new BorderLayout()); dynamicVersionPanel.setLayout(new BorderLayout());
dynamicVersionPanel.add(dynamicVersionTextField, BorderLayout.CENTER); dynamicVersionPanel.add(dynamicVersionTextField, BorderLayout.CENTER);
localVersionTextField = new JBasicTextField(); localVersionTextField = new JBasicTextField();
localVersionTextField.setEditable(false); localVersionTextField.setEditable(false);
JPanel localVersionPanel = new JPanel(); localVersionPanel = new JPanel();
localVersionPanel.setBorder(BorderFactory.createEmptyBorder(5, 0, 5, 0)); localVersionPanel.setBorder(BorderFactory.createEmptyBorder(5, 0, 5, 0));
localVersionPanel.setLayout(new BorderLayout()); localVersionPanel.setLayout(new BorderLayout());
localVersionPanel.add(localVersionTextField, BorderLayout.CENTER); localVersionPanel.add(localVersionTextField, BorderLayout.CENTER);
JBasicTabbedPane tabbedPane = new JBasicTabbedPane(); versionTabbedPane = new JBasicTabbedPane();
tabbedPane.setPreferredSize(new Dimension(tabbedPane.getPreferredSize().width, 75)); versionTabbedPane.setPreferredSize(new Dimension(versionTabbedPane.getPreferredSize().width, 75));
tabbedPane.addTab("灰度(动态)版本", dynamicVersionPanel, "灰度(动态)版本"); versionTabbedPane.addTab("灰度(动态)版本", dynamicVersionPanel, "灰度(动态)版本");
tabbedPane.addTab("初始(本地)版本", localVersionPanel, "初始(本地)版本"); versionTabbedPane.addTab("初始(本地)版本", localVersionPanel, "初始(本地)版本");
JClassicButton updateButton = new JClassicButton(createUpdateVersionAction()); JClassicButton updateButton = new JClassicButton(createUpdateVersionAction());
updateButton.setPreferredSize(new Dimension(updateButton.getPreferredSize().width, 30)); updateButton.setPreferredSize(new Dimension(updateButton.getPreferredSize().width, 30));
...@@ -493,7 +497,7 @@ public class ServiceTopology extends AbstractTopology { ...@@ -493,7 +497,7 @@ public class ServiceTopology extends AbstractTopology {
JPanel panel = new JPanel(); JPanel panel = new JPanel();
panel.setBorder(UIUtil.createTitledBorder("版本灰度")); panel.setBorder(UIUtil.createTitledBorder("版本灰度"));
panel.setLayout(new BorderLayout()); panel.setLayout(new BorderLayout());
panel.add(tabbedPane, BorderLayout.CENTER); panel.add(versionTabbedPane, BorderLayout.CENTER);
panel.add(toolBar, BorderLayout.SOUTH); panel.add(toolBar, BorderLayout.SOUTH);
return panel; return panel;
...@@ -504,9 +508,9 @@ public class ServiceTopology extends AbstractTopology { ...@@ -504,9 +508,9 @@ public class ServiceTopology extends AbstractTopology {
localRuleTextArea.setEditable(false); localRuleTextArea.setEditable(false);
dynamicRuleTextArea = new JBasicTextArea(); dynamicRuleTextArea = new JBasicTextArea();
JBasicTabbedPane tabbedPane = new JBasicTabbedPane(); ruleTabbedPane = new JBasicTabbedPane();
tabbedPane.addTab("灰度(动态)规则", new JBasicScrollPane(dynamicRuleTextArea), "灰度(动态)规则"); ruleTabbedPane.addTab("灰度(动态)规则", new JBasicScrollPane(dynamicRuleTextArea), "灰度(动态)规则");
tabbedPane.addTab("初始(本地)规则", new JBasicScrollPane(localRuleTextArea), "初始(本地)规则"); ruleTabbedPane.addTab("初始(本地)规则", new JBasicScrollPane(localRuleTextArea), "初始(本地)规则");
JClassicButton updateButton = new JClassicButton(createUpdateRuleAction()); JClassicButton updateButton = new JClassicButton(createUpdateRuleAction());
updateButton.setPreferredSize(new Dimension(updateButton.getPreferredSize().width, 30)); updateButton.setPreferredSize(new Dimension(updateButton.getPreferredSize().width, 30));
...@@ -523,7 +527,7 @@ public class ServiceTopology extends AbstractTopology { ...@@ -523,7 +527,7 @@ public class ServiceTopology extends AbstractTopology {
JPanel panel = new JPanel(); JPanel panel = new JPanel();
panel.setBorder(UIUtil.createTitledBorder("规则灰度")); panel.setBorder(UIUtil.createTitledBorder("规则灰度"));
panel.setLayout(new BorderLayout()); panel.setLayout(new BorderLayout());
panel.add(tabbedPane, BorderLayout.CENTER); panel.add(ruleTabbedPane, BorderLayout.CENTER);
panel.add(toolBar, BorderLayout.SOUTH); panel.add(toolBar, BorderLayout.SOUTH);
return panel; return panel;
...@@ -531,11 +535,25 @@ public class ServiceTopology extends AbstractTopology { ...@@ -531,11 +535,25 @@ public class ServiceTopology extends AbstractTopology {
public void setGray(InstanceEntity instance) { public void setGray(InstanceEntity instance) {
if (instance != null) { if (instance != null) {
if (versionTabbedPane.getTabCount() == 1) {
versionTabbedPane.addTab("初始(本地)版本", localVersionPanel, "初始(本地)版本");
}
if (ruleTabbedPane.getTabCount() == 1) {
ruleTabbedPane.addTab("初始(本地)规则", new JBasicScrollPane(localRuleTextArea), "初始(本地)规则");
}
localVersionTextField.setText(instance.getVersion()); localVersionTextField.setText(instance.getVersion());
dynamicVersionTextField.setText(instance.getDynamicVersion()); dynamicVersionTextField.setText(instance.getDynamicVersion());
localRuleTextArea.setText(instance.getRule()); localRuleTextArea.setText(instance.getRule());
dynamicRuleTextArea.setText(instance.getDynamicRule()); dynamicRuleTextArea.setText(instance.getDynamicRule());
} else { } else {
if (versionTabbedPane.getTabCount() == 2) {
versionTabbedPane.remove(1);
}
if (ruleTabbedPane.getTabCount() == 2) {
ruleTabbedPane.remove(1);
}
localVersionTextField.setText(""); localVersionTextField.setText("");
dynamicVersionTextField.setText(""); dynamicVersionTextField.setText("");
localRuleTextArea.setText(""); localRuleTextArea.setText("");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment