优化继承

src/Driver/CustomComponent.php

@@ -14,6 +14,7 @@ namespace FormBuilder\Driver;
 
 use FormBuilder\Contract\CustomComponentInterface;
 use FormBuilder\Rule\BaseRule;
+use FormBuilder\Rule\CallPropsRule;
 use FormBuilder\Rule\ChildrenRule;
 use FormBuilder\Rule\EmitRule;
 use FormBuilder\Rule\PropsRule;
@@ -30,7 +31,9 @@ class CustomComponent implements CustomComponentInterface
     use EmitRule;
     use PropsRule;
     use ValidateRule;
+    use CallPropsRule;
 
+    protected static $propsRule = [];
 
     protected $defaultProps = [];
 

src/Driver/FormComponent.php

@@ -14,14 +14,9 @@ namespace FormBuilder\Driver;
 
 use FormBuilder\Contract\FormComponentInterface;
 use FormBuilder\Contract\ValidateInterface;
-use FormBuilder\Rule\CallPropsRule;
 
 abstract class FormComponent extends CustomComponent implements FormComponentInterface
 {
-    use CallPropsRule;
-
-    protected static $propsRule = [];
-
     protected $defaultValue = '';
 
     protected $selectComponent = false;

src/UI/Elm/Components/Button.php

@@ -13,7 +13,6 @@ namespace FormBuilder\UI\Elm\Components;
 
 
 use FormBuilder\Driver\CustomComponent;
-use FormBuilder\Rule\CallPropsRule;
 
 /**
  * Class Button
@@ -34,8 +33,6 @@ use FormBuilder\Rule\CallPropsRule;
  */
 class Button extends CustomComponent
 {
-    use CallPropsRule;
-
     protected static $propsRule = [
         'size' => 'string',
         'type' => 'string',

src/UI/Elm/Components/Popover.php

@@ -13,7 +13,6 @@ namespace FormBuilder\UI\Elm\Components;
 
 
 use FormBuilder\Driver\CustomComponent;
-use FormBuilder\Rule\CallPropsRule;
 
 /**
  * Class Popover
@@ -35,10 +34,6 @@ use FormBuilder\Rule\CallPropsRule;
  */
 class Popover extends CustomComponent
 {
-    use CallPropsRule;
-
-    protected $defaultProps = [];
-
     protected static $propsRule = [
         'trigger' => 'string',
         'title' => 'string',

src/UI/Elm/Components/Tooltip.php

@@ -13,7 +13,6 @@ namespace FormBuilder\UI\Elm\Components;
 
 
 use FormBuilder\Driver\CustomComponent;
-use FormBuilder\Rule\CallPropsRule;
 
 /**
  * Class Tooltip
@@ -34,8 +33,6 @@ use FormBuilder\Rule\CallPropsRule;
  */
 class Tooltip extends CustomComponent
 {
-    use CallPropsRule;
-
     protected static $propsRule = [
         'effect' => 'string',
         'content' => 'string',

src/UI/Iview/Components/Button.php

@@ -13,7 +13,6 @@ namespace FormBuilder\UI\Iview\Components;
 
 
 use FormBuilder\Driver\CustomComponent;
-use FormBuilder\Rule\CallPropsRule;
 
 /**
  * Class Button
@@ -29,8 +28,6 @@ use FormBuilder\Rule\CallPropsRule;
  */
 class Button extends CustomComponent
 {
-    use CallPropsRule;
-
     protected static $propsRule = [
         'type' => 'string',
         'size' => 'string',

src/UI/Iview/Components/Poptip.php

@@ -13,7 +13,6 @@ namespace FormBuilder\UI\Iview\Components;
 
 
 use FormBuilder\Driver\CustomComponent;
-use FormBuilder\Rule\CallPropsRule;
 
 /**
  * Class Poptip
@@ -34,8 +33,6 @@ use FormBuilder\Rule\CallPropsRule;
  */
 class Poptip extends CustomComponent
 {
-    use CallPropsRule;
-
     protected $defaultProps = [
         'transfer' => true
     ];

src/UI/Iview/Components/Tooltip.php

@@ -13,7 +13,6 @@ namespace FormBuilder\UI\Iview\Components;
 
 
 use FormBuilder\Driver\CustomComponent;
-use FormBuilder\Rule\CallPropsRule;
 
 /**
  * Class Tooltip
@@ -29,8 +28,6 @@ use FormBuilder\Rule\CallPropsRule;
  */
 class Tooltip extends CustomComponent
 {
-    use CallPropsRule;
-
     protected $defaultProps = [
         'transfer' => true
     ];