Browse Source

修复Form生成冗余form-control类的BUG
更新版本号

Karson 7 years ago
parent
commit
dca32b0a13
2 changed files with 4 additions and 4 deletions
  1. 1 1
      application/config.php
  2. 3 3
      extend/fast/Form.php

+ 1 - 1
application/config.php

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

+ 3 - 3
extend/fast/Form.php

@@ -213,7 +213,7 @@ class FormBuilder
 
         if (!in_array($type, $this->skipValueTypes)) {
             $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');
@@ -317,7 +317,7 @@ class FormBuilder
 
         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);
 
         return '<textarea' . $options . '>' . $this->escape($value) . '</textarea>';
@@ -389,7 +389,7 @@ class FormBuilder
         foreach ($list as $value => $display) {
             $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);
         $list = implode('', $html);