From dca32b0a13b5410788ad17be6cce159a41113620 Mon Sep 17 00:00:00 2001
From: Karson <karsonzhang@163.com>
Date: Wed, 31 Oct 2018 19:22:42 +0800
Subject: [PATCH] 修复Form生成冗余form-control类的BUG 更新版本号
---
application/config.php | 2 +-
extend/fast/Form.php | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/application/config.php b/application/config.php
index 47b3aac..eae9a58 100755
--- a/application/config.php
+++ b/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',
],
diff --git a/extend/fast/Form.php b/extend/fast/Form.php
index f7fe1fb..f9f4e74 100644
--- a/extend/fast/Form.php
+++ b/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);
--
libgit2 0.24.0