From fde144057de0bf03a50cfec1e1dcc74fdb04f2bf Mon Sep 17 00:00:00 2001 From: terranc Date: Fri, 20 Jul 2018 07:40:35 +0800 Subject: [PATCH] =?UTF-8?q?=E9=98=B2=E6=AD=A2=E9=9D=9E=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E8=80=8C=E5=AF=BC=E8=87=B4=E7=9A=84append?= =?UTF-8?q?=E6=8A=A5=E9=94=99=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/command/Crud/stubs/mixins/checkbox.stub | 12 ++++++++---- .../admin/command/Crud/stubs/mixins/datetime.stub | 8 ++++++-- .../admin/command/Crud/stubs/mixins/multiple.stub | 12 ++++++++---- .../admin/command/Crud/stubs/mixins/radio.stub | 12 ++++++++---- .../admin/command/Crud/stubs/mixins/select.stub | 12 ++++++++---- 5 files changed, 38 insertions(+), 18 deletions(-) diff --git a/application/admin/command/Crud/stubs/mixins/checkbox.stub b/application/admin/command/Crud/stubs/mixins/checkbox.stub index 909adfd45..d766868a6 100644 --- a/application/admin/command/Crud/stubs/mixins/checkbox.stub +++ b/application/admin/command/Crud/stubs/mixins/checkbox.stub @@ -1,8 +1,12 @@ public function {%methodName%}($value, $data) { - $value = $value ? $value : $data['{%field%}']; - $valueArr = explode(',', $value); - $list = $this->{%listMethodName%}(); - return implode(',', array_intersect_key($list, array_flip($valueArr))); + if (isset($data['{%field%}')) { + $value = $value ? $value : $data['{%field%}']; + $valueArr = explode(',', $value); + $list = $this->{%listMethodName%}(); + return implode(',', array_intersect_key($list, array_flip($valueArr))); + } else { + return ''; + } } \ No newline at end of file diff --git a/application/admin/command/Crud/stubs/mixins/datetime.stub b/application/admin/command/Crud/stubs/mixins/datetime.stub index 60da81f37..f0d87fa32 100644 --- a/application/admin/command/Crud/stubs/mixins/datetime.stub +++ b/application/admin/command/Crud/stubs/mixins/datetime.stub @@ -1,6 +1,10 @@ public function {%methodName%}($value, $data) { - $value = $value ? $value : $data['{%field%}']; - return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value; + if (isset($data['{%field%}')) { + $value = $value ? $value : $data['{%field%}']; + return is_numeric($value) ? date("Y-m-d H:i:s", $value) : $value; + } else { + return $value; + } } \ No newline at end of file diff --git a/application/admin/command/Crud/stubs/mixins/multiple.stub b/application/admin/command/Crud/stubs/mixins/multiple.stub index 909adfd45..d766868a6 100644 --- a/application/admin/command/Crud/stubs/mixins/multiple.stub +++ b/application/admin/command/Crud/stubs/mixins/multiple.stub @@ -1,8 +1,12 @@ public function {%methodName%}($value, $data) { - $value = $value ? $value : $data['{%field%}']; - $valueArr = explode(',', $value); - $list = $this->{%listMethodName%}(); - return implode(',', array_intersect_key($list, array_flip($valueArr))); + if (isset($data['{%field%}')) { + $value = $value ? $value : $data['{%field%}']; + $valueArr = explode(',', $value); + $list = $this->{%listMethodName%}(); + return implode(',', array_intersect_key($list, array_flip($valueArr))); + } else { + return ''; + } } \ 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 f5fa6e0db..10a0eacab 100644 --- a/application/admin/command/Crud/stubs/mixins/radio.stub +++ b/application/admin/command/Crud/stubs/mixins/radio.stub @@ -1,7 +1,11 @@ public function {%methodName%}($value, $data) - { - $value = $value ? $value : $data['{%field%}']; - $list = $this->{%listMethodName%}(); - return isset($list[$value]) ? $list[$value] : ''; + { + if (isset($data['{%field%}')) { + $value = $value ? $value : $data['{%field%}']; + $list = $this->{%listMethodName%}(); + return isset($list[$value]) ? $list[$value] : ''; + } else { + return ''; + } } \ 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 f5fa6e0db..10a0eacab 100644 --- a/application/admin/command/Crud/stubs/mixins/select.stub +++ b/application/admin/command/Crud/stubs/mixins/select.stub @@ -1,7 +1,11 @@ public function {%methodName%}($value, $data) - { - $value = $value ? $value : $data['{%field%}']; - $list = $this->{%listMethodName%}(); - return isset($list[$value]) ? $list[$value] : ''; + { + if (isset($data['{%field%}')) { + $value = $value ? $value : $data['{%field%}']; + $list = $this->{%listMethodName%}(); + return isset($list[$value]) ? $list[$value] : ''; + } else { + return ''; + } } \ No newline at end of file -- Gitee