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

优化日期显示 

加强表单元素生成转义
pull/517/head
Karson 2026-01-20 11:23:02 +08:00
parent 24be463fae
commit cac61decce
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
extend/fast/Date.php
View File

@ -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 = [
@ -196,11 +196,11 @@ class Date
case 'quarter':
$quarter = ceil(date('n', $baseTime) / 3) + $offset;
$month = $quarter * 3;
$offset_year = ceil($month/12) - 1;
$offset_year = ceil($month / 12) - 1;
$year = $year + $offset_year;
$month = $month - ($offset_year * 12);
$time = $position ?
mktime(0, 0, 0, $month-2, 1, $year) :
mktime(0, 0, 0, $month - 2, 1, $year) :
mktime(23, 59, 59, $month, self::days_in_month($month, $year), $year);
break;
case 'year':

9
extend/fast/Form.php
View File

@ -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);
@ -586,9 +587,9 @@ EOD;
public function datetimepicker($name, $value, $options = [])
{
$defaults = [
'data-date-format' => "YYYY-MM-DD HH:mm:ss",
'data-date-format' => "YYYY-MM-DD HH:mm:ss",
// 兼容旧的用法
'data-use-current' => "true",
'data-use-current' => "true",
'data-date-use-current' => "true",
];
$value = is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value;
@ -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>