diff --git a/catch/permissions/tables/Department.php b/catch/permissions/tables/Department.php index e851882..0cc6d63 100644 --- a/catch/permissions/tables/Department.php +++ b/catch/permissions/tables/Department.php @@ -31,8 +31,8 @@ class Department extends CatchTable ])->withApiRoute('departments')->withActions([ Actions::create() ])->withSearch([ - Search::text('department_name', '请输入部门名称'), - Search::status() + Search::label('部门名称')->text('department_name', '请输入部门名称'), + Search::label('状态')->status() ])->withDialogWidth('35%') ->toTreeTable()->render(); } diff --git a/catch/permissions/tables/Job.php b/catch/permissions/tables/Job.php index 72d3d7e..e05607b 100644 --- a/catch/permissions/tables/Job.php +++ b/catch/permissions/tables/Job.php @@ -28,7 +28,7 @@ class Job extends CatchTable Actions::create() ]) ->withSearch([ - Search::text('job_name', '岗位名称') + Search::label('岗位名称')->text('job_name', '岗位名称') ]) ->withApiRoute('jobs') ->selectionChange() diff --git a/catch/permissions/tables/Permission.php b/catch/permissions/tables/Permission.php index 1f752e8..4ee4afa 100644 --- a/catch/permissions/tables/Permission.php +++ b/catch/permissions/tables/Permission.php @@ -28,7 +28,8 @@ class Permission extends CatchTable Actions::create() ]) ->withSearch([ - Search::text('permission_name', '菜单名称') + Search::label('菜单名称')->text('permission_name', '菜单名称')->clearable(true), + Search::hidden('actionList', 'actionList') ]) ->withFilterParams([ 'permission_name' => '', diff --git a/catch/permissions/tables/Role.php b/catch/permissions/tables/Role.php index 3af7915..b6bc7ea 100644 --- a/catch/permissions/tables/Role.php +++ b/catch/permissions/tables/Role.php @@ -24,7 +24,7 @@ class Role extends CatchTable ]) ]) ->withSearch([ - Search::text('role_name', '角色名称'), + Search::label('角色名称')->text('role_name', '角色名称'), ]) ->withApiRoute('roles') ->withActions([ diff --git a/catch/permissions/tables/User.php b/catch/permissions/tables/User.php index dc43a52..224f221 100644 --- a/catch/permissions/tables/User.php +++ b/catch/permissions/tables/User.php @@ -25,15 +25,15 @@ class User extends CatchTable ]) ]) ->withSearch([ - Search::text('username', '用户名'), - Search::text('email', '邮箱'), - Search::status() + Search::label('用户名')->text('username', '用户名'), + Search::label('邮箱')->text('email', '邮箱'), + Search::label('状态')->status(), + Search::hidden('department_id', '') ]) ->withApiRoute('users') ->withActions([ Actions::create(), - Actions::export(), - Actions::import() + Actions::export() ]) ->withExportRoute('user/export') ->withFilterParams([