|
@@ -23,8 +23,10 @@ class Input
|
|
|
} else {
|
|
|
$result = str_replace('form-control', 'form-control layui-input', $result);
|
|
|
}
|
|
|
-
|
|
|
- if (isset($param[1]) && !$param[1] && ((isset($param[0]['update']) && $param[0]['update'] != 'hidden') || !isset($param[0]['update']))) {
|
|
|
+
|
|
|
+ if ($name == 'hidden' || (isset($param[0]['update']) && $param[0]['update'] == 'hidden')) {
|
|
|
+ $result = '<div class="layui-inline" style="margin: 0;">'.$result.'</div>';
|
|
|
+ } elseif ((isset($param[1]) && !$param[1]) || !isset($param[0]['update'])) {
|
|
|
$result = '<div class="layui-inline"><div class="layui-input-inline">'.$result.'</div></div>';
|
|
|
} else {
|
|
|
$result = '<div>'.$result.'</div>';
|
|
@@ -50,7 +52,7 @@ class Input
|
|
|
{
|
|
|
$url = Dever::url('map', 'manage');
|
|
|
|
|
|
- $html = self::text($param);
|
|
|
+ $html = self::_text($param);
|
|
|
|
|
|
$id = $param['name'] . '_value';
|
|
|
$iframe_id = $id . '_map';
|
|
@@ -158,7 +160,7 @@ class Input
|
|
|
*/
|
|
|
public static function _pageLeft($param)
|
|
|
{
|
|
|
- $param = self::cue($param);
|
|
|
+ $param = self::_cue($param);
|
|
|
|
|
|
if ($param['cue']) {
|
|
|
$param['cue'] = '<span style="font-size:12px;font-weight:normal;font-color:#bababa;margin-left:5px;">[' . $param['cue'] . ']</span>';
|
|
@@ -561,7 +563,7 @@ class Input
|
|
|
$html .= '<a href="javascript:;" onclick="selector($(this))" class="' . $param['name'] . '_selector selector" data-check="' . $check . '" data-name="' . $param['name'] . '" data-value="' . $k . '">' . $value . '</a> ';
|
|
|
}
|
|
|
|
|
|
- $html .= self::hidden($param);
|
|
|
+ $html .= self::_hidden($param);
|
|
|
}
|
|
|
return '<div class="am-btn-group" >' . $html . '</div>';
|
|
|
}
|
|
@@ -923,12 +925,12 @@ class Input
|
|
|
|
|
|
if (isset($param['child'])) {
|
|
|
$child = $child_param['name'];
|
|
|
- $hidden = self::hidden(array('name' => $child, 'class' => $child . '_child_value'));
|
|
|
+ $hidden = self::_hidden(array('name' => $child, 'class' => $child . '_child_value'));
|
|
|
foreach ($param['child'] as $k => $v) {
|
|
|
$child_param['name'] = 'child-' . $k;
|
|
|
$child_param['option'] = $v;
|
|
|
|
|
|
- $html .= self::select($child_param, $child . '_child ' . $child . '_child_' . $k . '" parent="' . $k . '" style="display:none;margin-top: -35px;margin-left: 47%;"', $hidden);
|
|
|
+ $html .= self::_select($child_param, $child . '_child ' . $child . '_child_' . $k . '" parent="' . $k . '" style="display:none;margin-top: -35px;margin-left: 47%;"', $hidden);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -943,7 +945,7 @@ class Input
|
|
|
*/
|
|
|
public static function _checkbox($param)
|
|
|
{
|
|
|
- return self::radio($param);
|
|
|
+ return self::_radio($param);
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -954,7 +956,7 @@ class Input
|
|
|
public static function _text($param, $class = '')
|
|
|
{
|
|
|
if ($class) {
|
|
|
- return '<div class="">' . self::text($param, false) . '</div>';
|
|
|
+ return '<div class="">' . self::_text($param, false) . '</div>';
|
|
|
} else {
|
|
|
$auto = $input = '';
|
|
|
$value = (isset($param['value']) ? $param['value'] : (isset($param['default']) ? $param['default'] : ''));
|
|
@@ -963,7 +965,7 @@ class Input
|
|
|
$param['autocomplete'][1] = 'value';
|
|
|
}
|
|
|
if ($param['autocomplete'][1] == 'id') {
|
|
|
- $input = self::hidden(array('name' => $param['name'], 'value' => $value));
|
|
|
+ $input = self::_hidden(array('name' => $param['name'], 'value' => $value));
|
|
|
$input = '<script>var autocomplete_value = {};autocomplete_value[\''.$param['name'].'_value\'] = [];</script>';
|
|
|
if (isset($param['autocomplete'][2]) && $value) {
|
|
|
# 重新定义value
|
|
@@ -1007,7 +1009,7 @@ class Input
|
|
|
$param['searchbox'][1] = 'value';
|
|
|
}
|
|
|
if ($param['searchbox'][1] == 'id') {
|
|
|
- $input = self::hidden(array('name' => $param['name'], 'value' => $value));
|
|
|
+ $input = self::_hidden(array('name' => $param['name'], 'value' => $value));
|
|
|
$input = '<script>var searchbox_value = [];searchbox_value[\''.$param['name'].'_value\'] = [];</script>';
|
|
|
if (isset($param['searchbox'][2]) && $value) {
|
|
|
# 重新定义value
|
|
@@ -1086,7 +1088,7 @@ class Input
|
|
|
$param['class'] = 'dever-color form-control';
|
|
|
$param['update'] = 'text';
|
|
|
$param['default'] = isset($param['default']) ? $param['default'] : '#000000';
|
|
|
- return self::text($param, '');
|
|
|
+ return self::_text($param, '');
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -1097,7 +1099,7 @@ class Input
|
|
|
public static function _password($param)
|
|
|
{
|
|
|
$param['value'] = '';
|
|
|
- return self::text($param);
|
|
|
+ return self::_text($param);
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -1108,7 +1110,7 @@ class Input
|
|
|
public static function _hidden($param)
|
|
|
{
|
|
|
$param['update'] = 'hidden';
|
|
|
- return self::text($param, '');
|
|
|
+ return self::_text($param, '');
|
|
|
}
|
|
|
|
|
|
/**
|