edit

src/Database.php

@@ -1515,19 +1515,13 @@ class Database
                                 }
                                 $show = implode(',', $ts);
                             }
-                            /*
-                            if((isset($vi['child_name']) || (isset($vi['show']) && is_string($vi['show']))))
-                            {
-                            if(isset($vi['option'][$show]) && is_array($vi['option'][$show]))
-                            {
-                            $show = $vi['option'][$show]['name'];
-                            }
-                            else
-                            {
-                            $show = isset($vi['option'][$show]) ? $vi['option'][$show] : $show;
-                            }
+                            if ((isset($vi['child_name']) || (isset($vi['show']) && is_string($vi['show'])))) {
+                                if (isset($vi['option'][$show]) && is_array($vi['option'][$show])) {
+                                    $show = $vi['option'][$show]['name'];
+                                } else {
+                                    $show = isset($vi['option'][$show]) ? $vi['option'][$show] : $show;
+                                }
                             }
-                             */
                             //elseif ($config['state'] == 1 && (isset($vi['edit']) && $vi['edit']) || $ki == 'status')
                             elseif ($config['state'] == 1 && (isset($vi['edit']) && $vi['edit']))
                             {
@@ -1540,7 +1534,18 @@ class Database
 
                                 $show = Html::$m($vi, 'form-list', '', 'onchange="update($(this), \'' . $v['id'] . '\', \'' . $this->project . '\', \'' . $this->table . '\')"');
                             } else {
-                                if (isset($vi['option'][$show]) && is_array($vi['option'][$show])) {
+                                if (strstr($show, ',')) {
+                                    $temp = explode(',', $show);
+                                    $t = array();
+                                    foreach ($temp as $vv) {
+                                        if (isset($vi['option'][$vv]) && is_array($vi['option'][$vv])) {
+                                            $t[] = $vi['option'][$vv]['name'];
+                                        } else {
+                                            $t[] = $vv;
+                                        }
+                                    }
+                                    $show = implode('<br />', $t);
+                                } elseif (isset($vi['option'][$show]) && is_array($vi['option'][$show])) {
                                     $show = $vi['option'][$show]['name'];
                                 } else {
                                     $show = isset($vi['option'][$show]) ? $vi['option'][$show] : $show;

src/Lib/Input.php

@@ -318,7 +318,7 @@ class Input
                 $param['parent'] .= '_' . $param['name'];
 
                 if ($param['update'] == 'checkbox' && empty($param['checkall'])) {
-                    //$html .= '<input update_type="checked" class="checkbox-checkall ' . $param['name'] . ' update_value" type="' . $param['update'] . '" name="temp_' . $param['name'] . '[]" value="' . $param['parent'] . '"/> 全选 &nbsp;&nbsp;';
+                    $html .= '<input update_type="checked" class="checkbox-checkall ' . $param['name'] . ' update_value" type="' . $param['update'] . '" name="temp_' . $param['name'] . '[]" value="' . $param['parent'] . '"/> 全选 &nbsp;&nbsp;';
                 }
 
                 foreach ($param['option'] as $k => $v) {