Merge branch 'dev_wf' of wufeng/fuse into version1.5

app/admin/config/validate_rules.php

@@ -59,6 +59,7 @@ return [
         'weight|权重' => 'number|egt:0',
     ],
 
+
     //【视频】
     //添加视频
     'videoAdd' => [

app/admin/controller/Action.php

@@ -23,7 +23,7 @@ class Action extends BaseController
     //添加权限
     public function Add()
     {
-        $param = $this->request->only(['menuid','action_code','status'=>CommonModel::$status_normal], 'post');
+        $param = $this->request->only(['menuid', 'action_code', 'status' => CommonModel::$status_normal], 'post');
 
         $val = Validate::rule(Config::get('validate_rules.actionAdd'));
 
@@ -32,20 +32,23 @@ class Action extends BaseController
         return ActionLogic::Add($param);
     }
 
-    //获取权限详情
-    public function Read()
-    {
-        $id = $this->request->post('id/d', 0);
-
-        return ActionLogic::Read($id);
-    }
+//    //获取权限详情
+//    public function Read()
+//    {
+//        $id = $this->request->post('id/d', 0);
+//
+//        return ActionLogic::Read($id);
+//    }
 
     //编辑权限
     public function Edit()
     {
-        $param = $this->request->only([''], 'post');
+        $param = $this->request->only(['id', 'action_code'], 'post');
 
-        $val = Validate::rule(Config::get('validate_rules.'));
+        $val = Validate::rule([
+            'id' => 'require|number|gt:0',
+            'action_code|按钮编码' => 'require',
+        ]);
 
         if (!$val->check($param)) throw new ValidateException($val->getError());
 
@@ -55,19 +58,15 @@ class Action extends BaseController
     //删除权限
     public function Delete()
     {
-        $param = $this->request->only([''], 'post');
-
-        $val = Validate::rule(Config::get('validate_rules.'));
-
-        if (!$val->check($param)) throw new ValidateException($val->getError());
+        $id = $this->request->post('id/d', 0);
 
-        return ActionLogic::Delete($param);
+        return ActionLogic::Delete($id);
     }
 
     //启禁用权限
     public function Status()
     {
-        $param = $this->request->only(['id','status'], 'post');
+        $param = $this->request->only(['id', 'status'], 'post');
 
         $val = Validate::rule(Config::get('validate_rules.status'));
 

app/admin/logic/ActionLogic.php

@@ -44,8 +44,9 @@ class ActionLogic extends BaseLogic
     {
         $menu = ActionModel::alias('a')
             ->field('a.*,action_name')
-            ->leftJoin('action_list l', 'a.action_code=l.action_code')
+            ->leftJoin('action_list l', 'l.is_show = ' . CommonModel::$del_normal . ' AND a.action_code=l.action_code')
             ->where('a.id', $id)
+            ->where('')
             ->findOrEmpty()
             ->toArray();
 
@@ -56,11 +57,33 @@ class ActionLogic extends BaseLogic
     //编辑权限
     public static function Edit(array $data = []): Json
     {
+        $rs = ActionModel::field(true)
+            ->where('id', $data['id'])
+            ->findOrEmpty();
+        if ($rs->isEmpty()) throw new ValidateException('该菜单下的按钮不存在');
+
+        if ($rs->action_code != $data['action_code']) {
+            $temp = ActionModel::field('id')
+                ->where(['menuid' => $rs->menuid, 'action_code' => $data['action_code']])
+                ->findOrEmpty()
+                ->isEmpty();
+            if (!$temp) throw new ValidateException('该按钮已存在');
+        }
+
+        $data['updatetime'] = date('Y-m-d H:i:s');
+
+        $res = ActionModel::where('id', $data['id'])
+            ->save($data);
+
+        return $res ? json_show(CommonModel::$success, '修改按钮成功') : json_show(CommonModel::$error_param, '修改按钮失败');
+
     }
 
     //删除权限
-    public static function Delete(array $data = []): Json
+    public static function Delete(int $id = 0): Json
     {
+        $rs = ActionModel::where('id', $id)->delete();
+        return $rs ? json_show(CommonModel::$success, '删除成功') : json_show(CommonModel::$error_param, '删除失败');
     }
 
     //启禁用权限

app/admin/logic/MenuLogic.php

@@ -98,7 +98,7 @@ class MenuLogic extends BaseLogic
             ->isEmpty();
         if ($rs) return json_show(CommonModel::$error_param, '菜单信息不存在');
 
-        $data = array_merge($data, ['is_private' => $data['private']]);
+        $data = array_merge($data, ['is_private' => $data['private'], 'updatetime' => date('Y-m-d H:i:s')]);
 
         $res = AdminMenuModel::where('id', $data['id'])->strict(false)->save($data);
 

app/admin/route/app.php

@@ -2,14 +2,14 @@
 
 use think\facade\Route;
 
-Route::rule('login','admin/Login/login');//登录
-Route::rule('logout','admin/Login/logout');//登出
-Route::rule('upload','admin//upload');//上传图片？？？？？？？？？？？？？？？？？
+Route::rule('login', 'admin/Login/login');//登录
+Route::rule('logout', 'admin/Login/logout');//登出
+Route::rule('upload', 'admin//upload');//上传图片？？？？？？？？？？？？？？？？？
 
 //【版本】
-Route::rule('version','admin/Version/lastVersion');//最新版本
-Route::rule('versionList','Admin/Version/getList');//版本列表
-Route::rule('versionAdd','Admin/Version/create');//新建版本
+Route::rule('version', 'admin/Version/lastVersion');//最新版本
+Route::rule('versionList', 'Admin/Version/getList');//版本列表
+Route::rule('versionAdd', 'Admin/Version/create');//新建版本
 
 //【菜单】
 Route::rule('menuList', 'admin/Menu/List');//获取用户菜单列表
@@ -18,16 +18,11 @@ Route::rule('menuAdd', 'admin/Menu/Add');//添加菜单
 Route::rule('menuSave', 'admin/Menu/Edit');//编辑菜单
 Route::rule('menuDel', 'admin/Menu/Delete');//删除菜单
 Route::rule('menuStatus', 'admin/Menu/Status');//启禁用菜单
-Route::rule('menuActionList', 'admin/Action/List');//获取菜单下权限列表
-Route::rule('menuActionStatus', 'admin/Action/Status');//菜单下权限启禁用权限
-
-//【权限】
-
-Route::rule('ActionAdd', 'admin/Action/Add');//添加权限
-Route::rule('ActionRead', 'admin/Action/Read');//获取权限详情
-Route::rule('ActionEdit', 'admin/Action/Edit');//编辑权限
-Route::rule('ActionDelete', 'admin/Action/Delete');//删除权限
-//Route::rule('ActionStatus', 'admin/Action/Status');//启禁用权限
+Route::rule('menuActionAdd', 'admin/Action/Add');//给菜单添加按钮
+Route::rule('menuActionList', 'admin/Action/List');//获取菜单下按钮列表
+Route::rule('menuActionStatus', 'admin/Action/Status');//菜单下按钮启禁用
+Route::rule('menuActionSave', 'admin/Action/Edit');//修改菜单下按钮
+Route::rule('menuActionDel', 'admin/Action/Delete');//删除菜单下按钮
 
 //【角色】
 Route::rule('roleList', 'admin/Role/List');//获取角色列表