From e712577b65b4f12c33b43b17c36fc6cb6e529834 Mon Sep 17 00:00:00 2001
From: zhaoxiang <756958008@qq.com>
Date: Thu, 10 Nov 2016 18:46:25 +0800
Subject: [PATCH] =?UTF-8?q?modified=20=E5=AE=8C=E5=96=84=E8=A1=A8=E5=8D=95?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/Base.php   | 19 +++++++++++--------
 application/admin/controller/Menu.php   |  2 ++
 public/admin/static/js/template/form.js |  2 +-
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/application/admin/controller/Base.php b/application/admin/controller/Base.php
index e993653..92aa3aa 100644
--- a/application/admin/controller/Base.php
+++ b/application/admin/controller/Base.php
@@ -6,7 +6,8 @@
  */
 
 namespace app\admin\controller;
-use app\admin\model\User;
+
+use app\admin\model\Menu;
 use think\Controller;
 
 class Base extends Controller {
@@ -14,6 +15,9 @@ class Base extends Controller {
     public $primaryKey;
     public $uid;
     public $userInfo;
+    public $url;
+    public $menuInfo;
+
     private $superUrl = [
         'User/login'
     ];
@@ -43,13 +47,12 @@ class Base extends Controller {
      * 系统初始化函数（登陆状态检测，权限检测，初始化菜单）
      */
     private function iniSystem(){
-        $url = $this->request->controller().'/'.$this->request->action();
-        if( !in_array($url, $this->superUrl) ){
-//            $this->allMenu = D('Menu')->order('sort asc')->select();
-//            $this->menuInfo = D('Menu')->where(['url' => $this->url])->find();
-//            if( empty($this->menuInfo) ){
-//                $this->error( 'Menu'.L('_SELECT_NOT_EXIST_') );
-//            }
+        $this->url = $this->request->controller().'/'.$this->request->action();
+        if( !in_array($this->url, $this->superUrl) ){
+            $this->menuInfo = Menu::where(['url' => $this->url])->find()->toArray();
+            if( empty($this->menuInfo) ){
+                $this->error( '目录：'.$this->url.'不存在！' );
+            }
             $this->checkLogin();
 //            $this->checkRule();
         }
diff --git a/application/admin/controller/Menu.php b/application/admin/controller/Menu.php
index d50e943..ac8bfd1 100644
--- a/application/admin/controller/Menu.php
+++ b/application/admin/controller/Menu.php
@@ -217,6 +217,7 @@ class Menu extends Base {
             $data = array_column($data, 'name', $this->primaryKey);
             $defaultFather = $this->request->get($this->primaryKey);
             $form = [
+                'formTitle' => $this->menuInfo['name'],
                 'tempType' => 'add',
                 'formAttr' => [
                     'target' => url('Menu/add'),
@@ -365,6 +366,7 @@ class Menu extends Base {
             $data = array_column($data, 'name', $this->primaryKey);
             $detail = \app\admin\model\Menu::get($this->request->get($this->primaryKey))->toArray();
             $form = [
+                'formTitle' => $this->menuInfo['name'],
                 'tempType' => 'edit',
                 'formAttr' => [
                     'target' => url('Menu/edit'),
diff --git a/public/admin/static/js/template/form.js b/public/admin/static/js/template/form.js
index f24f9f7..b245684 100644
--- a/public/admin/static/js/template/form.js
+++ b/public/admin/static/js/template/form.js
@@ -29,7 +29,7 @@
      */
     function buildForm( formObj, boxType, method ) {
         var formHtml = '<div class="box '+ boxType +'" id="formBox"><div class="box-body">';
-        formHtml += '<div class="box-header with-border"><h3 class="box-title">新增菜单</h3></div>';
+        formHtml += '<div class="box-header with-border"><h3 class="box-title">'+formObj.formTitle+'</h3></div>';
         formHtml += '<form id="'+ formObj.formAttr.formId +'" action="'+ formObj.formAttr.target +'"><div class="box-body">';
         $.each(formObj.formList, function (index, value) {
             switch (value.module){