From 977c546c6e0bedaf1f46ffdca6bdeb069f3374f6 Mon Sep 17 00:00:00 2001 From: liaodeity Date: Wed, 30 Jun 2021 11:47:11 +0800 Subject: [PATCH 1/4] Update CHANGELOG.md --- CHANGELOG.md | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fe72a72..be3fb34 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,16 @@ # Release Notes -## [Unreleased](https://github.com/liaodeity/laravel-admin-cms/compare/v8.2.5...8.x) +## [Unreleased](https://github.com/liaodeity/laravel-admin-cms/compare/v8.3.0...8.x) + +## [v8.3.0(2021-06-30)](https://github.com/liaodeity/laravel-admin-cms/compare/v8.2.5...v8.3.0) + +### Added +- 增加Validator类用于表单认证（[#12](https://github.com/liaodeity/laravel-admin-cms/pull/12)） + +### Changed +- 修改注释 +- composer update + ## [v8.2.5(2021-06-28)](https://github.com/liaodeity/laravel-admin-cms/compare/v8.2.4...v8.2.5) -- Gitee From c2f3727660eaab04df184280859755435cac017f Mon Sep 17 00:00:00 2001 From: liaodeity Date: Wed, 30 Jun 2021 11:52:19 +0800 Subject: [PATCH 2/4] Update readme.md --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index c1c54f4..2aa4126 100644 --- a/readme.md +++ b/readme.md @@ -3,7 +3,7 @@

