diff --git a/designer-base/src/main/java/com/fine/theme/light/ui/FineHeaderPaneUI.java b/designer-base/src/main/java/com/fine/theme/light/ui/FineHeaderPaneUI.java index 4555096842..ea07516938 100644 --- a/designer-base/src/main/java/com/fine/theme/light/ui/FineHeaderPaneUI.java +++ b/designer-base/src/main/java/com/fine/theme/light/ui/FineHeaderPaneUI.java @@ -18,6 +18,7 @@ import java.awt.FontMetrics; import java.awt.Graphics; import java.awt.Graphics2D; import java.awt.Insets; +import java.awt.RenderingHints; import java.awt.geom.AffineTransform; /** @@ -100,6 +101,8 @@ public class FineHeaderPaneUI extends PanelUI implements AnimatedPainter { + FineUIScale.scale(UIManager.getInt("ExpandablePane.HeaderPane.hGap")); float titleY = (headerPane.getHeight() - (ascent + descent)) / 2.0f + ascent; FlatUIUtils.setRenderingHints(g2d); + g2d.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING, RenderingHints.VALUE_TEXT_ANTIALIAS_LCD_HRGB); + g2d.drawString(headerPane.getTitle(), titleX, titleY); g2d.dispose(); } diff --git a/designer-base/src/main/java/com/fr/design/backup/EnvBackupHelper.java b/designer-base/src/main/java/com/fr/design/backup/EnvBackupHelper.java index 73d0cbc1b1..1dddbc2493 100644 --- a/designer-base/src/main/java/com/fr/design/backup/EnvBackupHelper.java +++ b/designer-base/src/main/java/com/fr/design/backup/EnvBackupHelper.java @@ -131,7 +131,7 @@ public class EnvBackupHelper { */ public void rollbackEnv() { if (origin instanceof RemoteWorkspace && ((RemoteWorkspace) origin).getClient() instanceof FineWorkspaceHttpClient) { - ((FineWorkspaceHttpClient) ((RemoteWorkspace) origin).getClient()).startHeartBeat(); + ((FineWorkspaceHttpClient) ((RemoteWorkspace) origin).getClient()).connect(); } } diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java index fed8b1269e..ed96b2697e 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java @@ -2,6 +2,7 @@ package com.fr.design.data.datapane.connect; import com.fanruan.config.impl.data.ConnectionConfigProviderFactory; import com.fanruan.config.impl.data.ConnectionConfigWriterFactory; +import com.fine.theme.utils.FineUIScale; import com.fr.config.remote.RemoteConfigEvent; import com.fine.theme.icon.LazyIcon; import com.fr.data.impl.Connection; @@ -16,6 +17,7 @@ import com.fr.design.fun.ConnectionProvider; import com.fr.design.gui.controlpane.JListControlPane; import com.fr.design.gui.controlpane.NameObjectCreator; import com.fr.design.gui.controlpane.NameableCreator; +import com.fr.design.gui.controlpane.ShortCut4JControlPane; import com.fr.design.gui.ilist.ListModelElement; import com.fr.design.i18n.Toolkit; import com.fr.event.EventDispatcher; @@ -95,6 +97,21 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh getSupportedTypesWorker.execute(); } + @Override + protected ShortCut4JControlPane[] createShortcuts() { + return new ShortCut4JControlPane[]{ + shortCutFactory.addItemShortCut(), + shortCutFactory.removeItemShortCut(), + shortCutFactory.copyItemShortCut(), + shortCutFactory.sortItemShortCut(), + }; + } + + @Override + protected int getLeftPreferredSize() { + return FineUIScale.scale(180); + } + @Override public String getEmptyNameTip() { return Toolkit.i18nText("Fine-Design_Basic_Connection_Empty_Name"); diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/preview/TableDataBeanHelper.java b/designer-base/src/main/java/com/fr/design/data/datapane/preview/TableDataBeanHelper.java index ad3f9ad14e..a5309a8ce0 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/preview/TableDataBeanHelper.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/preview/TableDataBeanHelper.java @@ -16,8 +16,10 @@ import com.fr.decision.webservice.bean.dataset.ParameterExternal; import com.fr.decision.webservice.bean.dataset.SQLDataSetBean; import com.fr.decision.webservice.bean.dataset.ServerDataSetBean; import com.fr.decision.webservice.bean.dataset.StoreProcedureBean; +import com.fr.decision.webservice.bean.dataset.StrategyConfigBean; import com.fr.decision.webservice.v10.datasource.dataset.processor.impl.SQLDataSetProcessor; import com.fr.decision.webservice.v10.datasource.dataset.processor.impl.StoreProcedureProcessor; +import com.fr.esd.core.strategy.config.StrategyConfig; import com.fr.general.GeneralUtils; import com.fr.general.sql.SqlUtils; import com.fr.json.JSONObject; @@ -29,6 +31,7 @@ import com.fr.stable.StringUtils; import com.fr.workspace.server.repository.connection.ConnectionRepository; import com.fr.workspace.server.repository.tabledata.DataEncryptionHelper; import com.fr.workspace.server.repository.tabledata.TableDataRepository; +import org.jetbrains.annotations.NotNull; import java.util.ArrayList; import java.util.HashMap; @@ -163,6 +166,22 @@ public class TableDataBeanHelper { parameterBeans.add(new ParameterBean(parameter.getValue().getClass().getSimpleName(), parameter.getName(), GeneralUtils.objectToString(parameter.getValue()))); } bean.setParameters(parameterBeans); + StrategyConfig config = dataSet.getStrategyConfig(); + if (config != null) { + StrategyConfigBean strategyConfigBean = new StrategyConfigBean(); + strategyConfigBean.setUseGlobal(config.isUseGlobal()); + strategyConfigBean.setShouldMonitor(config.shouldMonitor()); + strategyConfigBean.setShouldEvolve(config.shouldEvolve()); + strategyConfigBean.setScheduleBySchema(config.isScheduleBySchema()); + strategyConfigBean.setTimeToLive(config.getTimeToLive()); + strategyConfigBean.setTimeToIdle(config.getTimeToIdle()); + strategyConfigBean.setUpdateInterval(config.getUpdateInterval()); + strategyConfigBean.setTerminalTime(config.getTerminalTime()); + strategyConfigBean.setUpdateSchema(config.getUpdateSchema()); + strategyConfigBean.setActiveInitiation(config.isActiveInitiation()); + strategyConfigBean.setShare(config.enabled()); + bean.setStrategyConfig(strategyConfigBean); + } return JSONObject.mapFrom(bean); } @@ -190,6 +209,27 @@ public class TableDataBeanHelper { tableData.setShare(oldDataSet.isShare()); tableData.setDataQueryProcessor(oldDataSet.getDataQueryProcessor()); } + StrategyConfig config = getStrategyConfig(bean.getStrategyConfig()); + tableData.setStrategyConfig(config); return tableData; } + + private static StrategyConfig getStrategyConfig(StrategyConfigBean bean) { + if (bean == null) { + return new StrategyConfig(); + } + StrategyConfig config = new StrategyConfig(); + config.setEnable(bean.isShare()); + config.setUseGlobal(bean.isUseGlobal()); + config.setShouldMonitor(bean.isShouldMonitor()); + config.setShouldEvolve(bean.isShouldEvolve()); + config.setScheduleBySchema(bean.isScheduleBySchema()); + config.setTimeToLive(bean.getTimeToLive()); + config.setTimeToIdle(bean.getTimeToIdle()); + config.setUpdateInterval(bean.getUpdateInterval()); + config.setTerminalTime(bean.getTerminalTime()); + config.setUpdateSchema(bean.getUpdateSchema()); + config.setActiveInitiation(bean.isActiveInitiation()); + return config; + } } diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java index c8c827260e..dbe45885cc 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java @@ -165,7 +165,8 @@ public class DBTableDataPane extends AbstractTableDataPane implemen ParameterTableModel model = new ParameterTableModel() { @Override public UITableEditAction[] createAction() { - return ArrayUtils.add(super.createDBTableAction(), new RefreshAction()); + // 当前仅支持刷新参数功能 + return ArrayUtils.toArray(new RefreshAction()); } }; editorPane = new UITableEditorPane<>(model); diff --git a/designer-base/src/main/java/com/fr/design/env/HttpWorkspaceConnector.java b/designer-base/src/main/java/com/fr/design/env/HttpWorkspaceConnector.java index ce2cdab889..e1c2c5513e 100644 --- a/designer-base/src/main/java/com/fr/design/env/HttpWorkspaceConnector.java +++ b/designer-base/src/main/java/com/fr/design/env/HttpWorkspaceConnector.java @@ -4,6 +4,7 @@ import com.fanruan.workplace.http.HttpConstants; import com.fanruan.workplace.http.HttpServiceMap; import com.fanruan.workplace.http.RepositoryManager; import com.fanruan.workplace.http.info.Stub; +import com.fanruan.workplace.network.RemoteNetworkRepository; import com.fr.log.FineLoggerFactory; import com.fr.stable.StringUtils; import com.fr.workspace.engine.exception.RemoteDesignConnectionException; @@ -43,33 +44,20 @@ public class HttpWorkspaceConnector implements WorkspaceConnector { @Override public boolean testConnection(WorkspaceConnectionInfo connectionInfo) throws Exception { FineWorkspaceHttpClient client = FineWorkspaceHttpClient.create("Http-Client", connectionInfo); - LoginResponseInfoBean bean; try { - bean = RemoteAuthorityRepository.getInstance().login(createLoginBean(connectionInfo)); - checkValidAndUpdateInfo(client, connectionInfo, bean); + return testConnect(client, connectionInfo); } finally { client.closePool(); } - - return StringUtils.isNotEmpty(bean.getAccessToken()); } @Override public WorkspaceClient connect(WorkspaceConnectionInfo connectionInfo) throws Exception { FineWorkspaceHttpClient client = FineWorkspaceHttpClient.create("Http-Client", connectionInfo); try { - for (Map.Entry> entry : HttpServiceMap.getInstance().entrySet()) { - Stub stub = entry.getValue(); - stub.clearProxy(); - } - LoginResponseInfoBean bean = RemoteAuthorityRepository.getInstance().login(createLoginBean(connectionInfo)); - // 服务器如果没返回token，肯定是出问题了，直接抛出异常 - if (StringUtils.isEmpty(bean.getAccessToken())) { - throw new RuntimeException("Empty token, try connect again and check server"); + if (testConnect(client, connectionInfo)) { + client.connect(); } - FineLoggerFactory.getLogger().info("[connector] infos:{}", bean.getAccessToken()); - checkValidAndUpdateInfo(client, connectionInfo, bean); - client.startHeartBeat(); } catch (Exception e) { client.closePool(); throw e; @@ -79,28 +67,25 @@ public class HttpWorkspaceConnector implements WorkspaceConnector { return client; } - private void checkValidAndUpdateInfo(FineWorkspaceHttpClient client, WorkspaceConnectionInfo connectionInfo, LoginResponseInfoBean bean) throws Exception { + private boolean testConnect(FineWorkspaceHttpClient client, WorkspaceConnectionInfo connectionInfo) throws Exception { + for (Map.Entry> entry : HttpServiceMap.getInstance().entrySet()) { + Stub stub = entry.getValue(); + stub.clearProxy(); + } + LoginResponseInfoBean bean = RemoteAuthorityRepository.getInstance().login(createLoginBean(connectionInfo)); WorkspaceConnection connection = new WorkspaceConnection( UUID.randomUUID().toString(), connectionInfo.getUserName(), HttpConstants.AUTHORIZATION_PREFIX + bean.getAccessToken(), InetAddress.getLocalHost().getHostAddress()); client.updateConnection(connection); - // 检查远程权限 - if (!checkRemoteAuthority(connection)) { - // 无权限则抛出无权限的错 - throw new RemoteDesignNoAuthException(); - } - } - - private boolean checkRemoteAuthority(WorkspaceConnection connection) { try { - return RemoteAuthorityRepository.getInstance().isRoot(connection.getUserName()) || RemoteAuthorityRepository.getInstance().hasAuthority(connection.getUserName()); + return RemoteNetworkRepository.getInstance().testConnect(); + } catch (RemoteDesignNoAuthException e) { + throw e; } catch (Exception e) { - // 如果这里出现异常，就认为fr服务没启动 throw new RemoteDesignConnectionException(e, StringUtils.EMPTY); } - } private LoginRequestInfoBean createLoginBean(WorkspaceConnectionInfo connectionInfo) { diff --git a/designer-base/src/main/java/com/fr/design/env/RemoteWorkspace.java b/designer-base/src/main/java/com/fr/design/env/RemoteWorkspace.java index ca070219e5..177ff86931 100644 --- a/designer-base/src/main/java/com/fr/design/env/RemoteWorkspace.java +++ b/designer-base/src/main/java/com/fr/design/env/RemoteWorkspace.java @@ -13,6 +13,7 @@ import com.fr.workspace.connect.WorkspaceConnection; import com.fr.workspace.connect.WorkspaceConnectionInfo; import com.fr.workspace.server.authority.decision.DecisionOperator; import com.fr.workspace.pool.WorkObjectPool; +import com.fr.workspace.server.repository.WorkplaceConstants; import com.fr.workspace.server.repository.authority.RemoteAuthorityRepository; import javax.swing.SwingWorker; @@ -80,7 +81,7 @@ public class RemoteWorkspace implements Workspace { if (isRoot == null) { synchronized (this) { if (isRoot == null) { - isRoot = RemoteAuthorityRepository.getInstance().isRoot(getConnection().getUserName()); + isRoot = WorkplaceConstants.isRoot(); } } } diff --git a/designer-base/src/main/java/com/fr/design/gui/ibutton/UIHeadGroup.java b/designer-base/src/main/java/com/fr/design/gui/ibutton/UIHeadGroup.java index 715fd3e793..e6730126d8 100644 --- a/designer-base/src/main/java/com/fr/design/gui/ibutton/UIHeadGroup.java +++ b/designer-base/src/main/java/com/fr/design/gui/ibutton/UIHeadGroup.java @@ -101,6 +101,7 @@ public class UIHeadGroup extends Row { b.setEnabled(h.isEnable()); b.putClientProperty(BUTTON_TYPE, BUTTON_TYPE_TAB); b.addActionListener(e -> setSelectedIndex((int) index)); + b.setFocusPainted(false); }) ).toArray(Layouts.Cell[]::new); diff --git a/designer-base/src/main/java/com/fr/design/i18n/DesignI18nImpl.java b/designer-base/src/main/java/com/fr/design/i18n/DesignI18nImpl.java index 3bd65fd7ae..7d57708642 100644 --- a/designer-base/src/main/java/com/fr/design/i18n/DesignI18nImpl.java +++ b/designer-base/src/main/java/com/fr/design/i18n/DesignI18nImpl.java @@ -1,5 +1,6 @@ package com.fr.design.i18n; +import com.fr.design.DesignerEnvManager; import com.fr.general.GeneralContext; import com.fr.general.log.MessageFormatter; import com.fr.locale.DesignI18nProvider; @@ -14,10 +15,10 @@ import java.util.Locale; public class DesignI18nImpl implements DesignI18nProvider { -// static { -// // GeneralContext上下文 存储本次启动的语言环境 直接使用DesignerEnvManager 会在设置语言环境后 不重启 立即生效 存在问题 -// GeneralContext.setLocale(DesignerEnvManager.getEnvManager().getLanguage()); -// } + static { + // GeneralContext上下文 存储本次启动的语言环境 直接使用DesignerEnvManager 会在设置语言环境后 不重启 立即生效 存在问题 + GeneralContext.setLocale(DesignerEnvManager.getEnvManager().getLanguage()); + } private static DesignI18nImpl instance = new DesignI18nImpl(); diff --git a/designer-base/src/main/java/com/fr/design/mainframe/DesignerUIModeConfig.java b/designer-base/src/main/java/com/fr/design/mainframe/DesignerUIModeConfig.java index 99e7d0335b..b617d0cdb7 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/DesignerUIModeConfig.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/DesignerUIModeConfig.java @@ -20,7 +20,7 @@ public class DesignerUIModeConfig { } private void init() { - uiDevMode = Boolean.parseBoolean(System.getProperty("uiDevMode", "false")); + uiDevMode = Boolean.parseBoolean(System.getProperty("devMode", "false")); } public static DesignerUIModeConfig getInstance() { diff --git a/designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java b/designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java index 6fae3748ff..f462c018d4 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java @@ -90,7 +90,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer { private static final int ARROW_RANGE_START = CONTENT_WIDTH - FineUIScale.scale(30); // 弹出对话框高度 private static final int POPUP_MIN_HEIGHT = FineUIScale.scale(145); - private static final int POPUP_DEFAULT_HEIGHT = FineUIScale.scale(356); + private static final int POPUP_DEFAULT_HEIGHT = FineUIScale.scale(600); public static final String KEY_CELL_ELEMENT = "cellElement"; public static final String KEY_CELL_ATTR = "cellAttr"; public static final String KEY_FLOAT_ELEMENT = "floatElement"; diff --git a/designer-base/src/main/resources/com/fine/theme/icon/font/background_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/font/background_disable.svg new file mode 100644 index 0000000000..3dff853cb9 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/font/background_disable.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/font/foreground_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/font/foreground_disable.svg new file mode 100644 index 0000000000..dcf70fdc59 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/font/foreground_disable.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-chart/src/main/java/com/fr/design/chartx/data/DataLayoutHelper.java b/designer-chart/src/main/java/com/fr/design/chartx/data/DataLayoutHelper.java index 98ae28085c..9ac16b486b 100644 --- a/designer-chart/src/main/java/com/fr/design/chartx/data/DataLayoutHelper.java +++ b/designer-chart/src/main/java/com/fr/design/chartx/data/DataLayoutHelper.java @@ -1,15 +1,13 @@ package com.fr.design.chartx.data; +import com.fine.theme.utils.FineLayoutBuilder; import com.fr.design.gui.ilable.UILabel; -import com.fr.design.layout.TableLayout; -import com.fr.design.layout.TableLayoutHelper; import javax.swing.BorderFactory; import javax.swing.JComponent; import javax.swing.JPanel; import javax.swing.SwingConstants; import java.awt.Component; -import java.util.Arrays; /** * @author shine @@ -46,13 +44,7 @@ public class DataLayoutHelper { } public static JPanel createDataLayoutPane(Component[][] components) { - int len = components.length; - double p = TableLayout.PREFERRED; - double[] columnSize = {DataLayoutHelper.LABEL_WIDTH, DataLayoutHelper.WIDTH}; - double[] rowSize = new double[len]; - Arrays.fill(rowSize, p); - - return TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); + return FineLayoutBuilder.compatibleTableLayout(10, components, new double[] {1.2, 3}); } public static JPanel createDataLayoutPane(String label, Component component) { diff --git a/designer-chart/src/main/java/com/fr/design/chartx/single/CellDataPane.java b/designer-chart/src/main/java/com/fr/design/chartx/single/CellDataPane.java index 37c45d0416..b4bb2672b0 100644 --- a/designer-chart/src/main/java/com/fr/design/chartx/single/CellDataPane.java +++ b/designer-chart/src/main/java/com/fr/design/chartx/single/CellDataPane.java @@ -2,7 +2,6 @@ package com.fr.design.chartx.single; import com.fr.chartx.data.CellDataDefinition; import com.fr.design.beans.FurtherBasicBeanPane; -import com.fr.design.chartx.data.DataLayoutHelper; import com.fr.design.chartx.fields.AbstractCellDataFieldsPane; import com.fr.design.i18n.Toolkit; @@ -24,7 +23,6 @@ public class CellDataPane extends FurtherBasicBeanPane { this.setLayout(new BorderLayout()); this.add(cellDataFieldsPane, BorderLayout.CENTER); - DataLayoutHelper.addNormalBorder(this); } @Override diff --git a/designer-chart/src/main/java/com/fr/design/chartx/single/DataSetPane.java b/designer-chart/src/main/java/com/fr/design/chartx/single/DataSetPane.java index dab74e15a4..699784cc73 100644 --- a/designer-chart/src/main/java/com/fr/design/chartx/single/DataSetPane.java +++ b/designer-chart/src/main/java/com/fr/design/chartx/single/DataSetPane.java @@ -48,7 +48,6 @@ public class DataSetPane extends FurtherBasicBeanPane { this.setLayout(new BorderLayout(0, 6)); this.add(northPane, BorderLayout.NORTH); this.add(dataSetFieldsPane, BorderLayout.CENTER); - DataLayoutHelper.addNormalBorder(this); checkBoxUse(); } diff --git a/designer-chart/src/main/java/com/fr/design/chartx/single/SingleDataPane.java b/designer-chart/src/main/java/com/fr/design/chartx/single/SingleDataPane.java index 06ed06649b..00873cadd1 100644 --- a/designer-chart/src/main/java/com/fr/design/chartx/single/SingleDataPane.java +++ b/designer-chart/src/main/java/com/fr/design/chartx/single/SingleDataPane.java @@ -46,7 +46,6 @@ public class SingleDataPane extends BasicBeanPane { protected void initLayout() { this.setLayout(new BorderLayout(0, 6)); JPanel northPane = DataLayoutHelper.createDataLayoutPane(Toolkit.i18nText("Fine-Design_Chart_Data_Source"), jcb); - DataLayoutHelper.addNormalBorder(northPane); this.add(northPane, BorderLayout.NORTH); this.add(cardPane, BorderLayout.CENTER); diff --git a/designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnSeriesPane.java b/designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnSeriesPane.java index 7822cb3443..a8b039c77b 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnSeriesPane.java @@ -79,7 +79,7 @@ public class VanChartColumnSeriesPane extends VanChartAbstractPlotSeriesPane { isFixedWidth.addActionListener(e -> checkColumnWidth()); isFillWithImage.addActionListener(e -> checkImagePane()); - return new UIExpandablePane(Toolkit.i18nText("Fine-Design_Chart_Filled_With_Image"), borderPane, true); + return new UIExpandablePane(Toolkit.i18nText("Fine-Design_Chart_Widget_Style"), borderPane, true); } private void checkAll() { diff --git a/designer-realize/src/main/java/com/fanruan/boot/pre/DesignPreStartComponent.java b/designer-realize/src/main/java/com/fanruan/boot/pre/DesignPreStartComponent.java index d77bafc3b4..3ad246a9a8 100644 --- a/designer-realize/src/main/java/com/fanruan/boot/pre/DesignPreStartComponent.java +++ b/designer-realize/src/main/java/com/fanruan/boot/pre/DesignPreStartComponent.java @@ -5,6 +5,7 @@ import com.fanruan.fs.FileServer; import com.fanruan.fs.RepositoryFactory; import com.fanruan.fs.repository.local.LocalFileRepository; import com.fanruan.product.ProductConstants; +import com.fr.decision.inject.node.impl.DecisionSystemInjectNode; import com.fr.design.ConfigHelper; import com.fanruan.boot.key.StartupArgsShell; import com.fanruan.carina.Carina; @@ -223,7 +224,8 @@ public class DesignPreStartComponent { ConfigProviderFactory.getInstance().registerProvider(ConfigRealm.SHARE, new ShareConfigProviderImpl()); ConfigProviderFactory.getInstance().registerProvider(ConfigRealm.PUBLIC, new PublicConfigProviderImpl()); ConfigRepositoryFactory.getInstance().registerConfigRepositoryBuilder(new LocalConfigRepositoryBuilder(ConfigHelper.getBaseProperties(), ConfigHelper.BASE_PATH)); - + // 标识默认使用内置库 + DecisionSystemInjectNode.KEY.registerSystemInjectInfo("startFromDesign", decisionInjectExtraInfoBuilder -> () -> true); } diff --git a/designer-realize/src/main/java/com/fr/start/common/SplashWindow.java b/designer-realize/src/main/java/com/fr/start/common/SplashWindow.java index 75ee988582..8b4ac0a48f 100644 --- a/designer-realize/src/main/java/com/fr/start/common/SplashWindow.java +++ b/designer-realize/src/main/java/com/fr/start/common/SplashWindow.java @@ -46,9 +46,7 @@ public class SplashWindow extends JFrame { this.setAlwaysOnTop(false); this.setUndecorated(true); //使窗体背景透明 - if (OperatingSystem.isWindows()) { - this.setBackground(new Color(0, 0, 0, 0)); - } + this.setBackground(new Color(0, 0, 0, 0)); GUICoreUtils.centerWindow(this); } diff --git a/designer-realize/src/main/resources/com/fr/design/images/splash.png b/designer-realize/src/main/resources/com/fr/design/images/splash.png index 287c333b54..deea7d10fc 100644 Binary files a/designer-realize/src/main/resources/com/fr/design/images/splash.png and b/designer-realize/src/main/resources/com/fr/design/images/splash.png differ diff --git a/designer-realize/src/main/resources/com/fr/design/images/splash@2x.png b/designer-realize/src/main/resources/com/fr/design/images/splash@2x.png index a6d859b34e..908779106c 100644 Binary files a/designer-realize/src/main/resources/com/fr/design/images/splash@2x.png and b/designer-realize/src/main/resources/com/fr/design/images/splash@2x.png differ diff --git a/designer-realize/src/main/resources/com/fr/design/images/splash@2x_en.png b/designer-realize/src/main/resources/com/fr/design/images/splash@2x_en.png index a6d859b34e..908779106c 100644 Binary files a/designer-realize/src/main/resources/com/fr/design/images/splash@2x_en.png and b/designer-realize/src/main/resources/com/fr/design/images/splash@2x_en.png differ diff --git a/designer-realize/src/main/resources/com/fr/design/images/splash@2x_zh.png b/designer-realize/src/main/resources/com/fr/design/images/splash@2x_zh.png index 0209515c9b..ac6381b31f 100644 Binary files a/designer-realize/src/main/resources/com/fr/design/images/splash@2x_zh.png and b/designer-realize/src/main/resources/com/fr/design/images/splash@2x_zh.png differ diff --git a/designer-realize/src/main/resources/com/fr/design/images/splash@2x_zh_TW.png b/designer-realize/src/main/resources/com/fr/design/images/splash@2x_zh_TW.png index 4774413fb9..243d1b0cf3 100644 Binary files a/designer-realize/src/main/resources/com/fr/design/images/splash@2x_zh_TW.png and b/designer-realize/src/main/resources/com/fr/design/images/splash@2x_zh_TW.png differ diff --git a/designer-realize/src/main/resources/com/fr/design/images/splash_en.png b/designer-realize/src/main/resources/com/fr/design/images/splash_en.png index 287c333b54..deea7d10fc 100644 Binary files a/designer-realize/src/main/resources/com/fr/design/images/splash_en.png and b/designer-realize/src/main/resources/com/fr/design/images/splash_en.png differ diff --git a/designer-realize/src/main/resources/com/fr/design/images/splash_zh.png b/designer-realize/src/main/resources/com/fr/design/images/splash_zh.png index e0e12d07fc..24ffb1ceea 100644 Binary files a/designer-realize/src/main/resources/com/fr/design/images/splash_zh.png and b/designer-realize/src/main/resources/com/fr/design/images/splash_zh.png differ diff --git a/designer-realize/src/main/resources/com/fr/design/images/splash_zh_TW.png b/designer-realize/src/main/resources/com/fr/design/images/splash_zh_TW.png index 9149b3cfa3..86949f2040 100644 Binary files a/designer-realize/src/main/resources/com/fr/design/images/splash_zh_TW.png and b/designer-realize/src/main/resources/com/fr/design/images/splash_zh_TW.png differ