From 5d3ce0ff12a5b2e840a4f311812f41c6f9176667 Mon Sep 17 00:00:00 2001
From: walkor <walkor@workerman.net>
Date: Tue, 16 May 2023 10:23:06 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E9=94=AE=E4=B8=8D=E8=87=AA=E5=A2=9E?=
 =?UTF-8?q?=E6=97=B6=E4=B8=BB=E9=94=AE=E6=98=BE=E7=A4=BA=E5=9C=A8=E8=A1=A8?=
 =?UTF-8?q?=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/plugin/admin/app/common/Layui.php | 3 ++-
 src/plugin/admin/config/app.php       | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/plugin/admin/app/common/Layui.php b/src/plugin/admin/app/common/Layui.php
index ae95664..1d93e7e 100644
--- a/src/plugin/admin/app/common/Layui.php
+++ b/src/plugin/admin/app/common/Layui.php
@@ -799,6 +799,7 @@ EOF;
             $field = $info['field'];
             $default = $columns[$key]['default'];
             $control = strtolower($info['control']);
+            $auto_increment = $columns[$key]['auto_increment'];
             // 搜索框里上传组件替换为input
             if ($type == 'search' && in_array($control, ['upload', 'uploadimg'])) {
                 $control = 'input';
@@ -815,7 +816,7 @@ EOF;
                 $props['value'] = $default;
             }
             // 表单不显示主键
-            if ($filter == 'form_show' && $primary_key && $field == $primary_key) {
+            if (($filter == 'form_show' && $primary_key && $field == $primary_key && $auto_increment)) {
                 continue;
             }
             // 范围查询
diff --git a/src/plugin/admin/config/app.php b/src/plugin/admin/config/app.php
index d802d13..e412c3a 100644
--- a/src/plugin/admin/config/app.php
+++ b/src/plugin/admin/config/app.php
@@ -17,5 +17,5 @@ return [
     'controller_suffix' => 'Controller',
     'controller_reuse' => false,
     'plugin_market_host' => 'https://www.workerman.net',
-    'version' => '0.6.0'
+    'version' => '0.6.12'
 ];