Skip to content

Feat 表格显示、搜索增强对枚举类型的支持 #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PrintNow merged 2 commits into from
Aug 5, 2025
Merged

Feat 表格显示、搜索增强对枚举类型的支持 #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e3a069
feat: 添加数据仓库枚举字段的渲染支持
PrintNow Aug 1, 2025
f30fabe
feat(Grid/Filter): 优化 Select Presenter 对枚举类型的处理
PrintNow Aug 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion src/Grid/Column/HasDisplayers.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,15 @@ public function prepend($val)
{
return $this->display(function ($v, $column) use (&$val) {
if ($val instanceof \Closure) {
$val = $val->call($this, $v, $column->getOriginal(), $column);
$original = $column->getOriginal();

if ($original instanceof \BackedEnum) {
$original = $original->value;
}else if($original instanceof \UnitEnum){
$original = $original->name;
}

$val = $val->call($this, $v, $original, $column);
}

if (is_array($v)) {
Expand All @@ -131,6 +139,18 @@ public function prepend($val)
return $v->prepend($val);
}

// 如果是枚举类型
if ($v instanceof \UnitEnum) {
// 如果实现了 JsonSerializable 接口，优先取此值
if ($v instanceof \JsonSerializable) {
$v = (string)$v->jsonSerialize();
} else if ($v instanceof \StringBackedEnum) {
$v = $v->value;
} else {
$v = $v->name;
}
}

return $val.$v;
});
}
Expand Down
12 changes: 12 additions & 0 deletions src/Grid/Filter/Presenter/Select.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,18 @@ protected function buildOptions(): array
$this->options = $this->options->toArray();
}

$firstOption = $this->options[0] ?? null;
if ($firstOption instanceof \UnitEnum) {
// TODO 如果实现了 \JsonSerializable 接口，是否要取 jsonSerialize() 方法的值？

$isBackedEnum = $firstOption instanceof \BackedEnum;
$this->options = array_column(
array: $this->options,
column_key: 'name',
index_key: $isBackedEnum ? 'value' : 'name'
);
}

$this->addDefaultConfig([
'allowClear' => true,
'placeholder' => [
Expand Down