hitsword
/
fastadmin
mirror of https://gitee.com/karson/fastadmin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

!336 解决Form类内部分方法的可选参在必选参前的问题 

Merge pull request !336 from Henry/repair
pull/338/MERGE
Karson 2021-07-10 01:55:09 +00:00 committed by Gitee
parent e05a8584e2 503c67f9d8
commit 88df7bd386
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
extend/fast/Form.php
View File

@ -929,7 +929,7 @@ EOD;
* @param array $previewAttr * @param array $previewAttr
* @return string * @return string
*/ */
public function image($name = null, $value, $inputAttr = [], $uploadAttr = [], $chooseAttr = [], $previewAttr = []) public function image($name = null, $value = null, $inputAttr = [], $uploadAttr = [], $chooseAttr = [], $previewAttr = [])
{ {
$default = [ $default = [
'data-mimetype' => 'image/gif,image/jpeg,image/png,image/jpg,image/bmp' 'data-mimetype' => 'image/gif,image/jpeg,image/png,image/jpg,image/bmp'
@ -950,7 +950,7 @@ EOD;
* @param array $previewAttr * @param array $previewAttr
* @return string * @return string
*/ */
public function images($name = null, $value, $inputAttr = [], $uploadAttr = [], $chooseAttr = [], $previewAttr = []) public function images($name = null, $value = null, $inputAttr = [], $uploadAttr = [], $chooseAttr = [], $previewAttr = [])
{ {
$default = [ $default = [
'data-multiple' => 'true', 'data-multiple' => 'true',
@ -972,7 +972,7 @@ EOD;
* @param array $previewAttr * @param array $previewAttr
* @return string * @return string
*/ */
public function upload($name = null, $value, $inputAttr = [], $uploadAttr = [], $chooseAttr = [], $previewAttr = []) public function upload($name = null, $value = null, $inputAttr = [], $uploadAttr = [], $chooseAttr = [], $previewAttr = [])
{ {
return $this->uploader($name, $value, $inputAttr, $uploadAttr, $chooseAttr, $previewAttr); return $this->uploader($name, $value, $inputAttr, $uploadAttr, $chooseAttr, $previewAttr);
} }
@ -988,7 +988,7 @@ EOD;
* @param array $previewAttr * @param array $previewAttr
* @return string * @return string
*/ */
public function uploads($name = null, $value, $inputAttr = [], $uploadAttr = [], $chooseAttr = [], $previewAttr = []) public function uploads($name = null, $value = null, $inputAttr = [], $uploadAttr = [], $chooseAttr = [], $previewAttr = [])
{ {
$default = [ $default = [
'data-multiple' => 'true', 'data-multiple' => 'true',
@ -998,7 +998,7 @@ EOD;
return $this->uploader($name, $value, $inputAttr, $uploadAttr, $chooseAttr, $previewAttr); return $this->uploader($name, $value, $inputAttr, $uploadAttr, $chooseAttr, $previewAttr);
} }
protected function uploader($name = null, $value, $inputAttr = [], $uploadAttr = [], $chooseAttr = [], $previewAttr = []) protected function uploader($name = null, $value = null, $inputAttr = [], $uploadAttr = [], $chooseAttr = [], $previewAttr = [])
{ {
$domname = str_replace(['[', ']', '.'], '', $name); $domname = str_replace(['[', ']', '.'], '', $name);
$options = [ $options = [