Browse Source

Pull request #14532: REPORT-114392 FR-FBP版本本地设计适配 修复部分问题

Merge in DESIGN/design from ~DESTINY.LIN/design:fbp-1.0 to fbp-1.0

* commit 'f239baf4263375c166bcc8e089a3716cb3de7188':
  REPORT-114392 FR-FBP版本本地设计适配 修复部分问题
fbp-1.0
Destiny.Lin-林锦龙 4 months ago
parent
commit
02edd53e69
  1. 2
      designer-base/src/main/java/com/fr/design/data/datapane/preview/TableDataBeanHelper.java
  2. 3
      designer-realize/src/main/java/com/fr/design/actions/file/newReport/NewWorkBookAction.java

2
designer-base/src/main/java/com/fr/design/data/datapane/preview/TableDataBeanHelper.java

@ -117,7 +117,7 @@ public class TableDataBeanHelper {
if (connection != null) {
tableData.setDatabase(new NameDatabaseConnection(bean.getDatabase()));
} else {
throw new RuntimeException("not find conn by " + bean.getDatabase());
FineLoggerFactory.getLogger().error("not find conn by {}", bean.getDatabase());
}
String sql = SqlUtils.clearSqlComments(DataEncryptionHelper.decrypt(bean.getQuery()));
Parameter[] parameters = new Parameter[bean.getParameters().size()];

3
designer-realize/src/main/java/com/fr/design/actions/file/newReport/NewWorkBookAction.java

@ -3,6 +3,7 @@ package com.fr.design.actions.file.newReport;
import com.fr.base.svg.IconUtils;
import com.fr.design.actions.UpdateAction;
import com.fr.design.cache.DesignCacheManager;
import com.fr.design.mainframe.DesignerContext;
import com.fr.design.mainframe.JWorkBook;
import com.fr.design.menu.MenuKeySet;
@ -35,7 +36,7 @@ public class NewWorkBookAction extends UpdateAction {
* @param e 事件
*/
public void actionPerformed(ActionEvent e) {
DesignerContext.getDesignerFrame().addAndActivateJTemplate(new JWorkBook());
DesignCacheManager.processByCacheTableData(() -> DesignerContext.getDesignerFrame().addAndActivateJTemplate(new JWorkBook()));
}
public static final MenuKeySet NEW_WORK_BOOK = new MenuKeySet() {

Loading…
Cancel
Save