Browse Source

Pull request #9170: REPORT-71476 新建保存后,目录没有选中模板,重命名不应该高亮 && REPORT-73532 F0017埋点新增content

Merge in DESIGN/design from ~HADES/design:feature/x to feature/x

* commit '652f8ac9a5aaf174fa7591bfe28a7dd77131751a':
  REPORT-73532 F0017埋点新增content
  REPORT-71476 新建保存后,目录没有选中模板,重命名不应该高亮
feature/x
Hades 2 years ago
parent
commit
ee9fb53762
  1. 1
      designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java
  2. 11
      designer-realize/src/main/java/com/fr/design/mainframe/alphafine/component/ProductNewsList.java

1
designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java

@ -1769,6 +1769,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
refreshToolArea(); refreshToolArea();
} }
DesignerFrameFileDealerPane.getInstance().refresh(); DesignerFrameFileDealerPane.getInstance().refresh();
DesignerFrameFileDealerPane.getInstance().stateChange();
} }
}); });
return worker; return worker;

11
designer-realize/src/main/java/com/fr/design/mainframe/alphafine/component/ProductNewsList.java

@ -4,6 +4,7 @@ import com.fr.design.DesignerEnvManager;
import com.fr.design.mainframe.alphafine.AlphaFineConstants; import com.fr.design.mainframe.alphafine.AlphaFineConstants;
import com.fr.design.mainframe.alphafine.AlphaFineHelper; import com.fr.design.mainframe.alphafine.AlphaFineHelper;
import com.fr.design.mainframe.alphafine.model.ProductNews; import com.fr.design.mainframe.alphafine.model.ProductNews;
import com.fr.design.utils.BrowseUtils;
import com.fr.log.FineLoggerFactory; import com.fr.log.FineLoggerFactory;
import java.awt.Cursor; import java.awt.Cursor;
@ -63,15 +64,15 @@ public class ProductNewsList extends JList<ProductNews> {
private void dealWithClick() { private void dealWithClick() {
ProductNews productNews = getSelectedValue(); ProductNews productNews = getSelectedValue();
try { jumpToUrl(productNews.getUrl());
Desktop.getDesktop().browse(new URI(productNews.getUrl()));
} catch (Exception e) {
FineLoggerFactory.getLogger().error(e.getMessage(), e);
}
DesignerEnvManager.getEnvManager().getAlphaFineConfigManager().getReadSet().add(productNews.getId()); DesignerEnvManager.getEnvManager().getAlphaFineConfigManager().getReadSet().add(productNews.getId());
AlphaFineHelper.getAlphaFineDialog().repaint(); AlphaFineHelper.getAlphaFineDialog().repaint();
} }
private void jumpToUrl(String url) {
BrowseUtils.browser(url);
}
public int getHoverIndex() { public int getHoverIndex() {
return hoverIndex; return hoverIndex;
} }

Loading…
Cancel
Save