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

designer-base/src/main/java/com/fr/design/gui/itextfield/UINumberField.java

@@ -35,6 +35,7 @@ public class UINumberField extends UITextField {
     private double maxValue = Double.MAX_VALUE;
 
     private boolean isContentChanged = false;
+    private boolean fillNegativeNumber = true;
 
     public UINumberField() {
         this(MAX_INTEGERLENGTH_32, MAX_DECIMALLENGTH);
@@ -62,6 +63,10 @@ public class UINumberField extends UITextField {
         initListener();
     }
 
+    public void canFillNegativeNumber(boolean fillNegativeNumber) {
+        this.fillNegativeNumber = fillNegativeNumber;
+    }
+
     public int getMaxIntegerLength() {
         return maxIntegerLength;
     }
@@ -185,6 +190,9 @@ public class UINumberField extends UITextField {
         // kunsnat: 这种限制输入 有个不好的地方, 比如删除时: 10.1  最大值限定100, 那么就删除中间的小数点之后变为101, 超出了100.
         // 但是直接限制不能删除中间类似小数点, 那么也可能遇到: 最小值10 , 从100变化到其中的19, 就很难..
         private boolean notChange(String strNew) {
+            if (!fillNegativeNumber && strNew.contains("-")) {
+                return true;
+            }
             boolean noChange = false;
             boolean isMinus = strNew.startsWith("-");
             strNew = strNew.replaceFirst("-", StringUtils.EMPTY); // 控制能输入负数

designer-base/src/main/java/com/fr/design/hyperlink/ReportletHyperNorthPane.java

@@ -368,6 +368,7 @@ public class ReportletHyperNorthPane extends AbstractHyperNorthPane<ReportletHyp
         sizeJPanel.add(heightLabel);
         UINumberField heightTextFiled = new UINumberField();
         heightTextFiled.setMinValue(0);
+        heightTextFiled.canFillNegativeNumber(false);
         heightTextFiled.setText(String.valueOf(DEFAULT_H_VALUE));
         heightTextFiled.setPreferredSize(new Dimension(40, 20));
         sizeJPanel.add(heightTextFiled);
@@ -377,6 +378,7 @@ public class ReportletHyperNorthPane extends AbstractHyperNorthPane<ReportletHyp
         sizeJPanel.add(widthLabel);
         UINumberField widthTextFiled = new UINumberField();
         widthTextFiled.setMinValue(0);
+        widthTextFiled.canFillNegativeNumber(false);
         widthTextFiled.setText(String.valueOf(DEFAULT_V_VALUE));
         widthTextFiled.setPreferredSize(new Dimension(40, 20));
         sizeJPanel.add(widthTextFiled);

designer-base/src/main/java/com/fr/design/javascript/Commit2DBJavaScriptPane.java

@@ -149,8 +149,6 @@ public class Commit2DBJavaScriptPane extends FurtherBasicBeanPane<Commit2DBJavaS
 
 		commit2dbJavaScript.setCallBack(this.javaScriptActionPane.getCall());
 
-		this.javaScriptActionPane.setCall(null);
-
 		return commit2dbJavaScript;
 	}
 

designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileStyleDefinePane.java

@@ -5,7 +5,7 @@ import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.style.color.NewColorSelectBox;
+import com.fr.design.style.color.ColorSelectBox;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.form.ui.Widget;
 import com.fr.form.ui.mobile.MobileStyle;
@@ -23,7 +23,7 @@ public class MobileStyleDefinePane extends BasicBeanPane<MobileStyle> {
     private Widget widget;
     private MobileStyleCustomDefinePane customBeanPane;
     private Class<? extends MobileStyle> mobileStyleClazz;
-    private NewColorSelectBox colorSelectBox;
+    private ColorSelectBox colorSelectBox;
     private Color titleColor = new Color(47, 142, 241);
 
     MobileStyleDefinePane(Widget widget, Class<? extends MobileStyleCustomDefinePane> customBeanPaneClass,
@@ -91,7 +91,7 @@ public class MobileStyleDefinePane extends BasicBeanPane<MobileStyle> {
         UILabel colorSelectLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Mobile_Widget_Background"), UILabel.RIGHT);
         colorSelectLabel.setPreferredSize(new Dimension(65, 20));
 
-        colorSelectBox = new NewColorSelectBox(152);
+        colorSelectBox = new ColorSelectBox(152);
         colorSelectBox.addSelectChangeListener(new ChangeListener() {
             @Override
             public void stateChanged(ChangeEvent e) {

designer-chart/src/main/java/com/fr/design/chart/gui/ChartComponent.java

@@ -13,6 +13,8 @@ import com.fr.log.FineLoggerFactory;
 import com.fr.script.Calculator;
 import com.fr.stable.core.PropertyChangeListener;
 
+import java.util.ArrayList;
+import java.util.List;
 import java.awt.Color;
 import java.awt.Dimension;
 import java.awt.Graphics;
@@ -22,8 +24,6 @@ import java.awt.RenderingHints;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 import java.awt.event.MouseMotionListener;
-import java.util.ArrayList;
-import java.util.List;
 
 /**
 * @author kunsnat E-mail:kunsnat@gmail.com
@@ -236,7 +236,7 @@ public class ChartComponent extends MiddleChartComponent implements MouseListene
     private void drawChart(Graphics2D g2d) {
         if (chartCollection4Design != null) {
 
-            BaseChartPainter painter = chartCollection4Design.createResultChartPainter(Calculator.createCalculator(),
+            BaseChartPainter painter = chartCollection4Design.createResultChartPainterWithOutDealFormula(Calculator.createCalculator(),
                     WebChartIDInfo.createEmptyDesignerInfo(), chartWidth, chartHeight);
 
             int resolution = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate().getJTemplateResolution();

designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/GisMapPlotPane.java

@@ -88,6 +88,11 @@ public class GisMapPlotPane extends AbstractDeprecatedChartTypePane {
 		return ChartConstants.GIS_CHAER;
 	}
 
+	@Override
+	public String getPlotID() {
+		return ChartConstants.GIS_CHAER;
+	}
+
 	protected String[] getTypeLayoutPath() {
         return new String[]{"/com/fr/design/images/chart/GisMapPlot/layout/0.png",
                 "/com/fr/design/images/chart/GisMapPlot/layout/1.png",
@@ -157,7 +162,6 @@ public class GisMapPlotPane extends AbstractDeprecatedChartTypePane {
 	 * 更新界面内容
 	 */
 	public void populateBean(Chart chart) {
-		typeDemo.get(0).isPressing = true; 
 		GisMapPlot plot = (GisMapPlot) chart.getPlot();
 
 		if(plot.isGisType()){

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

@@ -863,7 +863,7 @@ public abstract class ElementCasePane<T extends TemplateElementCase> extends Tar
                 // those that are interested in this event
                 for (int i = listeners.length - 2; i >= 0; i -= 2) {
                     if (listeners[i] == SelectionListener.class) {
-                        ((SelectionListener) listeners[i + 1]).selectionChanged(new SelectionEvent(this));
+                        ((SelectionListener) listeners[i + 1]).selectionChanged(new SelectionEvent(ElementCasePane.this));
                     }
                 }
             }

designer-realize/src/main/java/com/fr/start/module/PreStartActivator.java

@@ -5,6 +5,7 @@ import com.fr.design.RestartHelper;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.utils.DesignUtils;
 import com.fr.event.EventDispatcher;
+import com.fr.file.TmpFileUtils;
 import com.fr.general.CloudCenter;
 import com.fr.general.GeneralContext;
 import com.fr.module.Activator;
@@ -17,6 +18,8 @@ public class PreStartActivator extends Activator {
 
     @Override
     public void start() {
+        //清空临时文件
+        TmpFileUtils.cleanUpInnerTmpFiles();
         RestartHelper.deleteRecordFilesWhenStart();
         //初始化
         EventDispatcher.fire(ModuleEvent.MajorModuleStarting, Toolkit.i18nText("Fine-Design_Basic_Initializing"));