Merge branch 'feature/10.0' of ssh://cloud.finedevelop.com:7999/~lanlan/design into feature/10.0

designer-base/src/main/java/com/fr/design/gui/icontainer/UIResizableContainer.java

@@ -45,6 +45,7 @@ public class UIResizableContainer extends JPanel {
     private boolean isLeftRightDragEnabled = true;
     private boolean isDownPaneVisible = true ;
     private int paraHeight;
+    private int parentHeight = -1;
 
     public UIResizableContainer(int direction) {
         this(new JPanel(), new JPanel(), direction);
@@ -207,7 +208,8 @@ public class UIResizableContainer extends JPanel {
             if (verticalToolPane == null || downPane == null) {
                 return;
             }
-
+            // REPORT-42913 如果用户修改了分辨率或者dpi，可能造成toolPaneY大于parent.getHeight，整个downPane将丢失，因此这里调整下toolPaneY
+            adjustToolPaneY(parent);
             if (direction == Constants.RIGHT) {
                 if(isDownPaneVisible){
                     upPane.setBounds(0, 0, containerWidth - toolPaneHeight, toolPaneY);
@@ -236,6 +238,18 @@ public class UIResizableContainer extends JPanel {
             }
         }
 
+        private void adjustToolPaneY(Container parent) {
+            if (parentHeight == -1) {
+                // 初始化下parentheight，存一下当前的父容器height
+                parentHeight = parent.getHeight();
+            } else if (parentHeight != parent.getHeight()) {
+                // parentHeight与父容器height不等时，代表用户调整分辨率或者dpi了，此时调整toolPaneY
+                toolPaneY = toolPaneY * parent.getHeight() / parentHeight;
+                toolPaneY = Math.min(toolPaneY, (parent.getHeight() - toolPaneHeight));
+                parentHeight = parent.getHeight();
+            }
+        }
+
         @Override
         public void addLayoutComponent(String name, Component comp) {
         }
@@ -540,4 +554,4 @@ public class UIResizableContainer extends JPanel {
         jf.setSize(500, 500);
         jf.setVisible(true);
     }
-}
+}

designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java

@@ -136,9 +136,9 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
         this.editingFILE = file;
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
         this.setBorder(BorderFactory.createEmptyBorder());
+        designModel = createDesignModel();
         addCenterPane();
         this.undoState = createUndoState();
-        designModel = createDesignModel();
 
         consumeTimer.setEnabled(shouldInitForCollectInfo(isNewFile));
         initAndStartPlugin();

designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartGaugeLabelDetailPane.java

@@ -195,8 +195,14 @@ public class VanChartGaugeLabelDetailPane extends VanChartPlotLabelDetailPane {
     }
 
     private TwoTuple<String[], Integer[]> getAlignNamesAndValues() {
-        String[] names = new String[]{Toolkit.i18nText("Fine-Design_Chart_Follow"), Toolkit.i18nText("Fine-Design_Chart_Align_Left"), Toolkit.i18nText("Fine-Design_Chart_Align_Right")};
-        Integer[] values = new Integer[]{ChartConstants.AUTO_LABEL_POSITION, Constants.LEFT, Constants.RIGHT};
+        String[] names = new String[]{
+                Toolkit.i18nText("Fine-Design_Chart_Follow"),
+                Toolkit.i18nText("Fine-Design_Chart_Align_Left"),
+                Toolkit.i18nText("Fine-Design_Chart_StyleAlignment_Center"),
+                Toolkit.i18nText("Fine-Design_Chart_Align_Right")
+        };
+
+        Integer[] values = new Integer[]{ChartConstants.AUTO_LABEL_POSITION, Constants.LEFT, Constants.CENTER, Constants.RIGHT};
 
         return new TwoTuple<>(names, values);
     }

designer-form/src/main/java/com/fr/design/designer/beans/models/StateModel.java

@@ -4,6 +4,7 @@ import com.fr.design.beans.location.Absorptionline;
 import com.fr.design.designer.beans.AdapterBus;
 import com.fr.design.designer.beans.HoverPainter;
 import com.fr.design.designer.beans.LayoutAdapter;
+import com.fr.design.designer.beans.adapters.layout.FRParameterLayoutAdapter;
 import com.fr.design.designer.beans.events.DesignerEvent;
 import com.fr.design.designer.beans.location.Direction;
 import com.fr.design.designer.beans.location.Location;
@@ -136,6 +137,14 @@ public class StateModel {
     private boolean addBean(XLayoutContainer container, int mouseX, int mouseY) {
         LayoutAdapter adapter = container.getLayoutAdapter();
         Rectangle rectangleContainer = ComponentUtils.getRelativeBounds(container);
+        // 判断是否能把控件从表单布局中拖拽到参数面板中
+        if (adapter instanceof FRParameterLayoutAdapter) {
+            for (XCreator xCreator : selectionModel.getSelection().getSelectedCreators()) {
+                if (!xCreator.canEnterIntoParaPane()) {
+                    return false;
+                }
+            }
+        }
         if (selectionModel.getSelection().size() == 1) {
             return adapter.addBean(selectionModel.getSelection().getSelectedCreator(),
                     mouseX + designer.getArea().getHorizontalValue() - rectangleContainer.x,

designer-form/src/main/java/com/fr/design/designer/creator/XChartEditor.java

@@ -271,6 +271,9 @@ public class XChartEditor extends XBorderStyleWidgetCreator {
                     EastRegionContainerPane.getInstance().switchTabTo(EastRegionContainerPane.KEY_WIDGET_SETTINGS);
                 }
                 editingMouseListener.startEditing(this, isEditing ? adapter.getDesignerEditor() : null, adapter);
+                if (isEditing) {
+                    EastRegionContainerPane.getInstance().switchTabTo(EastRegionContainerPane.KEY_WIDGET_SETTINGS);
+                }
             }
         }
         HelpDialogManager.getInstance().setPane(coverPanel);

designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java

@@ -3,6 +3,7 @@ package com.fr.design.mainframe;
 import com.fr.base.Parameter;
 import com.fr.base.ScreenResolution;
 import com.fr.base.vcs.DesignerMode;
+import com.fr.design.DesignModelAdapter;
 import com.fr.design.DesignState;
 import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.actions.UpdateAction;
@@ -204,7 +205,7 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
      */
     public void populateParameterPropertyPane() {
         //参数
-        setParameterArray(getNoRepeatParas(getTarget().getParameters()));
+        setParameterArray(DesignModelAdapter.getCurrentModelAdapter().getParameters());
         refreshParameter();
         //容器
         ParameterPropertyPane.getInstance().populateBean(this);
@@ -728,7 +729,7 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
                 if (evt.getCreatorEventID() != DesignerEvent.CREATOR_SELECTED) {
                     FormDesigner.this.fireTargetModified();
                     if (evt.getCreatorEventID() == DesignerEvent.CREATOR_DELETED) {
-                        setParameterArray(getNoRepeatParas(getTarget().getParameters()));
+                        setParameterArray(getNoRepeatParas(DesignModelAdapter.getCurrentModelAdapter().getParameters()));
                         refreshParameter();
                     }
                 } else {

designer-form/src/main/java/com/fr/design/mainframe/FormModelAdapter.java

@@ -36,10 +36,10 @@ public class FormModelAdapter extends DesignModelAdapter<Form, BaseJForm<Form>>
      * 参数改变.
      */
     public void parameterChanged() {
-        //实时更新参数
-        jTemplate.populateParameter();
         // 更新缓存的参数
         updateCachedParameter();
+        //实时更新参数
+        jTemplate.populateParameter();
     }
 
     /**

designer-realize/src/main/java/com/fr/design/mainframe/WorkBookModelAdapter.java

@@ -66,9 +66,10 @@ public class WorkBookModelAdapter extends DesignModelAdapter<WorkBook, JWorkBook
      * 参数改变.
      */
     public void parameterChanged() {
+        // 参数改变 先更新缓存
+        updateCachedParameter();
         jTemplate.updateReportParameterAttr();
         jTemplate.populateReportParameterAttr();
-        updateCachedParameter();
     }
 
     /**

designer-realize/src/main/java/com/fr/design/mainframe/alphafine/cell/model/DocumentModel.java

@@ -19,6 +19,11 @@ public class DocumentModel extends AlphaCellModel {
     private String informationUrl;
     private int documentId;
 
+    public static final String TITLE = "title";
+    public static final String CONTENT = "content";
+    public static final String DID = "did";
+    public static final String SEARCHCOUNT = "searchcount";
+
     public DocumentModel(String name, String content, int documentId) {
         super(name, content, CellType.DOCUMENT);
         this.documentId = documentId;
@@ -43,7 +48,7 @@ public class DocumentModel extends AlphaCellModel {
     public JSONObject modelToJson() {
         JSONObject object = JSONObject.create();
         JSONObject modelObject = JSONObject.create();
-        modelObject.put("title", getName()).put("summary", getContent()).put("did", getDocumentId()).put("searchCount", getSearchCount());
+        modelObject.put(TITLE, getName()).put(CONTENT, getContent()).put(DID, getDocumentId()).put(SEARCHCOUNT, getSearchCount());
         object.put("result", modelObject).put("cellType", getType().getTypeValue());
         return object;
     }

designer-realize/src/main/java/com/fr/design/mainframe/alphafine/search/manager/impl/DocumentSearchManager.java

@@ -43,10 +43,10 @@ public class DocumentSearchManager implements AlphaFineSearchProvider {
      * @return
      */
     public static DocumentModel getModelFromCloud(JSONObject object) {
-        String name = object.optString("title");
-        String content = object.optString("summary");
-        int documentId = object.optInt("did");
-        int searchCount = object.optInt("searchCount");
+        String name = object.optString(DocumentModel.TITLE);
+        String content = object.optString(DocumentModel.CONTENT);
+        int documentId = object.optInt(DocumentModel.DID);
+        int searchCount = object.optInt(DocumentModel.SEARCHCOUNT);
         return new DocumentModel(name, content, documentId, searchCount);
     }
 

designer-realize/src/main/java/com/fr/design/parameter/ParameterDefinitePane.java

@@ -275,7 +275,7 @@ public class ParameterDefinitePane extends JPanel implements ToolBarMenuDockPlus
 
         paraDesignEditor.populate(parameterUI);
 
-        parameterArray = getNoRepeatParas(getTargetParameter(workBook));
+        parameterArray = getNoRepeatParas(DesignModelAdapter.getCurrentModelAdapter().getParameters());
         refreshParameter();
         allParameters = reportParameterAttr.getParameters();