dever 5 years ago
parent
commit
79c4f3aa90

+ 1 - 1
assets/layadmin/html/home.html

@@ -7,7 +7,7 @@
 </head>
 <body class="layui-layout-body fixed-left">
 
-  <div id="LAY_app wrapper">
+  <div id="LAY_app">
     <div class="layui-layout layui-layout-admin">
 
       <script class="include" system="" path="inc/" file="nav">include()</script>

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

@@ -68,7 +68,7 @@
     </dl>
   </li>
   
-  <li class="layui-nav-item layui-hide-xs" lay-unselect>
+  <li class="layui-nav-item layui-hide-xs" lay-unselect style="display:none;">
     <a href="javascript:;" layadmin-event="about"><i class="layui-icon layui-icon-more-vertical"></i></a>
   </li>
   <li class="layui-nav-item layui-show-xs-inline-block layui-hide-sm" lay-unselect>

+ 1 - 1
assets/layadmin/html/login.html

@@ -20,7 +20,7 @@
       <div class="layadmin-user-login-box layadmin-user-login-body layui-form">
         <div class="layui-form-item">
           <label class="layadmin-user-login-icon layui-icon layui-icon-username" for="LAY-user-login-username"></label>
-          <input type="text" ame="username" id="username" lay-verify="required" placeholder="账号" class="layui-input">
+          <input type="text" name="username" id="username" lay-verify="required" placeholder="账号" class="layui-input">
         </div>
         <div class="layui-form-item">
           <label class="layadmin-user-login-icon layui-icon layui-icon-password" for="LAY-user-login-password"></label>

+ 2 - 4
config/base.php

@@ -34,10 +34,7 @@ $config['template'] = array
 	'assets' => 'moltran',
 	'template' => 'default',
 
-	'assets' => 'layadmin',
-	'template' => 'layadmin',
-
-
+	//'assets' => 'layadmin',
 	
 	# 替换设置 一般用于替换资源,将模板中的(html中的)js等相对url换成绝对url,如果不定义,则默认为../js这样的
 	'replace' => array
@@ -61,6 +58,7 @@ $config['template'] = array
 
 if ($config['template']['assets'] == 'layadmin') {
 	$config['template']['layout'] = '';
+	$config['template']['template'] = $config['template']['assets'];
 }
 
 return $config;

+ 1 - 1
database/api.php

@@ -36,7 +36,7 @@ return array
 	'name' => 'api',
 	# 显示给用户看的名称
 	'lang' => '接口列表',
-	//'menu' => false,
+	'menu' => false,
 	'html' => $html,
 	'doc' => $doc,
 	'gettype' => $type,

+ 1 - 0
database/filter.php

@@ -15,6 +15,7 @@ return array
 	# 显示给用户看的名称
 	'lang' => '过滤词配置',
 	'order' => 1,
+	'menu' => false,
 	'check' => 'name',
 	# 数据结构
 	'struct' => array

+ 1 - 1
index.php

@@ -4,5 +4,5 @@ define('DEVER_APP_NAME', 'manage');
 define('DEVER_APP_LANG', '后台设置');
 define('DEVER_APP_PATH', dirname(__FILE__) . DIRECTORY_SEPARATOR);
 define('DEVER_MANAGE_ORDER', -100);
-define('DEVER_MANAGE_ICON', 'glyphicon glyphicon-wrench');
+define('DEVER_MANAGE_ICON', 'glyphicon glyphicon-wrench layui-icon-set-sm');
 include(DEVER_APP_PATH . '../boot.php');

+ 9 - 2
src/Database.php

@@ -2366,7 +2366,11 @@ class Database
             $method = $param['update'];
 
             if (is_array($method)) {
-                $result .= '<ul class="nav nav-tabs layui-tab-title">{tab}<li><a href="javascript:;" class="dever_form_add" toggle_key="' . $key . '">增加一条</a></li></ul>';
+                $c = '';
+                if (layadmin()) {
+                    $c = 'layui-tab-title';
+                }
+                $result .= '<ul class="nav nav-tabs '.$c.'">{tab}<li><a href="javascript:;" class="dever_form_add" toggle_key="' . $key . '">增加一条</a></li></ul>';
 
                 $tab = '';
 
@@ -2392,7 +2396,10 @@ class Database
 
                             $active = '';
                             if ($k == 0) {
-                                $active = 'active layui-this';
+                                $active = 'active';
+                            }
+                            if (layadmin() && $active) {
+                                $active .= ' layui-this';
                             }
                             $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>';

+ 57 - 8
src/Lib/Input.php

@@ -24,16 +24,16 @@ class Input
                     $result = str_replace('form-control', 'form-control layui-input', $result);
                 }
                 
