Browse Source

Pull request #9850: REPORT-78860【运营产品化二期】断网情况下搜索模板资源应该显示网络连接失败缺醒图

Merge in DESIGN/design from ~LINK.ZHAO/design:feature/x to feature/x

* commit '860c7c5071a34eb67ef3994bd54fc8b95cb03446':
  REPORT-78626【运营产品化二期】模板商城进入二级界面后,关闭alphafine,再次打开不应该显示上次点开的页面 修改切换页面的逻辑
  REPORT-78860【运营产品化二期】断网情况下搜索模板资源应该显示网络连接失败缺醒图 修改结果显示逻辑
feature/x
Link.Zhao 2 years ago
parent
commit
49528f230e
  1. 2
      designer-realize/src/main/java/com/fr/design/mainframe/alphafine/component/AlphaFineFrame.java
  2. 8
      designer-realize/src/main/java/com/fr/design/mainframe/alphafine/preview/TemplateShopPane.java
  3. 3
      designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/TemplateResourceSearchWorkerManager.java

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

@ -584,7 +584,7 @@ public class AlphaFineFrame extends JFrame {
switchType(CellType.PLUGIN); switchType(CellType.PLUGIN);
break; break;
case TEMPLATE_SHOP: case TEMPLATE_SHOP:
TemplateShopPane.getInstance().showPagePane(); TemplateShopPane.getInstance().showResult();
switchType(CellType.TEMPLATE_SHOP); switchType(CellType.TEMPLATE_SHOP);
break; break;
} }

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

@ -71,8 +71,12 @@ public class TemplateShopPane extends JPanel {
} }
} }
public void showPagePane() { public void showResult() {
switchCard(PAGE_PANEL); if (Strings.isEmpty(AlphaFineHelper.getAlphaFineDialog().getSearchText())) {
switchCard(DEFAULT_PAGE_PANEL);
} else {
switchCard(PAGE_PANEL);
}
} }
// 打开二级页面,显示详细信息 // 打开二级页面,显示详细信息

3
designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/TemplateResourceSearchWorkerManager.java

@ -38,13 +38,12 @@ public class TemplateResourceSearchWorkerManager implements SearchManager {
public void doSearch(SearchTextBean searchTextBean) { public void doSearch(SearchTextBean searchTextBean) {
checkSearchWork(); checkSearchWork();
searchOver = false; searchOver = false;
networkError = false;
this.searchWorker = new SwingWorker<List<TemplateResource>, Void>() { this.searchWorker = new SwingWorker<List<TemplateResource>, Void>() {
@Override @Override
protected List<TemplateResource> doInBackground() { protected List<TemplateResource> doInBackground() {
List<TemplateResource> list; List<TemplateResource> list;
if (!AlphaFineHelper.isNetworkOk() && cellType.isNeedNetWork()) { if (!AlphaFineHelper.isNetworkOk()) {
networkError = true; networkError = true;
FineLoggerFactory.getLogger().warn("alphaFine network error"); FineLoggerFactory.getLogger().warn("alphaFine network error");
} }

Loading…
Cancel
Save