|
@@ -769,7 +769,7 @@ class Database
|
|
$value['bind'] = $bind;
|
|
$value['bind'] = $bind;
|
|
}
|
|
}
|
|
$value['parent'] = $parent;
|
|
$value['parent'] = $parent;
|
|
- $result .= Html::select($value, false) . ' ';
|
|
|
|
|
|
+ $result .= Html::select($value, false);
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -789,7 +789,7 @@ class Database
|
|
if ($default) {
|
|
if ($default) {
|
|
//$value['default'] = $default;
|
|
//$value['default'] = $default;
|
|
}
|
|
}
|
|
- $result .= Html::group($value, false) . ' ';
|
|
|
|
|
|
+ $result .= Html::group($value, false);
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -810,7 +810,7 @@ class Database
|
|
if ($default) {
|
|
if ($default) {
|
|
//$value['default'] = $default;
|
|
//$value['default'] = $default;
|
|
}
|
|
}
|
|
- $result .= Html::linkage($value, 'span') . ' ';
|
|
|
|
|
|
+ $result .= Html::linkage($value, 'span');
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -821,20 +821,20 @@ class Database
|
|
public function list_search_time(&$result, $search, $prefix, $key, $lang, $type = 'time')
|
|
public function list_search_time(&$result, $search, $prefix, $key, $lang, $type = 'time')
|
|
{
|
|
{
|
|
$value['name'] = $prefix . 'option_start_' . $key;
|
|
$value['name'] = $prefix . 'option_start_' . $key;
|
|
- $value['lang'] = '开始' . $lang;
|
|
|
|
|
|
+ $value['lang'] = '>=' . $lang;
|
|
if (isset($search[$value['name']])) {
|
|
if (isset($search[$value['name']])) {
|
|
$value['value'] = Dever::maketime($search[$value['name']]);
|
|
$value['value'] = Dever::maketime($search[$value['name']]);
|
|
Dever::setInput($value['name'], $value['value'], 'search_');
|
|
Dever::setInput($value['name'], $value['value'], 'search_');
|
|
}
|
|
}
|
|
- $result .= Html::$type($value) . ' - ';
|
|
|
|
|
|
+ $result .= Html::$type($value, false);
|
|
|
|
|
|
$value['name'] = $prefix . 'option_end_' . $key;
|
|
$value['name'] = $prefix . 'option_end_' . $key;
|
|
- $value['lang'] = '结束' . $lang;
|
|
|
|
|
|
+ $value['lang'] = '<=' . $lang;
|
|
if (isset($search[$value['name']])) {
|
|
if (isset($search[$value['name']])) {
|
|
$value['value'] = Dever::maketime($search[$value['name']]);
|
|
$value['value'] = Dever::maketime($search[$value['name']]);
|
|
Dever::setInput($value['name'], $value['value'], 'search_');
|
|
Dever::setInput($value['name'], $value['value'], 'search_');
|
|
}
|
|
}
|
|
- $result .= Html::$type($value) . ' ';
|
|
|
|
|
|
+ $result .= Html::$type($value, false);
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -900,8 +900,8 @@ class Database
|
|
|
|
|
|
$info = $this->info();
|
|
$info = $this->info();
|
|
|
|
|
|
- $result = '<button type="button" class="btn btn-primary save-data"><i class="fa fa-save"></i> 提交保存</button>
|
|
|
|
- <a href="' . $info['list'] . '" class="btn btn-danger" onclicks="msg({status:1,msg:\'yes\'})">放弃保存</a>';
|
|
|
|
|
|
+ $result = '<button type="button" class="btn btn-primary save-data layui-btn layuiadmin-btn-list"><i class="fa fa-save"></i> 提交保存</button>
|
|
|
|
+ <a href="' . $info['list'] . '" class="btn btn-danger layui-btn layuiadmin-btn-list layui-btn-danger" onclicks="msg({status:1,msg:\'yes\'})">放弃保存</a>';
|
|
|
|
|
|
$config = $this->config();
|
|
$config = $this->config();
|
|
|
|
|
|
@@ -913,7 +913,7 @@ class Database
|
|
} elseif ($v == 'copy-data') {
|
|
} elseif ($v == 'copy-data') {
|
|
$result .= '<a href="javascript:;" class="btn btn-danger" onclick="set_update(\'#copy_num\', 1);set_update(\'#update_where_id\', 0);submit_action();">' . $k . '</a>';
|
|
$result .= '<a href="javascript:;" class="btn btn-danger" onclick="set_update(\'#copy_num\', 1);set_update(\'#update_where_id\', 0);submit_action();">' . $k . '</a>';
|
|
} elseif ($v == 'copy-datas') {
|
|
} elseif ($v == 'copy-datas') {
|
|
- $result .= '<a href="#dever_modal" data-toggle="modal" class="btn btn-danger" onclick="copy_data($(this))">' . $k . '</a>';
|
|
|
|
|
|
+ $result .= '<a href="javascript:;" class="btn btn-danger" onclick="copy_data($(this))">' . $k . '</a>';
|
|
} else {
|
|
} else {
|
|
$result .= '<a href="javascript:;" class="btn btn-danger" onclick="' . $v . '">' . $k . '</a>';
|
|
$result .= '<a href="javascript:;" class="btn btn-danger" onclick="' . $v . '">' . $k . '</a>';
|
|
}
|
|
}
|
|
@@ -929,24 +929,24 @@ class Database
|
|
foreach ($button as $k => $v) {
|
|
foreach ($button as $k => $v) {
|
|
if (is_array($v)) {
|
|
if (is_array($v)) {
|
|
if ($v[0] == 'location') {
|
|
if ($v[0] == 'location') {
|
|
- $result .= ' <a class="btn btn-default" onclick="location.href=\''.Dever::url($v[1]).'\'">' . $k . '</a>';
|
|
|
|
|
|
+ $result .= ' <a class="btn btn-default layui-btn layuiadmin-btn-list" onclick="location.href=\''.Dever::url($v[1]).'\'">' . $k . '</a>';
|
|
} else {
|
|
} else {
|
|
- $result .= ' <a class="btn btn-default" href="' . $this->url($v[0], false, $v[1]) . '">' . $k . '</a>';
|
|
|
|
|
|
+ $result .= ' <a class="btn btn-default layui-btn layuiadmin-btn-list" href="' . $this->url($v[0], false, $v[1]) . '">' . $k . '</a>';
|
|
}
|
|
}
|
|
|
|
|
|
} elseif (strpos($v, 'modal|') !== false) {
|
|
} elseif (strpos($v, 'modal|') !== false) {
|
|
$t = explode('modal|', $v);
|
|
$t = explode('modal|', $v);
|
|
- $result .= ' <a href="#dever_modal" data-toggle="modal" class="btn btn-default" onclick="$(\'#dever_modal_body\').html(\'' . $t[1] . '\')">' . $k . '</a>';
|
|
|
|
|
|
+ $result .= ' <a href="javascript:;" class="btn btn-default layui-btn layuiadmin-btn-list" onclick="showAlert(\'' . $t[1] . '\')">' . $k . '</a>';
|
|
} elseif (strpos($v, '|') !== false) {
|
|
} elseif (strpos($v, '|') !== false) {
|
|
$t = explode('|', $v);
|
|
$t = explode('|', $v);
|
|
- $result .= $t[0] . ' <a href="javascript:;" class="btn btn-warning" ' . $t[1] . '>' . $k . '</a>';
|
|
|
|
|
|
+ $result .= $t[0] . ' <a href="javascript:;" class="btn btn-warning layui-btn layuiadmin-btn-list layui-btn-warm" ' . $t[1] . '>' . $k . '</a>';
|
|
} elseif (strpos($v, 'onclick') !== false) {
|
|
} elseif (strpos($v, 'onclick') !== false) {
|
|
- $result .= ' <a href="javascript:;" class="btn btn-warning" ' . $v . '>' . $k . '</a>';
|
|
|
|
|
|
+ $result .= ' <a href="javascript:;" class="btn btn-warning layui-btn layuiadmin-btn-list layui-btn-warm" ' . $v . '>' . $k . '</a>';
|
|
} elseif (strpos($v, 'http://') !== false) {
|
|
} elseif (strpos($v, 'http://') !== false) {
|
|
//$result .= ' <a href="javascript:;" class="btn btn-default" onclick="jump(\''.Dever::url($v).'\')">'.$k.'</a>';
|
|
//$result .= ' <a href="javascript:;" class="btn btn-default" onclick="jump(\''.Dever::url($v).'\')">'.$k.'</a>';
|
|
- $result .= ' <a class="btn btn-default" href="' . Dever::url($v) . '">' . $k . '</a>';
|
|
|
|
|
|
+ $result .= ' <a class="btn btn-default layui-btn layuiadmin-btn-list" href="' . Dever::url($v) . '">' . $k . '</a>';
|
|
} else {
|
|
} else {
|
|
- $result .= ' <a href="javascript:;" class="btn btn-danger" onclick="load(\'' . Dever::url($v) . '\')">' . $k . '</a>';
|
|
|
|
|
|
+ $result .= ' <a href="javascript:;" class="btn btn-danger layui-btn layuiadmin-btn-list layui-btn-danger" onclick="load(\'' . Dever::url($v) . '\')">' . $k . '</a>';
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -973,8 +973,8 @@ class Database
|
|
if (isset($config['struct']) && isset($config['manage']['search'])) {
|
|
if (isset($config['struct']) && isset($config['manage']['search'])) {
|
|
$search = Dever::preInput('search_');
|
|
$search = Dever::preInput('search_');
|
|
|
|
|
|
- $node = Html::node(array('class="am-u-sm-12" style="margin-top:10px;"', 'class="am-form-group am-input-group-sm"'));
|
|
|
|
- $btn = '<input type="hidden" value="2" name="excel" id="excel"><button class="btn btn-primary" onclick="$(\'#form1\').attr(\'action\', \'' . $this->url('search') . '\');list_search($(this))" type="button" style="height: 38px;margin-left:10px;">搜索</button>';
|
|
|
|
|
|
+ $node = Html::node(array(' style="margin-top:0px;"', ''));
|
|
|
|
+ $btn = '<div class="layui-inline"><input type="hidden" value="2" name="excel" id="excel"><button class="btn btn-primary layui-btn layuiadmin-btn-list" onclick="$(\'#form1\').attr(\'action\', \'' . $this->url('search') . '\');list_search($(this))" type="button" style="height: 38px;margin-left:0px;margin-top:-2px;">搜索</button></div>';
|
|
|
|
|
|
//$result .= '<form id="f1" action="'.$this->url('list').'" method="post">';
|
|
//$result .= '<form id="f1" action="'.$this->url('list').'" method="post">';
|
|
|
|
|
|
@@ -1050,7 +1050,7 @@ class Database
|
|
$v['lang'] = $t[0];
|
|
$v['lang'] = $t[0];
|
|
}
|
|
}
|
|
$value['placeholder'] = $v['lang'];
|
|
$value['placeholder'] = $v['lang'];
|
|
- $result .= Html::text($value, false) . ' ';
|
|
|
|
|
|
+ $result .= Html::text($value, false);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1068,7 +1068,7 @@ class Database
|
|
$v = $t[0];
|
|
$v = $t[0];
|
|
}
|
|
}
|
|
$value['placeholder'] = $v;
|
|
$value['placeholder'] = $v;
|
|
- $result .= Html::text($value, false) . ' ';
|
|
|
|
|
|
+ $result .= Html::text($value, false);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1086,7 +1086,7 @@ class Database
|
|
$v = $t[0];
|
|
$v = $t[0];
|
|
}
|
|
}
|
|
$value['placeholder'] = $v;
|
|
$value['placeholder'] = $v;
|
|
- $result .= Html::text($value, false) . ' ';
|
|
|
|
|
|
+ $result .= Html::text($value, false);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -1110,7 +1110,7 @@ class Database
|
|
$value['value'] = $search[$value['name']];
|
|
$value['value'] = $search[$value['name']];
|
|
}
|
|
}
|
|
$value['placeholder'] = '填写值';
|
|
$value['placeholder'] = '填写值';
|
|
- $result .= Html::text($value, false) . ' ';
|
|
|
|
|
|
+ $result .= Html::text($value, false);
|
|
}
|
|
}
|
|
|
|
|
|
# 列表页按钮
|
|
# 列表页按钮
|
|
@@ -1180,7 +1180,11 @@ class Database
|
|
$limit .= '<a href="'.$url.'" style="width:60px;font-weight:bold;" class="btn btn-'.$btn.'">'.$v.'</a> ';
|
|
$limit .= '<a href="'.$url.'" style="width:60px;font-weight:bold;" class="btn btn-'.$btn.'">'.$v.'</a> ';
|
|
}
|
|
}
|
|
|
|
|
|
- $num = '<div class="form-group "><div style="padding-top:20px;margin-bottom: -30px;"><label style="color:#bababa;margin-left:8px;margin-right:10px;font-size:14px;font-weight:bold;">每页显示条数:</label>'.$limit.'</div></div>';
|
|
|
|
|
|
+ $num = '<div class="form-group layui-inline"><div style="padding-top:20px;margin-bottom: -30px;"><label style="color:#bababa;margin-left:8px;margin-right:10px;font-size:14px;font-weight:bold;">每页显示条数:</label>'.$limit.'</div></div>';
|
|
|
|
+
|
|
|
|
+ if (layadmin()) {
|
|
|
|
+ $num = '';
|
|
|
|
+ }
|
|
|
|
|
|
$result .= $num;
|
|
$result .= $num;
|
|
|
|
|
|
@@ -1933,14 +1937,19 @@ class Database
|
|
|
|
|
|
if ($oper == true) {
|
|
if ($oper == true) {
|
|
if (strpos($kj, 'edit') !== false) {
|
|
if (strpos($kj, 'edit') !== false) {
|
|
- $result .= '<a href="javascript:;" onclick="fastEdit($(this), \'' . $this->url($kj, $data['id']) . '\', \''.$vj[0].'\', \''.$vj[1].'\')"><button type="button" class="btn btn-info btn-rounded waves-effect waves-light m-b-5">' . $vj[0] . '</button></a> ';
|
|
|
|
|
|
+ $result .= '<a href="javascript:;" onclick="fastEdit($(this), \'' . $this->url($kj, $data['id']) . '\', \''.$vj[0].'\', \''.$vj[1].'\')"><button type="button" class="btn btn-info btn-rounded waves-effect waves-light m-b-5 layui-btn">' . $vj[0] . '</button></a> ';
|
|
} elseif (strpos($kj, 'oper') !== false) {
|
|
} elseif (strpos($kj, 'oper') !== false) {
|
|
- $result .= '<a href="javascript:;" onclick="load(\'' . Dever::url($pj) . '\')"><button type="button" class="btn btn-info btn-rounded waves-effect waves-light m-b-5">' . $vj[0] . '</button></a> ';
|
|
|
|
|
|
+ $result .= '<a href="javascript:;" onclick="load(\'' . Dever::url($pj) . '\')"><button type="button" class="btn btn-info btn-rounded waves-effect waves-light m-b-5 layui-btn">' . $vj[0] . '</button></a> ';
|
|
} elseif (isset($vj[1]) && strpos($vj[1], 'modal|') !== false) {
|
|
} elseif (isset($vj[1]) && strpos($vj[1], 'modal|') !== false) {
|
|
$t = explode('|', $vj[1]);
|
|
$t = explode('|', $vj[1]);
|
|
- $result .= '<a href="#dever_modal" data-toggle="modal" class="btn btn-info btn-rounded waves-effect waves-light m-b-5" onclick=' . $t[1] . ' msg-send="' . $this->value($t[2], $data) . '">' . $vj[0] . '</a> ';
|
|
|
|
|
|
+ $result .= '<a href="#dever_modal" data-toggle="modal" class="btn btn-info btn-rounded waves-effect waves-light m-b-5 layui-btn" onclick=' . $t[1] . ' msg-send="' . $this->value($t[2], $data) . '">' . $vj[0] . '</a> ';
|
|
} elseif (isset($vj[1])) {
|
|
} elseif (isset($vj[1])) {
|
|
- $result .= '<a href="' . $this->url($kj, $data['id'], $pj) . '" class="oper_' . $kj . '"><button type="button" class="btn btn-info btn-rounded waves-effect waves-light m-b-5">' . $h . $vjn . '</button></a> ';
|
|
|
|
|
|
+ if ($kj == 'delete') {
|
|
|
|
+ $class = 'layui-btn layui-btn-danger';
|
|
|
|
+ } else {
|
|
|
|
+ $class = 'layui-btn';
|
|
|
|
+ }
|
|
|
|
+ $result .= '<a href="' . $this->url($kj, $data['id'], $pj) . '" class="oper_' . $kj . '"><button type="button" class="btn btn-info btn-rounded waves-effect waves-light m-b-5 '.$class.'">' . $h . $vjn . '</button></a> ';
|
|
} else {
|
|
} else {
|
|
$result .= '<span style="margin-left:5px;margin-right:10px;">' . $vj[0] . '</span>';
|
|
$result .= '<span style="margin-left:5px;margin-right:10px;">' . $vj[0] . '</span>';
|
|
}
|
|
}
|
|
@@ -2024,7 +2033,7 @@ class Database
|
|
$mul = Dever::preInput('mul_');
|
|
$mul = Dever::preInput('mul_');
|
|
|
|
|
|
$node = Html::node(array('class="am-u-sm-12" style="margin-top:10px;"', 'class="am-form-group am-input-group-sm"'));
|
|
$node = Html::node(array('class="am-u-sm-12" style="margin-top:10px;"', 'class="am-form-group am-input-group-sm"'));
|
|
- $btn = '<button class="btn btn-danger" onclick="$(\'#form1\').attr(\'action\', \'' . $this->url('list') . '\');list_mul($(this))" type="button" style="height: 38px;margin-left:10px;">更新</button>';
|
|
|
|
|
|
+ $btn = '<button class="btn btn-danger layui-btn layui-btn-danger" onclick="$(\'#form1\').attr(\'action\', \'' . $this->url('list') . '\');list_mul($(this))" type="button" style="height: 38px;margin-left:10px;">更新</button>';
|
|
|
|
|
|
$prefix = 'mul_';
|
|
$prefix = 'mul_';
|
|
|
|
|
|
@@ -2152,6 +2161,10 @@ class Database
|
|
|
|
|
|
$result[$k] = '<div class="form-group ' . $class . '"><div class="margin-top">';
|
|
$result[$k] = '<div class="form-group ' . $class . '"><div class="margin-top">';
|
|
|
|
|
|
|
|
+ if (layadmin()) {
|
|
|
|
+ $result[$k] = '<div class="layui-form-item ' . $class . '"><div class="layui-col-lg6">';
|
|
|
|
+ }
|
|
|
|
+
|
|
$result[$k] .= $this->create_update_html($k, $v, $data);
|
|
$result[$k] .= $this->create_update_html($k, $v, $data);
|
|
|
|
|
|
$result[$k] .= '</div></div>';
|
|
$result[$k] .= '</div></div>';
|
|
@@ -2159,6 +2172,10 @@ class Database
|
|
} elseif (!$col && isset($v['class'])) {
|
|
} elseif (!$col && isset($v['class'])) {
|
|
# 分割线
|
|
# 分割线
|
|
$v['name'] = $this->value($v['name'], array('test' => 1));
|
|
$v['name'] = $this->value($v['name'], array('test' => 1));
|
|
|
|
+ if (isset($v['right'])) {
|
|
|
|
+ $this->card_right = true;
|
|
|
|
+ }
|
|
|
|
+ $this->card = true;
|
|
$result[$k] = Html::hr($v);
|
|
$result[$k] = Html::hr($v);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -2172,6 +2189,22 @@ class Database
|
|
return $result;
|
|
return $result;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ public function card()
|
|
|
|
+ {
|
|
|
|
+ if (isset($this->card_right)) {
|
|
|
|
+ return 'layui-col-md6';
|
|
|
|
+ }
|
|
|
|
+ return 'layui-col-md12';
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ public function layui_card()
|
|
|
|
+ {
|
|
|
|
+ if (isset($this->card)) {
|
|
|
|
+ return false;
|
|
|
|
+ }
|
|
|
|
+ return true;
|
|
|
|
+ }
|
|
|
|
+
|
|
/**
|
|
/**
|
|
* update_class
|
|
* update_class
|
|
*
|
|
*
|
|
@@ -2325,7 +2358,7 @@ class Database
|
|
$method = $param['update'];
|
|
$method = $param['update'];
|
|
|
|
|
|
if (is_array($method)) {
|
|
if (is_array($method)) {
|
|
- $result .= '<ul class="nav nav-tabs">{tab}<li><a href="javascript:;" class="dever_form_add" toggle_key="' . $key . '">增加一条</a></li></ul>';
|
|
|
|
|
|
+ $result .= '<ul class="nav nav-tabs layui-tab-title">{tab}<li><a href="javascript:;" class="dever_form_add" toggle_key="' . $key . '">增加一条</a></li></ul>';
|
|
|
|
|
|
$tab = '';
|
|
$tab = '';
|
|
|
|
|
|
@@ -2351,7 +2384,7 @@ class Database
|
|
|
|
|
|
$active = '';
|
|
$active = '';
|
|
if ($k == 0) {
|
|
if ($k == 0) {
|
|
- $active = 'active';
|
|
|
|
|
|
+ $active = 'active layui-this';
|
|
}
|
|
}
|
|
$k = $k + 1;
|
|
$k = $k + 1;
|
|
$tab .= '<li class="' . $active . '"><a href="javascript:;" id="tab-' . $key . '-child-' . $k . '" toggle_key="' . $key . '" toggle_id="' . $k . '" toggle_child=".dever_' . $key . '_child" toggle="#' . $key . '-child-' . $k . '" onclick="showToggle($(this))">第' . $k . '条</a></li>';
|
|
$tab .= '<li class="' . $active . '"><a href="javascript:;" id="tab-' . $key . '-child-' . $k . '" toggle_key="' . $key . '" toggle_id="' . $k . '" toggle_child=".dever_' . $key . '_child" toggle="#' . $key . '-child-' . $k . '" onclick="showToggle($(this))">第' . $k . '条</a></li>';
|
|
@@ -2361,7 +2394,7 @@ class Database
|
|
} else {
|
|
} else {
|
|
$this->update_child(array(), $method, $key, $result, 0);
|
|
$this->update_child(array(), $method, $key, $result, 0);
|
|
|
|
|
|
- $tab = '<li class="active"><a href="javascript:;" id="tab-' . $key . '-child-1" toggle_key="' . $key . '" toggle_id="1" toggle_child=".dever_' . $param['col'] . '_child" toggle="#' . $key . '-child-1" onclick="showToggle($(this))">第1条</a></li>';
|
|
|
|
|
|
+ $tab = '<li class="active layui-this"><a href="javascript:;" id="tab-' . $key . '-child-1" toggle_key="' . $key . '" toggle_id="1" toggle_child=".dever_' . $param['col'] . '_child" toggle="#' . $key . '-child-1" onclick="showToggle($(this))">第1条</a></li>';
|
|
}
|
|
}
|
|
|
|
|
|
$result = str_replace('{tab}', $tab, $result);
|
|
$result = str_replace('{tab}', $tab, $result);
|