edit

assets/layadmin/html/inc/script.html

@@ -36,7 +36,7 @@
 <script type="text/javascript" src="../script/lib/pic/holder.js"></script>
 
 <script type="text/javascript" src="../script/lib/excel/xlsx.min.js"></script>
-<script type="text/javascript" src="../script/lib/excel/excel.js?v15"></script>
+<script type="text/javascript" src="../script/lib/excel/excel.js?v16"></script>
 
 <!-- 加载主要js，很乱，后续优化 -->
 <script type="text/javascript" src="../script/lib/manage/main.js?v200"></script>

database/admin.php

@@ -210,8 +210,9 @@ return array
 			'match' 	=> Dever::rule('email'),
 			'update'	=> 'text',
 			/*
+			* search_name：检索名称
 			* search_order：检索排序
-			* search_style：检索样式
+			* search_after：展示当前检索之后需要展示什么，默认为<br />
 			* 列表页搜索选项，这里的search或者update的值为
 			* fulltext：全文检索,模糊匹配
 			* text：精确匹配

src/Database.php

@@ -555,6 +555,8 @@ class Database
             $config['manage']['struct'] = '<table border=1 width=100% height=100%>';
 
             $config['level'] = 1;
+
+            $option = array('select', 'group', 'linkage');
             foreach ($config['struct'] as $k => $v) {
                 if (isset($v['level'])) {
                     $config['level'] = 3;
@@ -568,65 +570,31 @@ class Database
                 if (!isset($config['search'])) {
                     if (isset($v['search']) && is_string($v['search'])) {
 
-                        if ($v['search'] == 'sday') {
-                            $config['manage']['search']['sday'][$k] = $v['name'];
-                        } elseif ($v['search'] == 'sdate') {
-                            $config['manage']['search']['sdate'][$k] = $v['name'];
-                        } elseif (strpos($v['search'], 'time') !== false || strpos($v['search'], 'day') !== false) {
-                            $config['manage']['search']['day'][$k] = $v['name'];
-                        } elseif (strpos($v['search'], 'date') !== false) {
-                            $config['manage']['search']['date'][$k] = $v['name'];
-                        } elseif (strpos($v['search'], 'year') !== false) {
-                            $config['manage']['search']['year'][$k] = $v['name'];
-                        } elseif (strpos($v['search'], 'month') !== false) {
-                            $config['manage']['search']['month'][$k] = $v['name'];
+                        $config['manage']['search'][$v['search']][$k]['lang'] = $v['name'];
+                        if ($v['search'] == 'fulltext' && isset($v['match'])) {
+                            $config['request']['list']['option'][$k] = array('option', 'like_score');
                         }
 
-                        if (strpos($v['search'], 'exp') !== false) {
-                            $config['manage']['search']['exp'][$k] = $v['name'];
+                        if (isset($v['option'])) {
+                            $config['manage']['search'][$v['search']][$k]['option'] = $v['option'];
                         }
-
-                        if (strpos($v['search'], 'ins') !== false) {
-                            $config['manage']['search']['ins'][$k] = $v['name'];
+                        if (isset($v['exist'])) {
+                            $config['manage']['search'][$v['search']][$k]['option'] = $v['exist'];
                         }
-
-                        if (strpos($v['search'], 'fulltext') !== false) {
-                            $config['manage']['search']['fulltext'][$k] = $v['name'];
-
-                            isset($v['match']) && $config['request']['list']['option'][$k] = array('option', 'like_score');
-                        } elseif (strpos($v['search'], 'text') !== false) {
-                            $config['manage']['search']['text'][$k] = $v['name'];
-                        } elseif (strpos($v['search'], 'hidden') !== false) {
-                            $config['manage']['search']['hidden'][$k] = $v['name'];
+                        if (isset($v['search_option'])) {
+                            $config['manage']['search'][$v['search']][$k]['option'] = $v['search_option'];
                         }
-
-                        if (isset($v['exist']) && strpos($v['search'], 'exist') !== false) {
-                            $config['manage']['search']['exist'][$k]['option'] = $v['exist'];
-                            $config['manage']['search']['exist'][$k]['lang'] = $v['name'];
+                        if (isset($v['default'])) {
+                            $config['manage']['search'][$v['search']][$k]['default'] = $v['default'];
                         }
-
-                        if (isset($v['option']) && strpos($v['search'], 'select') !== false) {
-                            $config['manage']['search']['select'][$k]['option'] = $v['option'];
-                            $config['manage']['search']['select'][$k]['lang'] = $v['name'];
-                            if (isset($v['default'])) {
-                                $config['manage']['search']['select'][$k]['default'] = $v['default'];
-                            }
+                        if (isset($v['search_after'])) {
+                            $config['manage']['search'][$v['search']][$k]['after'] = $v['search_after'];
                         }
-
-                        if (isset($v['option']) && strpos($v['search'], 'group') !== false) {
-                            $config['manage']['search']['group'][$k]['option'] = $v['option'];
-                            $config['manage']['search']['group'][$k]['lang'] = $v['name'];
-                            if (isset($v['default'])) {
-                                $config['manage']['search']['group'][$k]['default'] = $v['default'];
-                            }
+                        if (isset($v['search_name'])) {
+                            $config['manage']['search'][$v['search']][$k]['lang'] = $v['search_name'];
                         }
-
-                        if (isset($v['option']) && strpos($v['search'], 'linkage') !== false) {
-                            $config['manage']['search']['linkage'][$k]['option'] = $v['option'];
-                            $config['manage']['search']['linkage'][$k]['lang'] = $v['name'];
-                            if (isset($v['default'])) {
-                                $config['manage']['search']['linkage'][$k]['default'] = $v['default'];
-                            }
+                        if (isset($v['search_order'])) {
+                            $config['manage']['search'][$v['search']][$k]['order'] = $v['search_order'];
                         }
                     } elseif (isset($v['search']) && is_array($v['search'])) {
                         if (isset($v['search']['api'])) {
@@ -1248,6 +1216,11 @@ class Database
                         $parent = $config['manage']['search_child'][$k];
                     }
                     $this->list_search_select($result, $search, $prefix . 'option_' . $k, $v['lang'], $option, $v['default'], $bind, $parent);
+
+                    print_r($v);die;
+                    if (isset($v['search_after']) && $v['search_after']) {
+                        echo 11;die;
+                    }
                 }
             }
 

src/Lib/Input.php

@@ -854,7 +854,7 @@ class Input
         }
 
         if (layadmin()) {
-            $w = 'margin-top:0px;width:20%;';
+            $w = 'margin-top:0px;width:20%;margin-left:-3px;';
         }
 
         if (!isset($param['search_state'])) {