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

Pre Merge pull request !420 from 战场原礼亚/hotfix/curd_rmdir_error

pull/420/MERGE
战场原礼亚 2025-06-26 09:09:02 +00:00 committed by Gitee
parent 2e48ea5ddf 87630bac8f
commit 915140b1c7
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1312,6 +1312,7 @@ EOD;
$iterator = new \FilesystemIterator($parentDir); $iterator = new \FilesystemIterator($parentDir);
$isDirEmpty = !$iterator->valid(); $isDirEmpty = !$iterator->valid();
if ($isDirEmpty) { if ($isDirEmpty) {
unset($iterator);
rmdir($parentDir); rmdir($parentDir);
$parentDir = dirname($parentDir); $parentDir = dirname($parentDir);
} else { } else {
@ -1607,7 +1608,7 @@ EOD;
$inputType = 'datetime'; $inputType = 'datetime';
} }
// 指定后缀结尾且类型为enum,说明是个单选框 // 指定后缀结尾且类型为enum,说明是个单选框
if ($this->isMatchSuffix($fieldsName, $this->enumRadioSuffix) && $v['DATA_TYPE'] == 'enum') { if ($this->isMatchSuffix($fieldsName, $this->enumRadioSuffix) && $v['DATA_TYPE'] == 'enum' || $v['DATA_TYPE'] == 'smallint') {
$inputType = "radio"; $inputType = "radio";
} }
// 指定后缀结尾且类型为set,说明是个复选框 // 指定后缀结尾且类型为set,说明是个复选框