dever 3 年之前
父節點
當前提交
6625ad5fd2
共有 2 個文件被更改,包括 10 次插入5 次删除
  1. 1 1
      assets/layadmin/html/inc/script.html
  2. 9 4
      src/Database.php

+ 1 - 1
assets/layadmin/html/inc/script.html

@@ -51,4 +51,4 @@
 <script type="text/javascript" src="../script/lib/pic/holder.js"></script>
 
 <!-- 加载主要js,很乱,后续优化 -->
-<script type="text/javascript" src="../script/lib/manage/main.js?v92"></script>
+<script type="text/javascript" src="../script/lib/manage/main.js?v93"></script>

+ 9 - 4
src/Database.php

@@ -688,7 +688,7 @@ class Database
         $config['project'] = $project;
 
         # 新增排序
-        $l = $_GET['l'];
+        $l = isset($_GET['l']) ? $_GET['l'] : '';
         if ($l == 'project/database/list' || $l == 'database.list_excel') {
             $list_order = array();
             $i = 0;
@@ -2545,8 +2545,13 @@ class Database
                         if (!isset($vj[1])) {
                             $vj[1] = '';
                         }
+                        if (!isset($vj[2])) {
+                            $vj[2] = '';
+                        }
                         if (strstr($vj[1], 'http')) {
                             $url = $vj[1] . '&id=' . $data['id'];
+                        } elseif($vj[2]) {
+                            $url = Dever::url($this->value($vj[1], $data), $vj[2]);
                         } else {
                             $url = $this->url($kj, $data['id']);
                         }
@@ -3115,9 +3120,9 @@ class Database
      */
     private function update_child($data, $param, $key, &$result, $index, $delete = true)
     {
-        $style = '';
+        $style = 'style="margin:10px"';
         if ($index != 0) {
-            $style = 'style="display:none;"';
+            $style = 'style="display:none;margin:10px"';
         }
         $result .= '<div id="' . $key . '-child-' . ($index + 1) . '" class="dever_' . $key . '_child dever_form_add_child" ' . $style . '>';
 
@@ -3144,7 +3149,7 @@ class Database
             
             $class = $this->update_class($v['col'], $v, $prefix);
 
-            $result .= '<div class="form-group ' . $class . '">';
+            $result .= '<div class="form-group ' . $class . '" style="margin-top:10px">';
 
             $this->update_html($v, $key, $v['col'], $data, $result);