dever 3 years ago
parent
commit
c71a352bad
2 changed files with 17 additions and 2 deletions
  1. 1 1
      assets/layadmin/html/inc/script.html
  2. 16 1
      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?v93"></script>
+<script type="text/javascript" src="../script/lib/manage/main.js?v95"></script>

+ 16 - 1
src/Database.php

@@ -2051,7 +2051,22 @@ class Database
         }
         foreach ($search as $k => $v) {
             if ($v) {
-                if (strpos($k, 'option_') !== false) {
+                if (strpos($k, '-') !== false) {
+                    $k = str_replace('search_option_', '', $k);
+                    $temp = explode('-', $k);
+                    if (isset($config['struct'][$k]) && isset($config['struct'][$k]['sync'])) {
+                        
+                    }
+                    $sync = $config['struct'][$k];
+                    if ($v[$vi['sync'][0]] > 0) {
+                        $load = Dever::load($temp[0] . '/' . $temp[1] . '-one', array('option_' . $vi['sync'][1] => $v[$vi['sync'][0]]));
+                    } else {
+                        $lw = array('option_' . $vi['sync'][3] => $v[$vi['sync'][2]], 'option_' . $vi['sync'][4] => $v[$vi['sync'][0]]);
+                        $load = Dever::load($temp[0] . '/' . $temp[1] . '-one', $lw);
+                    }
+                    
+                    $data[$k][$ki] = $v[$ki] = isset($load[$temp[2]]) ? $load[$temp[2]] : $vi['default'];
+                } elseif (strpos($k, 'option_') !== false) {
                     //Dever::setInput(str_replace('search_', '', $k), $v);
                     if (is_array($v)) {
                         if ($v[0] == 0) {