Merge pull request #686 in DESIGN/design from ~MATA.LI/design:release/10.0 to release/10.0

* commit '1ee9e304726119b3a2d2880547752954afc5a03d':
  REPORT-13629 & REPORT-13572

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

@@ -5,6 +5,7 @@ import com.fr.base.PaperSize;
 import com.fr.base.Parameter;
 import com.fr.base.vcs.DesignerMode;
 import com.fr.design.DesignState;
+import com.fr.design.actions.FormMobileAttrAction;
 import com.fr.design.actions.TemplateParameterAction;
 import com.fr.design.actions.core.WorkBookSupportable;
 import com.fr.design.actions.file.export.EmbeddedFormExportExportAction;
@@ -496,9 +497,9 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm<F
     @Override
     public ShortCut[] shortcut4TemplateMenu() {
         if (this.index == FORM_TAB) {
-            return ArrayUtils.addAll(new ShortCut[]{new TemplateParameterAction(this), new ReportFitAttrAction(this)}, new ShortCut[0]);
+            return ArrayUtils.addAll(new ShortCut[]{new TemplateParameterAction(this), new FormMobileAttrAction(this), new ReportFitAttrAction(this)}, new ShortCut[0]);
         } else {
-            return ArrayUtils.addAll(new ShortCut[]{new TemplateParameterAction(this), new ReportFitAttrAction(this)}, this.elementCaseDesign.shortcut4TemplateMenu());
+            return ArrayUtils.addAll(new ShortCut[]{new TemplateParameterAction(this), new FormMobileAttrAction(this), new ReportFitAttrAction(this)}, this.elementCaseDesign.shortcut4TemplateMenu());
         }
     }
 

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

@@ -335,7 +335,8 @@ public class SheetNameTabPane extends JComponent implements MouseListener, Mouse
         checkButton(showCount < widthArray.length);
 
         // richie:当linearray不为空时，说明有了鼠标拖动,下面画由于鼠标拖动产生的效果.
-        if (!lineArray.isEmpty()) {
+        //REPORT-13572 点击切换会出现重影,保证:此时鼠标点击是没有放开的,才会绘制轨迹
+        if (!lineArray.isEmpty() && !isReleased) {
             paintDragTab(g2d, textHeight, charWidth, textAscent);
         }
 
@@ -568,6 +569,7 @@ public class SheetNameTabPane extends JComponent implements MouseListener, Mouse
      * @param evt 鼠标事件
      */
     public void mousePressed(MouseEvent evt) {
+        isReleased = false;
         int reportcount = reportComposite.getEditingWorkBook().getReportCount();
         if (scrollIndex < 0 || scrollIndex >= reportcount) {
             return;
@@ -749,7 +751,7 @@ public class SheetNameTabPane extends JComponent implements MouseListener, Mouse
     /**
      * exchange workSheet
      *
-     * @param workBook
+     * @param
      * @param index1
      * @param index2
      * @return workBook