重命名

resources/lang/en/admin.php

@@ -169,7 +169,7 @@ return [
         'failed_num' => 'failed::fail.',
         'pause_upload' => 'Pause',
         'go_on_upload' => 'Go On',
-        'start_upload' => 'Start Upload',
+        'start_upload' => 'Upload',
         'upload_success_message' => ':success files uploaded successfully',
         'go_on_add' => 'New File',
         'Q_TYPE_DENIED' => 'Sorry, the type of this file is not allowed!',

src/Form/Field.php

@@ -324,18 +324,18 @@ class Field implements Renderable
     {
         $this->data($data);
 
-        $this->value = $this->formatAttributeFromQuery($data);
+        $this->value = $this->formatFieldData($data);
 
         $this->callCustomFormatter();
     }
 
     /**
-     * Format attribute.
+     * Format field data.
      *
      * @param array $data
      * @return mixed
      */
-    protected function formatAttributeFromQuery($data)
+    protected function formatFieldData($data)
     {
         if (is_array($this->column)) {
             $value = [];
@@ -347,7 +347,7 @@ class Field implements Renderable
             return $value;
         }
 
-        return Arr::get($data, $this->column);
+        return Arr::get($data, $this->column, $this->value);
     }
 
     /**
@@ -372,7 +372,7 @@ class Field implements Renderable
      */
     final public function setOriginal($data)
     {
-        $this->original = $this->formatAttributeFromQuery($data);
+        $this->original = $this->formatFieldData($data);
 
         $this->callCustomFormatter('original', new Fluent($data));
     }

src/Form/Field/BootstrapMultipleFile.php

@@ -132,7 +132,7 @@ class BootstrapMultipleFile extends Field
         return $this->original;
     }
 
-    protected function formatAttributeFromQuery($data)
+    protected function formatFieldData($data)
     {
         $value = Arr::get($data, $this->column);
 

src/Form/Field/File.php

@@ -123,7 +123,7 @@ class File extends Field
         return $this;
     }
 
-    protected function formatAttributeFromQuery($data)
+    protected function formatFieldData($data)
     {
         return Helper::array(Arr::get($data, $this->column));
     }

src/Form/Field/KeyValue.php

@@ -20,7 +20,7 @@ class KeyValue extends Field
      *
      * @return mixed
      */
-    public function formatAttributeFromQuery($data)
+    public function formatFieldData($data)
     {
         $this->data = $data;
 

src/Form/Field/ListField.php

@@ -60,7 +60,7 @@ class ListField extends Field
      *
      * @return void
      */
-    public function formatAttributeFromQuery($data)
+    public function formatFieldData($data)
     {
         $this->data = $data;
 

src/Form/Field/MultipleSelect.php

@@ -7,7 +7,7 @@ use Illuminate\Support\Arr;
 
 class MultipleSelect extends Select
 {
-    protected function formatAttributeFromQuery($data)
+    protected function formatFieldData($data)
     {
         return Helper::array(Arr::get($data, $this->column));
     }

src/Form/Field/Tags.php

@@ -38,7 +38,7 @@ class Tags extends Field
     /**
      * {@inheritdoc}
      */
-    protected function formatAttributeFromQuery($data)
+    protected function formatFieldData($data)
     {
         $value = Arr::get($data, $this->column);
 

src/Form/Field/Tree.php

@@ -196,7 +196,7 @@ class Tree extends Field
         return $this;
     }
 
-    protected function formatAttributeFromQuery($data)
+    protected function formatFieldData($data)
     {
         $value = Arr::get($data, $this->column);