From ca2af73a2c456394b77653b5bdf65bea29dbb22b Mon Sep 17 00:00:00 2001 From: walkor Date: Tue, 16 May 2023 11:16:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=BB=E9=94=AE=E4=B8=BA?= =?UTF-8?q?=E5=AD=97=E7=AC=A6=E4=B8=B2=E6=97=B6=E8=BF=94=E5=9B=9E0?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/app/controller/TableController.php | 17 +++++++++++++++-- src/plugin/admin/app/view/table/crud.html | 1 - 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/plugin/admin/app/controller/TableController.php b/src/plugin/admin/app/controller/TableController.php index d0defa4..0acd067 100644 --- a/src/plugin/admin/app/controller/TableController.php +++ b/src/plugin/admin/app/controller/TableController.php @@ -563,6 +563,7 @@ class TableController extends Base $pk = 'id'; $properties = ''; $timestamps = ''; + $incrementing = ''; $columns = []; try { $database = config('database.connections')['plugin.admin.mysql']['database']; @@ -571,6 +572,18 @@ class TableController extends Base if ($item->COLUMN_KEY === 'PRI') { $pk = $item->COLUMN_NAME; $item->COLUMN_COMMENT .= "(主键)"; + if (strpos(strtolower($item->DATA_TYPE), 'int') === false) { + $incrementing = <<getType($item->DATA_TYPE); $properties .= " * @property $type \${$item->COLUMN_NAME} {$item->COLUMN_COMMENT}\n"; @@ -585,6 +598,7 @@ class TableController extends Base * @var bool */ public \$timestamps = false; + EOF; } @@ -614,9 +628,8 @@ class $class extends Base * @var string */ protected \$primaryKey = '$pk'; - $timestamps - + $incrementing } diff --git a/src/plugin/admin/app/view/table/crud.html b/src/plugin/admin/app/view/table/crud.html index 22baa2b..1156813 100644 --- a/src/plugin/admin/app/view/table/crud.html +++ b/src/plugin/admin/app/view/table/crud.html @@ -125,7 +125,6 @@ return layui.popup.failure(res.msg); } return layui.popup.success("操作成功", function () { - parent.refreshTable(); parent.layer.close(parent.layer.getFrameIndex(window.name)); }); }