-                if (isset($param[1]) && !$param[1]) {
+                if (isset($param[1]) && !$param[1] && isset($param[0]['update']) && $param[0]['update'] != 'hidden') {
                     $result = '<div class="layui-inline"><div class="layui-input-inline">'.$result.'</div></div>';
                 } else {
                     $result = '<div>'.$result.'</div>';
                 }
             } else {
-                if (isset($param[1])) {
+                if (isset($param[0]['update']) && $param[0]['update'] == 'hidden') {
+                    
+                } elseif (isset($param[1]) && !$param[1]) {
                     $result = '<div style="display:inline;margin-right: 10px;">'.$result.'</div>';
-                } else {
-                    $result = '<div>'.$result.'</div>';
                 }
             }
             
@@ -691,6 +691,58 @@ class Input
                     $param['name'] = $param['name'] . '_temp';
                 }
                 $auto = 'complete="' . Dever::url($param['autocomplete'][0]) . '" complete_callback="' . $param['autocomplete'][1] . '" ';
+
+                if (isset($param['autocomplete'][3])) {
+                    $auto .= ' complete_cate="' . $param['autocomplete'][3] . '" ';
+                }
+            } elseif (isset($param['searchbox'])) {
+                if (empty($param['searchbox'][1])) {
+                    $param['searchbox'][1] = 'value';
+                }
+                if ($param['searchbox'][1] == 'id') {
+                    $input = self::hidden(array('name' => $param['name'], 'value' => $value));
+                    $input = '<script>var searchbox_value = [];</script>';
+                    if (isset($param['searchbox'][2]) && $value) {
+                        # 重新定义value
+                        $value = Dever::load($param['searchbox'][2], $value);
+                        if (is_array($value)) {
+                            
+                            $html = '<div style="margin-top: 10px;width: 60%;overflow: auto;max-height: 500px;"><table id="'.$param['name'].'_value_show" class="table table-small-font table-bordered">';
+                            foreach ($value as $k => $v) {
+
+                                $link = '';
+                                $attr = '';
+                                $pic = '';
+                                if (isset($v['pic']) && $v['pic']) {
+                                    $pic = '<a href="javascript:;"><img src="'.$v['pic'].'" width="100"></a>&nbsp;&nbsp;';
+                                }
+                                if (isset($v['link']) && $v['link']) {
+                                    $link = $v['link'];
+                                    $attr = ' target="_blank"';
+                                }
+
+                                $html .= '<tr><td width="90%"><input type="checkbox" checked name="'.$param['name'].'[]" value="'.$v['id'].'"/>&nbsp;&nbsp;'.$pic.'<a href="'.$link.'" '.$attr.' title="'.$v['value'].'">'.$v['value'].'</td><td width="10%"><a href="javascript:;" onclick="searchbox_del($(this), \''.$param['name'].'_value\', \''.$v['id'].'\')">[删除]</a></td></tr><script>searchbox_value.push('.$v['id'].');</script>';
+                            }
+
+                            $html .= '</table></div>';
+
+                            $input .= $html;
+
+                            $value = '';
+                        }
+                    }
+
+                    $param['name'] = $param['name'] . '_temp';
+                }
+                $auto = 'searchbox="' . Dever::url($param['searchbox'][0]) . '" searchbox_callback="' . $param['searchbox'][1] . '" ';
+
+                if (isset($param['searchbox'][3])) {
+                    $auto .= ' searchbox_cate="' . $param['searchbox'][3] . '" ';
+                }
+
+                $auto .= ' style="display: inline;"';
+
+                $input = '<button type="button" onclick="searchbox($(this))" class="btn btn-primary layui-btn layuiadmin-btn-list" style="margin-left:10px;margin-top: -2px;"><i class="fa fa-save"></i> 搜索</button>' . $input;
             }
             if (isset($param['bind'])) {
                 $param['bind'][2] = isset($param['bind'][2]) ? str_replace('"', '\'', json_encode($param['bind'][2], true)) : false;
@@ -698,10 +750,7 @@ class Input
 
                 $auto .= ' onload="' . $param['bind'][1] . '($(this), ' . $param['bind'][2] . ')" ';
             }
-
-            if (isset($param['autocomplete'][3])) {
-                $auto .= ' complete_cate="' . $param['autocomplete'][3] . '" ';
-            }
+            
             return '<input ' . $auto . ' type="' . (isset($param['update']) ? $param['update'] : 'text') . '" class="autoload_text update_value ' . (isset($param['class']) ? $param['class'] : 'form-control') . ' ' . (isset($param['valid']) ? $param['valid'] : '') . '" value="' . $value . '" name="' . $param['name'] . '" id="' . $param['name'] . '_value" autocomplete="new'.time().'" placeholder="' . (isset($param['placeholder']) ? $param['placeholder'] : '') . '"/>' . $input;
         }
     }

+ 1 - 1
template/layadmin/home.php

@@ -12,7 +12,7 @@ $view
 ->fetch('.fixed-left@test', '公告')
 
 ->fetch('body@class', 'theme-<{Dever::load("manage/auth.config#template")}>')
-->fetch('#wrapper@class', 'manage/database.cookie#wrapper')
+->fetch('#LAY_app@class', 'manage/database.cookie#wrapper')
 ->fetch('.layadmin-iframe@src', 'manage/menu.link#console')
 
 ->fetch('#LAY_app_tabsheader li@lay-id', 'manage/menu.link#console')