Merge branch 'release/11.0' of https://code.fineres.com/scm/~henry.wang/design into release/11.0

designer-base/src/main/java/com/fr/design/formula/FormulaPane.java

@@ -102,6 +102,7 @@ import java.io.Reader;
 import java.io.StringReader;
 import java.text.NumberFormat;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
@@ -787,9 +788,9 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
                 return scanner.getUnSupportFormula();
             }
 
-            UnsupportedSimulationFormulaHunter unsupportedSimulationFormulaHunter = new UnsupportedSimulationFormulaHunter();
+            UnsupportedSimulationNodeHunter unsupportedSimulationFormulaHunter = new UnsupportedSimulationNodeHunter();
             expression.traversal4Tiny(unsupportedSimulationFormulaHunter);
-            return unsupportedSimulationFormulaHunter.isSupported() ? null : unsupportedSimulationFormulaHunter.getUnSupportFormula();
+            return unsupportedSimulationFormulaHunter.isSupported() ? null : unsupportedSimulationFormulaHunter.getUnSupportedNode();
         } catch (Exception e) {
             FineLoggerFactory.getLogger().error("", e);
         }
@@ -869,25 +870,30 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
         }
     }
 
-    private static class UnsupportedSimulationFormulaHunter extends TinyHunter {
+    private static class UnsupportedSimulationNodeHunter extends TinyHunter {
-
 
         private boolean supported = true;
 
-        private String unSupportFormula;
+        private String unSupportedNode;
+
+        private String[] curReportVariables;
+
+        public UnsupportedSimulationNodeHunter() {
+            curReportVariables = VariableResolver.DEFAULT.resolveCurReportVariables();
+        }
 
         public boolean isSupported() {
             return supported;
         }
 
-        public String getUnSupportFormula() {
+        public String getUnSupportedNode() {
-            return unSupportFormula;
+            return unSupportedNode;
         }
 
         public void hunter4Tiny(Tiny tiny) {
-            if (tiny.getClass() == ColumnRowRangeInPage.class) {
+            if (tiny.getClass() == ColumnRowRangeInPage.class || Arrays.asList(curReportVariables).contains(tiny.toString())) {
                 supported = false;
-                unSupportFormula = tiny.toString();
+                unSupportedNode = tiny.toString();
             }
         }
     }

designer-base/src/main/java/com/fr/design/mainframe/theme/preview/FormThemePreviewPane.java

@@ -3,7 +3,6 @@ package com.fr.design.mainframe.theme.preview;
 import com.fr.base.BaseFormula;
 import com.fr.base.background.ColorBackground;
 import com.fr.base.theme.FormTheme;
-import com.fr.chart.base.ChartConstants;
 import com.fr.chart.chartattr.ChartCollection;
 import com.fr.chart.chartattr.Title;
 import com.fr.chart.chartdata.NormalChartData;
@@ -19,17 +18,19 @@ import com.fr.plugin.chart.attr.axis.VanChartAxis;
 import com.fr.plugin.chart.base.AttrLabel;
 import com.fr.plugin.chart.base.VanChartTools;
 import com.fr.plugin.chart.column.VanChartColumnPlot;
+import com.fr.plugin.chart.type.GradientType;
 import com.fr.plugin.chart.type.RadiusType;
 import com.fr.plugin.chart.vanchart.VanChart;
 import com.fr.stable.Constants;
 import com.fr.stable.StringUtils;
+
 import javax.swing.JPanel;
 import java.awt.AlphaComposite;
-import java.awt.Composite;
-import java.awt.Graphics2D;
 import java.awt.BorderLayout;
 import java.awt.Color;
+import java.awt.Composite;
 import java.awt.Dimension;
+import java.awt.Graphics2D;
 import java.awt.geom.Rectangle2D;
 
 /**
@@ -124,7 +125,7 @@ public class FormThemePreviewPane extends TemplateThemePreviewPane<FormTheme> {
             plot.getConditionCollection().getDefaultAttr().addDataSeriesCondition(defaultAttrLabel);
 
             plot.getLegend().setPosition(Constants.TOP);
-            plot.setPlotStyle(ChartConstants.STYLE_NONE);
+            plot.getGradientStyle().setGradientType(GradientType.NONE);
             plot.setSeriesOverlapPercent(30);
             plot.setCategoryIntervalPercent(30);
 
@@ -178,7 +179,7 @@ public class FormThemePreviewPane extends TemplateThemePreviewPane<FormTheme> {
 
             PiePlot4VanChart plot = chart.getPlot();
             plot.getLegend().setPosition(Constants.BOTTOM);
-            plot.setPlotStyle(ChartConstants.STYLE_NONE);
+            plot.getGradientStyle().setGradientType(GradientType.NONE);
             plot.setInnerRadiusPercent(75);
             plot.getRadius().setRadiusType(RadiusType.FIXED);
             plot.getRadius().setRadius(80);

designer-base/src/main/java/com/fr/design/mainframe/theme/preview/ReportThemePreviewPane.java

@@ -3,7 +3,6 @@ package com.fr.design.mainframe.theme.preview;
 import com.fr.base.BaseFormula;
 import com.fr.base.background.ColorBackground;
 import com.fr.base.theme.ReportTheme;
-import com.fr.chart.base.ChartConstants;
 import com.fr.chart.chartattr.ChartCollection;
 import com.fr.chart.chartattr.Title;
 import com.fr.chart.chartdata.NormalChartData;
@@ -18,11 +17,12 @@ import com.fr.plugin.chart.attr.axis.VanChartAxis;
 import com.fr.plugin.chart.base.AttrLabel;
 import com.fr.plugin.chart.base.VanChartTools;
 import com.fr.plugin.chart.column.VanChartColumnPlot;
+import com.fr.plugin.chart.type.GradientType;
 import com.fr.plugin.chart.vanchart.VanChart;
 
-import java.awt.Graphics2D;
 import java.awt.BorderLayout;
 import java.awt.Color;
+import java.awt.Graphics2D;
 import java.awt.geom.Rectangle2D;
 
 /**
@@ -37,7 +37,7 @@ public class ReportThemePreviewPane extends TemplateThemePreviewPane<ReportTheme
 
     private final ChartPreviewPane chartPreviewPane;
 
-    public ReportThemePreviewPane(){
+    public ReportThemePreviewPane() {
         setLayout(FRGUIPaneFactory.createBorderLayout());
         chartPreviewPane = new ChartPreviewPane();
         chartPreviewPane.populate(initColumnChart());
@@ -80,7 +80,7 @@ public class ReportThemePreviewPane extends TemplateThemePreviewPane<ReportTheme
             defaultAttrLabel.getAttrLabelDetail().getBackground().setBackground(null);
             plot.getConditionCollection().getDefaultAttr().addDataSeriesCondition(defaultAttrLabel);
 
-            plot.setPlotStyle(ChartConstants.STYLE_NONE);
+            plot.getGradientStyle().setGradientType(GradientType.NONE);
             plot.setSeriesOverlapPercent(30);
             plot.setCategoryIntervalPercent(30);
 

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

@@ -34,6 +34,7 @@ import com.fr.design.utils.ComponentUtils;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.design.utils.gui.LayoutUtils;
 import com.fr.general.ComparatorUtils;
+import com.fr.stable.ArrayUtils;
 import com.fr.stable.Constants;
 
 import javax.swing.BorderFactory;
@@ -645,16 +646,15 @@ public class EditingMouseListener extends MouseInputAdapter {
                 selectionModel.selectACreatorAtMouseEvent(e);
                 refreshTopXCreator();
                 XCreator[] xCreators = selectionModel.getSelection().getSelectedCreators();
-                // 放到事件队尾执行
+                if (ArrayUtils.getLength(xCreators) == 1) {
-                SwingUtilities.invokeLater(new Runnable() {
+                    // 放到事件队尾执行
-                    @Override
+                    SwingUtilities.invokeLater(new Runnable() {
-                    public void run() {
+                        @Override
-                        for (XCreator xCreator : xCreators) {
+                        public void run() {
-                            xCreator.setSelected(!e.isShiftDown() && !e.isControlDown());
+                            xCreators[0].setSelected(!e.isShiftDown() && !e.isControlDown());
                         }
-                    }
+                    });
-                });
+                }
-
             } else if (clickedNonCardButton && uneditedTab && responseTabLayout(oldCreator, e)) {
                 // do nothing
             } else {

designer-realize/src/main/java/com/fr/design/javascript/ListenerEditPane.java

@@ -189,7 +189,10 @@ public class ListenerEditPane extends BasicBeanPane<Listener> {
     @Override
     public Listener updateBean() {
         String actionLocaleName = ReportEngineEventMapping.getLocaleName(listener.getEventName());
-        javaScriptActionPane.setResourceInfo(new JavaScriptResourceInfo(JavaScriptResourceInfo.Type.WEB_CONFIG, Toolkit.i18nText(actionLocaleName)));
+
+        JavaScriptResourceInfo.PathNode pathNode = JavaScriptResourceInfo.PathNode.create(JavaScriptResourceInfo.Type.WEB_CONFIG, Toolkit.i18nText(actionLocaleName));
+        JavaScriptResourceInfo javaScriptResourceInfo = new JavaScriptResourceInfo().addFirstPathNode(pathNode);
+        javaScriptActionPane.setResourceInfo(javaScriptResourceInfo);
         this.listener.setEventName(this.nameText.getText());
         FurtherBasicBeanPane<? extends JavaScript> pane = this.cards.get(this.styleBox.getSelectedIndex());
         this.listener.setAction(pane.updateBean());

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

@@ -156,11 +156,15 @@ public class DesignerSocketIO {
     private static String[] getSocketUri() throws IOException {
         Workspace current = WorkContext.getCurrent();
         URL url = new URL(current.getPath());
-        Integer[] ports = current.get(SocketInfoOperator.class).getPort();
+        Integer[] ports = WebSocketConfig.getInstance().getAvailablePorts();
         WorkspaceConnection connection = current.getConnection();
         // 服务器配置https  webSocket可能是wss也可能是ws webSocket的协议可以单独配置
         WebSocketProtocol webSocketProtocol = WebSocketConfig.getInstance().getProtocol();
         currentProtocol = webSocketProtocol == WebSocketProtocol.PLAIN ? HTTP : HTTPS;
+        if (WebSocketConfig.getInstance().isUsingProxy()) {
+            // 如果配置了代理服务器跟随服务器协议
+            currentProtocol = url.getProtocol();
+        }
         String[] result = new String[ports.length];
         for (int i = 0; i < ports.length; i++) {
             result[i] = String.format("%s://%s:%s%s?%s=%s&%s=%s",

designer-realize/src/main/java/com/fr/design/webattr/EditToolBar.java

@@ -519,7 +519,10 @@ public class EditToolBar extends BasicPane {
                 if (javaScriptPane == null || ((CustomToolBarButton) widget).getJSImpl() == null) {
                     javaScriptPane = JavaScriptActionPane.createDefault();
                 }
-                javaScriptPane.setResourceInfo(new JavaScriptResourceInfo(JavaScriptResourceInfo.Type.WIDGET, ((Button) widget).getText()));
+
+                JavaScriptResourceInfo.PathNode pathNode = JavaScriptResourceInfo.PathNode.create(JavaScriptResourceInfo.Type.WIDGET, ((Button) widget).getText());
+                JavaScriptResourceInfo javaScriptResourceInfo = new JavaScriptResourceInfo().addFirstPathNode(pathNode);
+                javaScriptPane.setResourceInfo(javaScriptResourceInfo);
 
                 javaScriptPane.setPreferredSize(new Dimension(750, 500));
                 BasicDialog dialog = javaScriptPane.showWindow(SwingUtilities.getWindowAncestor(ButtonPane.this));
@@ -539,27 +542,28 @@ public class EditToolBar extends BasicPane {
             }
         };
 
-		/**
+        /**
-		 * 更新
+         * 更新
-		 * @param widget 对应组件
+         *
-		 */
+         * @param widget 对应组件
-		public void populate(Widget widget) {
+         */
-			this.widget = widget;
+        public void populate(Widget widget) {
-			card.show(centerPane, "none");
+            this.widget = widget;
-			if (widget instanceof Button) {
+            card.show(centerPane, "none");
-				populateDefault();
+            if (widget instanceof Button) {
-			}
+                populateDefault();
-			if (widget instanceof Export) {
+            }
-				populateExport();
+            if (widget instanceof Export) {
-			} else if (widget instanceof AppendColumnRow) {
+                populateExport();
-				populateAppendColumnRow();
+            } else if (widget instanceof AppendColumnRow) {
-			} else if (widget instanceof Submit) {
+                populateAppendColumnRow();
-				populateSubmit();
+            } else if (widget instanceof Submit) {
-			} else if (widget instanceof CustomToolBarButton) {
+                populateSubmit();
-				populateCustomToolBarButton();
+            } else if (widget instanceof CustomToolBarButton) {
-			} else if (widget instanceof Email) {
+                populateCustomToolBarButton();
-				populateEmail();
+            } else if (widget instanceof Email) {
-			}
+                populateEmail();
+            }
 
             Set<ExtraButtonToolBarProvider> extraButtonSet = ExtraDesignClassManager.getInstance().getArray(ExtraButtonToolBarProvider.XML_TAG);
             for (ExtraButtonToolBarProvider provider : extraButtonSet) {
@@ -572,21 +576,22 @@ public class EditToolBar extends BasicPane {
             count.setValue(((AppendColumnRow) widget).getCount());
         }
 
-		private void populateExport(){
+        private void populateExport() {
-			card.show(centerPane, "export");
+            card.show(centerPane, "export");
-			Export export = (Export) widget;
+            Export export = (Export) widget;
-			this.pdf.setSelected(export.isPdfAvailable());
+            this.pdf.setSelected(export.isPdfAvailable());
-			this.excelP.setSelected(export.isExcelPAvailable());
+            this.excelP.setSelected(export.isExcelPAvailable());
-			this.excelO.setSelected(export.isExcelOAvailable());
+            this.excelO.setSelected(export.isExcelOAvailable());
-			this.excelS.setSelected(export.isExcelSAvailable());
+            this.excelS.setSelected(export.isExcelSAvailable());
-			this.word.setSelected(export.isWordAvailable());
+            this.word.setSelected(export.isWordAvailable());
-			this.image.setSelected(export.isImageAvailable());
+            this.image.setSelected(export.isImageAvailable());
-			if(exportToolBarProviders != null){
+            if (exportToolBarProviders != null) {
-				for(int i=0; i<exportToolBarProviders.length; i++){
+                for (int i = 0; i < exportToolBarProviders.length; i++) {
-					exportToolBarProviders[i].populate();;
+                    exportToolBarProviders[i].populate();
-				}
+                    ;
-			}
+                }
-		}
+            }
+        }
 
         private void populateEmail() {
             card.show(centerPane, EMAIL);
@@ -694,7 +699,10 @@ public class EditToolBar extends BasicPane {
             if (customToolBarButton.getJSImpl() == null) {
                 this.javaScriptPane = JavaScriptActionPane.createDefault();
             }
-            javaScriptPane.setResourceInfo(new JavaScriptResourceInfo(JavaScriptResourceInfo.Type.CUSTOM_BUTTON, ((Button) widget).getText()));
+
+            JavaScriptResourceInfo.PathNode pathNode = JavaScriptResourceInfo.PathNode.create(JavaScriptResourceInfo.Type.CUSTOM_BUTTON, ((Button) widget).getText());
+            JavaScriptResourceInfo javaScriptResourceInfo = new JavaScriptResourceInfo().addFirstPathNode(pathNode);
+            javaScriptPane.setResourceInfo(javaScriptResourceInfo);
 
             customToolBarButton.setJSImpl(this.javaScriptPane.updateBean());
         }

designer-realize/src/main/java/com/fr/design/widget/WidgetEventPane.java

@@ -55,29 +55,31 @@ public class WidgetEventPane extends UIListGroupControlPane {
     public NameableCreator[] createNameableCreators() {
         return new NameableCreator[]{
                 new EventCreator(Widget.EVENT_STATECHANGE, WidgetEventListenerUpdatePane.class)
-            };
+        };
     }
 
-	@Override
+    @Override
-	public void saveSettings() {
+    public void saveSettings() {
         CellWidgetPropertyPane.getInstance().update(selection);
     }
 
-	@Override
+    @Override
     protected String title4PopupWindow() {
-    	return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Event");
+        return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Event");
     }
 
     public static class WidgetEventListenerUpdatePane extends ListenerUpdatePane {
-    	private ElementCasePane epane;
+        private ElementCasePane epane;
+
         // 反射会用到
         public WidgetEventListenerUpdatePane() {
             this(null);
         }
-    	public WidgetEventListenerUpdatePane(ElementCasePane epane){
+
-    		this.epane = epane;
+        public WidgetEventListenerUpdatePane(ElementCasePane epane) {
-    		super.initComponents();
+            this.epane = epane;
-    	}
+            super.initComponents();
+        }
 
         /**
          *  根据有无单元格创建 DBManipulationPane
@@ -88,41 +90,41 @@ public class WidgetEventPane extends UIListGroupControlPane {
             return jTemplate.createDBManipulationPaneInWidget();
         }
 
-		@Override
+        @Override
-		protected JavaScriptActionPane createJavaScriptActionPane() {
+        protected JavaScriptActionPane createJavaScriptActionPane() {
-			return new JavaScriptActionPane() {
+            return new JavaScriptActionPane() {
 
-				@Override
+                @Override
-				protected DBManipulationPane createDBManipulationPane() {
+                protected DBManipulationPane createDBManipulationPane() {
-                    if(epane == null && DesignerContext.getDesignerFrame().getSelectedJTemplate() != null) {
+                    if (epane == null && DesignerContext.getDesignerFrame().getSelectedJTemplate() != null) {
-						return autoCreateDBManipulationInWidgetEventPane();
+                        return autoCreateDBManipulationInWidgetEventPane();
-					}
+                    }
 
-					return new SmartInsertDBManipulationInWidgetEventPane(epane);
+                    return new SmartInsertDBManipulationInWidgetEventPane(epane);
-				}
+                }
 
-				@Override
+                @Override
-				protected String title4PopupWindow() {
+                protected String title4PopupWindow() {
-					return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Callback_Function");
+                    return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Set_Callback_Function");
-				}
+                }
 
-				@Override
+                @Override
-				protected boolean isForm() {
+                protected boolean isForm() {
-					return false;
+                    return false;
-				}
+                }
 
-				protected String[] getDefaultArgs() {
+                protected String[] getDefaultArgs() {
-					return new String[0];
+                    return new String[0];
-				}
+                }
-			};
+            };
-		}
+        }
 
-		@Override
+        @Override
-		protected boolean supportCellAction() {
+        protected boolean supportCellAction() {
-			return false;
+            return false;
-		}
+        }
 
-	}
+    }
 
     public void populate(Widget widget) {
         if (widget == null) {
@@ -191,7 +193,13 @@ public class WidgetEventPane extends UIListGroupControlPane {
     public void wrapperListener(Listener listener) {
         if (listener.getAction() instanceof Commit2DBJavaScript) {
             Commit2DBJavaScript commit2DBJavaScript = (Commit2DBJavaScript) listener.getAction();
-            commit2DBJavaScript.setJsResourceInfo(new JavaScriptResourceInfo(JavaScriptResourceInfo.Type.WIDGET, targetWidget.getWidgetName()));
+            JavaScriptResourceInfo.PathNode widgetNode = JavaScriptResourceInfo.PathNode.create(JavaScriptResourceInfo.Type.WIDGET, targetWidget.getWidgetName());
+            JavaScriptResourceInfo.PathNode EventNode = JavaScriptResourceInfo.PathNode.create(JavaScriptResourceInfo.Type.EVENT, listener.getName());
+
+            JavaScriptResourceInfo javaScriptResourceInfo = new JavaScriptResourceInfo()
+                    .addFirstPathNode(EventNode)
+                    .addFirstPathNode(widgetNode);
+            commit2DBJavaScript.setJsResourceInfo(javaScriptResourceInfo);
         }
     }