Merge remote-tracking branch 'origin/release/10.0' into release/10.0

designer-base/src/main/java/com/fr/design/condition/ConditionAttributesPane.java

@@ -14,10 +14,10 @@ import javax.swing.BoxLayout;
 import javax.swing.JComponent;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
-import java.awt.Dimension;
 import java.util.Iterator;
-import java.util.Map;
 import java.util.LinkedHashMap;
+import java.util.Map;
+import java.awt.Dimension;
 
 @Open
 public abstract class ConditionAttributesPane<T> extends BasicBeanPane<T> {
@@ -69,7 +69,12 @@ public abstract class ConditionAttributesPane<T> extends BasicBeanPane<T> {
         selectedItemScrollPane.setViewportView(selectedItemPane);
         selectedItemScrollPane.setHorizontalScrollBarPolicy(JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
         selectedItemScrollPane.setMinimumSize(new Dimension((int) selectedItemScrollPane.getPreferredSize().getWidth(), MIN_HEIGHT));
+        dealScrollPane(selectedItemScrollPane);
         propertyChangePane.add(selectedItemScrollPane);
+    }
+
+    protected void dealScrollPane(JScrollPane scrollPane){
+
     }
 
 	public void updateBean(T ob) {

designer-base/src/main/java/com/fr/design/env/RemoteDesignerWorkspaceInfo.java

@@ -25,13 +25,19 @@ public class RemoteDesignerWorkspaceInfo implements DesignerWorkspaceInfo {
     private static final String HOST_NAME = "127.0.0.1";
     private static final String LOCAL_HOTS_NAME = "localhost";
     private static final String QUOTATION = ":";
-    private static final String PORT = Integer.toString(DesignerEnvManager.getEnvManager().getEmbedServerPort());
+    private static String port = Integer.toString(DesignerEnvManager.getEnvManager().getEmbedServerPort());
 
     static {
-        FILTER_SET.add(HTTP + HOST_NAME + QUOTATION + PORT + PATH);
-        FILTER_SET.add(HTTPS + HOST_NAME + QUOTATION + PORT + PATH);
-        FILTER_SET.add(HTTP + LOCAL_HOTS_NAME + QUOTATION + PORT + PATH);
-        FILTER_SET.add(HTTPS + LOCAL_HOTS_NAME + QUOTATION + PORT + PATH);
+        initFilerSet(port);
+    }
+
+    private static void initFilerSet(String newPort) {
+        FILTER_SET.clear();
+        FILTER_SET.add(HTTP + HOST_NAME + QUOTATION + newPort + PATH);
+        FILTER_SET.add(HTTPS + HOST_NAME + QUOTATION + newPort + PATH);
+        FILTER_SET.add(HTTP + LOCAL_HOTS_NAME + QUOTATION + newPort + PATH);
+        FILTER_SET.add(HTTPS + LOCAL_HOTS_NAME + QUOTATION + newPort + PATH);
+        port = newPort;
     }
 
     private String name;
@@ -164,6 +170,11 @@ public class RemoteDesignerWorkspaceInfo implements DesignerWorkspaceInfo {
     @Override
     public boolean checkValid() {
         boolean result = false;
+        String newPort = Integer.toString(DesignerEnvManager.getEnvManager().getEmbedServerPort());
+        if (!ComparatorUtils.equals(port, newPort)) {
+            // 使用过程中 更改了内置服务器端口 重新初始化下
+            initFilerSet(newPort);
+        }
         if (FILTER_SET.contains(connection.getUrl())) {
             FineLoggerFactory.getLogger().error("url is same with local designer");
             return result;

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

@@ -41,4 +41,15 @@ public interface App<T extends BaseBook> extends Mutable, Aftermath {
      * @return 报表
      */
     T asIOFile(FILE tplFile);
+
+
+    /**
+     * 输出workbook等对象
+     * @param tplFile 文件
+     * @param needCheck 是否需要check
+     * @return
+     */
+   default T asIOFile(FILE tplFile, boolean needCheck) {
+       return asIOFile(tplFile);
+   }
 }

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

@@ -56,7 +56,7 @@ public final class JTemplateFactory {
             String[] defaultAppExtensions = app.defaultExtensions();
             for (String defaultAppExtension : defaultAppExtensions) {
                 if (defaultAppExtension.equalsIgnoreCase(fileExtension)) {
-                    BaseBook bb = app.asIOFile(file);
+                    BaseBook bb = app.asIOFile(file, false);
                     if (bb != null) {
                         return (T) bb;
                     }

designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataSeriesConditionPane.java

@@ -15,9 +15,10 @@ import com.fr.log.FineLoggerFactory;
 
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import java.util.Iterator;
 import java.awt.BorderLayout;
 import java.awt.Dimension;
-import java.util.Iterator;
 
 /**
  * Created by IntelliJ IDEA.
@@ -27,6 +28,9 @@ import java.util.Iterator;
  * Time   : 上午9:16
  */
 public class DataSeriesConditionPane extends ConditionAttributesPane<ConditionAttr> {
+
+    private static final int SCROLL_BAR_UNIT_INCREMENT = 16;
+
     protected Plot plot;
 
     public DataSeriesConditionPane(Plot plot) {
@@ -43,6 +47,10 @@ public class DataSeriesConditionPane extends ConditionAttributesPane<ConditionAt
         this(null);
     }
 
+    protected void dealScrollPane(JScrollPane scrollPane){
+       scrollPane.getVerticalScrollBar().setUnitIncrement(SCROLL_BAR_UNIT_INCREMENT);
+    }
+
     private void initAvailableActionList() {
         addBasicAction();
         addAxisPositionAction();

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-realize/src/main/java/com/fr/design/mainframe/app/CptApp.java

@@ -42,7 +42,11 @@ class CptApp extends AbstractWorkBookApp {
 
     @Override
     public WorkBook asIOFile(FILE file) {
+        return asIOFile(file, true);
+    }
 
+    @Override
+    public WorkBook asIOFile(FILE file, boolean needCheck) {
         if (XMLEncryptUtils.isCptEncoded() &&
                 !XMLEncryptUtils.checkVaild(DesignerEnvManager.getEnvManager().getEncryptionKey())) {
             if (!new DecodeDialog(file).isPwdRight()) {
@@ -67,7 +71,9 @@ class CptApp extends AbstractWorkBookApp {
         } catch (Exception exp) {
             FineLoggerFactory.getLogger().error(Toolkit.i18nText("Fine-Design_Report_NS_Exception_ReadError") + file, exp);
         }
-        checkNameStyle(namestyle);
+        if (needCheck) {
+            checkNameStyle(namestyle);
+        }
         return tpl;
     }