edit

assets/layadmin/html/project/database/list.html

@@ -217,8 +217,9 @@
              $('#list-thead').addClass('table-header-fixed'); //添加样式，固定住表头
 
              $('#list-thead th').each(function (k, v) {
-                  var width = $('#list-tbody td').eq(k).width() + 1;
-                  $(v).width(width);
+                  var width = $('#list-tbody td').eq(k).width() + 0.9;
+                  //$(v).width(width + 1);
+                  $(v).css({'min-width': width});
               });
          } else { //没超过
              $('#list-thead').removeClass('table-header-fixed'); //移除样式

database/menu.php

@@ -97,7 +97,7 @@ return array
 		(
 			'type' 		=> 'int-11',
 			'name' 		=> '选择分组',
-			'default' 	=> 1,
+			'default' 	=> '1',
 			'desc' 		=> '请选择选择分组',
 			'match' 	=> 'is_numeric',
 			'update'	=> 'select',

index.php

@@ -5,4 +5,6 @@ define('DEVER_APP_LANG', '后台设置');
 define('DEVER_APP_PATH', dirname(__FILE__) . DIRECTORY_SEPARATOR);
 define('DEVER_MANAGE_ORDER', -100);
 define('DEVER_MANAGE_ICON', 'glyphicon glyphicon-wrench layui-icon-set-sm');
+define('DEVER_GROUP_ORDER', -10);
+define('DEVER_GROUP_NAME', '平台系统管理');
 include(DEVER_APP_PATH . '../boot.php');

src/Api.php

@@ -303,6 +303,9 @@ class Api
             $desc = $data;
         }
 
+        if (!is_string($desc)) {
+            $desc = '{object}';
+        }
         if (strlen($desc) > 100) {
             $desc = '{long}';
         }

src/Menu.php

@@ -382,12 +382,22 @@ class Menu
         $child = array();
         foreach ($project as $k => $v) {
 
+            $project[$k]['group_id'] = 1;
             if (!isset($v['url'])) {
                 continue;
             }
             if (!isset($v['lang'])) {
                 continue;
             }
+
+            if (isset($v['group_name'])) {
+                $group = Dever::db('manage/menu_group')->find(array('name' => $v['group_name']));
+                if (!$group) {
+                    $project[$k]['group_id'] = Dever::db('manage/menu_group')->insert(array('name' => $v['group_name'], 'reorder' => $v['group_order']));
+                } else {
+                    $project[$k]['group_id'] = $group['id'];
+                }
+            }
             if (isset($v['base']) && isset($v['rel'])) {
                 $v['path'] = DEVER_INCLUDE_PATH . $v['rel'];
             }
@@ -469,22 +479,22 @@ class Menu
                 }
 
                 if ($v && isset($v['lang']) && $v['child']) {
-                    $id = $this->updateMenu($k, $v['lang'], $v['path'] . ':' . $v['name'], -1, $v['order'], 2, (isset($v['icon']) ? $v['icon'] : ''));
+                    $id = $this->updateMenu($k, $v['lang'], $v['path'] . ':' . $v['name'], -1, $v['order'], 2, (isset($v['icon']) ? $v['icon'] : ''), $v['group_id']);
                     if ($id > 0) {
                         foreach ($v['child'] as $i => $j) {
                             if (isset($j['child']) && $j['child']) {
-                                $parent = $this->updateMenu($j['key'], $j['name'], $j['link'], $id, $j['order'], $j['fast']);
+                                $parent = $this->updateMenu($j['key'], $j['name'], $j['link'], $id, $j['order'], $j['fast'], '', $v['group_id']);
                                 foreach ($j['child'] as $i1 => $j1) {
-                                    $this->updateMenu($j1['key'], $j1['name'], $j1['link'], $parent, $j1['order'], $j1['fast']);
+                                    $this->updateMenu($j1['key'], $j1['name'], $j1['link'], $parent, $j1['order'], $j1['fast'], '', $v['group_id']);
                                 }
                             } elseif (isset($j['parent']) && $j['parent']) {
                                 $p = $j['parent'];
-                                $parent = $this->updateMenu($p['key'], $p['name'], $p['link'], $id, $p['order'], $p['fast']);
+                                $parent = $this->updateMenu($p['key'], $p['name'], $p['link'], $id, $p['order'], $p['fast'], '', $v['group_id']);
                                 if ($parent) {
-                                    $this->updateMenu($j['key'], $j['name'], $j['link'], $parent, $j['order'], $j['fast']);
+                                    $this->updateMenu($j['key'], $j['name'], $j['link'], $parent, $j['order'], $j['fast'], '', $v['group_id']);
                                 }
                             } else {
-                                $this->updateMenu($j['key'], $j['name'], $j['link'], $id, $j['order'], $j['fast']);
+                                $this->updateMenu($j['key'], $j['name'], $j['link'], $id, $j['order'], $j['fast'], '', $v['group_id']);
                             }
                         }
                     }
@@ -582,7 +592,7 @@ class Menu
      *
      * @return array
      */
-    public function updateMenu($key, $name, $link, $menu, $order, $fast, $icon = '')
+    public function updateMenu($key, $name, $link, $menu, $order, $fast, $icon = '', $group_id = 1)
     {
         if (!$key) {
             return;
@@ -604,6 +614,9 @@ class Menu
             if ($icon) {
                 $update['add_icon'] = $icon;
             }
+            if ($group_id) {
+                $update['group_id'] = $group_id;
+            }
             $info['id'] = Dever::db('manage/menu')->insert($update);
         }
         /*