Merge branch 'release/10.0' of https://code.fineres.com/scm/~lucian.chen/design into release/10.0

designer-base/src/main/resources/com/fr/design/images/gui/color/background_normal.svg

@@ -3,6 +3,5 @@
     <title>icon_文本背景色_normal</title>
     <g id="icon_文本背景色_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
         <path d="M9,0 L8.9993,1.656 L11.3546845,4.01296053 C12.496044,4.07957725 16,4.48860182 16,7 C16,10 13,12 13,12 C13,12 13.4489375,10.2042499 12.842809,7.81595247 L7.6363,13.021 L1.9793,7.364 L4.9993,4.344 L5,0 L9,0 Z M7.9993,2.756 L3.3933,7.364 L7.6363,11.606 L12.5054659,6.73651111 C12.4728171,6.64900228 12.4386503,6.56099677 12.4029036,6.47254402 L8.9993,3.07 L9,6 L8,6 L7.9993,2.756 Z M7.9993,1 L5.9993,1 L5.9993,3.344 L7.9993,1.344 L7.9993,1 Z" id="Combined-Shape" fill="#333334"></path>
-        <rect id="Rectangle" fill="#F87777" x="0" y="12" width="16" height="4"></rect>
     </g>
-</svg>
+</svg>

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

@@ -97,6 +97,7 @@ import java.awt.image.BufferedImage;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import javax.swing.tree.TreePath;
 
 public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm<Form> {
     private static final String FORM_CARD = "FORM";
@@ -623,6 +624,15 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm<F
                 this.formDesign.getSelectionModel().setSelectedCreators(FormSelectionUtils.rebuildSelection(formDesign.getRootComponent(),
                         formDesign.getRootComponent() == selectedBodyLayout() ? u.getSelectWidgets() : new Widget[]{selectedBodyLayout().toData()}));
                 refreshToolArea();
+                // 停止编辑 恢复浮层展示
+                TreePath[] treePaths = FormHierarchyTreePane.getInstance(formDesign).getComponentTree().getSelectedTreePath();
+                if (treePaths != null) {
+                    for (TreePath path : treePaths) {
+                        if (path != null) {
+                            formDesign.stopEditing(path);
+                        }
+                    }
+                }
             } else {
                 // 只在报表块里撤销是不需要修改外部form对象的, 因为编辑的是当前报表块.
                 // 修改了JForm的Target需要同步修改formDesign的Target.