Browse Source

Pull request #14843: REPORT-134721 【fr-fbp回归】服务器配置-pc端自适应属性,frm相关的内容屏蔽 & REPORT-133220 【fr-fbp回归】启动加载页没有模块加载状态了,鸣谢也没有了

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

* commit '3cebf78907a3fc079e3ad7651144ce9fb64ecb9a':
  REPORT-133220 【fr-fbp回归】启动加载页没有模块加载状态了,鸣谢也没有了
  REPORT-134721 【fr-fbp回归】服务器配置-pc端自适应属性,frm相关的内容屏蔽
fbp/merge
Destiny.Lin-林锦龙 3 months ago
parent
commit
cb20566393
  1. 4
      designer-base/src/main/java/com/fr/design/report/fit/BaseFitAttrPane.java
  2. 2
      designer-realize/src/main/java/com/fanruan/boot/pre/DesignPreStartComponent.java
  3. 11
      designer-realize/src/main/java/com/fr/design/webattr/ServerFitAttrPane.java

4
designer-base/src/main/java/com/fr/design/report/fit/BaseFitAttrPane.java

@ -82,8 +82,6 @@ public abstract class BaseFitAttrPane extends BasicBeanPane<ReportFitAttr> {
protected void initComponents() {
//添加以下设置
initItemChoose();
//服务器配置-PC端自适应属性面板中需要添加提示
initPrompt();
this.setLayout(new BorderLayout());
this.add(contentJPanel);
}
@ -112,8 +110,6 @@ public abstract class BaseFitAttrPane extends BasicBeanPane<ReportFitAttr> {
}
protected void initPrompt() {
}
protected void refresh() {
validate();

2
designer-realize/src/main/java/com/fanruan/boot/pre/DesignPreStartComponent.java

@ -23,6 +23,7 @@ import com.fr.base.function.UITerminator;
import com.fr.carina.util.CarinaResourceUtils;
import com.fr.carina.util.provider.CarinaResourceProvider;
import com.fr.design.DesignerEnvManager;
import com.fr.design.constants.DesignerLaunchStatus;
import com.fr.design.deeplink.DeepLinkManager;
import com.fr.design.fun.OemProcessor;
import com.fr.design.mainframe.messagecollect.StartErrorMessageCollector;
@ -236,6 +237,7 @@ public class DesignPreStartComponent {
PreLoadService.getInstance().addUIFuture(initLookAndFeel);
showSplash();
DesignerLaunchStatus.setStatusAndAsyncFire(DesignerLaunchStatus.UI_PRE_INIT_COMPLETE);
}
/**

11
designer-realize/src/main/java/com/fr/design/webattr/ServerFitAttrPane.java

@ -79,15 +79,6 @@ public class ServerFitAttrPane extends BaseFitAttrPane {
};
}
/**
* 服务器配置-PC端自适应属性面板中需要添加提示
*/
@Override
protected void initPrompt() {
UILabel uiLabel = new UILabel(Toolkit.i18nText("Fine-Designer_Fit_Attr_Pane_Hint"));
FineUIStyle.setStyle(uiLabel, FineUIStyle.LABEL_TIP);
uiLabel.setBorder(new ScaledEmptyBorder(5, 5, 5, 0));
contentJPanel.add(uiLabel);
}
}

Loading…
Cancel
Save