ulthon/ulthon_admin
1
0
Fork 0
mirror of https://gitee.com/ulthon/ulthon_admin.git synced 2026-07-06 18:12:50 +08:00
Code Issues Packages Projects Releases Wiki Activity

自动生成CURD导出生成关联查询

Browse Source
This commit is contained in:
augushong
2022-07-14 10:19:56 +08:00
parent 065851fcb1
commit cf6d0f9814
5 changed files with 43 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/common/command/admin/Version.php
View File

@@ -12,10 +12,10 @@ use think\console\Output;
class Version extends Command
{
const VERSION = 'v2.0.3';
const VERSION = 'v2.0.4';
const COMMENT = [
'优化导出功能，兼容自定义参数、兼容关联查询用法',
'自动生成CURD导出生成关联查询',
];
protected function configure()

4
app/common/tools/ExcelTools.php
View File

@@ -72,8 +72,8 @@ class ExcelTools
}
} else if (array_key_exists($field_key, $select_fields)) {
// 需要设置选项
$cel = $select_fields[$field_key][$value];
$cel = $select_fields[$field_key][$value] ?? '';
} else if (in_array($field_key, $date_fields)) {
if (empty($value)) {
$cel = '';