|
@@ -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);
|
|
|
|