0b2/catchAdmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

new feature

Browse Source
This commit is contained in:
JaguarJack
2022-12-14 19:25:52 +08:00
parent b63cd5d01c
commit 098463f4e1
35 changed files with 391 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/Permissions/Models/DepartmentsModel.php
View File

@@ -26,10 +26,12 @@ class DepartmentsModel extends Model
protected $fillable = ['id', 'parent_id', 'department_name', 'principal', 'mobile', 'email', 'status', 'sort', 'creator_id', 'created_at', 'updated_at', 'deleted_at'];
protected bool $isPaginate = false;
/**
* @var array
*/
protected array $fieldsInList = ['id','parent_id','department_name','status','sort','created_at'];
protected array $fields = ['id','parent_id','department_name','status','sort','created_at'];
/**
* @var array
@@ -44,8 +46,5 @@ class DepartmentsModel extends Model
'status' => '=',
];
public function getList(): mixed
{
return self::query()->select($this->fieldsInList)->quickSearch()->get()->toTree();
}
protected bool $asTree = true;
}

2
modules/Permissions/Models/JobsModel.php
View File

@@ -27,7 +27,7 @@ class JobsModel extends Model
/**
* @var array
*/
protected array $fieldsInList = ['id','job_name','coding','status','sort','description','created_at','updated_at'];
protected array $fields = ['id','job_name','coding','status','sort','description','created_at','updated_at'];
/**
* @var array

37
modules/Permissions/Models/PermissionsModel.php
View File

@@ -5,6 +5,9 @@ declare(strict_types=1);
namespace Modules\Permissions\Models;
use Catch\Base\CatchModel as Model;
use Catch\Enums\Status;
use Modules\Permissions\Enums\MenuStatus;
use Modules\Permissions\Enums\MenuType;
/**
* @property $id
@@ -34,7 +37,9 @@ class PermissionsModel extends Model
/**
* @var array
*/
protected array $fieldsInList = ['id','parent_id','permission_name','route','icon','module','permission_mark','component','redirect','keepalive','type','hidden','sort','created_at','updated_at'];
protected array $fields = ['id','parent_id','permission_name','route','icon','module','permission_mark','component','redirect','keepalive','type','hidden','sort','created_at','updated_at'];
protected bool $isPaginate = false;
/**
* @var array
@@ -48,13 +53,21 @@ class PermissionsModel extends Model
'permission_name' => 'like',
];
/**
* @return mixed
* @var bool
*/
public function getList(): mixed
{
return self::query()->select($this->fieldsInList)->quickSearch()->get()->toTree();
}
protected bool $asTree = true;
/**
* @var string[]
*/
protected $casts = [
'type' => MenuType::class,
'status' => MenuStatus::class
];
/**
* is hidden
@@ -63,6 +76,16 @@ class PermissionsModel extends Model
*/
public function isHidden(): bool
{
return $this->hidden === 2;
return $this->hidden === Status::Disable;
}
/**
* action type
*
* @return bool
*/
public function isAction(): bool
{
return $this->type == MenuType::Action;
}
}

16
modules/Permissions/Models/RolesModel.php
View File

@@ -26,13 +26,19 @@ class RolesModel extends Model
/**
* @var array
*/
protected array $fieldsInList = ['id', 'role_name','identify','parent_id','description','data_range', 'created_at', 'updated_at'];
protected array $fields = ['id', 'role_name','identify','parent_id','description','data_range', 'created_at', 'updated_at'];
/**
* @var array
*/
protected array $form = ['role_name','identify','parent_id','description','data_range'];
/**
* @var bool
*/
protected bool $isPaginate = false;
/**
* @var array
*/
@@ -41,11 +47,5 @@ class RolesModel extends Model
];
/**
* @return mixed
*/
public function getList(): mixed
{
return self::query()->select($this->fieldsInList)->quickSearch()->get()->toTree();
}
protected bool $asTree = true;
}