From b087607a94580062c3a2d80eb16d39b3ee7d538c Mon Sep 17 00:00:00 2001
From: kuangshuai <kuangshuai_ios@icloud.com>
Date: Mon, 24 May 2021 17:38:45 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-52512=20=E5=85=B1=E4=BA=AB=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E5=88=A0=E9=99=A4=E5=90=8E=E5=88=A0=E9=99=A4=E5=AF=B9?=
 =?UTF-8?q?=E5=BA=94=E7=9A=84=E6=95=B0=E6=8D=AE=E9=9B=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/fr/design/mainframe/JForm.java   | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/designer-form/src/main/java/com/fr/design/mainframe/JForm.java b/designer-form/src/main/java/com/fr/design/mainframe/JForm.java
index 54db2ec1a..a78c53270 100644
--- a/designer-form/src/main/java/com/fr/design/mainframe/JForm.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/JForm.java
@@ -4,6 +4,7 @@ import com.fr.base.BaseUtils;
 import com.fr.base.PaperSize;
 import com.fr.base.Parameter;
 import com.fr.base.extension.FileExtension;
+import com.fr.base.iofile.attr.ExtendSharableAttrMark;
 import com.fr.base.vcs.DesignerMode;
 import com.fr.design.DesignModelAdapter;
 import com.fr.design.DesignState;
@@ -64,6 +65,11 @@ import com.fr.file.filter.ChooseFileFilter;
 import com.fr.form.FormElementCaseContainerProvider;
 import com.fr.form.FormElementCaseProvider;
 import com.fr.form.main.Form;
+import com.fr.form.main.WidgetGatherAdapter;
+import com.fr.form.share.SharableWidgetProvider;
+import com.fr.form.share.editor.SharableEditorProvider;
+import com.fr.form.share.utils.ShareUtils;
+import com.fr.form.ui.AbstractBorderStyleWidget;
 import com.fr.form.ui.Widget;
 import com.fr.form.ui.container.WBorderLayout;
 import com.fr.form.ui.container.WLayout;
@@ -77,6 +83,7 @@ import com.fr.report.worksheet.FormElementCase;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.Constants;
 import com.fr.stable.ProductConstants;
+import com.fr.stable.StringUtils;
 import com.fr.stable.bridge.StableFactory;
 import com.fr.web.controller.ViewRequestConstants;
 
@@ -96,6 +103,7 @@ import java.awt.event.ActionListener;
 import java.awt.image.BufferedImage;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.Iterator;
 import java.util.List;
 import javax.swing.tree.TreePath;
 
@@ -305,6 +313,7 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm<F
                 } else if (evt.getCreatorEventID() == DesignerEvent.CREATOR_DELETED) {
                     // 在 delete 之前，会先 select 父组件。这里直接传入 lastAffectedCreator 就好了
                     setPropertyPaneChange(lastAffectedCreator);
+                    refreshSharableWidgetTableDataTree((XCreator) lastAffectedCreator);
                 } else if (evt.getCreatorEventID() == DesignerEvent.CREATOR_SELECTED) {
                     lastAffectedCreator = evt.getAffectedCreator();
                     setPropertyPaneChange(lastAffectedCreator);
@@ -1038,4 +1047,35 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm<F
         // richer:form文件 daniel 改成三个字
         fileChooser.addChooseFILEFilter(new ChooseFileFilter(FileExtension.FRM, appName + Toolkit.i18nText("Fine-Design_Report_Template_File")));
     }
+
+    private void refreshSharableWidgetTableDataTree(XCreator lastAffectedCreator) {
+        String lastAffectedCreatorShareID = lastAffectedCreator.getShareId();
+        if (StringUtils.isNotEmpty(lastAffectedCreatorShareID)) {
+            final boolean[] needDeleteTableData = {true};
+            Form.traversalWidget(template.getContainer(), new WidgetGatherAdapter() {
+                @Override
+                public void dealWith(Widget widget) {
+                    AbstractBorderStyleWidget borderStyleWidget = (AbstractBorderStyleWidget) widget;
+                    ExtendSharableAttrMark attrMark = borderStyleWidget.getWidgetAttrMark(ExtendSharableAttrMark.XML_TAG);
+                    if (attrMark != null) {
+                        needDeleteTableData[0] = needDeleteTableData[0] && !ComparatorUtils.equals(lastAffectedCreatorShareID, attrMark.getShareId());
+                    }
+                }
+            }, AbstractBorderStyleWidget.class);
+            if (!needDeleteTableData[0]) {
+                return;
+            }
+
+            SharableWidgetProvider bindInfo = ShareUtils.getElCaseBindInfoById(lastAffectedCreatorShareID);
+            SharableEditorProvider sharableEditor = ShareUtils.getSharedElCaseEditorById(lastAffectedCreatorShareID);
+            if (sharableEditor == null || bindInfo == null) {
+                return;
+            }
+            Iterator tdIterator = sharableEditor.getTableDataSource().getTableDataNameIterator();
+            while (tdIterator.hasNext()) {
+                String tdName = bindInfo.getName() + "-" + tdIterator.next();
+                TableDataTreePane.getInstance(DesignModelAdapter.getCurrentModelAdapter()).removeTableData(tdName);
+            }
+        }
+    }
 }