Browse Source

Pull request #14874: REPORT-134055 & REPORT-134048 & REPORT-132457 fix:NewUI问题修复

Merge in DESIGN/design from ~LEVY.XIE/design:fbp/release to fbp/release

* commit '2c8195939bbe7adceedefefad50e9ae36a95e8bb':
  REPORT-132457 fix:设计器参数栏组件小窗设置展示不全
  REPORT-134055 & REPORT-134048 fix: 屏蔽数据集及参数上下移动按钮
  无jira 启动页替换
fbp/release
Levy.Xie-解安森 2 months ago
parent
commit
5416cd89fd
  1. 17
      designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionListPane.java
  2. 3
      designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java
  3. 9
      designer-base/src/main/java/com/fr/design/i18n/DesignI18nImpl.java
  4. 2
      designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java
  5. 4
      designer-realize/src/main/java/com/fr/start/common/SplashWindow.java
  6. BIN
      designer-realize/src/main/resources/com/fr/design/images/splash.png
  7. BIN
      designer-realize/src/main/resources/com/fr/design/images/splash@2x.png
  8. BIN
      designer-realize/src/main/resources/com/fr/design/images/splash@2x_en.png
  9. BIN
      designer-realize/src/main/resources/com/fr/design/images/splash@2x_zh.png
  10. BIN
      designer-realize/src/main/resources/com/fr/design/images/splash@2x_zh_TW.png
  11. BIN
      designer-realize/src/main/resources/com/fr/design/images/splash_en.png
  12. BIN
      designer-realize/src/main/resources/com/fr/design/images/splash_zh.png
  13. BIN
      designer-realize/src/main/resources/com/fr/design/images/splash_zh_TW.png

17
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.ConnectionConfigProviderFactory;
import com.fanruan.config.impl.data.ConnectionConfigWriterFactory; import com.fanruan.config.impl.data.ConnectionConfigWriterFactory;
import com.fine.theme.utils.FineUIScale;
import com.fr.config.remote.RemoteConfigEvent; import com.fr.config.remote.RemoteConfigEvent;
import com.fine.theme.icon.LazyIcon; import com.fine.theme.icon.LazyIcon;
import com.fr.data.impl.Connection; 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.JListControlPane;
import com.fr.design.gui.controlpane.NameObjectCreator; import com.fr.design.gui.controlpane.NameObjectCreator;
import com.fr.design.gui.controlpane.NameableCreator; 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.gui.ilist.ListModelElement;
import com.fr.design.i18n.Toolkit; import com.fr.design.i18n.Toolkit;
import com.fr.event.EventDispatcher; import com.fr.event.EventDispatcher;
@ -95,6 +97,21 @@ public class ConnectionListPane extends JListControlPane implements ConnectionSh
getSupportedTypesWorker.execute(); 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 @Override
public String getEmptyNameTip() { public String getEmptyNameTip() {
return Toolkit.i18nText("Fine-Design_Basic_Connection_Empty_Name"); return Toolkit.i18nText("Fine-Design_Basic_Connection_Empty_Name");

3
designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java

@ -165,7 +165,8 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> implemen
ParameterTableModel model = new ParameterTableModel() { ParameterTableModel model = new ParameterTableModel() {
@Override @Override
public UITableEditAction[] createAction() { public UITableEditAction[] createAction() {
return ArrayUtils.add(super.createDBTableAction(), new RefreshAction()); // 当前仅支持刷新参数功能
return ArrayUtils.toArray(new RefreshAction());
} }
}; };
editorPane = new UITableEditorPane<>(model); editorPane = new UITableEditorPane<>(model);

9
designer-base/src/main/java/com/fr/design/i18n/DesignI18nImpl.java

@ -1,5 +1,6 @@
package com.fr.design.i18n; package com.fr.design.i18n;
import com.fr.design.DesignerEnvManager;
import com.fr.general.GeneralContext; import com.fr.general.GeneralContext;
import com.fr.general.log.MessageFormatter; import com.fr.general.log.MessageFormatter;
import com.fr.locale.DesignI18nProvider; import com.fr.locale.DesignI18nProvider;
@ -14,10 +15,10 @@ import java.util.Locale;
public class DesignI18nImpl implements DesignI18nProvider { public class DesignI18nImpl implements DesignI18nProvider {
// static { static {
// // GeneralContext上下文 存储本次启动的语言环境 直接使用DesignerEnvManager 会在设置语言环境后 不重启 立即生效 存在问题 // GeneralContext上下文 存储本次启动的语言环境 直接使用DesignerEnvManager 会在设置语言环境后 不重启 立即生效 存在问题
// GeneralContext.setLocale(DesignerEnvManager.getEnvManager().getLanguage()); GeneralContext.setLocale(DesignerEnvManager.getEnvManager().getLanguage());
// } }
private static DesignI18nImpl instance = new DesignI18nImpl(); private static DesignI18nImpl instance = new DesignI18nImpl();

2
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 ARROW_RANGE_START = CONTENT_WIDTH - FineUIScale.scale(30);
// 弹出对话框高度 // 弹出对话框高度
private static final int POPUP_MIN_HEIGHT = FineUIScale.scale(145); 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_ELEMENT = "cellElement";
public static final String KEY_CELL_ATTR = "cellAttr"; public static final String KEY_CELL_ATTR = "cellAttr";
public static final String KEY_FLOAT_ELEMENT = "floatElement"; public static final String KEY_FLOAT_ELEMENT = "floatElement";

4
designer-realize/src/main/java/com/fr/start/common/SplashWindow.java

@ -46,9 +46,7 @@ public class SplashWindow extends JFrame {
this.setAlwaysOnTop(false); this.setAlwaysOnTop(false);
this.setUndecorated(true); 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); GUICoreUtils.centerWindow(this);
} }

BIN
designer-realize/src/main/resources/com/fr/design/images/splash.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 256 KiB

After

Width:  |  Height:  |  Size: 253 KiB

BIN
designer-realize/src/main/resources/com/fr/design/images/splash@2x.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 914 KiB

After

Width:  |  Height:  |  Size: 870 KiB

BIN
designer-realize/src/main/resources/com/fr/design/images/splash@2x_en.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 914 KiB

After

Width:  |  Height:  |  Size: 870 KiB

BIN
designer-realize/src/main/resources/com/fr/design/images/splash@2x_zh.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 913 KiB

After

Width:  |  Height:  |  Size: 870 KiB

BIN
designer-realize/src/main/resources/com/fr/design/images/splash@2x_zh_TW.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 913 KiB

After

Width:  |  Height:  |  Size: 870 KiB

BIN
designer-realize/src/main/resources/com/fr/design/images/splash_en.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 256 KiB

After

Width:  |  Height:  |  Size: 253 KiB

BIN
designer-realize/src/main/resources/com/fr/design/images/splash_zh.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 255 KiB

After

Width:  |  Height:  |  Size: 252 KiB

BIN
designer-realize/src/main/resources/com/fr/design/images/splash_zh_TW.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 255 KiB

After

Width:  |  Height:  |  Size: 252 KiB

Loading…
Cancel
Save