From f89a5d3171f9de2a09101f06650e7155b4363a9b Mon Sep 17 00:00:00 2001
From: Harrison <Harrison@fanruan.com>
Date: Tue, 24 Mar 2020 14:38:48 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-27647=20=E6=A8=A1=E6=9D=BF=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E7=9A=84=E5=AE=89=E8=A3=85=E4=B8=8B=E8=BD=BD-?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E7=BB=84=E4=BB=B6=E5=A4=8D=E7=94=A8=E6=8F=92?=
 =?UTF-8?q?=E4=BB=B6=20=E5=88=A0=E6=8E=89=E5=A4=9A=E4=BD=99=E7=9A=84?=
 =?UTF-8?q?=E8=AE=BE=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../design/fun/PropertyItemPaneProvider.java  | 21 ++++++++++++++++
 ...AbstractComponentLibraryPaneProcessor.java | 25 -------------------
 .../mainframe/EastRegionContainerPane.java    |  6 +++++
 3 files changed, 27 insertions(+), 25 deletions(-)
 delete mode 100644 designer-base/src/main/java/com/fr/design/fun/impl/AbstractComponentLibraryPaneProcessor.java

diff --git a/designer-base/src/main/java/com/fr/design/fun/PropertyItemPaneProvider.java b/designer-base/src/main/java/com/fr/design/fun/PropertyItemPaneProvider.java
index 2dbead9ed6..2c5c3f2d48 100644
--- a/designer-base/src/main/java/com/fr/design/fun/PropertyItemPaneProvider.java
+++ b/designer-base/src/main/java/com/fr/design/fun/PropertyItemPaneProvider.java
@@ -14,12 +14,33 @@ public interface PropertyItemPaneProvider<T> extends Mutable {
     
     String XML_TAG = "PropertyItemPaneProvider";
     
+    /**
+     * 独一无二的标志
+     *
+     * @return 标志
+     */
     String key();
     
+    /**
+     * 配置属性
+     *
+     * @return 熟悉
+     */
     PropertyItemBean getItem();
     
+    /**
+     * 面板持有者
+     *
+     * @param clazz 类型
+     * @return 持有者
+     */
     @Nullable
     PaneHolder<T> getPaneHolder(Class<?> clazz);
     
+    /**
+     * 想要替代的类型
+     *
+     * @return 替代类型
+     */
     String replaceKey();
 }
diff --git a/designer-base/src/main/java/com/fr/design/fun/impl/AbstractComponentLibraryPaneProcessor.java b/designer-base/src/main/java/com/fr/design/fun/impl/AbstractComponentLibraryPaneProcessor.java
deleted file mode 100644
index f376ad7887..0000000000
--- a/designer-base/src/main/java/com/fr/design/fun/impl/AbstractComponentLibraryPaneProcessor.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package com.fr.design.fun.impl;
-
-import com.fr.design.fun.ComponentLibraryPaneProcessor;
-import com.fr.stable.fun.impl.AbstractProvider;
-import com.fr.stable.fun.mark.API;
-import com.fr.stable.fun.mark.Layer;
-
-/**
- * created by Harrison on 2020/03/16
- **/
-@API(level = ComponentLibraryPaneProcessor.CURRENT_LEVEL)
-public abstract class AbstractComponentLibraryPaneProcessor extends AbstractProvider implements ComponentLibraryPaneProcessor {
-    
-    @Override
-    public int currentAPILevel() {
-        
-        return ComponentLibraryPaneProcessor.CURRENT_LEVEL;
-    }
-    
-    @Override
-    public int layerIndex() {
-        
-        return Layer.DEFAULT_LAYER_INDEX;
-    }
-}
diff --git a/designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java b/designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java
index 790c0eb39f..0c23e8658f 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java
@@ -178,6 +178,9 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
         
         propertyItemMap.remove(provider.key());
         String replaceKey = provider.replaceKey();
+        if (replaceKey == null) {
+            return;
+        }
         PropertyItem replaceItem = propertyItemMap.get(replaceKey);
         if (replaceItem != null) {
             replaceItem.setReplace(false);
@@ -210,6 +213,9 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
         propertyItemMap.put(key, propertyItem);
     
         String replaceKey = provider.replaceKey();
+        if (replaceKey == null) {
+            return;
+        }
         PropertyItem replaceItem = propertyItemMap.get(replaceKey);
         if (replaceItem != null) {
             replaceItem.setReplace(true);