!7 v8.3.1 更新信息，修复菜单排序字段默认值

Merge pull request !7 from liaodeity/8.x

Author: liaodeity

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)
 

app/Enums/MySqlEnum.php

@@ -0,0 +1,21 @@
+<?php
+/*
+|-----------------------------------------------------------------------------------------------------------
+| laravel-admin-cms [ 简单高效的开发插件系统 ]
+|-----------------------------------------------------------------------------------------------------------
+| Licensed ( MIT )
+| ----------------------------------------------------------------------------------------------------------
+| Copyright (c) 2020-2021 https://gitee.com/liaodeiy/laravel-admin-cms All rights reserved.
+| ----------------------------------------------------------------------------------------------------------
+| Author: 廖春贵 < liaodeity@gmail.com >
+|-----------------------------------------------------------------------------------------------------------
+*/
+
+namespace App\Enums;
+
+
+class MySqlEnum extends BaseEnum
+{
+    const SMALLINT_MIN   = -32767;//
+    const SMALLINT_MAX   = 32767;//
+}

app/Http/Controllers/Admin/MenuController.php

@@ -15,6 +15,7 @@
 
 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 @@ public function create ()
         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 @@ public function store (Request $request)
         $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 @@ public function store (Request $request)
         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 @@ public function update (Request $request, Menu $menu)
         $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 @@ public function update (Request $request, Menu $menu)
 
     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;
     }
 

readme.md

@@ -3,7 +3,7 @@
 
 <p align="center">
   <a href="https://github.com/laravel/framework">
-    <img src="https://img.shields.io/badge/laravel-8.40.0-brightgreen.svg" alt="laravel">
+    <img src="https://img.shields.io/badge/laravel-8.48.2-brightgreen.svg" alt="laravel">
   </a>
   <a href="https://www.layui.com">
     <img src="https://img.shields.io/badge/layui-2.5.5-brightgreen.svg" alt="layui">
@@ -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)提交修复
 
  - 完善我们的文档和例子
 

resources/views/admin/menu/add.blade.php

@@ -77,7 +77,7 @@ class="layui-input">
                     <div class="layui-form-item">
                         <label class="layui-form-label">排序 <span class="color-red"></span></label>
                         <div class="layui-input-block">
-                            <input type="number" name="Menu[sort]" value="{{$menu->sort ?? ''}}" maxlength="100" autocomplete="off"
+                            <input type="number" name="Menu[sort]" value="{{$menu->sort ?? 99}}" maxlength="100" autocomplete="off"
                                    placeholder=""
                                    class="layui-input">
                         </div>