Browse Source

Pull request #8871: REPORT-71217 alphafine仅开启模版时,还会出现产品动态一键处理的按钮 && REPORT-71160 交互问题 REPORT-67417 处理配置空值场景 REPORT-71221 使用alt+ f4 , alphafine面板仍会保留上一次搜索结果

Merge in DESIGN/design from ~HADES/design:release/11.0 to release/11.0

* commit 'f57f3b1fe15c8e892c96ff2312e60b304054a9be':
  REPORT-71160 交互问题
  REPORT-67417 处理配置空值场景
  REPORT-71221 使用alt+ f4 , alphafine面板仍会保留上一次搜索结果
  REPORT-71217 alphafine仅开启模版时,还会出现产品动态一键处理的按钮
release/11.0
Hades 3 years ago
parent
commit
e97d00b547
  1. 12
      designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineConfigManager.java
  2. 8
      designer-realize/src/main/java/com/fr/design/mainframe/alphafine/component/AlphaFineFrame.java
  3. 4
      designer-realize/src/main/java/com/fr/design/mainframe/alphafine/component/AlphaFineList.java

12
designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineConfigManager.java

@ -192,9 +192,12 @@ public class AlphaFineConfigManager implements XMLable {
if (tmpVal != null) { if (tmpVal != null) {
tmpVal = tmpVal.replace("[",StringUtils.EMPTY).replace("]",StringUtils.EMPTY); tmpVal = tmpVal.replace("[",StringUtils.EMPTY).replace("]",StringUtils.EMPTY);
Stack<String> stack = new SizedStack<>(3); Stack<String> stack = new SizedStack<>(3);
List<String> historyList = Arrays.asList(tmpVal.split(",")); String[] historyList = tmpVal.split(",");
for (String history : historyList) { for (String history : historyList) {
stack.add(history.trim()); String value = history.trim();
if (StringUtils.isNotEmpty(value)) {
stack.add(value);
}
} }
historySearchMap.put(reader.getAttrAsString("user", StringUtils.EMPTY), stack); historySearchMap.put(reader.getAttrAsString("user", StringUtils.EMPTY), stack);
} }
@ -215,7 +218,10 @@ public class AlphaFineConfigManager implements XMLable {
String[] idArr = tmpVal.split(","); String[] idArr = tmpVal.split(",");
Set<Long> setId = new HashSet<>(); Set<Long> setId = new HashSet<>();
for (String id : idArr) { for (String id : idArr) {
setId.add(Long.parseLong(id.trim())); String value = id.trim();
if (StringUtils.isNotEmpty(value)) {
setId.add(Long.parseLong(value));
}
} }
readSetMap.put(reader.getAttrAsString("user", StringUtils.EMPTY), setId); readSetMap.put(reader.getAttrAsString("user", StringUtils.EMPTY), setId);
} }

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

@ -385,6 +385,11 @@ public class AlphaFineFrame extends JFrame {
selectedLabelList.add(new SelectedLabel(PLUGIN, CellType.PLUGIN)); selectedLabelList.add(new SelectedLabel(PLUGIN, CellType.PLUGIN));
} }
selectedType = selectedLabelList.get(0).getCellType(); selectedType = selectedLabelList.get(0).getCellType();
// 第一个tab 非产品动态
if (selectedType != CellType.PRODUCT_NEWS) {
tabLabel.setText(selectedLabelList.get(0).getText());
readLabel.setVisible(false);
}
for (SelectedLabel selectedLabel : selectedLabelList) { for (SelectedLabel selectedLabel : selectedLabelList) {
selectedLabel.addMouseListener(new MouseAdapter() { selectedLabel.addMouseListener(new MouseAdapter() {
@ -803,6 +808,9 @@ public class AlphaFineFrame extends JFrame {
public void setVisible(boolean b) { public void setVisible(boolean b) {
super.setVisible(b); super.setVisible(b);
QuestionWindow.getInstance().setVisible(!b); QuestionWindow.getInstance().setVisible(!b);
if (!b) {
AlphaFineHelper.resetAlphaFineDialog();
}
} }
@Override @Override

4
designer-realize/src/main/java/com/fr/design/mainframe/alphafine/component/AlphaFineList.java

@ -49,6 +49,10 @@ public class AlphaFineList extends JList<AlphaCellModel> {
@Override @Override
public void keyPressed(KeyEvent e) { public void keyPressed(KeyEvent e) {
if (e.getKeyCode() == KeyEvent.VK_ENTER) { if (e.getKeyCode() == KeyEvent.VK_ENTER) {
AlphaCellModel selectedValue = getSelectedValue();
if (selectedValue.hasAction() && !(selectedValue instanceof DocumentModel)) {
AlphaFineHelper.getAlphaFineDialog().toBack();
}
dealWithSearchResult(); dealWithSearchResult();
} }
} }

Loading…
Cancel
Save