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

Merge remote-tracking branch 'origin/develop' into develop

pull/339/MERGE
Karson 2021-07-19 11:59:56 +08:00
parent b3d32e2bf3 88df7bd386
commit 2c4efe19f2
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/admin/command/Crud.php
View File

@ -891,7 +891,7 @@ class Crud extends Command
'editList' => $editList, 'editList' => $editList,
'javascriptList' => $javascriptList, 'javascriptList' => $javascriptList,
'langList' => $langList, 'langList' => $langList,
'sofeDeleteClassPath' => in_array($this->deleteTimeField, $fieldArr) ? "use traits\model\SoftDelete;" : '', 'softDeleteClassPath' => in_array($this->deleteTimeField, $fieldArr) ? "use traits\model\SoftDelete;" : '',
'softDelete' => in_array($this->deleteTimeField, $fieldArr) ? "use SoftDelete;" : '', 'softDelete' => in_array($this->deleteTimeField, $fieldArr) ? "use SoftDelete;" : '',
'modelAutoWriteTimestamp' => in_array($this->createTimeField, $fieldArr) || in_array($this->updateTimeField, $fieldArr) ? "'int'" : 'false', 'modelAutoWriteTimestamp' => in_array($this->createTimeField, $fieldArr) || in_array($this->updateTimeField, $fieldArr) ? "'int'" : 'false',
'createTime' => in_array($this->createTimeField, $fieldArr) ? "'{$this->createTimeField}'" : 'false', 'createTime' => in_array($this->createTimeField, $fieldArr) ? "'{$this->createTimeField}'" : 'false',

2
application/admin/command/Crud/stubs/model.stub
View File

@ -3,7 +3,7 @@
namespace {%modelNamespace%}; namespace {%modelNamespace%};
use think\Model; use think\Model;
{%sofeDeleteClassPath%} {%softDeleteClassPath%}
class {%modelName%} extends Model class {%modelName%} extends Model
{ {

6
application/api/controller/User.php
View File

@ -6,6 +6,7 @@ use app\common\controller\Api;
use app\common\library\Ems; use app\common\library\Ems;
use app\common\library\Sms; use app\common\library\Sms;
use fast\Random; use fast\Random;
use think\Config;
use think\Validate; use think\Validate;
/** /**
@ -19,6 +20,11 @@ class User extends Api
public function _initialize() public function _initialize()
{ {
parent::_initialize(); parent::_initialize();
if (!Config::get('fastadmin.usercenter')) {
$this->error(__('User center already closed'));
}
} }
/** /**

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 = [