Merge branch 'master' of http://git.dever.cc:3000/dever-package/manage

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

@@ -186,7 +186,7 @@
     var form; 
   layui.config({
     base: '../script/lib/layui/admin/' //静态资源所在路径
-    ,version:true
+    ,version:false
   }).extend({
     formSelects: 'plugin/formselects/formselects',
     index: 'lib/index' //主入口模块

assets/layadmin/html/project/database/update.html

@@ -72,7 +72,7 @@
   var skuTable;
   layui.config({
     base: '../script/lib/layui/admin/' //静态资源所在路径
-    ,version:true
+    ,version:false
   }).extend({
     index: 'lib/index', //主入口模块
     formSelects: 'plugin/formselects/formselects',

src/Database.php

@@ -144,19 +144,23 @@ class Database
             return $table;
         }
 
+        if ($id) {
+            $id = '&where_id=' . $id;
+        }
+
         $config = array
         (
             'project'           => 'project/database?project=' . $this->project,
             'list'              => 'project/database/list?{param}',
             'search'              => 'project/database/list?{param}',
             'add'               => 'project/database/update?{param}',
-            'update'            => 'project/database/update?{param}&where_id=' . $id,
+            'update'            => 'project/database/update?{param}' . $id,
             # 增加快捷更新
-            'edit'            => 'project/database/update?{param}&where_id=' . $id,
+            'edit'            => 'project/database/update?{param}' . $id,
             'updateAction'      => 'database.update_action',
             'url'               => '',
-            'delete'      => 'database.delete_action?{param}&where_id=' . $id,
-            'recovery'    => 'database.recovery_action?{param}&where_id=' . $id,
+            'delete'      => 'database.delete_action?{param}' . $id,
+            'recovery'    => 'database.recovery_action?{param}' . $id,
             'stat'              => 'project/database/stat?{param}',
             'excel'             => 'database.list_excel?{param}',
             'stat_excel'        => 'database.stat_excel?{param}',
@@ -3769,7 +3773,7 @@ class Database
      */
     private function update_child($data, $param, $key, &$result, $index, $config, $delete = true)
     {
-        if (isset($config['tab']) && $config['tab']) {
+        if (isset($config['tab_config']) && $config['tab_config']) {
             if ($index != 0) {
                 $style = 'display:none;';
             } else {
@@ -3778,7 +3782,7 @@ class Database
             $result .= '<div class="layui-tab layui-tab-brief dever_' . $key . '_child dever_form_add_child" lay-filter="component-tabs-brief" style="'.$style.'" id="' . $key . '-child-' . ($index + 1) . '"><ul class="layui-tab-title">';
             $tab = '<div class="layui-tab-content">';
             $i = 0;
-            foreach ($config['tab'] as $k => $v) {
+            foreach ($config['tab_config'] as $k => $v) {
                 $content = $this->update_child_data($data, $param, $key, $index, $k, $config);
                 if ($content) {
                     $class_0 = $class_1 = '';
@@ -4480,6 +4484,12 @@ class Database
         $config = $this->config();
         $data = array();
         if (isset($config['manage']['data']) && $config['manage']['data']) {
+            $num = count($config['manage']['data']);
+            if ($num <= 4) {
+                $xs = '3';
+            } else {
+                $xs = '1';
+            }
             foreach ($config['manage']['data'] as $k => $v) {
                 if (is_object($v[1])) {
                     $function = $v[1];
@@ -4490,7 +4500,7 @@ class Database
                     $link = 'project/database/list?project=' . $this->project . '&table=' . $this->table . '&' . $v[2];
                     $link = 'href="' . Dever::url($link, 'manage') . '"';
                 }
-                $data[] = '<li class="layui-col-xs3">
+                $data[] = '<li class="layui-col-xs'.$xs.'" style="min-width: 12%;">
                 <a class="layadmin-backlog-body" '.$link.'><h3>'.$v[0].'</h3>
                   <p><cite>'.$v[1].'</cite></p></a></li>';
             }

src/Lib/Input.php

@@ -870,7 +870,9 @@ class Input
     public static function _linkage($param, $class = '', $hidden = '', $change = '')
     {
         $div = 'div';
+        $fast = Dever::input('fast');
         $w = 'width:20%;';
+        
         if ($class == 'span') {
             $div = 'span';
             $w = '';
@@ -878,6 +880,11 @@ class Input
 
         if (layadmin()) {
             $w = 'margin-top:0px;width:20%;margin-left:-3px;';
+            if ($fast == 1) {
+                $w = 'margin-top:0px;width:35%;margin-left:-3px;';
+            } else {
+                $w = 'margin-top:0px;width:20%;margin-left:-3px;';
+            }
         }
 
         if (!isset($param['search_state'])) {
@@ -1008,6 +1015,9 @@ class Input
             }
 
             if (isset($param['update_search'])) {
+                if (strstr($param['update_search'], '{id}')) {
+                    $param['update_search'] = str_replace('{id}', 'where_id=' . $param['where_id'], $param['update_search']);
+                }
                 $xm = str_replace('xm-select-search=""', 'xm-select-search="'.Dever::url($param['update_search'] . '&yes='.$search_value.'&json=1').'"', $xm);
             }
 

src/Menu.php

@@ -157,7 +157,7 @@ class Menu
     public function getCate()
     {
         # 联动总数
-        $level_total = 100;
+        $level_total = 1;
 
         # 当前联动级别
         $level_num = Dever::input('level_num', 1);