new feature

modules/Permissions/Models/PermissionsModel.php

@@ -6,6 +6,7 @@ namespace Modules\Permissions\Models;
 
 use Catch\Base\CatchModel as Model;
 use Catch\Enums\Status;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 use Modules\Permissions\Enums\MenuStatus;
 use Modules\Permissions\Enums\MenuType;
 
@@ -51,8 +52,11 @@ class PermissionsModel extends Model
      */
     public array $searchable = [
         'permission_name' => 'like',
+
+        'role_id' => '='
     ];
 
+    protected $hidden = ['pivot'];
 
     /**
      * @var bool
@@ -88,4 +92,37 @@ class PermissionsModel extends Model
     {
         return $this->type == MenuType::Action;
     }
+
+    /**
+     * actions
+     *
+     * @return HasMany
+     */
+    public function actions(): HasMany
+    {
+        return $this->hasMany(self::class, 'parent_id', 'id')->where('type', MenuType::Action);
+    }
+
+    /**
+     *
+     * @param array $data
+     * @return bool
+     */
+    public function storeBy(array $data): bool
+    {
+       $model = $this->fill($data);
+
+       if ($model->isAction()) {
+          $parentMenu =  $this->firstBy($model->parent_id, 'id');
+          $model->setAttribute('module', $parentMenu->module);
+          $model->setAttribute('permission_mark', $parentMenu->permission_mark . '@' . $data['permission_mark']);
+          $model->setAttribute('route', '');
+           $model->setAttribute('icon', '');
+           $model->setAttribute('component', '');
+           $model->setAttribute('redirect', '');
+          return $model->setCreatorId()->save();
+       } else {
+           return parent::storeBy($data);
+       }
+    }
 }

modules/Permissions/Models/RolesModel.php

@@ -5,6 +5,7 @@ declare(strict_types=1);
 namespace Modules\Permissions\Models;
 
 use Catch\Base\CatchModel as Model;
+use Illuminate\Database\Eloquent\Relations\BelongsToMany;
 
 /**
  * @property $role_name
@@ -33,6 +34,7 @@ class RolesModel extends Model
      */
     protected array $form = ['role_name','identify','parent_id','description','data_range'];
 
+    protected array $formRelations = ['permissions'];
 
     /**
      * @var bool
@@ -44,8 +46,19 @@ class RolesModel extends Model
      */
     public array $searchable = [
         'role_name' => 'like',
+
+        'id' => '<>'
     ];
 
-
     protected bool $asTree = true;
+
+
+    /**
+     *
+     * @return BelongsToMany
+     */
+    public function permissions(): BelongsToMany
+    {
+        return $this->belongsToMany(PermissionsModel::class, 'role_has_permissions', 'role_id', 'permission_id');
+    }
 }