fanruan
/
design
6
0
Fork 2
Code Issues 2 Pull Requests Releases Wiki Activity
Browse Source

REPORT-99485 修复一些问题 

1. storybook在windows下的标签字体缩放
2. uibutton兼容
newui
jinsihou 6 months ago
parent
0501e5e366
commit
0b7c65a565
12 changed files with 57 additions and 40 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      designer-base/src/main/java/com/fr/design/actions/help/alphafine/component/CustomSortPane.java
  2. 18
      designer-base/src/test/java/com/fr/design/gui/storybook/StoryBoard.java
  3. 3
      designer-base/src/test/java/com/fr/design/gui/storybook/Storybook.java
  4. 12
      designer-base/src/test/java/com/fr/design/gui/storybook/components/ButtonTabStoryBoard.java
  5. 6
      designer-base/src/test/java/com/fr/design/gui/storybook/components/CheckBoxStoryBoard.java
  6. 4
      designer-base/src/test/java/com/fr/design/gui/storybook/components/ComboBoxStoryBoard.java
  7. 20
      designer-base/src/test/java/com/fr/design/gui/storybook/components/InputStoryBoard.java
  8. 4
      designer-base/src/test/java/com/fr/design/gui/storybook/components/RadioButtonStoryBoard.java
  9. 2
      designer-base/src/test/java/com/fr/design/gui/storybook/components/SliderStoryBoard.java
  10. 6
      designer-base/src/test/java/com/fr/design/gui/storybook/components/ToolTipStoryBoard.java
  11. 8
      designer-base/src/test/java/com/fr/design/gui/storybook/components/UIHeadGroupStoryBoard.java
  12. 6
      designer-realize/src/main/java/com/fr/start/MainDesigner.java

8
designer-base/src/main/java/com/fr/design/actions/help/alphafine/component/CustomSortPane.java
Unescape View File

