mirror
/
fastadmin
mirror of https://gitee.com/karson/fastadmin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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

更新版本号
pull/80/MERGE v1.0.0.20181031_beta
Karson 2018-10-31 19:22:42 +08:00
parent 86ba65d907
commit dca32b0a13
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/config.php
View File

@ -272,7 +272,7 @@ return [
//自动检测更新 //自动检测更新
'checkupdate' => false, 'checkupdate' => false,
//版本号 //版本号
'version' => '1.0.0.20180911_beta', 'version' => '1.0.0.20181031_beta',
//API接口地址 //API接口地址
'api_url' => 'https://api.fastadmin.net', 'api_url' => 'https://api.fastadmin.net',
], ],

6
extend/fast/Form.php
View File

@ -213,7 +213,7 @@ class FormBuilder
if (!in_array($type, $this->skipValueTypes)) { if (!in_array($type, $this->skipValueTypes)) {
$value = $this->getValueAttribute($name, $value); $value = $this->getValueAttribute($name, $value);
$options['class'] = isset($options['class']) ? $options['class'] . ' form-control' : 'form-control'; $options['class'] = isset($options['class']) ? $options['class'] . (stripos($options['class'], 'form-control') !== false ? '' : ' form-control') : 'form-control';
} }
$merge = compact('type', 'value', 'id'); $merge = compact('type', 'value', 'id');
@ -317,7 +317,7 @@ class FormBuilder
unset($options['size']); unset($options['size']);
$options['class'] = isset($options['class']) ? $options['class'] . ' form-control' : 'form-control'; $options['class'] = isset($options['class']) ? $options['class'] . (stripos($options['class'], 'form-control') !== false ? '' : ' form-control') : 'form-control';
$options = $this->attributes($options); $options = $this->attributes($options);
return '<textarea' . $options . '>' . $this->escape($value) . '</textarea>'; return '<textarea' . $options . '>' . $this->escape($value) . '</textarea>';
@ -389,7 +389,7 @@ class FormBuilder
foreach ($list as $value => $display) { foreach ($list as $value => $display) {
$html[] = $this->getSelectOption($display, $value, $selected); $html[] = $this->getSelectOption($display, $value, $selected);
} }
$options['class'] = isset($options['class']) ? $options['class'] . ' form-control' : 'form-control'; $options['class'] = isset($options['class']) ? $options['class'] . (stripos($options['class'], 'form-control') !== false ? '' : ' form-control') : 'form-control';
$options = $this->attributes($options); $options = $this->attributes($options);
$list = implode('', $html); $list = implode('', $html);