From cb3b80a6508d546586e7c707f9f2be8d2987c933 Mon Sep 17 00:00:00 2001
From: "Destiny.Lin" <Destiny.Lin@fanruan.com>
Date: Mon, 19 Dec 2022 15:35:01 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-85618=20=E3=80=90FR=E8=AE=BE=E8=AE=A1?=
 =?UTF-8?q?=E5=99=A8-=E7=A7=BB=E5=8A=A8=E7=AB=AF=E3=80=91=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E9=A1=BA=E5=BA=8F-frm=E6=A8=A1=E6=9D=BF=EF=BC=8C?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E4=BF=AE=E6=94=B9=E5=90=8D=E7=A7=B0=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8Cbody-=E7=A7=BB=E5=8A=A8=E7=AB=AF-=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E4=BC=9A=E6=8E=92=E5=88=B0=E6=9C=80=E5=90=8E?=
 =?UTF-8?q?=E4=B8=80=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mainframe/widget/ui/FormSingleWidgetCardPane.java       | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/designer-form/src/main/java/com/fr/design/mainframe/widget/ui/FormSingleWidgetCardPane.java b/designer-form/src/main/java/com/fr/design/mainframe/widget/ui/FormSingleWidgetCardPane.java
index 491b42b2b9..6869b8b30f 100644
--- a/designer-form/src/main/java/com/fr/design/mainframe/widget/ui/FormSingleWidgetCardPane.java
+++ b/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());