rabin 2 年之前
父節點
當前提交
990b78b341

+ 1 - 0
assets/layadmin/html/project/database/update.html

@@ -53,6 +53,7 @@
     <input type="hidden" name="table" id="table" />
     <input type="hidden" name="fast" id="fast" />
     <input type="hidden" name="dever_submit" id="dever_submit" />
+    <input type="hidden" name="dever_submit" id="dever_submit" />
     <input type="hidden" name="menu_id" id="menu_id" />
     <input type="hidden" name="update_where_id" id="update_where_id"/>
     <input type="hidden" name="copy_num" id="copy_num" value="0"/>

+ 19 - 6
src/Database.php

@@ -428,7 +428,6 @@ class Database
             'struct' => isset($config['manage']['struct']) ? $config['manage']['struct'] : '',
             'stat_desc' => '主动统计',
             'search_param' => '',
-            'dever_submit' => Dever::submit(),
         );
 
         # 此处为了兼容旧版本的一些设置
@@ -794,6 +793,13 @@ class Database
         return $config;
     }
 
+    public function submit()
+    {
+        $data = Dever::submit();
+
+        return $data;
+    }
+
     /**
      * 自定义列表页面
      *
@@ -3426,7 +3432,7 @@ class Database
         return $result;
     }
 
-    public function update_struct($config, $col, $data, $tab = -1, $prefix = '', $layadmin = false)
+    public function update_struct($config, $col, $data, $tab = -1, $prefix = '', $layadmin = false, $show = true)
     {
         if (!$layadmin) {
             $layadmin = layadmin();
@@ -3483,6 +3489,9 @@ class Database
                         $result[$k] = '<div class="layui-form-item ' . $class . '" '.$style.'><div class="layui-tab layui-tab-card">';
                     }
                 }
+                if (!$show) {
+                    $result[$k] = '<div classs="layui-col-lg6">';
+                }
 
                 if ($upload_call) {
                     $v['upload_call'] = $upload_call . '&key=' . $k;
@@ -3495,7 +3504,11 @@ class Database
 
                 $result[$k] .= $this->create_update_html($k, $v, $data, false, $prefix);
 
-                $result[$k] .= '</div></div>';
+                if (!$show) {
+                    $result[$k] .= '</div>';
+                } else {
+                    $result[$k] .= '</div></div>';
+                }
 
             } elseif (!$col && isset($v['class'])) {
                 # 分割线
@@ -4079,12 +4092,12 @@ class Database
      */
     public function update_action_api()
     {
+        $key = Dever::input('dever_submit_key');
         $col = Dever::input('col');
         $value = Dever::input('value');
-        if (!$col && !$value) {
-            Dever::submit_check(false, true);
+        if ($key) {
+            Dever::submit_check($key, false, true);
         }
-        
 
         $method = false;
 

+ 4 - 3
src/Lib/Input.php

@@ -618,7 +618,7 @@ class Input
 
             $html .= self::hidden($param);
         }
-        return '<div class="am-btn-group" >' . $html . '</div>';
+        return '<div class="am-btn-group" id="' . $param['name'] . '">' . $html . '</div>';
     }
 
     /**
@@ -826,7 +826,7 @@ class Input
                 }
             }
         }
-        return '<div class="am-btn-group" >' . $html . '</div>';
+        return '<div class="am-btn-group" id="' . $param['name'] . '">' . $html . '</div>';
     }
 
     /**
@@ -909,7 +909,8 @@ class Input
             $level_param = $param['linkage'];
         }
         
-        $id = 'dever-linkage-' . $param['name'];
+        //$id = 'dever-linkage-' . $param['name'];
+        $id = $param['name'];
 
         $html = '<' . $div . ' class="' . $class . '" id="' . $id . '" >';
 

+ 1 - 1
template/layadmin/project/database/list.php

@@ -9,7 +9,7 @@ include(dirname(__FILE__) . DIRECTORY_SEPARATOR . 'common.php');
   
 $view   
 ->set('fast', 'Dever::input("fast")')  
-->fetch('#dever_submit@value',      'manage/database.info#dever_submit')
+//->fetch('#dever_submit@value',      'Dever::submit()')
 ->fetch('#fast@value',      '$fast')
 ->fetch('#load_style', 'manage/database.res#css')
 ->fetch('#search_param', 'manage/database.info#search_param')

+ 2 - 1
template/layadmin/project/database/update.php

@@ -16,7 +16,8 @@ $view
 ->fetch('.form1@action',	'manage/database.info#action')
 
 # 基本配置
-->fetch('#dever_submit@value',		'manage/database.info#dever_submit')
+->fetch('#dever_submit_key@value',		'manage/database.submit#key')
+->fetch('#dever_submit@value',		'manage/database.submit#token')
 ->fetch('#fast@value',      '$fast')
 ->fetch('#project@value',		'manage/database.info#project')
 ->fetch('#table@value',		'manage/database.info#table')