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

优化CRUD

pull/354/MERGE
Karson 2021-12-31 21:51:16 +08:00
parent 82ea7fcd15
commit 5ea57836c8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/admin/command/Crud.php
View File

@ -722,14 +722,14 @@ class Crud extends Command
$field = $v['COLUMN_NAME']; $field = $v['COLUMN_NAME'];
$itemArr = []; $itemArr = [];
// 这里构建Enum和Set类型的列表数据 // 这里构建Enum和Set类型的列表数据
if (in_array($v['DATA_TYPE'], ['enum', 'set', 'tinyint'])) { if (in_array($v['DATA_TYPE'], ['enum', 'set', 'tinyint']) || $this->headingFilterField == $field) {
if ($v['DATA_TYPE'] !== 'tinyint') { if ($v['DATA_TYPE'] !== 'tinyint') {
$itemArr = substr($v['COLUMN_TYPE'], strlen($v['DATA_TYPE']) + 1, -1); $itemArr = substr($v['COLUMN_TYPE'], strlen($v['DATA_TYPE']) + 1, -1);
$itemArr = explode(',', str_replace("'", '', $itemArr)); $itemArr = explode(',', str_replace("'", '', $itemArr));
} }
$itemArr = $this->getItemArray($itemArr, $field, $v['COLUMN_COMMENT']); $itemArr = $this->getItemArray($itemArr, $field, $v['COLUMN_COMMENT']);
//如果类型为tinyint且有使用备注数据 //如果类型为tinyint且有使用备注数据
if ($itemArr && $v['DATA_TYPE'] == 'tinyint') { if ($itemArr && !in_array($v['DATA_TYPE'], ['enum', 'set'])) {
$v['DATA_TYPE'] = 'enum'; $v['DATA_TYPE'] = 'enum';
} }
} }