Browse Source

Pull request #12611: REPORT-101812 fix: 国际化文本截断

Merge in DESIGN/design from ~CARLSON/design:release/11.0 to release/11.0

* commit 'c17243b6392ead71b2dd9e7a346dd270d6c1aa89':
  加个注释 #none
  REPORT-101812 fix: 国际化文本截断
release/11.0
Carlson-洪金阳 1 year ago
parent
commit
9c49debc89
  1. 2
      designer-base/src/main/java/com/fr/design/formula/DefaultTinyFormulaPane.java
  2. 10
      designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnSeriesPane.java
  3. 2
      designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartInteractivePane.java

2
designer-base/src/main/java/com/fr/design/formula/DefaultTinyFormulaPane.java

@ -6,7 +6,7 @@ import com.fr.base.BaseFormula;
* @author Carlson
* @version 11.0
* Created by Carlson on 2023/8/14 17:15
* @description
* @description 默认的公式输入面板包含一个输入框和一个F(x)按钮清空公式内容后不会显示$$$主要在图表配置面板里使用
**/
public class DefaultTinyFormulaPane extends TinyFormulaPane{

10
designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnSeriesPane.java

@ -3,13 +3,13 @@ package com.fr.van.chart.column;
import com.fr.base.background.ImageBackground;
import com.fr.chart.chartattr.Plot;
import com.fr.chart.chartglyph.ConditionAttr;
import com.fr.design.gui.frpane.UINumberDragPaneWithPercent;
import com.fr.design.gui.ispinner.chart.UISpinnerWithPx;
import com.fr.design.i18n.Toolkit;
import com.fr.design.gui.frpane.UINumberDragPane;
import com.fr.design.gui.frpane.UINumberDragPaneWithPercent;
import com.fr.design.gui.ibutton.UIButtonGroup;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.gui.ispinner.UISpinner;
import com.fr.design.gui.ispinner.chart.UISpinnerWithPx;
import com.fr.design.i18n.Toolkit;
import com.fr.design.layout.TableLayout;
import com.fr.design.layout.TableLayoutHelper;
import com.fr.design.mainframe.backgroundpane.ImageBackgroundQuickPane;
@ -91,8 +91,8 @@ public class VanChartColumnSeriesPane extends VanChartAbstractPlotSeriesPane {
panel1.add(columnWidth, BorderLayout.CENTER);
Component[][] components2 = new Component[][]{
new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Gap_Series")),seriesGap},
new Component[]{new UILabel(Toolkit.i18nText("Fine-Design_Chart_Gap_Category")),categoryGap},
new Component[]{FRWidgetFactory.createLineWrapLabel(Toolkit.i18nText("Fine-Design_Chart_Gap_Series")),seriesGap},
new Component[]{FRWidgetFactory.createLineWrapLabel(Toolkit.i18nText("Fine-Design_Chart_Gap_Category")),categoryGap},
};
JPanel panel2 = TableLayout4VanChartHelper.createGapTableLayoutPane(components2, row, col);

2
designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartInteractivePane.java

@ -498,7 +498,7 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane<Chart> {
protected JPanel createAnimationPane() {
isChartAnimation = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Close")});
chartAnimationLabel = new UILabel(Toolkit.i18nText("Fine-Design_Chart_Animation_Effects"));
chartAnimationLabel = FRWidgetFactory.createLineWrapLabel(Toolkit.i18nText("Fine-Design_Chart_Animation_Effects"));
double p = TableLayout.PREFERRED;
double f = TableLayout.FILL;
double e = TableLayout4VanChartHelper.EDIT_AREA_WIDTH;

Loading…
Cancel
Save