@ -74,10 +74,10 @@ public class CustomSortPane extends JPanel {
}
private void createToolbarPane() {
top = new UIButton(IconUtils.readIcon("com/fr/design/mainframe/alphafine/images/top.svg"), false);
bottom = new UIButton(IconUtils.readIcon("com/fr/design/mainframe/alphafine/images/bottom.svg"), false);
up = new UIButton(IconUtils.readIcon("com/fr/design/mainframe/alphafine/images/up.svg"), false);
down = new UIButton(IconUtils.readIcon("com/fr/design/mainframe/alphafine/images/down.svg"), false);
top = new UIButton(IconUtils.readIcon("com/fr/design/mainframe/alphafine/images/top.svg"));
bottom = new UIButton(IconUtils.readIcon("com/fr/design/mainframe/alphafine/images/bottom.svg"));
up = new UIButton(IconUtils.readIcon("com/fr/design/mainframe/alphafine/images/up.svg"));
down = new UIButton(IconUtils.readIcon("com/fr/design/mainframe/alphafine/images/down.svg"));
top.setDisabledIcon(IconUtils.readIcon("com/fr/design/mainframe/alphafine/images/top_disable.svg"));
bottom.setDisabledIcon(IconUtils.readIcon("com/fr/design/mainframe/alphafine/images/bottom_disable.svg"));
up.setDisabledIcon(IconUtils.readIcon("com/fr/design/mainframe/alphafine/images/up_disable.svg"));

18
designer-base/src/test/java/com/fr/design/gui/storybook/StoryBoard.java
Unescape View File

@ -25,6 +25,22 @@ public class StoryBoard extends Column {
public StoryBoard(String title) {
this.title = title;
setSpacing(4);
add(cell(new UILabel(title)).with(it -> it.setFont(labelFont.deriveFont(16f).deriveFont(Font.BOLD))));
add(cell(new UILabel(title)).with(it -> it.setFont(h2())));
}
protected Font h1() {
return font("h1.font");
}
protected Font h2() {
return font("h2.font");
}
protected Font h3() {
return font("h3.font");
}
private Font font(String key) {
return UIManager.getFont(key);
}
}

3
designer-base/src/test/java/com/fr/design/gui/storybook/Storybook.java
Unescape View File

@ -8,6 +8,7 @@ import com.formdev.flatlaf.FlatLaf;
import com.formdev.flatlaf.FlatLightLaf;
import com.formdev.flatlaf.extras.FlatAnimatedLafChange;
import com.formdev.flatlaf.util.ScaledEmptyBorder;
import com.formdev.flatlaf.util.UIScale;
import com.fr.design.gui.UILookAndFeel;
import com.fr.value.NotNullLazyValue;
@ -60,7 +61,7 @@ public class Storybook {
public void start() {
FineLightLaf.setup();
jf = new JFrame("Story Book");
jf = new JFrame("Story Book(dpi scale:" + UIScale.getUserScaleFactor() * 100 + "%)");
jf.setJMenuBar(initMenu());
jf.add(row(
cell(new JList<>(StoryBookComponent.getValue())).with(it -> {

12
designer-base/src/test/java/com/fr/design/gui/storybook/components/ButtonTabStoryBoard.java
Unescape View File

@ -25,17 +25,17 @@ public class ButtonTabStoryBoard extends StoryBoard {
public ButtonTabStoryBoard() {
super("切换按钮组");
add(
cell(new UILabel("单行文字按钮")).with(it -> it.setFont(labelFont.deriveFont(14f))),
cell(new UILabel("单行文字按钮")).with(it -> it.setFont(h3())),
cell(new UIButtonGroup<>(new String[]{"按钮1", "按钮2", "按钮3"})),
cell(new UILabel("单行图标按钮")).with(it -> it.setFont(labelFont.deriveFont(14f))),
cell(new UILabel("单行图标按钮")).with(it -> it.setFont(h3())),
cell(new UIButtonGroup<>(iconArray())),
cell(new UILabel("选中切换图标按钮")).with(it -> it.setFont(labelFont.deriveFont(14f))),
cell(new UILabel("选中切换图标按钮")).with(it -> it.setFont(h3())),
cell(new UIButtonGroup<>(iconArrayWithWhite())),
cell(new UILabel("多行按钮-偶数场景-6按钮")).with(it -> it.setFont(labelFont.deriveFont(14f))),
cell(new UILabel("多行按钮-偶数场景-6按钮")).with(it -> it.setFont(h3())),
cell(new UITabGroup(sixTextArray())),
cell(new UILabel("多行按钮-奇数场景-5按钮")).with(it -> it.setFont(labelFont.deriveFont(14f))),
cell(new UILabel("多行按钮-奇数场景-5按钮")).with(it -> it.setFont(h3())),
cell(new UITabGroup(fiveTextArray())),
cell(new UILabel("多行按钮-奇数场景-7按钮")).with(it -> it.setFont(labelFont.deriveFont(14f))),
cell(new UILabel("多行按钮-奇数场景-7按钮")).with(it -> it.setFont(h3())),
cell(new UITabGroup(sevenTextArray())),
flex()
);

6
designer-base/src/test/java/com/fr/design/gui/storybook/components/CheckBoxStoryBoard.java
Unescape View File

@ -27,21 +27,21 @@ public class CheckBoxStoryBoard extends StoryBoard {
public CheckBoxStoryBoard() {
super("复选按钮");
add(
cell(new UILabel("水平布局")).with(it -> it.setFont(labelFont.deriveFont(14f))),
cell(new UILabel("水平布局")).with(it -> it.setFont(h3())),
row(10,
cell(new UICheckBox("测试1")),
cell(new UICheckBox("测试2")),
cell(new UICheckBox("测试3"))
),
fix(5),
cell(new UILabel("垂直布局")).with(it -> it.setFont(labelFont.deriveFont(14f))),
cell(new UILabel("垂直布局")).with(it -> it.setFont(h3())),
column(5,
cell(new UICheckBox("测试1")),
cell(new UICheckBox("测试2")),
cell(new UICheckBox("测试3"))
),
fix(5),
cell(new UILabel("禁用状态")).with(it -> it.setFont(labelFont.deriveFont(14f))),
cell(new UILabel("禁用状态")).with(it -> it.setFont(h3())),
row(10,
cell(getDisabledStatus(new UICheckBox("测试"))),
cell(getDisabledSelectedStatus(new UICheckBox("测试")))

4
designer-base/src/test/java/com/fr/design/gui/storybook/components/ComboBoxStoryBoard.java
Unescape View File

@ -23,11 +23,11 @@ public class ComboBoxStoryBoard extends StoryBoard {
super("下拉选择框");
add(
cell(new UILabel("普通状态")).with(it -> it.setFont(labelFont.deriveFont(14f))),
cell(new UILabel("普通状态")).with(it -> it.setFont(h3())),
cell(new UIComboBox(
ArrayUtils.toArray("测试1", "测试2", "测试3", "测试4")
)),
cell(new UILabel("禁用状态")).with(it -> it.setFont(labelFont.deriveFont(14f))),
cell(new UILabel("禁用状态")).with(it -> it.setFont(h3())),
cell(getDisabledStatus()),
flex()
);

20
designer-base/src/test/java/com/fr/design/gui/storybook/components/InputStoryBoard.java
Unescape View File

@ -21,13 +21,13 @@ public class InputStoryBoard extends StoryBoard {
public InputStoryBoard() {
super("输入框");
add(
cell(new UILabel("文本框")).with(it -> it.setFont(labelFont.deriveFont(14f))),
cell(new UILabel("文本框")).with(it -> it.setFont(h3())),
cell(new UITextField("文本")),
cell(new UILabel("文本框-禁用")).with(it -> it.setFont(labelFont.deriveFont(14f))),
cell(new UILabel("文本框-禁用")).with(it -> it.setFont(h3())),
cell(new UITextField("文本")).with(it -> it.setEnabled(false)),
cell(new UILabel("文本域")).with(it -> it.setFont(labelFont.deriveFont(14f))),
cell(new UILabel("文本域")).with(it -> it.setFont(h3())),
cell(new UITextArea("下面一些近期重要通知公告、常用CRM&KMS页面链接，希望可以帮到你哦~ " +
"或者你可以找我的两个好兄弟“Fine人事”、“ISC服务平台Fine人事”的工位在“企业微信工作台-ISC”下面，" +
"菜单栏里的内容可以解答一些常见问题 ISC服务平台”的工位在“CRM主页”，" +
@ -35,7 +35,7 @@ public class InputStoryBoard extends StoryBoard {
"常用入口的服务平台，如有意见建议，欢迎多多反馈Jewel-朱朱~如果觉得我可以帮到你，" +
"请滑到页面左下角给我点个赞吧(#^.^#)")),
cell(new UILabel("文本域-禁用")).with(it -> it.setFont(labelFont.deriveFont(14f))),
cell(new UILabel("文本域-禁用")).with(it -> it.setFont(h3())),
cell(new UITextArea("下面一些近期重要通知公告、常用CRM&KMS页面链接，" +
"希望可以帮到你哦~ 或者你可以找我的两个好兄弟“Fine人事”、" +
"“ISC服务平台Fine人事”的工位在“企业微信工作台-ISC”下面，" +
@ -44,25 +44,25 @@ public class InputStoryBoard extends StoryBoard {
"常用入口的服务平台，如有意见建议，欢迎多多反馈Jewel-朱朱~如果觉得我可以帮到你，" +
"请滑到页面左下角给我点个赞吧(#^.^#)")).with(it -> it.setEnabled(false)),
cell(new UILabel("数字步进(0～100，步长:1)")).with(it -> it.setFont(labelFont.deriveFont(14f))),
cell(new UILabel("数字步进(0～100，步长:1)")).with(it -> it.setFont(h3())),
cell(new UISpinner(0, 100, 1, 50)),
cell(new UILabel("数字步进-禁用")).with(it -> it.setFont(labelFont.deriveFont(14f))),
cell(new UILabel("数字步进-禁用")).with(it -> it.setFont(h3())),
cell(new UISpinner(0, 100, 1, 50)).with(it -> it.setEnabled(false)),
cell(new UILabel("搜索框")).with(it -> it.setFont(labelFont.deriveFont(14f))),
cell(new UILabel("搜索框")).with(it -> it.setFont(h3())),
cell(new FineSearchPane()),
cell(new UILabel("搜索框-禁用")).with(it -> it.setFont(labelFont.deriveFont(14f))),
cell(new UILabel("搜索框-禁用")).with(it -> it.setFont(h3())),
cell(new FineSearchPane()).with(it -> {
it.setEnabled(false);
it.setText("搜索文本");
}),
cell(new UILabel("输入框-更多，带按钮")).with(it -> it.setFont(labelFont.deriveFont(14f))),
cell(new UILabel("输入框-更多，带按钮")).with(it -> it.setFont(h3())),
cell(new AccessibleBackgroundEditor()),
cell(new UILabel("输入框-更多，带按钮-禁用")).with(it -> it.setFont(labelFont.deriveFont(14f))),
cell(new UILabel("输入框-更多，带按钮-禁用")).with(it -> it.setFont(h3())),
cell(new AccessibleBackgroundEditor()).with(it -> it.setEnabled(false))
);

4
designer-base/src/test/java/com/fr/design/gui/storybook/components/RadioButtonStoryBoard.java
Unescape View File

@ -24,7 +24,7 @@ public class RadioButtonStoryBoard extends StoryBoard {
public RadioButtonStoryBoard() {
super("单选按钮");
add(
cell(new UILabel("普通")).with(it -> it.setFont(labelFont.deriveFont(14f))),
cell(new UILabel("普通")).with(it -> it.setFont(h3())),
row(10,
cell(new UIRadioButton("选项一")).with(it -> {
buttonGroup.add(it);
@ -33,7 +33,7 @@ public class RadioButtonStoryBoard extends StoryBoard {
cell(new UIRadioButton("选项二")).with(it -> buttonGroup.add(it)),
cell(new UIRadioButton("选项三")).with(it -> buttonGroup.add(it))
),
cell(new UILabel("禁用状态")).with(it -> it.setFont(labelFont.deriveFont(14f))),
cell(new UILabel("禁用状态")).with(it -> it.setFont(h3())),
row(10,
cell(new UIRadioButton("选项一")).with(it -> {
buttonGroup1.add(it);

2
designer-base/src/test/java/com/fr/design/gui/storybook/components/SliderStoryBoard.java
Unescape View File

@ -17,7 +17,7 @@ public class SliderStoryBoard extends StoryBoard {
public SliderStoryBoard() {
super("滑块");
add(
cell(new UILabel("面板缩放滑块")).with(it -> it.setFont(labelFont.deriveFont(14f))),
cell(new UILabel("面板缩放滑块")).with(it -> it.setFont(h3())),
row(cell(new JFormSliderPane()))
);
}

6
designer-base/src/test/java/com/fr/design/gui/storybook/components/ToolTipStoryBoard.java
Unescape View File

@ -17,14 +17,14 @@ public class ToolTipStoryBoard extends StoryBoard {
public ToolTipStoryBoard() {
super("提示框");
add(
cell(new UILabel("组件启用状态下的提示")).with(it -> it.setFont(labelFont.deriveFont(14f))),
cell(new UILabel("组件启用状态下的提示")).with(it -> it.setFont(h3())),
cell(new UIButton("组件")).with(it -> it.setToolTipText("组件启用状态下的提示")),
cell(new UILabel("组件禁用状态下的提示")).with(it -> it.setFont(labelFont.deriveFont(14f))),
cell(new UILabel("组件禁用状态下的提示")).with(it -> it.setFont(h3())),
cell(new UIButton("组件")).with(it -> {
it.setEnabled(false);
it.setToolTipText("组件禁用状态下的提示");
}),
cell(new UILabel("较长提示")).with(it -> it.setFont(labelFont.deriveFont(14f))),
cell(new UILabel("较长提示")).with(it -> it.setFont(h3())),
cell(new UIButton("组件")).with(it -> it.setToolTipText("下面一些近期重要通知公告、常用CRM&KMS页面链接，" +
"希望可以帮到你哦~ 或者你可以找我的两个好兄弟“Fine人事”、" +
"“ISC服务平台Fine人事”的工位在“企业微信工作台-ISC”下面，" +

8
designer-base/src/test/java/com/fr/design/gui/storybook/components/UIHeadGroupStoryBoard.java
Unescape View File

@ -24,13 +24,13 @@ public class UIHeadGroupStoryBoard extends StoryBoard {
public UIHeadGroupStoryBoard() {
super("属性面板&导入数据集tab");
add(
cell(new UILabel("文字Tab")).with(it -> it.setFont(labelFont.deriveFont(14f))),
cell(new UILabel("文字Tab")).with(it -> it.setFont(h3())),
cell(new UIHeadGroup(new String[]{"左按钮", "右按钮"})),
cell(new UILabel("图标Tab")).with(it -> it.setFont(labelFont.deriveFont(14f))),
cell(new UILabel("图标Tab")).with(it -> it.setFont(h3())),
cell(new UIHeadGroup(iconList())),
cell(new UILabel("文字Tab带禁用")).with(it -> it.setFont(labelFont.deriveFont(14f))),
cell(new UILabel("文字Tab带禁用")).with(it -> it.setFont(h3())),
cell(new UIHeadGroup(iconList2())),
cell(new UILabel("文字图标Tab带禁用")).with(it -> it.setFont(labelFont.deriveFont(14f))),
cell(new UILabel("文字图标Tab带禁用")).with(it -> it.setFont(h3())),
cell(new UIHeadGroup(iconList3())),
flex()
);

6
designer-realize/src/main/java/com/fr/start/MainDesigner.java
Unescape View File

@ -312,7 +312,7 @@ public class MainDesigner extends BaseDesigner {
private void createSaveButton() {
saveButton = new UIButton(new LazyIcon("save"), true);
saveButton = new UIButton(new LazyIcon("save"));
saveButton.setToolTipText(KeySetUtils.SAVE_TEMPLATE.getMenuKeySetName());
saveButton.set4ToolbarButton();
saveButton.addActionListener(new ActionListener() {
@ -329,7 +329,7 @@ public class MainDesigner extends BaseDesigner {
private void createUndoButton() {
undo = new UIButton(new LazyIcon("undo"), true);
undo = new UIButton(new LazyIcon("undo"));
undo.setToolTipText(KeySetUtils.UNDO.getMenuKeySetName());
undo.set4ToolbarButton();
undo.addActionListener(new ActionListener() {
@ -344,7 +344,7 @@ public class MainDesigner extends BaseDesigner {
}
private void createRedoButton() {
redo = new UIButton(new LazyIcon("redo"), true);
redo = new UIButton(new LazyIcon("redo"));
redo.setToolTipText(KeySetUtils.REDO.getMenuKeySetName());
redo.set4ToolbarButton();
redo.addActionListener(new ActionListener() {

Write Preview
Loading…
Cancel
Save