Browse Source

Pull request #14585: REPORT-130368 版本管理自动清理不会触发 & REPORT-130872 FBP设计器和平台 新建sql数据集,设置公式参数保存后再次打开没有保存上

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

* commit '46d3bcc5941b19d850e4c1dce0276bfbcf9d53ac':
  REPORT-130872 FBP设计器和平台 新建sql数据集,设置公式参数保存后再次打开没有保存上
  REPORT-130368 版本管理自动清理不会触发
fbp-1.0
Destiny.Lin-林锦龙 3 months ago
parent
commit
30d3a81139
  1. 3
      designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java
  2. 9
      designer-realize/src/main/java/com/fanruan/boot/env/function/DesignDatasourceComponent.java

3
designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java

@ -523,6 +523,9 @@ public class PreferencePane extends BasicPane {
autoCleanPane.add(autoCleanRetainIntervalComboBox);
autoCleanPane.add(new UILabel(i18nText("Fine-Design_Vcs_Auto_Clean_Last")));
autoCleanPane.setVisible(false);
if (WorkContext.getCurrent().isLocal()) {
return new JPanel();
}
return autoCleanPane;
}

9
designer-realize/src/main/java/com/fanruan/boot/env/function/DesignDatasourceComponent.java vendored

@ -12,6 +12,11 @@ import com.fanruan.config.impl.data.ConnectionConfigWriter;
import com.fanruan.config.impl.data.ConnectionConfigWriterFactory;
import com.fanruan.config.impl.data.TableDataConfigProviderFactory;
import com.fanruan.data.ConnectionConfigWrapper;
import com.fr.base.MultiParameterParser;
import com.fr.base.ParameterType;
import com.fr.base.ParameterTypeHandler;
import com.fr.base.parameter.FormulaParameterParser;
import com.fr.base.parameter.TableColumnParameterParser;
import com.fr.data.driver.classloader.DriverClassLoaderHelper;
import com.fr.data.driver.classloader.impl.ChildFirstDriverClassLoader;
import com.fr.data.driver.classloader.impl.ChildOnlyDriverClassLoader;
@ -65,6 +70,10 @@ public class DesignDatasourceComponent extends DatasourceComponent {
registerDriverClassLoader();
ConnectionConfigWriterFactory.registerConnectionConfigWriter((ConnectionConfigWriter) ConnectionConfigProviderFactory.getConfigProvider());
Carina.getApplicationContext().singleton(ConnectionWriterShell.class).set(ConnectionConfigWriterFactory.getConfigWriter());
ParameterTypeHandler.getInstance().addParser(ParameterType.Multi.name(), new MultiParameterParser());
ParameterTypeHandler.getInstance().addParser(ParameterType.JSONArray.name(), new MultiParameterParser());
ParameterTypeHandler.getInstance().addParser(ParameterType.Formula.name(), new FormulaParameterParser());
ParameterTypeHandler.getInstance().addParser(ParameterType.TableColumn.name(), new TableColumnParameterParser());
}
private void registerDriverClassLoader() {

Loading…
Cancel
Save