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

designer-chart/src/main/java/com/fr/design/module/ChartPreFillStylePane.java

@@ -53,7 +53,6 @@ public class ChartPreFillStylePane extends BasicBeanPane<ChartColorMatching> {
         JPanel customPane = new JPanel(FRGUIPaneFactory.createBorderLayout());
 
         groupButton = new UIButtonGroup<>(new String[]{Toolkit.i18nText("Fine-Design_Chart_Custom_Color"), Toolkit.i18nText("Fine-Design_Chart_Gradient_Color")});
-        groupButton.setPreferredSize(new Dimension(155, 20));
         groupButton.setSelectedIndex(0);
         customPane.add(groupButton, BorderLayout.NORTH);
 
@@ -64,11 +63,11 @@ public class ChartPreFillStylePane extends BasicBeanPane<ChartColorMatching> {
         cardLayout.show(changeColorSetPane, "acc");
         customPane.add(changeColorSetPane, BorderLayout.CENTER);
 
-        customPane.setPreferredSize(new Dimension(155, 200));
+        customPane.setPreferredSize(new Dimension(155, 300));
         colorGradient.setPreferredSize(new Dimension(155, 30));
         colorGradient.getSelectColorPointBtnP1().setColorInner(Color.WHITE);
         colorGradient.getSelectColorPointBtnP2().setColorInner(FixedGradientBar.NEW_CHARACTER);
-
+        
         double p = TableLayout.PREFERRED;
         double[] columnSize = {p, p};
         double[] rowSize = {p, p, p};

designer-realize/src/main/java/com/fr/design/actions/report/ReportWriteAttrAction.java

@@ -3,6 +3,7 @@ package com.fr.design.actions.report;
 import com.fr.design.actions.ReportComponentAction;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;
+import com.fr.design.dialog.DialogActionListener;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.JTemplate;
 import com.fr.design.mainframe.WorkSheetDesigner;
@@ -11,10 +12,15 @@ import com.fr.design.webattr.ReportWriteAttrPane;
 import com.fr.general.IOUtils;
 import com.fr.report.worksheet.WorkSheet;
 
+import java.awt.Dimension;
+
+
 /**
  * ReportWriteAttrAction
  */
 public class ReportWriteAttrAction extends ReportComponentAction<WorkSheetDesigner> {
+    public static final Dimension WINDOW_CUSTOM_SIZE = new Dimension(720, 600);
+
     public ReportWriteAttrAction(WorkSheetDesigner t) {
         super(t);
         this.setMenuKeySet(KeySetUtils.REPORT_WRITE);
@@ -49,7 +55,7 @@ public class ReportWriteAttrAction extends ReportComponentAction<WorkSheetDesign
             }
         };
 
-        BasicDialog dialog = reportWritePane.showWindow(DesignerContext.getDesignerFrame(), new DialogActionAdapter() {
+        DialogActionListener dialogActionListener = new DialogActionAdapter() {
             @Override
             public void doOk() {
                 isChange = true;
@@ -67,7 +73,9 @@ public class ReportWriteAttrAction extends ReportComponentAction<WorkSheetDesign
             public void doCancel() {
                 isChange = false;
             }
-        });
+        };
+
+        BasicDialog dialog = reportWritePane.showWindowWithCustomSize(DesignerContext.getDesignerFrame(), dialogActionListener, WINDOW_CUSTOM_SIZE);
 
         DesignerContext.setReportWritePane(dialog);
         dialog.setVisible(true);

designer-realize/src/main/java/com/fr/design/actions/server/StyleListAction.java

@@ -17,6 +17,7 @@ import com.fr.transaction.WorkerCallBack;
 import com.fr.transaction.WorkerFacade;
 
 import javax.swing.*;
+import java.awt.*;
 import java.awt.event.ActionEvent;
 
 
@@ -24,6 +25,8 @@ import java.awt.event.ActionEvent;
  * StyleList Action
  */
 public class StyleListAction extends UpdateAction {
+    public static final Dimension WINDOW_CUSTOM_SIZE = new Dimension(710, 600);
+
     public StyleListAction() {
         this.setMenuKeySet(PREDEFINED_STYLES);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
@@ -37,23 +40,23 @@ public class StyleListAction extends UpdateAction {
      *
      * @param evt 事件
      */
-	public void actionPerformed(ActionEvent evt) {
-		DesignerFrame designerFrame = DesignerContext.getDesignerFrame();
-		final StyleManagerPane styleListPane = new StyleManagerPane();
-		final BasicDialog styleListDialog = styleListPane.showWindow(designerFrame);
-		styleListDialog.addDialogActionListener(new DialogActionAdapter() {
-			@Override
-			public void doOk() {
-			    if (!styleListPane.isNamePermitted()) {
-			        styleListDialog.setDoOKSucceed(false);
+    public void actionPerformed(ActionEvent evt) {
+        DesignerFrame designerFrame = DesignerContext.getDesignerFrame();
+        final StyleManagerPane styleListPane = new StyleManagerPane();
+        final BasicDialog styleListDialog = styleListPane.showWindowWithCustomSize(designerFrame, null, WINDOW_CUSTOM_SIZE);
+        styleListDialog.addDialogActionListener(new DialogActionAdapter() {
+            @Override
+            public void doOk() {
+                if (!styleListPane.isNamePermitted()) {
+                    styleListDialog.setDoOKSucceed(false);
                 }
-				Configurations.modify(new WorkerFacade(ServerPreferenceConfig.class) {
-					@Override
-					public void run() {
-						styleListPane.update(ServerPreferenceConfig.getInstance());
-					}
-				}.addCallBack(new CallBackAdaptor(){
-				    @Override
+                Configurations.modify(new WorkerFacade(ServerPreferenceConfig.class) {
+                    @Override
+                    public void run() {
+                        styleListPane.update(ServerPreferenceConfig.getInstance());
+                    }
+                }.addCallBack(new CallBackAdaptor() {
+                    @Override
                     public void afterCommit() {
                         DesignerContext.getDesignerBean("predefinedStyle").refreshBeanElement();
                     }