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

Merge pull request #10226 in DESIGN/design from bugfix/11.0 to feature/x 

* commit '6ab017fa175244079076c93cb00e262fc87c47c3':
  REPORT-80251 英文设计器国际化显示问题 【问题原因】1、部分功能模块的label显示文字未做自动换行设置。2、开始界面右键弹出框宽度被固定，未考虑不同语言的适配问题。 【改动思路】1、更改label为自动换行。2、局部微调UI（横排组件变竖排，已与产品沟通无问题）。3、根据当前语言环境确定右键弹出框宽度。 【Review建议】
  REPORT-80251 英文设计器国际化显示问题 【问题原因】1、部分功能模块的label显示文字未做自动换行设置。2、开始界面右键弹出框宽度被固定，未考虑不同语言的适配问题。 【改动思路】1、更改label为自动换行。2、局部微调UI（横排组件变竖排，已与产品沟通无问题）。3、根据当前语言环境确定右键弹出框宽度。 【Review建议】
  REPORT-80251 英文设计器国际化显示问题 【问题原因】1、部分功能模块的label显示文字未做自动换行设置。2、开始界面右键弹出框宽度被固定，未考虑不同语言的适配问题。 【改动思路】1、更改label为自动换行。2、局部微调UI（横排组件变竖排，已与产品沟通无问题）。3、根据当前语言环境确定右键弹出框宽度。 【Review建议】
  REPORT-80251 英文设计器国际化显示问题 【问题原因】1、部分功能模块的label显示文字未做自动换行设置。2、开始界面右键弹出框宽度被固定，未考虑不同语言的适配问题。 【改动思路】1、更改label为自动换行。2、局部微调UI（横排组件变竖排，已与产品沟通无问题）。3、根据当前语言环境确定右键弹出框宽度。 【Review建议】
  REPORT-80251 英文设计器国际化显示问题 问题原因： 1、部分功能模块的label显示文字未做自动换行设置。 2、原先开始界面右键弹出框宽度被固定，未考虑不同语言的适配问题。 改动思路： 1、更改label为自动换行。 2、局部微调UI（横排组件变竖排，已与产品沟通无问题）。 3、设置右键弹出框前，根据当前语言环境确定弹出框宽度。
  111111111
  Revert "REPORT-70593 图片控件设计器插件，原插件禁用。方案参考https://kms.fineres.com/pages/viewpage.action?pageId=457117391"
  REPORT-80583 多结果数据集预览要弹参数面板
  REPORT-80491 linux设计器调用系统文件夹，设计器闪退
  REPORT-80583 多数据集预览参数设置
  REPORT-80745 FR11新自适应-在界面有缩放比例时，报表块单元格宽度会显示缩放的像素值
feature/x
superman 2 years ago
parent
16bfe20dcd 6ab017fa17
commit
603d7eaf43
12 changed files with 53 additions and 34 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. 19
      designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java
  2. 1
      designer-base/src/main/java/com/fr/design/carton/FeedbackToolboxDialog.java
  3. 10
      designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java
  4. 7
      designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java
  5. 8
      designer-base/src/main/java/com/fr/design/os/impl/SupportOSImpl.java
  6. 1
      designer-base/src/main/resources/com/fr/design/i18n/dimension_en.properties
  7. 1
      designer-base/src/main/resources/com/fr/design/i18n/dimension_ja_JP.properties
  8. 1
      designer-base/src/main/resources/com/fr/design/i18n/dimension_ko_KR.properties
  9. 1
      designer-base/src/main/resources/com/fr/design/i18n/dimension_zh.properties
  10. 1
      designer-base/src/main/resources/com/fr/design/i18n/dimension_zh_TW.properties
  11. 5
      designer-realize/src/main/java/com/fr/grid/AbstractGridHeaderMouseHandler.java
  12. 2
      designer-realize/src/main/java/com/fr/start/module/DesignerActivator.java

19
designer-base/src/main/java/com/fr/design/actions/file/PreferencePane.java
Unescape View File

