From 6a1934fd1b7597720e3dba9f9b4e316765f05912 Mon Sep 17 00:00:00 2001
From: kerry <kerry@fanruan.com>
Date: Thu, 23 Apr 2020 17:45:51 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-29815=20=20=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=8F=92=E4=BB=B6=E7=9B=91=E5=90=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/fr/design/unit/UnitConvertUtil.java   | 23 ++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/designer-base/src/main/java/com/fr/design/unit/UnitConvertUtil.java b/designer-base/src/main/java/com/fr/design/unit/UnitConvertUtil.java
index 406ddcfdd..520430d51 100644
--- a/designer-base/src/main/java/com/fr/design/unit/UnitConvertUtil.java
+++ b/designer-base/src/main/java/com/fr/design/unit/UnitConvertUtil.java
@@ -6,7 +6,11 @@ import com.fr.design.unit.impl.CMReportLengthUNIT;
 import com.fr.design.unit.impl.INCHReportLengthUNIT;
 import com.fr.design.unit.impl.MMReportLengthUNIT;
 import com.fr.design.unit.impl.PTReportLengthUNIT;
-
+import com.fr.general.GeneralContext;
+import com.fr.plugin.context.PluginContext;
+import com.fr.plugin.manage.PluginFilter;
+import com.fr.plugin.observer.PluginEvent;
+import com.fr.plugin.observer.PluginEventListener;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
@@ -18,6 +22,23 @@ public class UnitConvertUtil {
     private static List<ReportLengthUNITProvider> lengthUNITList = new ArrayList<ReportLengthUNITProvider>();
 
     static {
+        GeneralContext.listenPluginRunningChanged(new PluginEventListener() {
+            @Override
+            public void on(PluginEvent pluginEvent) {
+                initSupportedReportLengthUNIT();
+            }
+        }, new PluginFilter() {
+            @Override
+            public boolean accept(PluginContext pluginContext) {
+                return pluginContext.contain(ReportLengthUNITProvider.MARK_STRING);
+            }
+        });
+
+        initSupportedReportLengthUNIT();
+    }
+
+    private static void initSupportedReportLengthUNIT(){
+        lengthUNITList.clear();
         lengthUNITList.add(new MMReportLengthUNIT());
         lengthUNITList.add(new CMReportLengthUNIT());
         lengthUNITList.add(new INCHReportLengthUNIT());