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

Author: modstart

vendor/modstart/modstart/views/core/field/areaChina.blade.php

@@ -14,7 +14,7 @@
             <input type="hidden"
                    data-title
                    name="{{$name}}"
-                   value="{{$value}}"
+                   value="{{null===$value?$defaultValue:$value}}"
             />
         </div>
         @if(!empty($help))

vendor/modstart/modstart/views/core/field/audio.blade.php

@@ -12,7 +12,7 @@
                class="form"
                name="{{$name}}"
                placeholder="{{$placeholder}}"
-               value="{{$value}}"/>
+               value="{{null===$value?$defaultValue:$value}}"/>
         <div id="{{$name}}Selector">
             <div class="ub-audio-selector" style="display:inline-block;border:1px solid #EEE;position:relative;border-radius:0.2rem;line-height:1.3rem;padding:0 2rem 0 0.5rem;vertical-align:bottom;">
                 <div data-value>{{empty($value)?L('None'):$value}}</div>

vendor/modstart/modstart/views/core/field/captcha.blade.php

@@ -15,7 +15,7 @@ class="form"
                    placeholder="{{$placeholder}}"
                    style="max-width:100%;"
                    autocomplete="off"
-                   value="{{$value}}" />
+                   value="{{null===$value?$defaultValue:$value}}" />
             <img data-captcha src="{{$url}}"
                  style="height:29px;border-radius:3px;cursor:pointer;position:absolute;right:0px;top:1px;bottom:1px;border-left:1px solid #EEE;"
                  title="{{L('Click To Refresh')}}"

vendor/modstart/modstart/views/core/field/checkbox.blade.php

@@ -12,7 +12,7 @@
         <div class="layui-form" lay-filter="{{$name}}">
             @foreach($options as $k=>$v)
                 <input type="checkbox" value="{{$k}}" name="{{$name}}[]" lay-skin="primary"
-                       @if((!empty($value) && in_array($k,$value))||(!empty($defaultValue) && in_array($k,$defaultValue))) checked @endif title="{{$v}}">
+                       @if((null!==$value&&!empty($value)&&in_array($k,$value))||(null===$value&&!empty($defaultValue)&&in_array($k,$defaultValue))) checked @endif title="{{$v}}">
             @endforeach
         </div>
         @if(!empty($help))

vendor/modstart/modstart/views/core/field/code.blade.php

@@ -10,7 +10,7 @@
         <textarea name="{{$name}}" rows="3"
                   placeholder="{{$placeholder}}"
                   @if($styleFormField) style="{!! $styleFormField !!}" @endif
-                   {{$readonly?'readonly':''}}>{{$value}}</textarea>
+                   {{$readonly?'readonly':''}}>{{null===$value?$defaultValue:$value}}</textarea>
         @if(!empty($help))
             <div class="help">{!! $help !!}</div>
         @endif

vendor/modstart/modstart/views/core/field/color.blade.php

@@ -14,7 +14,7 @@ class="form"
                    style="width:8em;vertical-align:middle;"
                    name="{{$name}}"
                    placeholder="{{$placeholder}}"
-                   value="{{$value}}" />
+                   value="{{null===$value?$defaultValue:$value}}" />
             <div id="{{$id}}Color" style="vertical-align:top;"></div>
         </div>
         @if(!empty($help))

vendor/modstart/modstart/views/core/field/customField.blade.php

@@ -65,7 +65,7 @@
         var app = new Vue({
             el: '#{{$id}}Input',
             data: {
-                value: {!! json_encode($value) !!}
+                value: {!! json_encode(null===$value?$defaultValue:$value) !!}
             },
             computed:{
                 jsonValue:function(){

vendor/modstart/modstart/views/core/field/date.blade.php

@@ -15,7 +15,7 @@ class="form"
                id="{{$id}}Input"
                placeholder="{{$placeholder}}"
                autocomplete="off"
-               value="{{$value}}" />
+               value="{{null===$value?$defaultValue:$value}}" />
         @if(!empty($help))
             <div class="help">{!! $help !!}</div>
         @endif

vendor/modstart/modstart/views/core/field/datetime.blade.php

@@ -15,7 +15,7 @@ class="form"
                id="{{$id}}Input"
                placeholder="{{$placeholder}}"
                autocomplete="off"
-               value="{{$value}}" />
+               value="{{null===$value?$defaultValue:$value}}" />
         @if(!empty($help))
             <div class="help">{!! $help !!}</div>
         @endif

vendor/modstart/modstart/views/core/field/display.blade.php

@@ -10,7 +10,7 @@
     </div>
     <div class="field">
         <div class="value">{{$value}}</div>
-        <input type="hidden" name="{{$name}}" value="{{$value}}"/>
+        <input type="hidden" name="{{$name}}" value="{{null===$value?$defaultValue:$value}}"/>
         @if(!empty($help))
             <div class="help">{!! $help !!}</div>
         @endif