Browse Source

Merge branch 'release/10.0' of https://code.fineres.com/scm/~yvan/design into release/10.0

# 请输入一个提交信息以解释此合并的必要性,尤其是将一个更新后的上游分支
# 合并到主题分支。
#
# 以 '#' 开始的行将被忽略,而空的提交说明将终止提交。
feature/big-screen
Yvan 4 years ago
parent
commit
0a80bfb61f
  1. 2
      build.gradle
  2. 10
      designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MaxMemRowCountPanel.java

2
build.gradle

@ -58,7 +58,7 @@ allprojects {
dependencies { dependencies {
implementation 'com.fr.third:jxbrowser:6.23' implementation 'com.fr.third:jxbrowser:6.23'
//implementation 'com.fr.third:jxbrowser-swing:6.23' implementation 'com.fr.third:jxbrowser-swing:6.23'
implementation 'com.fr.third:jxbrowser-mac:6.23' implementation 'com.fr.third:jxbrowser-mac:6.23'
implementation 'com.fr.third:jxbrowser-win64:6.23' implementation 'com.fr.third:jxbrowser-win64:6.23'
implementation 'com.fr.third.server:servlet-api:3.0' implementation 'com.fr.third.server:servlet-api:3.0'

10
designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/MaxMemRowCountPanel.java

@ -1,6 +1,7 @@
package com.fr.design.data.tabledata.tabledatapane; package com.fr.design.data.tabledata.tabledatapane;
import java.awt.*;
import java.awt.Dimension;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
@ -87,13 +88,12 @@ public class MaxMemRowCountPanel extends UIToolbar {
this.removeAll(); this.removeAll();
this.add(switchCache); this.add(switchCache);
switchCache.setSelectedIndex(MAX_IN_MEMORY); switchCache.setSelectedIndex(MAX_IN_MEMORY);
if (this.getComponentCount() == 4) {
return;
}
this.add(new UILabel(" ")); this.add(new UILabel(" "));
this.add(numberSpinner); this.add(numberSpinner);
this.add(new UILabel(" " + Toolkit.i18nText("Fine-Design_Basic_Row"))); this.add(new UILabel(" " + Toolkit.i18nText("Fine-Design_Basic_Row")));
if (this.getComponentCount() > 4) {
this.remove(1);
this.remove(1);
}
this.validate(); this.validate();
this.repaint(); this.repaint();
} }

Loading…
Cancel
Save