作者 Karson

修复Form生成冗余form-control类的BUG

更新版本号
@@ -272,7 +272,7 @@ return [ @@ -272,7 +272,7 @@ return [
272 //自动检测更新 272 //自动检测更新
273 'checkupdate' => false, 273 'checkupdate' => false,
274 //版本号 274 //版本号
275 - 'version' => '1.0.0.20180911_beta', 275 + 'version' => '1.0.0.20181031_beta',
276 //API接口地址 276 //API接口地址
277 'api_url' => 'https://api.fastadmin.net', 277 'api_url' => 'https://api.fastadmin.net',
278 ], 278 ],
@@ -213,7 +213,7 @@ class FormBuilder @@ -213,7 +213,7 @@ class FormBuilder
213 213
214 if (!in_array($type, $this->skipValueTypes)) { 214 if (!in_array($type, $this->skipValueTypes)) {
215 $value = $this->getValueAttribute($name, $value); 215 $value = $this->getValueAttribute($name, $value);
216 - $options['class'] = isset($options['class']) ? $options['class'] . ' form-control' : 'form-control'; 216 + $options['class'] = isset($options['class']) ? $options['class'] . (stripos($options['class'], 'form-control') !== false ? '' : ' form-control') : 'form-control';
217 } 217 }
218 218
219 $merge = compact('type', 'value', 'id'); 219 $merge = compact('type', 'value', 'id');
@@ -317,7 +317,7 @@ class FormBuilder @@ -317,7 +317,7 @@ class FormBuilder
317 317
318 unset($options['size']); 318 unset($options['size']);
319 319
320 - $options['class'] = isset($options['class']) ? $options['class'] . ' form-control' : 'form-control'; 320 + $options['class'] = isset($options['class']) ? $options['class'] . (stripos($options['class'], 'form-control') !== false ? '' : ' form-control') : 'form-control';
321 $options = $this->attributes($options); 321 $options = $this->attributes($options);
322 322
323 return '<textarea' . $options . '>' . $this->escape($value) . '</textarea>'; 323 return '<textarea' . $options . '>' . $this->escape($value) . '</textarea>';
@@ -389,7 +389,7 @@ class FormBuilder @@ -389,7 +389,7 @@ class FormBuilder
389 foreach ($list as $value => $display) { 389 foreach ($list as $value => $display) {
390 $html[] = $this->getSelectOption($display, $value, $selected); 390 $html[] = $this->getSelectOption($display, $value, $selected);
391 } 391 }
392 - $options['class'] = isset($options['class']) ? $options['class'] . ' form-control' : 'form-control'; 392 + $options['class'] = isset($options['class']) ? $options['class'] . (stripos($options['class'], 'form-control') !== false ? '' : ' form-control') : 'form-control';
393 393
394 $options = $this->attributes($options); 394 $options = $this->attributes($options);
395 $list = implode('', $html); 395 $list = implode('', $html);