bugfix: 部分字段默认值不生效问题

Author: modstart

vendor/modstart/modstart/src/Field/AbstractField.php

@@ -151,9 +151,13 @@ class AbstractField implements Renderable
      */
     protected $label;
     /**
-     * @var null 字段值，null表示为空，非null表示有值
+     * @var null 字段值，null表示没有值，非null表示有值
      */
     protected $value = null;
+    /**
+     * @var null 默认值，null表示没有默认值，非null表示有默认值
+     */
+    protected $defaultValue = null;
     /**
      * @var null ?
      */
@@ -209,7 +213,6 @@ class AbstractField implements Renderable
     protected $showable = true;
     protected $sortable = false;
     protected $renderMode;
-    protected $defaultValue = null;
     protected $placeholder = null;
     protected $help = null;
     protected $tip = null;

vendor/modstart/modstart/src/Field/Checkbox.php

@@ -53,6 +53,9 @@ public function optionType($typeCls)
 
     public function unserializeValue($value, AbstractField $field)
     {
+        if (null === $value) {
+            return $value;
+        }
         switch ($this->getVariable('serializeType')) {
             case self::SERIALIZE_TYPE_COLON_SEPARATED:
                 return TagUtil::string2Array($value);

vendor/modstart/modstart/src/Field/ComplexFields.php

@@ -11,7 +11,6 @@
  */
 class ComplexFields extends AbstractField
 {
-    protected $value = [];
     protected $width = 300;
     protected $listable = false;
 
@@ -53,6 +52,9 @@ public function fields($value)
 
     public function unserializeValue($value, AbstractField $field)
     {
+        if (null === $value) {
+            return $value;
+        }
         $value = @json_decode($value, true);
         if (empty($value)) {
             $value = new \stdClass();

vendor/modstart/modstart/src/Field/CustomField.php

@@ -15,13 +15,6 @@
  */
 class CustomField extends AbstractField
 {
-    protected $value = [
-        'type' => '',
-        'title' => '',
-        'data' => [
-            'option' => [],
-        ],
-    ];
     protected $listable = false;
 
     protected function setup()
@@ -32,6 +25,9 @@ protected function setup()
 
     public function unserializeValue($value, AbstractField $field)
     {
+        if (null === $value) {
+            return $value;
+        }
         $value = @json_decode($value, true);
         if (empty($value)) {
             $value = [];

vendor/modstart/modstart/src/Field/DynamicFields.php

@@ -17,7 +17,6 @@
  */
 class DynamicFields extends AbstractField
 {
-    protected $value = [];
     protected $width = 300;
     protected $listable = false;
 
@@ -30,6 +29,9 @@ protected function setup()
 
     public function unserializeValue($value, AbstractField $field)
     {
+        if (null === $value) {
+            return $value;
+        }
         $value = @json_decode($value, true);
         if (empty($value)) {
             $value = [];

vendor/modstart/modstart/src/Field/Files.php

@@ -41,6 +41,9 @@ public function mode($mode)
 
     public function unserializeValue($value, AbstractField $field)
     {
+        if (null === $value) {
+            return $value;
+        }
         return ConvertUtil::toArray($value);
     }
 

vendor/modstart/modstart/src/Field/Images.php

@@ -25,6 +25,9 @@ public function server($server)
 
     public function unserializeValue($value, AbstractField $field)
     {
+        if (null === $value) {
+            return $value;
+        }
         return ConvertUtil::toArray($value);
     }
 

vendor/modstart/modstart/src/Field/ImagesTemp.php

@@ -28,6 +28,9 @@ public function server($server)
 
     public function unserializeValue($value, AbstractField $field)
     {
+        if (null === $value) {
+            return $value;
+        }
         return ConvertUtil::toArray($value);
     }
 

vendor/modstart/modstart/src/Field/Json.php

@@ -29,6 +29,9 @@ public function editorHeight($height)
 
     public function unserializeValue($value, AbstractField $field)
     {
+        if (null === $value) {
+            return $value;
+        }
         return @json_decode($value, true);
     }
 

vendor/modstart/modstart/src/Field/JsonIdItems.php

@@ -47,6 +47,9 @@ public function previewUrl($value)
 
     public function unserializeValue($value, AbstractField $field)
     {
+        if (null === $value) {
+            return $value;
+        }
         return @json_decode($value, true);
     }