Merge branch 'master' into 2.0

resources/assets/dcat/extra/upload.scss

@@ -154,7 +154,8 @@
   overflow: hidden;
   border-radius: 2px;
   font-size: 12px;
-  box-shadow: $shadow-200;
+  //box-shadow: $shadow-200;
+  border: 1px solid $input-border-color;
   //color: #333;
   background: #fff;
   display: table;
@@ -401,8 +402,7 @@
 }
 
 .web-uploader .statusBar {
-  height: 53px;
-  line-height: 53px;
+  //line-height: 53px;
   vertical-align: middle;
   position: relative
 }
@@ -444,6 +444,7 @@
   display: inline-block;
   font-size: 14px;
   color: #666!important;
+  margin-top: 20px;
 }
 
 .web-uploader .statusBar .btns {

resources/assets/dcat/sass/components/_form.scss

@@ -1,6 +1,9 @@
-.form-control:not(textarea) {
+.form-control {
   border-color: $input-border-color;
   color: $font-color;
+}
+
+.form-control:not(textarea) {
   padding: .5rem .7rem;
   font-size: .9rem;
 }
@@ -11,6 +14,10 @@ input.form-control, div.form-control {
   border-radius: $card-border-radius;
 }
 
+.input-group-text {
+  border-color: $input-border-color;
+}
+
 .form-control-sm {
   padding: 0.5rem 1.5rem;
 }

resources/assets/dcat/sass/theme/_colors.scss

@@ -113,7 +113,7 @@ $gray-bg: #f1f1f1;
 $border-color: #ebeff2;
 
 // 表单边框颜色
-$input-border-color: #d9d9d9;
+$input-border-color: darken(#e4eaec, 3%);
 
 // 常用分割线颜色
 $divider-color: #f4f4f4;

resources/views/form/file.blade.php

@@ -21,8 +21,9 @@
                 </div>
                 <div class="info"></div>
                 <div class="btns">
-                    <div class="add-file-button"></div> &nbsp;
+                    <div class="add-file-button"></div>
                     @if($showUploadBtn)
+                    &nbsp;
                     <div class="upload-btn btn btn-primary"><i class="feather icon-upload"></i> &nbsp;{{trans('admin.upload')}}</div>
                     @endif
                 </div>

src/Form/Field.php

@@ -62,6 +62,11 @@ class Field implements Renderable
      */
     protected $default;
 
+    /**
+     * @var bool
+     */
+    protected $allowDefaultValueInEditPage = false;
+
     /**
      * Element label.
      *
@@ -620,22 +625,26 @@ class Field implements Renderable
     /**
      * Get or set default value for field.
      *
-     * @param $default
+     * @param mixed $default
+     * @param bool  $edit
      *
      * @return $this|mixed
      */
-    public function default($default = null)
+    public function default($default = null, bool $edit = false)
     {
         if ($default === null) {
             if (
                 $this->form
                 && method_exists($this->form, 'isCreating')
                 && ! $this->form->isCreating()
+                && ! $this->allowDefaultValueInEditPage
             ) {
                 return;
             }
 
             if ($this->default instanceof \Closure) {
+                $this->default->bindTo($this->data());
+
                 return call_user_func($this->default, $this->form);
             }
 
@@ -643,6 +652,7 @@ class Field implements Renderable
         }
 
         $this->default = $default;
+        $this->allowDefaultValueInEditPage = $edit;
 
         return $this;
     }

src/Form/Field/Select.php

@@ -124,7 +124,7 @@ $(document).on('change', "{$this->getElementClassSelector()}", function () {
                 d.text = d.$textField;
                 return d;
             })
-        }).val(target.attr('data-value')).trigger('change');
+        }).val(target.attr('data-value').split(',')).trigger('change');
     });
 });
 $("{$this->getElementClassSelector()}").trigger('change');
@@ -172,7 +172,7 @@ JS;
                     d.text = d.$textField;
                     return d;
                 })
-            }).val(target.data('value')).trigger('change');
+            }).val(target.data('value').split(',')).trigger('change');
         });
     };