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

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

@@ -977,6 +977,10 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
      * @param jt 添加的模板.
      */
     public void addAndActivateJTemplate(JTemplate<?, ?> jt) {
+        JTemplate currentEditingTemplate = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
+        if (currentEditingTemplate != null) {
+            currentEditingTemplate.stopEditing();
+        }
         //切换文件后清空FixedPopupPane面板
         EastRegionContainerPane.getInstance().clearCurrentPopupPane();
         //释放模板对象

designer-chart/src/main/java/com/fr/van/chart/map/designer/other/condition/item/VanChartCommonMarkerConditionPane.java

@@ -2,7 +2,6 @@ package com.fr.van.chart.map.designer.other.condition.item;
 
 import com.fr.chart.base.DataSeriesCondition;
 import com.fr.design.condition.ConditionAttributesPane;
-
 import com.fr.plugin.chart.base.VanChartAttrMarker;
 import com.fr.van.chart.designer.other.condition.item.AbstractNormalMultiLineConditionPane;
 import com.fr.van.chart.map.designer.style.series.VanChartMapScatterMarkerPane;
@@ -30,6 +29,10 @@ public class VanChartCommonMarkerConditionPane extends AbstractNormalMultiLineCo
         return commonMarkerPane;
     }
 
+    public void setDefault() {
+        this.populate(new VanChartAttrMarker());
+    }
+
     /**
      * 条目名称
      *

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

@@ -8,6 +8,8 @@ import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.utils.gui.UIComponentUtils;
 import com.fr.general.ComparatorUtils;
+import com.fr.transaction.Configurations;
+import com.fr.transaction.WorkerAdaptor;
 
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
@@ -140,8 +142,14 @@ public class WriteShortCutsPane extends JPanel{
 				nextRowString = temp;
 				switchColRow();
 
+				Configurations.update(new WorkerAdaptor(ServerPreferenceConfig.class) {
+
+					@Override
+					public void run() {
 						ServerPreferenceConfig.getInstance().setWriteShortCuts(ComparatorUtils.equals(nextColString, "Tab"));
 					}
+				});
+			}
 		};
 		
 		return actionListener;

designer-realize/src/main/java/com/fr/design/write/submit/SmartInsertDBManipulationPane.java

@@ -310,9 +310,9 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
         // 单元格组要记录下之前的选中情况
         private CellSelection oriCellSelection = null;
 
-        private List<String> newAdd = new ArrayList<String>();
+        private List<ColumnRow> newAdd = new ArrayList<>();
 
-        private List<String> oldAdd = new ArrayList<String>();
+        private List<ColumnRow> oldAdd = new ArrayList<>();
 
         public SmartJTablePane4DB(KeyColumnTableModel model, ElementCasePane actionReportPane) {
             this(model, actionReportPane, false);
@@ -433,7 +433,8 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
                     if (!allColumnRow.contains(columnRow.toString())) {
                         add.addColumnRow(columnRow);
                     }
-
+                    // 重新更换区域框选单元格后 清理历史框选
+                    oldAdd.clear();
                 }
 
                 if (add.getSize() > 0) {
@@ -459,10 +460,11 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
                         TemplateCellElement cellElement = ePane.getEditingElementCase().getTemplateCellElement(c + i, r + j);
                         if (cellElement != null && ((i + c) != 0 || (r + j) != 0)) {
                             String value = cellElement.toString();
-                            if (!newAdd.contains(value) && !allColumnRow.contains(value)) {
-                                add.addColumnRow(ColumnRow.valueOf(value));
+                            ColumnRow columnRow = ColumnRow.valueOf(value);
+                            if (!newAdd.contains(columnRow) && !allColumnRow.contains(value)) {
+                                add.addColumnRow(columnRow);
                             }
-                            newAdd.add(value);
+                            newAdd.add(columnRow);
                         }
 
                         if (cellElement == null) {
@@ -470,16 +472,14 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
                             if (!allColumnRow.contains(columnRow.toString())) {
                                 add.addColumnRow(columnRow);
                             }
-                            newAdd.add(columnRow.toString());
-                        }
+                            newAdd.add(columnRow);
                         }
                     }
-                int oldSize = oldAdd.size();
-                int newSize = newAdd.size();
-                if (oldSize > newSize && oldAdd.containsAll(newAdd)) {
-                    int diff = oldSize - newSize;
-                    newValue.splice(newValue.getSize() - diff, diff);
                 }
+                // 计算出前后两次选中的差值
+                oldAdd.removeAll(newAdd);
+                // 移除差值部分
+                newValue.removeAll(oldAdd);
                 oldAdd.clear();
                 oldAdd.addAll(newAdd);
             }

designer-realize/src/main/java/com/fr/poly/creator/ECBlockEditor.java

@@ -176,6 +176,7 @@ public class ECBlockEditor extends BlockEditor<ECBlockPane, PolyECBlock> {
         // 超级链接
         HyperlinkGroupPane hyperlinkGroupPane = DesignerContext.getDesignerFrame().getSelectedJTemplate()
                 .getHyperLinkPane(HyperlinkGroupPaneActionImpl.getInstance());
+        EastRegionContainerPane.getInstance().replaceHyperlinkPane(hyperlinkGroupPane);
         hyperlinkGroupPane.populate(editComponent);
     }