mirror of https://gitee.com/karson/fastadmin.git
parent
24be463fae
commit
cac61decce
|
|
@ -124,7 +124,7 @@ class Date
|
|||
*/
|
||||
public static function human($remote, $local = null)
|
||||
{
|
||||
$time_diff = (is_null($local) ? time() : $local) - $remote;
|
||||
$time_diff = (is_null($local) ? time() : $local) - (int)$remote;
|
||||
$tense = $time_diff < 0 ? 'after' : 'ago';
|
||||
$time_diff = abs($time_diff);
|
||||
$chunks = [
|
||||
|
|
|
|||
|
|
@ -205,6 +205,7 @@ class FormBuilder
|
|||
$value = $this->getValueAttribute($name, $value);
|
||||
$options['class'] = isset($options['class']) ? $options['class'] . (stripos($options['class'], 'form-control') !== false ? '' : ' form-control') : 'form-control';
|
||||
}
|
||||
$value = $this->escape($value);
|
||||
|
||||
$merge = compact('type', 'value', 'id');
|
||||
$options = array_merge($options, $merge);
|
||||
|
|
@ -680,6 +681,7 @@ EOD;
|
|||
return "<ins>{$value}</ins>";
|
||||
}, $title));
|
||||
$value = is_array($value) ? json_encode($value) : $value;
|
||||
$value = $this->escape($value);
|
||||
$html = <<<EOD
|
||||
<dl class="fieldlist" data-name="{$name}" {$template} {$attributes}>
|
||||
<dd>
|
||||
|
|
@ -710,7 +712,8 @@ EOD;
|
|||
$level = $index + 1;
|
||||
$class = "cxselect-{$level}";
|
||||
$classes[] = $class;
|
||||
$selectValue = isset($values[$value]) ? $values[$value] : (isset($values[$index]) ? $values[$index] : '');
|
||||
$selectValue = $values[$value] ?? ($values[$index] ?? '');
|
||||
$selectValue = $this->escape($selectValue);
|
||||
|
||||
$cxselect[] = <<<EOD
|
||||
<select class="{$class} form-control" name="{$value}" data-value="{$selectValue}" data-url="{$url}?level={$level}&name={$value}" {$attributes}></select>
|
||||
|
|
|
|||
Loading…
Reference in New Issue