- laravel + laravel layui -- Gitee From ef719aa9eb7a7be3d1c4fac6fe42523dcef3c395 Mon Sep 17 00:00:00 2001 From: liaodeity Date: Wed, 30 Jun 2021 14:05:59 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E9=A6=96=E5=8F=91Gitee?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- readme.md | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/readme.md b/readme.md index 2aa4126..3d9e18e 100644 --- a/readme.md +++ b/readme.md @@ -38,11 +38,13 @@ - 演示说明：理性演示，误删除基础数据，可自行添加数据，自行删除（数据库会不定时重置抹除数据） ### 项目仓库说明 -如果因网络原因无法下载，可通过`国内Gitee`版本下载，一旦有新的发行版将同步到`Gitee` -- GitHub：[https://github.com/liaodeity/laravel-admin-cms](https://github.com/liaodeity/laravel-admin-cms) +因网络访问原因，目前通过首发`Gitee`版本，一旦有新的发行版将同步到`GitHub` + +- 首发Gitee：[https://gitee.com/liaodeiy/laravel-admin-cms](https://gitee.com/liaodeiy/laravel-admin-cms) + +- 同步GitHub：[https://github.com/liaodeity/laravel-admin-cms](https://github.com/liaodeity/laravel-admin-cms) -- 国内Gitee：[https://gitee.com/liaodeiy/laravel-admin-cms](https://gitee.com/liaodeiy/laravel-admin-cms) ### 如何使用 @@ -52,7 +54,7 @@ - 获取代码 ```bash -git clone https://github.com/liaodeity/laravel-admin-cms.git +git clone https://gitee.com/liaodeiy/laravel-admin-cms.git cd laravel-admin-cms composer install ``` @@ -109,9 +111,9 @@ php artisan serve ### 如何贡献 - - 发布[issue](https://github.com/liaodeity/laravel-admin-cms/issues)进行问题反馈和建议 + - 发布[issue](https://gitee.com/liaodeiy/laravel-admin-cms/issues)进行问题反馈和建议 - - 通过[Pull Request](https://github.com/liaodeity/laravel-admin-cms/pulls)提交修复 + - 通过[Pull Request](https://gitee.com/liaodeiy/laravel-admin-cms/pulls)提交修复 - 完善我们的文档和例子 -- Gitee From 123852ee0eb89bc91a04b088f0c9c8b101c5e2fd Mon Sep 17 00:00:00 2001 From: liaodeity Date: Mon, 5 Jul 2021 23:24:48 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E6=8E=92=E5=BA=8F=E5=AD=97=E6=AE=B5=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Enums/MySqlEnum.php | 21 +++++++++++++++++++ app/Http/Controllers/Admin/MenuController.php | 17 ++++++++++++--- resources/views/admin/menu/add.blade.php | 2 +- 3 files changed, 36 insertions(+), 4 deletions(-) create mode 100644 app/Enums/MySqlEnum.php diff --git a/app/Enums/MySqlEnum.php b/app/Enums/MySqlEnum.php new file mode 100644 index 0000000..03d71b3 --- /dev/null +++ b/app/Enums/MySqlEnum.php @@ -0,0 +1,21 @@ + +|----------------------------------------------------------------------------------------------------------- +*/ + +namespace App\Enums; + + +class MySqlEnum extends BaseEnum +{ + const SMALLINT_MIN = -32767;// + const SMALLINT_MAX = 32767;// +} diff --git a/app/Http/Controllers/Admin/MenuController.php b/app/Http/Controllers/Admin/MenuController.php index a6ffbea..a786064 100644 --- a/app/Http/Controllers/Admin/MenuController.php +++ b/app/Http/Controllers/Admin/MenuController.php @@ -15,6 +15,7 @@ namespace App\Http\Controllers\Admin; use App\Enums\MenuStatusEnum; use App\Enums\MenuTypeEnum; +use App\Enums\MySqlEnum; use App\Http\Controllers\Controller; use App\Libs\QueryWhere; use App\Models\Log; @@ -95,11 +96,13 @@ class MenuController extends Controller if (!check_admin_auth ($this->module_name . '_' . __FUNCTION__)) { return auth_error_return (); } - $menu = $this->repository->makeModel (); + $menu = $this->repository->makeModel (); $_method = 'POST'; $menus = Menu::orderBy ('sort', 'asc')->get (); $menus = $menus->toArray (); $menuPidList = list_to_tree ($menus); + $maxSort = Menu::max ('sort'); + $menu->sort = $maxSort ? $maxSort + 1 : 99; return view ('admin.' . $this->module_name . '.add', compact ('menu', '_method', 'menuPidList')); } @@ -115,9 +118,11 @@ class MenuController extends Controller $request->validate ([ 'Menu.title' => 'required', 'Menu.status' => 'required', + 'Menu.sort' => 'integer|between:' . MySqlEnum::SMALLINT_MIN . ',' . MySqlEnum::SMALLINT_MAX ], [], [ 'Menu.title' => '菜单名称', 'Menu.status' => '状态', + 'Menu.sort' => '排序' ]); if (!check_admin_auth ($this->module_name . ' edit')) { return auth_error_return (); @@ -127,7 +132,7 @@ class MenuController extends Controller try { $input['type'] = MenuTypeEnum::MENU; $input['uuid'] = get_uuid (); - $menu = $this->repository->create ($input); + $menu = $this->repository->create ($input); if ($menu) { Log::createLog (Log::EDIT_TYPE, '添加菜单', $menu->toArray (), $menu->id, Menu::class); @@ -187,9 +192,11 @@ class MenuController extends Controller $request->validate ([ 'Menu.title' => 'required', 'Menu.status' => 'required', + 'Menu.sort' => 'integer|between:' . MySqlEnum::SMALLINT_MIN . ',' . MySqlEnum::SMALLINT_MAX ], [], [ 'Menu.title' => '菜单名称', 'Menu.status' => '状态', + 'Menu.sort' => '排序' ]); if (!check_admin_auth ($this->module_name . ' edit')) { return auth_error_return (); @@ -213,9 +220,13 @@ class MenuController extends Controller private function formatRequestInput (string $__FUNCTION__, $input) { - if(isset($input['pid']) && empty($input['pid'])){ + if (isset($input['pid']) && empty($input['pid'])) { $input['pid'] = 0; } + if (isset($input['sort']) && $input['sort'] == '') { + unset($input['sort']); + } + return $input; } diff --git a/resources/views/admin/menu/add.blade.php b/resources/views/admin/menu/add.blade.php index 5f312ef..1799e0f 100644 --- a/resources/views/admin/menu/add.blade.php +++ b/resources/views/admin/menu/add.blade.php @@ -77,7 +77,7 @@

-
-- Gitee