From 67aa9df53a3770b4e713f3d4728fdba77f3d733e Mon Sep 17 00:00:00 2001
From: Karson <karsonzhang@163.com>
Date: Wed, 7 Jun 2023 15:04:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96CRUD=E7=94=9F=E6=88=90?=
 =?UTF-8?q?=E7=9A=84=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/command/Crud/stubs/mixins/checkbox.stub | 2 +-
 application/admin/command/Crud/stubs/mixins/datetime.stub | 2 +-
 application/admin/command/Crud/stubs/mixins/radio.stub    | 4 ++--
 application/admin/command/Crud/stubs/mixins/select.stub   | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/application/admin/command/Crud/stubs/mixins/checkbox.stub b/application/admin/command/Crud/stubs/mixins/checkbox.stub
index d5f7b664..ba87ac81 100644
--- a/application/admin/command/Crud/stubs/mixins/checkbox.stub
+++ b/application/admin/command/Crud/stubs/mixins/checkbox.stub
@@ -1,7 +1,7 @@
 
     public function {%methodName%}($value, $data)
     {
-        $value = $value ? $value : (isset($data['{%field%}']) ? $data['{%field%}'] : '');
+        $value = $value ?: ($data['{%field%}'] ?? '');
         $valueArr = explode(',', $value);
         $list = $this->{%listMethodName%}();
         return implode(',', array_intersect_key($list, array_flip($valueArr)));
diff --git a/application/admin/command/Crud/stubs/mixins/datetime.stub b/application/admin/command/Crud/stubs/mixins/datetime.stub
index 591dd4dd..60044487 100644
--- a/application/admin/command/Crud/stubs/mixins/datetime.stub
+++ b/application/admin/command/Crud/stubs/mixins/datetime.stub
@@ -1,6 +1,6 @@
 
     public function {%methodName%}($value, $data)
     {
-        $value = $value ? $value : (isset($data['{%field%}']) ? $data['{%field%}'] : '');
+        $value = $value ?: ($data['{%field%}'] ?? '');
         return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value;
     }
\ No newline at end of file
diff --git a/application/admin/command/Crud/stubs/mixins/radio.stub b/application/admin/command/Crud/stubs/mixins/radio.stub
index 71234a63..030d373d 100644
--- a/application/admin/command/Crud/stubs/mixins/radio.stub
+++ b/application/admin/command/Crud/stubs/mixins/radio.stub
@@ -1,7 +1,7 @@
 
     public function {%methodName%}($value, $data)
     {
-        $value = $value ? $value : (isset($data['{%field%}']) ? $data['{%field%}'] : '');
+        $value = $value ?: ($data['{%field%}'] ?? '');
         $list = $this->{%listMethodName%}();
-        return isset($list[$value]) ? $list[$value] : '';
+        return $list[$value] ?? '';
     }
\ No newline at end of file
diff --git a/application/admin/command/Crud/stubs/mixins/select.stub b/application/admin/command/Crud/stubs/mixins/select.stub
index 71234a63..030d373d 100644
--- a/application/admin/command/Crud/stubs/mixins/select.stub
+++ b/application/admin/command/Crud/stubs/mixins/select.stub
@@ -1,7 +1,7 @@
 
     public function {%methodName%}($value, $data)
     {
-        $value = $value ? $value : (isset($data['{%field%}']) ? $data['{%field%}'] : '');
+        $value = $value ?: ($data['{%field%}'] ?? '');
         $list = $this->{%listMethodName%}();
-        return isset($list[$value]) ? $list[$value] : '';
+        return $list[$value] ?? '';
     }
\ No newline at end of file