@ -119,6 +119,7 @@ public class PreferencePane extends BasicPane {
private static final int CACHING_DEFAULT = 5;
private static final int CACHING_GAP = 5;
private static final int MEMORY_TIP_LABEL_MAX_WIDTH = 230;
private static final int PREFERENCE_LABEL_MAX_WIDTH = 460;
private static final int OFFSET_HEIGHT = 60;
private static final String TYPE = "pressed";
@ -423,22 +424,20 @@ public class PreferencePane extends BasicPane {
private void createFunctionPane(JPanel generalPane) {
JPanel topVerticalTitledBorderPane = FRGUIPaneFactory.createTopVerticalTitledBorderPane(i18nText("Fine-Design_Basic_Preference_Function"));
JPanel upper = new JPanel(FRGUIPaneFactory.createLeftZeroVgapNormalHgapLayout());
JPanel lower = new JPanel(FRGUIPaneFactory.createLeftZeroVgapNormalHgapLayout());
topVerticalTitledBorderPane.add(upper);
topVerticalTitledBorderPane.add(lower);
JPanel supportUndoPanel = new JPanel(FRGUIPaneFactory.createLeftZeroVgapNormalHgapLayout());
topVerticalTitledBorderPane.add(supportUndoPanel);
generalPane.add(topVerticalTitledBorderPane);
//添加supportUndo选择项
supportUndoCheckBox = new UICheckBox(i18nText("Fine-Design_Basic_Preference_Support_Undo"));
upper.add(supportUndoCheckBox);
supportUndoPanel.add(supportUndoCheckBox);
//添加maxUndoLimit
//String[] undoTimes = {"最大撤销次数","5次","10次","15次","20次","50次"};
String[] undoTimes = {i18nText("Fine-Design_Basic_Max_Undo_Limit"), MAX_UNDO_LIMIT_5 + i18nText("Fine-Design_Basic_Time(s)"), MAX_UNDO_LIMIT_10 + i18nText("Fine-Design_Basic_Time(s)")
, MAX_UNDO_LIMIT_15 + i18nText("Fine-Design_Basic_Time(s)"), MAX_UNDO_LIMIT_20 + i18nText("Fine-Design_Basic_Time(s)"), MAX_UNDO_LIMIT_50 + i18nText("Fine-Design_Basic_Time(s)")};
maxUndoLimit = new UIComboBox(undoTimes);
upper.add(maxUndoLimit);
supportUndoPanel.add(maxUndoLimit);
//不支持撤销则不能选择撤销可缓存，也不能设置最大撤销次数
supportUndoCheckBox.addActionListener(new ActionListener() {
@ -452,14 +451,14 @@ public class PreferencePane extends BasicPane {
//添加supportDefaultParentCalculate选择项
supportDefaultParentCalculateCheckBox = new UICheckBox(
i18nText("Fine-Design_Basic_Preference_Support_Default_Parent_Calculate"));
upper.add(supportDefaultParentCalculateCheckBox);
topVerticalTitledBorderPane.add(supportDefaultParentCalculateCheckBox);
//添加是否展示打开模板提示缺少插件选择项
showTemplateMissingPlugin = new UICheckBox(
i18nText("Fine-Design_Basic_Preference_Show-Template-Missing-Plugin"));
upper.add(showTemplateMissingPlugin);
topVerticalTitledBorderPane.add(showTemplateMissingPlugin);
startWithEmptyFile = new UICheckBox(i18nText("Fine-Design_Basic_Preference_Start_Empty_File"));
lower.add(startWithEmptyFile);
topVerticalTitledBorderPane.add(startWithEmptyFile);
}
private void createEditPane(JPanel generalPane) {
@ -661,7 +660,7 @@ public class PreferencePane extends BasicPane {
startupPageEnabledCheckBox = new UICheckBox(Toolkit.i18nText("Fine-Design_Startup_Page_Config_Check_Text"));
startupPane.add(startupPageEnabledCheckBox);
UILabel descLabel = new UILabel(Toolkit.i18nText("Fine-Design_Startup_Page_Config_Desc"));
UILabel descLabel = FRWidgetFactory.createLineWrapLabel(Toolkit.i18nText("Fine-Design_Startup_Page_Config_Desc"), PREFERENCE_LABEL_MAX_WIDTH);
descLabel.setForeground(new Color(51, 51, 52, (int)Math.round(0.5 * 255)));
startupPane.add(descLabel);
}

1
designer-base/src/main/java/com/fr/design/carton/FeedbackToolboxDialog.java
Unescape View File

@ -94,7 +94,6 @@ public class FeedbackToolboxDialog extends JDialog {
private JPanel createInfoPane() {
JPanel northPane = FRGUIPaneFactory.createNColumnGridInnerContainer_Pane(2, 10, 10);
UILabel title = new UILabel();
//空格布局会好看一点
title.setText(" " + Toolkit.i18nText("Fine-Design_Basic_Carton_Record_Lag_Time") + ": ");
//判断一下当天是否有卡顿日志记录，如果有将日期设置为当天，如果没有设置为空
boolean cartonExists = SwitchForSwingChecker.isCartonExists();

10
designer-base/src/main/java/com/fr/design/data/DesignTableDataManager.java
Unescape View File

@ -625,6 +625,8 @@ public abstract class DesignTableDataManager {
// 把storeProcedure写成xml文件到out
DataCoreXmlUtils.writeXMLStoreProcedure(writer, storeProcedure, null);
if (storeProcedure.getDataModelList().size() > 0 && !storeProcedure.isFirstExpand()) {
// 存储过程有些特殊处理
// 这个就简单直接获取暂存列表吧
return storeProcedure.getDataModelList().toArray(new ProcedureDataModel[0]);
}
ParameterProvider[] inParameters = DataOperator.getInstance().getStoreProcedureParameters(storeProcedure);
@ -633,11 +635,13 @@ public abstract class DesignTableDataManager {
showParaWindow(parameterMap, inParameters);
}
storeProcedure.setFirstExpand(false);
} else {
ParameterProvider[] parameters = DataOperator.getInstance().getTableDataParameters(tableData);
if (parameters.length > 0) {
showParaWindow(parameterMap, parameters);
}
}
// 存储过程有些特殊处理
// 这个就简单直接获取暂存列表吧
// TODO 参数处理？
if (needLoadingBar) {
MultiResultTableDataWrapper.loadingBar.start();
}

7
designer-base/src/main/java/com/fr/design/file/MutilTempalteTabPane.java
Unescape View File

@ -11,6 +11,7 @@ import com.fr.design.dialog.FineJOptionPane;
import com.fr.design.gui.imenu.UIMenuItem;
import com.fr.design.gui.imenu.UIPopupMenu;
import com.fr.design.gui.imenu.UIScrollPopUpMenu;
import com.fr.design.i18n.DesignSizeI18nManager;
import com.fr.design.i18n.Toolkit;
import com.fr.design.mainframe.DesignerContext;
import com.fr.design.mainframe.JTemplate;
@ -24,6 +25,7 @@ import com.fr.design.utils.TemplateUtils;
import com.fr.design.worker.save.CallbackSaveWorker;
import com.fr.file.FILE;
import com.fr.general.ComparatorUtils;
import com.fr.general.GeneralContext;
import com.fr.general.IOUtils;
import com.fr.log.FineLoggerFactory;
import com.fr.stable.Constants;
@ -67,6 +69,7 @@ import java.awt.geom.Line2D;
import java.awt.geom.Path2D;
import java.awt.geom.RoundRectangle2D;
import java.util.List;
import java.util.Locale;
import static com.fr.design.dialog.FineJOptionPane.showConfirmDialog;
import static javax.swing.JOptionPane.OK_CANCEL_OPTION;
@ -197,7 +200,9 @@ public class MutilTempalteTabPane extends JComponent {
height += 25;
}
}
menu.setPreferredSize(new Dimension(170, height));
//根据当前i18n语言环境，动态调整popupMenu的宽度
menu.setPreferredSize(new Dimension((int) DesignSizeI18nManager.getInstance().
i18nDimension("com.fr.design.file.MultiTemplateTabPane.popUpMenu").getWidth(), height));
GUICoreUtils.showPopupMenu(menu, MutilTempalteTabPane.getInstance(), e.getX(), MutilTempalteTabPane.getInstance().getY() - 1 + MutilTempalteTabPane.getInstance().getHeight());
}
}

8
designer-base/src/main/java/com/fr/design/os/impl/SupportOSImpl.java
Unescape View File

@ -152,7 +152,13 @@ public enum SupportOSImpl implements SupportOS {
@Override
public boolean support() {
return (OperatingSystem.isLinux() && Arch.getArch() == Arch.ARM) || MACOS_12_VERSION_ADAPTER.support();
boolean javafxExist = true;
try {
Class.forName("javafx.stage.FileChooser");
} catch (ClassNotFoundException e) {
javafxExist = false;
}
return !javafxExist || (OperatingSystem.isLinux() && Arch.getArch() == Arch.ARM) || MACOS_12_VERSION_ADAPTER.support();
}
},

1
designer-base/src/main/resources/com/fr/design/i18n/dimension_en.properties
Unescape View File

@ -22,3 +22,4 @@ com.fr.design.sort.expand.header.pane=95*10
com.fr.design.plugin.remind.PluginInvalidateRemindDialog.dialog=600*500
com.fr.design.plugin.remind.PluginInvalidateRemindDialog.centerPane=580*369
com.fr.design.report.WatermarkSettingPane=720*600
com.fr.design.file.MultiTemplateTabPane.popUpMenu=350*65

1
designer-base/src/main/resources/com/fr/design/i18n/dimension_ja_JP.properties
Unescape View File

@ -21,3 +21,4 @@ com.fr.design.sort.expand.header.pane=95*10
com.fr.design.plugin.remind.PluginInvalidateRemindDialog.dialog=600*500
com.fr.design.plugin.remind.PluginInvalidateRemindDialog.centerPane=580*369
com.fr.design.report.WatermarkSettingPane=720*600
com.fr.design.file.MultiTemplateTabPane.popUpMenu=240*65

1
designer-base/src/main/resources/com/fr/design/i18n/dimension_ko_KR.properties
Unescape View File

@ -21,3 +21,4 @@ com.fr.design.sort.expand.header.pane=95*10
com.fr.design.plugin.remind.PluginInvalidateRemindDialog.dialog=600*500
com.fr.design.plugin.remind.PluginInvalidateRemindDialog.centerPane=580*369
com.fr.design.report.WatermarkSettingPane=720*600
com.fr.design.file.MultiTemplateTabPane.popUpMenu=240*65

1
designer-base/src/main/resources/com/fr/design/i18n/dimension_zh.properties
Unescape View File

@ -23,3 +23,4 @@ com.fr.design.sort.expand.header.pane=108*10
com.fr.design.plugin.remind.PluginInvalidateRemindDialog.dialog=600*500
com.fr.design.plugin.remind.PluginInvalidateRemindDialog.centerPane=580*369
com.fr.design.report.WatermarkSettingPane=720*600
com.fr.design.file.MultiTemplateTabPane.popUpMenu=170*65

1
designer-base/src/main/resources/com/fr/design/i18n/dimension_zh_TW.properties
Unescape View File

@ -21,3 +21,4 @@ com.fr.design.sort.expand.header.pane=108*10
com.fr.design.plugin.remind.PluginInvalidateRemindDialog.dialog=600*500
com.fr.design.plugin.remind.PluginInvalidateRemindDialog.centerPane=580*369
com.fr.design.report.WatermarkSettingPane=720*600
com.fr.design.file.MultiTemplateTabPane.popUpMenu=170*65

5
designer-realize/src/main/java/com/fr/grid/AbstractGridHeaderMouseHandler.java
Unescape View File

@ -305,11 +305,14 @@ public abstract class AbstractGridHeaderMouseHandler extends MouseInputAdapter {
StringBuilder sb = new StringBuilder();
sb.append(String.format("%.2f", new Double(len)))
.append('/').append(String.format("%.2f", new Double(tlen)))
.append(unit).append('(')
.append(unit);
if(!DesignerUIModeConfig.getInstance().simulateWebUIMode()){
sb.append('(')
.append((int)(unitValue.toPixD(resolution))).append('/')
.append((int)(totalUnitValue.toPixD(resolution)))
.append(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Px"))
.append(')');
}
return sb.toString();
}

2
designer-realize/src/main/java/com/fr/start/module/DesignerActivator.java
Unescape View File

@ -163,7 +163,6 @@ public class DesignerActivator extends Activator implements Prepare {
private LogHandler<DesignerLogAppender> logHandler = null;
private static final String PLUGIN_EXPORT_IMAGE_SETTING = "com.fr.plugin.exportimagesettings.v11";
private static final String PICTURE_WIDGET_PLUGIN_ID = "com.fr.plugin.widget.picture.v11";
private final Once pushUpdateTask = new Once(new Runnable() {
@Override
public void run() {
@ -559,7 +558,6 @@ public class DesignerActivator extends Activator implements Prepare {
private void prepareDefaultEmbedPluginInfo() {
addMutable(PluginEmbedInfo.KEY, DefaultPluginEmbedInfo.create(PLUGIN_EXPORT_IMAGE_SETTING));
addMutable(PluginEmbedInfo.KEY, DefaultPluginEmbedInfo.create(PICTURE_WIDGET_PLUGIN_ID));
}
private void startBBSLoginAuthServer() {

Write Preview
Loading…
Cancel
Save