diff --git a/designer-base/src/main/java/com/fr/design/carton/FeedbackToolboxDialog.java b/designer-base/src/main/java/com/fr/design/carton/FeedbackToolboxDialog.java index 328e47e8aa..029ef4bc8d 100644 --- a/designer-base/src/main/java/com/fr/design/carton/FeedbackToolboxDialog.java +++ b/designer-base/src/main/java/com/fr/design/carton/FeedbackToolboxDialog.java @@ -96,7 +96,7 @@ 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") + ": "); + title.setText("" + " " + Toolkit.i18nText("Fine-Design_Basic_Carton_Record_Lag_Time") + ": " + ""); //判断一下当天是否有卡顿日志记录，如果有将日期设置为当天，如果没有设置为空 boolean cartonExists = SwitchForSwingChecker.isCartonExists(); if (cartonExists) { diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionTableProcedurePane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionTableProcedurePane.java index 79e75a0b83..29ce692bdb 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionTableProcedurePane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/ConnectionTableProcedurePane.java @@ -214,19 +214,12 @@ public class ConnectionTableProcedurePane extends BasicPane { second.add(viewCheckBox); // 根据环境是否为中文设置不同的显示 - if (GeneralContext.isChineseEnv()) { + first.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_SQL_Table"), BaseUtils.readIcon("/com/fr/design/images/data/tables.png"), UILabel.LEADING)); second.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_SQL_View"), BaseUtils.readIcon("/com/fr/design/images/data/views.png"), UILabel.LEADING)); - } else { - UILabel ui1 = new UILabel(BaseUtils.readIcon("/com/fr/design/images/data/tables.png"), UILabel.LEADING); - UILabel ui2 = new UILabel(BaseUtils.readIcon("/com/fr/design/images/data/views.png"), UILabel.LEADING); - ui1.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_SQL_Table")); - ui2.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_SQL_View")); - first.add(ui1); - second.add(ui2); - } + checkBoxgroupPane.add(first); checkBoxgroupPane.add(second); diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/DBCPAttrPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/DBCPAttrPane.java index ebfd195d8e..57f8407221 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/DBCPAttrPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/DBCPAttrPane.java @@ -74,7 +74,7 @@ public class DBCPAttrPane extends BasicPane { // JPanel northFlowPane northFlowPane = FRGUIPaneFactory.createTopVerticalTitledBorderPane(Toolkit.i18nText("Fine-Design_Basic_ConnectionPool_Attr")); - northFlowPane.setPreferredSize(new Dimension(630, 330)); + northFlowPane.setPreferredSize(new Dimension(630, 430)); defaultPane.add(northFlowPane, BorderLayout.NORTH); // ContextPane @@ -94,7 +94,7 @@ public class DBCPAttrPane extends BasicPane { {new UILabel(Toolkit.i18nText("Fine-Design_Basic_Connection_Pool_Mix_Evictable_Idle_Time_Millis") + ":", SwingConstants.RIGHT), DBCP_MINEVICTABLEIDLETIMEMILLIS}}; - JPanel contextPane = TableLayoutHelper.createGapTableLayoutPane(comps, rowSize, columnSize, 10, 10); + JPanel contextPane = TableLayoutHelper.createGapTableLayoutPane(comps, rowSize, columnSize, 10, 1); northFlowPane.add(contextPane); JPanel boxFlowInnerContainer = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane(0, 5, 5); UILabel uiLabel = new UILabel(Toolkit.i18nText("Fine-Design_Dbcp_Warning")); diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/FileTableDataPane.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/FileTableDataPane.java index 5d9d4146d6..8eb4474064 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/FileTableDataPane.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/FileTableDataPane.java @@ -214,7 +214,7 @@ public class FileTableDataPane extends AbstractTableDataPane { // 中间的pane，提示信息 String tipContent = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Type_Parameter") + "reportlets/excel/FineReport${abc}." + "txt" + "
" - + "http://192.168.100.120:8080/XXServer/Report/excel${abc}.jsp
" + "  "; + + "http://192.168.100.120:8080/XXServer/Report/excel${abc}.jsp
" + "  "; tips = new UILabel(tipContent); centerPanel.add(tips, BorderLayout.CENTER); } diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/CommitTabbedPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/CommitTabbedPane.java index 1c916fed19..291c80e798 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/CommitTabbedPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/CommitTabbedPane.java @@ -38,7 +38,7 @@ public class CommitTabbedPane extends JComponent implements MouseListener, Mous private static final int TOOLBAR_HEIGHT = 16; // 按钮高度 private static final int GAP = 5; //间隔 private static final int SMALLGAP = 3; - + private static final int FIRST_TAB_POSITION = 20; @@ -217,7 +217,7 @@ public class CommitTabbedPane extends JComponent implements MouseListener, Mous while (true) { //从提交1开始 count = count == 0 ? 1 : count; - String newName = prefix + count; + String newName = prefix + " " + count; boolean repeated = false; for (int i= 0;i < getTabCount();i++) { if (ComparatorUtils.equals( ((DBManipulationPane)dbManipulationPaneList.get(i)).getSubMitName(), newName)) { @@ -249,7 +249,7 @@ public class CommitTabbedPane extends JComponent implements MouseListener, Mous } - private void calMinAndMaxIndex() { //如果个数大于最多能容纳的个数，则多余的进行处理 + private void calMinAndMaxIndex() { //如果个数大于最多能容纳的个数，则多余的进行处理 if (dbManipulationPaneList.size() > showCount) { @@ -417,7 +417,7 @@ public class CommitTabbedPane extends JComponent implements MouseListener, Mous // 删除tab以后，获得第一个tab，再刷新一下，否则画面会停留在已删除的tab上，第一个tab是不可删除的 selectedIndex = getTabIndex(FIRST_TAB_POSITION); commit2DBJavaScriptPane.updateCardPane(); - + } } else if (selectedIndex != getTabIndex(x)){ selectedIndex = getTabIndex(x); diff --git a/designer-base/src/main/java/com/fr/design/gui/icontainer/UIEastResizableContainer.java b/designer-base/src/main/java/com/fr/design/gui/icontainer/UIEastResizableContainer.java index cec4b840a7..af7bfc9672 100644 --- a/designer-base/src/main/java/com/fr/design/gui/icontainer/UIEastResizableContainer.java +++ b/designer-base/src/main/java/com/fr/design/gui/icontainer/UIEastResizableContainer.java @@ -23,20 +23,23 @@ import java.awt.LayoutManager; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import java.awt.event.MouseMotionListener; +import java.awt.Point; /** * Created by plough on 2017/7/7. */ public class UIEastResizableContainer extends JPanel { private static final long serialVersionUID = 1854340560790476907L; - - public static final int MAX_CONTAINER_WIDTH = 340; - public static final int MIN_CONTAINER_WIDTH = 286; + public static final int MAX_CONTAINER_WIDTH = 825; + public static final int INIT_CONTAINER_WIDTH = 380; + public static final int MIN_CONTAINER_WIDTH = 150; private int containerWidth = 240; private int preferredWidth = 240; private int topToolPaneHeight = 25; private int leftPaneWidth = 40; + private static final int RESIZE_RANGE = 8; + private Cursor westResizeCursor = Cursor.getPredefinedCursor(Cursor.W_RESIZE_CURSOR); private JComponent leftPane; private JComponent rightPane; @@ -278,6 +281,7 @@ public class UIEastResizableContainer extends JPanel { private class TopToolPane extends JPanel { private int model = UIConstants.MODEL_NORMAL; + private Point mouseDownCompCoords; public TopToolPane() { super(); @@ -285,9 +289,8 @@ public class UIEastResizableContainer extends JPanel { @Override public void mouseMoved(MouseEvent e) { - if (e.getX() <= ARROW_RANGE) { - setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); - model = UIConstants.MODEL_PRESS; + if (e.getX() <= RESIZE_RANGE) { + setCursor(westResizeCursor); } else { setCursor(Cursor.getDefaultCursor()); model = UIConstants.MODEL_NORMAL; @@ -297,16 +300,18 @@ public class UIEastResizableContainer extends JPanel { @Override public void mouseDragged(MouseEvent e) { - // do noting + if (mouseDownCompCoords != null && getCursor().equals(westResizeCursor)) { + Point currCoords = e.getLocationOnScreen(); + int newWidth = containerWidth - (currCoords.x - mouseDownCompCoords.x); + if (newWidth >= MIN_CONTAINER_WIDTH && newWidth <= MAX_CONTAINER_WIDTH) { + containerWidth = newWidth; + mouseDownCompCoords = currCoords; + refreshContainer(); + } + } } }); addMouseListener(new MouseAdapter() { - @Override - public void mouseExited(MouseEvent e) { - setCursor(Cursor.getDefaultCursor()); - model = UIConstants.MODEL_NORMAL; - refreshContainer(); - } @Override public void mouseClicked(MouseEvent e) { @@ -318,6 +323,19 @@ public class UIEastResizableContainer extends JPanel { } } } + @Override + public void mousePressed(MouseEvent e) { + model = UIConstants.MODEL_NORMAL; + if (e.getX() <= RESIZE_RANGE) { + mouseDownCompCoords = e.getLocationOnScreen(); + } + refreshContainer(); + } + + @Override + public void mouseReleased(MouseEvent e) { + mouseDownCompCoords = null; + } }); } @@ -340,4 +358,42 @@ public class UIEastResizableContainer extends JPanel { SvgDrawUtils.doDrawSVG(g, () -> SvgDrawUtils.drawImage(g, button, 10, 7, null)); } } + + public class ResizeListener extends MouseAdapter implements MouseMotionListener { + private Point mouseDownCompCoords; + + @Override + public void mouseMoved(MouseEvent e) { + if (e.getX() <= RESIZE_RANGE) { + setCursor(westResizeCursor); + } else { + setCursor(Cursor.getDefaultCursor()); + } + } + + @Override + public void mousePressed(MouseEvent e) { + if (e.getX() <= RESIZE_RANGE) { + mouseDownCompCoords = e.getLocationOnScreen(); + } + } + + @Override + public void mouseDragged(MouseEvent e) { + if (mouseDownCompCoords != null && getCursor().equals(westResizeCursor)) { + Point currCoords = e.getLocationOnScreen(); + int newWidth = containerWidth - (currCoords.x - mouseDownCompCoords.x); + if (newWidth >= MIN_CONTAINER_WIDTH && newWidth <= MAX_CONTAINER_WIDTH) { + containerWidth = newWidth; + mouseDownCompCoords = currCoords; + refreshContainer(); + } + } + } + + @Override + public void mouseReleased(MouseEvent e) { + mouseDownCompCoords = null; + } + } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/gui/style/BorderPane.java b/designer-base/src/main/java/com/fr/design/gui/style/BorderPane.java index d2a302ea01..c8090de8e4 100644 --- a/designer-base/src/main/java/com/fr/design/gui/style/BorderPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/style/BorderPane.java @@ -67,7 +67,7 @@ public class BorderPane extends AbstractBasicStylePane implements GlobalNameObse protected void initComponents() { initButtonsWithIcon(); - this.setLayout(new BorderLayout(0, 0)); + JPanel externalPane = new JPanel(new GridLayout(0, 4)); externalPane.add(topToggleButton); externalPane.add(leftToggleButton); diff --git a/designer-base/src/main/java/com/fr/design/hyperlink/popup/MobilePopupUIUtils.java b/designer-base/src/main/java/com/fr/design/hyperlink/popup/MobilePopupUIUtils.java index cb3fbad58e..7347591ec9 100644 --- a/designer-base/src/main/java/com/fr/design/hyperlink/popup/MobilePopupUIUtils.java +++ b/designer-base/src/main/java/com/fr/design/hyperlink/popup/MobilePopupUIUtils.java @@ -9,7 +9,7 @@ import java.awt.*; public class MobilePopupUIUtils { static public int Line_Height = 20; static public int SplitLineWidth = 520; - static public int Left_Title_width = 80; + static public int Left_Title_width = 120; static public JPanel createLeftTileRightContentPanel(String title, JComponent contentPanel) { JPanel jp = new JPanel(); diff --git a/designer-base/src/main/java/com/fr/design/javascript/ExportJavaScriptPane.java b/designer-base/src/main/java/com/fr/design/javascript/ExportJavaScriptPane.java index dc9907f237..a94f64c62e 100644 --- a/designer-base/src/main/java/com/fr/design/javascript/ExportJavaScriptPane.java +++ b/designer-base/src/main/java/com/fr/design/javascript/ExportJavaScriptPane.java @@ -318,9 +318,10 @@ public class ExportJavaScriptPane extends AbstractHyperLinkPane= ARROW_RANGE_START) { + if (getButtonBounds().contains(e.getPoint())) { onPop(); } } @@ -1204,8 +1214,8 @@ public class EastRegionContainerPane extends UIEastResizableContainer { @Override public void mousePressed(MouseEvent e) { - if (e.getX() < ARROW_RANGE_START) { - mouseDownCompCoords = e.getPoint(); + if (isMovable) { + mouseDownCompCoords = new Point(e.getX(), e.getY()); } } }; @@ -1213,7 +1223,8 @@ public class EastRegionContainerPane extends UIEastResizableContainer { private MouseMotionListener mouseMotionListener = new MouseMotionListener() { @Override public void mouseMoved(MouseEvent e) { - if (e.getX() >= ARROW_RANGE_START) { + Rectangle buttonBounds = getButtonBounds(); + if (buttonBounds.contains(e.getPoint())) { setCursor(Cursor.getPredefinedCursor(Cursor.HAND_CURSOR)); } else if (isMovable) { setCursor(Cursor.getPredefinedCursor(Cursor.MOVE_CURSOR)); @@ -1321,7 +1332,17 @@ public class EastRegionContainerPane extends UIEastResizableContainer { } else { button = UIConstants.POP_BUTTON_UP; } - SvgDrawUtils.doDrawSVG(g, () -> SvgDrawUtils.drawImage(g, button, (ARROW_RANGE_START + 8), 4, null)); + int buttonX = getWidth() - button.getWidth(null) - 10; + int buttonY = 4; + SvgDrawUtils.doDrawSVG(g, () -> SvgDrawUtils.drawImage(g, button, buttonX, buttonY, null)); + } + + private Rectangle getButtonBounds() { + int buttonWidth = UIConstants.POP_BUTTON_UP.getWidth(null); + int buttonHeight = UIConstants.POP_BUTTON_UP.getHeight(null); + int buttonX = getWidth() - buttonWidth - 10; + int buttonY = 4; + return new Rectangle(buttonX, buttonY, buttonWidth, buttonHeight); } } @@ -1330,6 +1351,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer { private static final int RESIZE_RANGE = 8; private Cursor originCursor; private Cursor southResizeCursor = Cursor.getPredefinedCursor(Cursor.S_RESIZE_CURSOR); + private Cursor eastResizeCursor = Cursor.getPredefinedCursor(Cursor.E_RESIZE_CURSOR); private Point mouseDownCompCoords; private JPanel contentWrapper; @@ -1402,17 +1424,29 @@ public class EastRegionContainerPane extends UIEastResizableContainer { addMouseMotionListener(new MouseMotionListener() { @Override public void mouseDragged(MouseEvent e) { - if (mouseDownCompCoords != null) { - Rectangle bounds = getBounds(); - Point currCoords = e.getLocationOnScreen(); - bounds.height = currCoords.y - mouseDownCompCoords.y + bounds.height; - // 校正位置 - if (bounds.height < POPUP_MIN_HEIGHT) { - bounds.height = POPUP_MIN_HEIGHT; - } - mouseDownCompCoords.y = currCoords.y; - setBounds(bounds); - } + if (mouseDownCompCoords == null) return; + + Rectangle bounds = getBounds(); + Point currCoords = e.getLocationOnScreen(); + + bounds.height = adjustSize(bounds.height, currCoords.y - mouseDownCompCoords.y, + POPUP_MIN_HEIGHT, POPUP_MAX_HEIGHT, southResizeCursor); + + bounds.width = adjustSize(bounds.width, currCoords.x - mouseDownCompCoords.x, + POPUP_MIN_WIDTH, POPUP_MAX_WIDTH, eastResizeCursor); + + mouseDownCompCoords = currCoords; + setBounds(bounds); + + contentWrapper.revalidate(); + contentWrapper.repaint(); + + } + + private int adjustSize(int currentSize, int delta, int minSize, int maxSize, Cursor resizeCursor) { + return getCursor().equals(resizeCursor) + ? Math.max(minSize, Math.min(maxSize, currentSize + delta)) + : currentSize; } @Override @@ -1420,13 +1454,14 @@ public class EastRegionContainerPane extends UIEastResizableContainer { if (originCursor == null) { // 记录最初的光标 originCursor = getCursor(); } - if (e.getY() > getHeight() - RESIZE_RANGE) { - setCursor(southResizeCursor); - } else { - // 还原 - if (mouseDownCompCoords == null && getCursor().equals(southResizeCursor)) { - setCursor(originCursor); - } + Cursor newCursor = originCursor; + if (e.getY() >= getHeight() - RESIZE_RANGE) { + newCursor = southResizeCursor; + } else if (e.getX() >= getWidth() - RESIZE_RANGE) { + newCursor = eastResizeCursor; + } + if (!getCursor().equals(newCursor)) { + setCursor(newCursor); } repaint(); @@ -1435,7 +1470,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer { addMouseListener(new MouseAdapter() { @Override public void mousePressed(MouseEvent e) { - if (getCursor().equals(southResizeCursor)) { + if (getCursor().equals(southResizeCursor) || getCursor().equals(eastResizeCursor)) { mouseDownCompCoords = e.getLocationOnScreen(); } } diff --git a/designer-base/src/main/java/com/fr/design/report/fit/ReportFitConfigPane.java b/designer-base/src/main/java/com/fr/design/report/fit/ReportFitConfigPane.java index 158089602f..a4baf471c5 100644 --- a/designer-base/src/main/java/com/fr/design/report/fit/ReportFitConfigPane.java +++ b/designer-base/src/main/java/com/fr/design/report/fit/ReportFitConfigPane.java @@ -116,7 +116,7 @@ public class ReportFitConfigPane extends JPanel { wrapperPane.add(previewJPanel, BorderLayout.CENTER); int leftIndent = globalConfig ? (int) DesignSizeI18nManager.getInstance().i18nDimension("com.fr.design.report.fit.firstColumn").getWidth() : 0; wrapperPane.setBorder(BorderFactory.createEmptyBorder(0, leftIndent, 0, 0)); - wrapperPane.setPreferredSize(new Dimension(300 + leftIndent, 204)); + wrapperPane.setPreferredSize(new Dimension(300 + leftIndent, 160)); return wrapperPane; } diff --git a/designer-base/src/main/java/com/fr/design/write/submit/CustomJobPane.java b/designer-base/src/main/java/com/fr/design/write/submit/CustomJobPane.java index 6e4f2d803f..169a64e21f 100644 --- a/designer-base/src/main/java/com/fr/design/write/submit/CustomJobPane.java +++ b/designer-base/src/main/java/com/fr/design/write/submit/CustomJobPane.java @@ -30,7 +30,7 @@ import java.awt.event.ActionListener; public abstract class CustomJobPane extends BasicBeanPane { protected UITextField classNameTextField; protected ObjectProperiesPane objectProperiesPane; - private static final int DEFAULT_LENGTH = 25; + private static final int DEFAULT_LENGTH = 17; public CustomJobPane() { this.setLayout(FRGUIPaneFactory.createBorderLayout()); @@ -40,12 +40,12 @@ public abstract class CustomJobPane extends BasicBeanPane { UIButton browserButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Select")); browserButton.setPreferredSize(new Dimension( - GraphHelper.getWidth(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Select")) + 20, + GraphHelper.getWidth(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Select")) + 22, classNameTextField.getPreferredSize().height)); UIButton editButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit")); editButton.setPreferredSize(new Dimension( - GraphHelper.getWidth(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Select")) + 20, + GraphHelper.getWidth(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Select")) + 22, classNameTextField.getPreferredSize().height)); reportletNamePane.add(browserButton); diff --git a/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java b/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java index cf9ee43e16..d4f5a96790 100644 --- a/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java +++ b/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java @@ -201,7 +201,7 @@ public class DBManipulationPane extends BasicBeanPane { String updateCheckBoxName = Toolkit.i18nText("Fine-Design_Basic_RWA_NotChange_Unmodified"); UpdateCheckBox = new UICheckBox(updateCheckBoxName); UpdateCheckBox.setToolTipText(updateCheckBoxName); - UpdateCheckBox.setPreferredSize(new Dimension(100, 20)); + UpdateCheckBox.setPreferredSize(new Dimension(180, 20)); UIButton helpButton = new UIButton(HEIP_ICON); helpButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_Help")); helpButton.setPreferredSize(new Dimension(20, 20)); @@ -350,7 +350,7 @@ public class DBManipulationPane extends BasicBeanPane { } protected Dimension createControlBtnPanePreferredSize() { - return new Dimension(110, 20); + return new Dimension(110, 0); } protected String setControlBtnPanePosition() { diff --git a/designer-base/src/main/java/com/fr/env/detect/ui/EnvDetectorDialog.java b/designer-base/src/main/java/com/fr/env/detect/ui/EnvDetectorDialog.java index f7ede9f1a0..6fe0c1793b 100644 --- a/designer-base/src/main/java/com/fr/env/detect/ui/EnvDetectorDialog.java +++ b/designer-base/src/main/java/com/fr/env/detect/ui/EnvDetectorDialog.java @@ -171,7 +171,7 @@ public class EnvDetectorDialog extends JDialog { stopDetecting(detectButton); } }); - detectButton.setPreferredSize(new Dimension(68, 20)); +` detectButton.setPreferredSize(new Dimension(89, 30)); detectButton.setBorderPainted(false); detectButton.setContentAreaFilled(false); headerPanel.add(detectButton, BorderLayout.WEST); diff --git a/designer-base/src/main/resources/com/fr/design/i18n/dimension_ru.properties b/designer-base/src/main/resources/com/fr/design/i18n/dimension_ru.properties new file mode 100644 index 0000000000..62866186d1 --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/i18n/dimension_ru.properties @@ -0,0 +1,32 @@ +com.fr.design.mainframe.check.CheckButton=305*118 +com.fr.design.mainframe.check.CheckFontInfoDialog.collapse=630*185 +com.fr.design.mainframe.check.CheckFontInfoDialog.messageWithLink=570*31 +com.fr.design.mainframe.check.CheckFontInfoDialog.unfold=630*280 +com.fr.design.report.ReportColumnsPane=800*600 +com.fr.env.RemoteEnvPane.dialog=458*132 +com.fr.design.version.check.dialog=490*95 +com.fr.design.version.detail.label=750*30 +com.fr.design.version.detail.dialog=900*500 +com.fr.env.SyncFailedPluginsDialog.messageWithLink=316*36 +com.fr.design.web.pane.text.field=430*20 +com.fr.design.actions.server.dialog=800*630 +com.fr.design.report.fit.templatePane.dialog=800*400 +com.fr.design.report.fit.firstColumn=120*20 +com.fr.design.report.fit.column=160*20 +com.fr.design.lock.LockInfoDialog=500*180 +com.fr.design.mainframe.ForbiddenPane.refreshButton=75*24 +com.fr.start.common.DesignerOpenEmptyPanel.createButton=120*24 +com.fr.design.cell.expand.sort.pane=257*185 +com.fr.design.sort.rule.item=125*20 +com.fr.design.ds.column.sort.pane=250*180 +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 +com.fr.design.data.datapane.preview.desensitization.view.rule.DesensitizationRuleChoosePane.ruleEditPane=800*600 +com.fr.design.formula.FormulaPane=900*600 +com.fr.design.formula.FormulaPaneWhenReserveFormula=1200*600 +com.fr.design.mainframe.mobile.ui.MobileStyleDefinePane.configLabel=130*20 +com.fr.design.mainframe.mobile.utils.DesignerUtils.configLabel=140*20 +com.fr.design.update.ui.dialog.UpdateMainDialog.updateButton=100*24 diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPoplinkPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPoplinkPane.java index 35b0c0d5bc..b7eb39eb1b 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPoplinkPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPoplinkPane.java @@ -20,7 +20,12 @@ import com.fr.van.chart.config.DefaultStyleHelper4Van; import java.awt.BorderLayout; import java.awt.Dimension; +import java.awt.event.AdjustmentEvent; +import java.awt.event.AdjustmentListener; import java.util.HashMap; +import javax.swing.JPanel; +import javax.swing.JScrollBar; +import javax.swing.JScrollPane; /** * 类说明: 图表超链 -- 弹出 悬浮窗. @@ -30,7 +35,7 @@ import java.util.HashMap; */ public class ChartHyperPoplinkPane extends AbstractHyperLinkPane { private static final long serialVersionUID = 2469115951510144738L; - private static final int EDIT_PANE_WIDTH = 248; + private static final int EDIT_PANE_WIDTH = 331; private UITextField itemNameTextField; private ChartHyperEditPane hyperEditPane; private ChartComponent chartComponent; @@ -52,6 +57,8 @@ public class ChartHyperPoplinkPane extends AbstractHyperLinkPane 0) { + chartComponent.setPreferredSize(new Dimension(availableWidth, chartComponent.getHeight())); + } + } + }); } private ChartCollection createChartCollection() { diff --git a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/data/StructurePlotTableDataContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/data/StructurePlotTableDataContentPane.java index f91f6641eb..952720abfc 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/data/StructurePlotTableDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/data/StructurePlotTableDataContentPane.java @@ -56,7 +56,7 @@ public class StructurePlotTableDataContentPane extends AbstractTableDataContentP JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components,rowSize,columnSize,24,6); panel.setBorder(BorderFactory.createEmptyBorder(0,24,0,15)); this.setLayout(new BorderLayout()); - this.add(panel, BorderLayout.CENTER); + this.add(panel, BorderLayout.WEST); this.setPreferredSize(new Dimension(246,(int)this.getPreferredSize().getHeight())); } diff --git a/designer-chart/src/main/resources/com/fr/design/editor/script/i18n.js b/designer-chart/src/main/resources/com/fr/design/editor/script/i18n.js index f80cc05e7c..9d5bc519b3 100644 --- a/designer-chart/src/main/resources/com/fr/design/editor/script/i18n.js +++ b/designer-chart/src/main/resources/com/fr/design/editor/script/i18n.js @@ -145,6 +145,36 @@ "Fine-Design_Chart_Use_Summary_Value": "요약 값" }; + var russian = { + "BI-Design_Font_Style": "Стиль шрифта", + "BI-Font_Size": "Размер шрифта", + "BI-Basic_Auto": "авто", + "BI-Basic_Custom": "пользовательский", + "BI-Basic_Default": "по умолчанию", + "BI-Basic_Sim_Hei": "Sim_Hei", + "BI-Basic_Sim_Sun": "Sim_Sun", + "BI-Basic_Fang_Song": "Fang_Song", + "BI-Basic_Kai_Ti": "Kai_Ti", + "BI-Basic_Bold": "Жирный", + "BI-Basic_Italic": "Курсив", + "BI-Basic_Underline": "Подчёркивание", + "BI-Basic_Font_Color": "Цвет шрифта", + "BI-Word_Align_Left": "Выровнять по левому краю", + "BI-Word_Align_Center": "Выровнять по центру", + "BI-Word_Align_Right": "Выровнять по правому краю", + "BI-Basic_Cancel": "Отмена", + "BI-Basic_Save": "Сохранить", + "BI-Basic_More": "Ещё", + "BI-Custom_Color": "Пользовательский цвет", + "BI-Transparent_Color": "Прозрачный цвет", + "Fine-Design_Chart_Category_Use_Name": "Название категории", + "Fine-Design_Chart_Series_Name": "Серия", + "Fine-Design_Chart_Use_Value": "Значение", + "Fine-Design_Chart_Use_Percent": "Процент", + "Fine-Design_Chart_Use_Summary_Value": "Суммарное значение" + }; + + function transformI18n(language) { var BI = window.BI; @@ -164,6 +194,8 @@ BI.addI18n(japanese); } else if (language.indexOf('ko_KR') > -1) { BI.addI18n(korean); + } else if (language.indexOf('ru') > -1) { + BI.addI18n(russian); } else { BI.addI18n(chinese); } diff --git a/designer-realize/src/main/java/com/fr/design/actions/replace/ui/ITReplaceNorthPanel.java b/designer-realize/src/main/java/com/fr/design/actions/replace/ui/ITReplaceNorthPanel.java index 8b7d865d22..eb4865dc89 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/replace/ui/ITReplaceNorthPanel.java +++ b/designer-realize/src/main/java/com/fr/design/actions/replace/ui/ITReplaceNorthPanel.java @@ -81,7 +81,7 @@ public class ITReplaceNorthPanel { private int maxItemCount = 5; private static final int LIMIT_WIDTH = 800; private static final int HEIGHT = 161; - private static final int BUTTON_WIDTH = 44; + private static final int BUTTON_WIDTH = 99; private static final int GAP = 20; private static final int BUTTON_GAP = 10; private static final int MATCH_WIDTH = 800; @@ -564,14 +564,14 @@ public class ITReplaceNorthPanel { private void setSearchButtonBounds() { searchButtonHeight = COMPONENT_HEIGHT; searchButtonY = FOURTH_Y; - searchButtonX = replaceInputComboBoxX + replaceInputComboBoxWidth - BUTTON_WIDTH * 2 - BUTTON_GAP; + searchButtonX = replaceInputComboBoxX + replaceInputComboBoxWidth - BUTTON_WIDTH * 2 - BUTTON_GAP - 40; searchButton.setBounds(searchButtonX, searchButtonY, BUTTON_WIDTH, searchButtonHeight); } private void setReplaceButtonBounds() { replaceButtonHeight = COMPONENT_HEIGHT; replaceButtonY = FOURTH_Y; - replaceButtonX = replaceInputComboBoxX + replaceInputComboBoxWidth - BUTTON_WIDTH; + replaceButtonX = replaceInputComboBoxX + replaceInputComboBoxWidth - BUTTON_WIDTH - 30; replaceButton.setBounds(replaceButtonX, replaceButtonY, BUTTON_WIDTH, replaceButtonHeight); } diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePaneAuthorityEditPane.java b/designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePaneAuthorityEditPane.java index 54ba90ea9f..22241c83d6 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePaneAuthorityEditPane.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePaneAuthorityEditPane.java @@ -54,7 +54,7 @@ public class ElementCasePaneAuthorityEditPane extends AuthorityEditPane { private static final int NEW_VALUE = 4; //新值下面的编辑器的宽度 private static final int NEW_PANE_WIDTH = 120; - private static final Dimension VALUEPANE_NEW_DIMENSION = new Dimension(154,20); + private static final Dimension VALUEPANE_NEW_DIMENSION = new Dimension(154,25); private static final Dimension VALUEPANE_OLD_DIMENSION = new Dimension(0,0); diff --git a/designer-realize/src/main/java/com/fr/design/report/ImageExportPane.java b/designer-realize/src/main/java/com/fr/design/report/ImageExportPane.java index ba4eccb63a..f89a3b8a8b 100644 --- a/designer-realize/src/main/java/com/fr/design/report/ImageExportPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/ImageExportPane.java @@ -44,7 +44,7 @@ public class ImageExportPane extends AbstractExportPane { private static final int RESOLUTION_M = 192; private static final int RESOLUTION_L = 300; - private static final int GAP = 20; + private static final int GAP = 6; public static final String GLOBAL_CONF = Toolkit.i18nText("Fine-Design_Image_Export_Setting"); @@ -53,7 +53,7 @@ public class ImageExportPane extends AbstractExportPane { this.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10)); JPanel globalTitlePane = FRGUIPaneFactory.createTitledBorderPane(GLOBAL_CONF); JPanel outNorthPane = FRGUIPaneFactory.createTitledBorderPane(Toolkit.i18nText("Fine-Design_Report_Export_Setting")); - outNorthPane.setPreferredSize(new Dimension(580, 230)); + outNorthPane.setPreferredSize(new Dimension(580, 260)); UILabel tipLabel = new UILabel(Toolkit.i18nText("Fine-Design_Image_Export_Tips")); tipLabel.setForeground(Color.GRAY); JPanel tipsTitlePane = new JPanel(); diff --git a/designer-realize/src/main/java/com/fr/design/report/ReportColumnsPane.java b/designer-realize/src/main/java/com/fr/design/report/ReportColumnsPane.java index f1897e148e..9eb805c032 100644 --- a/designer-realize/src/main/java/com/fr/design/report/ReportColumnsPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/ReportColumnsPane.java @@ -101,7 +101,7 @@ public class ReportColumnsPane extends BasicPane{ @Override protected void initButton(UIToggleButton labelButton) { labelButton.setSize(new Dimension(60,20)); - labelButton.setPreferredSize(new Dimension(60, 20)); + labelButton.setPreferredSize(new Dimension(80, 20)); super.initButton(labelButton); } }; @@ -309,10 +309,10 @@ public class ReportColumnsPane extends BasicPane{ UITitledBorder explainBorder = UITitledBorder.createBorderWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Column_Area")); rowPane.setBorder(explainBorder); rowPane.setLayout(new FlowLayout(FlowLayout.LEFT, 5,13)); - rowPane.setPreferredSize(new Dimension(500,80)); + rowPane.setPreferredSize(new Dimension(500,100)); rowPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Column_Data") + ":")); repeatColDataTextField = new UITextField(); - repeatColDataTextField.setPreferredSize(new Dimension(107,24)); + repeatColDataTextField.setPreferredSize(new Dimension(147,24)); rowPane.add(repeatColDataTextField); rowPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Base_Format") + ": A2:D5 ")); copyLabel = new UILabel(REPORT_COLUMN_RAPEAT[rowOrColumn] + ":"); diff --git a/designer-realize/src/main/java/com/fr/design/report/WordExportPane.java b/designer-realize/src/main/java/com/fr/design/report/WordExportPane.java index c252a4e627..c322c9e4b5 100644 --- a/designer-realize/src/main/java/com/fr/design/report/WordExportPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/WordExportPane.java @@ -47,7 +47,7 @@ public class WordExportPane extends BasicPane { this.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10)); JPanel outPane = FRGUIPaneFactory.createTopVerticalTitledBorderPane("Word" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ReportD_Excel_Export")); JPanel outNorthPane =FRGUIPaneFactory.createTopVerticalTitledBorderPane(Toolkit.i18nText("Fine-Design_Report_Export_Setting")); - outNorthPane.setPreferredSize(new Dimension(580, 110)); + outNorthPane.setPreferredSize(new Dimension(700, 120)); this.add(outPane); outPane.add(outNorthPane); diff --git a/designer-realize/src/main/java/com/fr/design/report/freeze/RepeatAndFreezeSettingPane.java b/designer-realize/src/main/java/com/fr/design/report/freeze/RepeatAndFreezeSettingPane.java index 0d5ca8de7f..81a4a7a88f 100644 --- a/designer-realize/src/main/java/com/fr/design/report/freeze/RepeatAndFreezeSettingPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/freeze/RepeatAndFreezeSettingPane.java @@ -71,7 +71,7 @@ public class RepeatAndFreezeSettingPane extends BasicPane { private UICheckBox useWriteFrozenCCheckBox; private UICheckBox useWriteFrozenRCheckBox; - private static final int REPEAT_AND_FROZEN_WIDTH = 600, REPEAT_AND_FROZEN_HEIGHT = 100; + private static final int REPEAT_AND_FROZEN_WIDTH = 600, REPEAT_AND_FROZEN_HEIGHT = 95; //标题区域 private static final String REPEAT_AND_FROZEN_HEAD = Toolkit.i18nText("Fine-Design_Report_Repeat_Head"); diff --git a/designer-realize/src/main/java/com/fr/design/sort/common/AbstractSortPane.java b/designer-realize/src/main/java/com/fr/design/sort/common/AbstractSortPane.java index 281b365ac9..50aeb49084 100644 --- a/designer-realize/src/main/java/com/fr/design/sort/common/AbstractSortPane.java +++ b/designer-realize/src/main/java/com/fr/design/sort/common/AbstractSortPane.java @@ -105,7 +105,7 @@ public abstract class AbstractSortPane extends JPanel { } public static UILabel createIntervalUILabel() { - return createIntervalUILabel(new Dimension(PANE_COMPONENT_H_GAP, 10)); + return createIntervalUILabel(new Dimension(PANE_COMPONENT_H_GAP, 20)); } public static UILabel createIntervalUILabel(Dimension dimension) { diff --git a/designer-realize/src/main/java/com/fr/design/webattr/WebCssPane.java b/designer-realize/src/main/java/com/fr/design/webattr/WebCssPane.java index 7dcd3e21b2..5ad573c661 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/WebCssPane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/WebCssPane.java @@ -36,8 +36,9 @@ public class WebCssPane extends BasicPane { this.setLayout(new BorderLayout(0, 20)); this.setBorder(BorderFactory.createEmptyBorder(10, 5, 0, 0)); - JPanel outnorth = new JPanel(new BorderLayout(0, 5)); - JPanel northPane = new JPanel(new FlowLayout(FlowLayout.LEFT,8,0)); + JPanel outnorth = new JPanel(new BorderLayout(0, 0)); + JPanel northPane = new JPanel(new FlowLayout(FlowLayout.LEFT,0,0)); + localText = new UITextField(); localText.setPreferredSize(DesignSizeI18nManager.getInstance().i18nDimension("com.fr.design.web.pane.text.field")); localText.setEditable(false); diff --git a/designer-realize/src/main/java/com/fr/design/webattr/WebJsPane.java b/designer-realize/src/main/java/com/fr/design/webattr/WebJsPane.java index 7b371802b6..daf2663a95 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/WebJsPane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/WebJsPane.java @@ -52,8 +52,8 @@ public class WebJsPane extends BasicPane { UILabel infor2; public WebJsPane() { - this.setLayout(new BorderLayout(0, 20)); - this.setBorder(BorderFactory.createEmptyBorder(10, 5, 0, 0)); + this.setLayout(new BorderLayout(0, 0)); + this.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); localFileRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Disk_File") + ":", true); urlFileRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Url_Location")+ ":", false); @@ -68,7 +68,7 @@ public class WebJsPane extends BasicPane { localText.setEditable(false); urlText = new UITextField(); localText.setPreferredSize(DesignSizeI18nManager.getInstance().i18nDimension("com.fr.design.web.pane.text.field")); - urlText.setPreferredSize(DesignSizeI18nManager.getInstance().i18nDimension("com.fr.design.web.pane.text.field")); + urlText.setPreferredSize(DesignSizeI18nManager.getInstance().i18nDimension("com.fr.design.web.pane.text.field")) ; urlText.addKeyListener(urlTextListener); urlText.setEnabled(false); chooseFile = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Selection")); diff --git a/designer-realize/src/main/java/com/fr/design/webattr/printsettings/AbstractNativePrintSettingPane.java b/designer-realize/src/main/java/com/fr/design/webattr/printsettings/AbstractNativePrintSettingPane.java index 2ff9d41800..0dbe4cf2f8 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/printsettings/AbstractNativePrintSettingPane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/printsettings/AbstractNativePrintSettingPane.java @@ -221,7 +221,7 @@ public abstract class AbstractNativePrintSettingPane extends JPanel { {getTopAlignLabelPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Margin") + ":"), pageMarginCheckPane}, {getTopAlignLabelPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Scale_EnlargeOrReduce") + ":"), scaleCheckPane}, }; - return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, 0, 15); + return TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, 0, 30); } private String[] getAllPrinterNames() { diff --git a/designer-realize/src/main/java/com/fr/quickeditor/CellQuickEditor.java b/designer-realize/src/main/java/com/fr/quickeditor/CellQuickEditor.java index 4419392f90..5edf887353 100644 --- a/designer-realize/src/main/java/com/fr/quickeditor/CellQuickEditor.java +++ b/designer-realize/src/main/java/com/fr/quickeditor/CellQuickEditor.java @@ -149,7 +149,6 @@ public abstract class CellQuickEditor extends QuickEditor { int height = parent.getHeight(); if (leftContentPane.getPreferredSize().height > maxHeight) { leftContentPane.setBounds(0, -beginY, width - SCROLLBAR_WIDTH - CONTENT_PANE_WIDTH_GAP, height + beginY); - scrollBar.setBounds(width - SCROLLBAR_WIDTH - CONTENT_PANE_WIDTH_GAP, 0, SCROLLBAR_WIDTH + CONTENT_PANE_WIDTH_GAP, height); } else { leftContentPane.setBounds(0, 0, width - SCROLLBAR_WIDTH - CONTENT_PANE_WIDTH_GAP, height); }