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

将最新的代码合并到当前开发分支中

Browse Source
This commit is contained in:
augushong
2022-12-14 16:40:11 +08:00
parent 3c0929dae5 d5446b61f3
commit e6ab19a9c9
23 changed files with 145 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/admin/service/curd/templates/controller/exportMethod.code
View File

@@ -21,5 +21,11 @@
$content = \app\common\tools\ExportTools::excel($this->model, $where, $fields, $image_fields, $select_fields, $date_fields);
return download($content, $this->model->getName() . date('YmdHis') . '.xlsx', true);
$export_file_name = $this->exportFileName;
if (empty($export_file_name)) {
$export_file_name = $this->model->getName();
}
return download($content, $export_file_name . date('YmdHis') . '.xlsx', true);
}

1
app/admin/service/curd/templates/view/index.code
View File

@@ -1,6 +1,7 @@
<div class="layuimini-container">
<div class="layuimini-main">
<table id="currentTable" class="layui-table layui-hide"
data-auth-index="{:auth('{{controllerUrl}}/index')}"
data-auth-add="{:auth('{{controllerUrl}}/add')}"
data-auth-edit="{:auth('{{controllerUrl}}/edit')}"
data-auth-delete="{:auth('{{controllerUrl}}/delete')}"