Browse Source

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

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

* commit 'c80d70652d4d3af72b37768ef5dd377db27238ca':
  REPORT-114392 FR-FBP版本本地设计适配 修复参数面板细节问题,去除decode,后续再考虑
  REPORT-130348  控件管理读取的内容,本地和远程感觉读的是同一套
fbp-1.0
Destiny.Lin-林锦龙 4 months ago
parent
commit
7a95bf1abe
  1. 7
      designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ProcedureDataPane.java
  2. 2
      designer-realize/src/main/java/com/fanruan/boot/env/DesignEnvComponent.java

7
designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ProcedureDataPane.java

@ -35,6 +35,8 @@ import com.fr.design.utils.gui.GUICoreUtils;
import com.fr.log.FineLoggerFactory; import com.fr.log.FineLoggerFactory;
import com.fr.stable.ArrayUtils; import com.fr.stable.ArrayUtils;
import com.fr.stable.StringUtils; import com.fr.stable.StringUtils;
import com.fr.workspace.server.entity.connection.ConnectionBean;
import com.fr.workspace.server.repository.connection.ConnectionRepository;
import javax.swing.BorderFactory; import javax.swing.BorderFactory;
import javax.swing.Box; import javax.swing.Box;
@ -176,8 +178,9 @@ public class ProcedureDataPane extends AbstractTableDataPane<StoreProcedure> imp
} }
private boolean isAutoParameterDatabase() { private boolean isAutoParameterDatabase() {
Connection connection = ConnectionConfigProviderFactory.getConfigProvider().getConnection(connectionTableProcedurePane.getSelectedDatabaseConnnectonName()); ConnectionBean bean = ConnectionRepository.getInstance().getByName(connectionTableProcedurePane.getSelectedDatabaseConnnectonName());
return connection == null ? false : ArrayUtils.contains(DRIVERS, connection.getDriver()); Connection connection = bean == null ? null : bean.getConnection();
return connection != null && ArrayUtils.contains(DRIVERS, connection.getDriver());
} }
@Override @Override

2
designer-realize/src/main/java/com/fanruan/boot/env/DesignEnvComponent.java vendored

@ -31,6 +31,7 @@ import com.fr.cbb.dialect.security.InsecurityElementFactory;
import com.fr.cluster.ClusterBridge; import com.fr.cluster.ClusterBridge;
import com.fr.cluster.lock.ClusterLock; import com.fr.cluster.lock.ClusterLock;
import com.fr.config.BaseDBEnv; import com.fr.config.BaseDBEnv;
import com.fr.config.ConfigContext;
import com.fr.config.ConfigEvent; import com.fr.config.ConfigEvent;
import com.fr.config.Configuration; import com.fr.config.Configuration;
import com.fr.config.FinalPreferenceConfig; import com.fr.config.FinalPreferenceConfig;
@ -361,6 +362,7 @@ public class DesignEnvComponent {
DaoContext.setEntityDao(null); DaoContext.setEntityDao(null);
DaoContext.setXmlEntityDao(null); DaoContext.setXmlEntityDao(null);
Configurations.setHelper(null); Configurations.setHelper(null);
ConfigContext.destroyAllConfig();
} }
/** /**

Loading…
Cancel
Save