Merge pull request #11029 in DESIGN/design from bugfix/10.0 to feature/10.0

* commit '88b8032a8334346b02121596fd1a032d63a16b06':
  REPORT-85618 【FR设计器-移动端】组件顺序-frm模板，组件修改名称后，body-移动端-组件顺序会排到最后一位

designer-form/src/main/java/com/fr/design/mainframe/widget/ui/FormSingleWidgetCardPane.java

@@ -30,6 +30,7 @@ import com.fr.design.widget.Operator;
 import com.fr.design.widget.ui.designer.component.WidgetAbsoluteBoundPane;
 import com.fr.design.widget.ui.designer.component.WidgetBoundPane;
 import com.fr.design.widget.ui.designer.component.WidgetCardTagBoundPane;
+import com.fr.form.main.WidgetUtil;
 import com.fr.form.ui.ChartEditor;
 import com.fr.form.ui.Widget;
 import com.fr.form.ui.container.WScaleLayout;
@@ -243,7 +244,12 @@ public class FormSingleWidgetCardPane extends FormWidgetCardPane {
                 showNameInvalidDialog(Toolkit.i18nText("Fine-Design_Form_Chart_Widget_Rename_Failure"));
                 return;
             }
+            String oldName = widget.getWidgetName();
             widgetPropertyPane.update(widget);
+            Widget innerWidget = WidgetUtil.getInnerWidget(widget);
+            if (!StringUtils.equals(oldName, innerWidget.getWidgetName())) {
+                innerWidget.setMobileOldWidgetName(oldName);
+            }
             // 上面一行更新了组件 这里必须重新调用getWidgetName
             xCreator.resetCreatorName(widget.getWidgetName());
             xCreator.resetVisible(widget.isVisible());