|
@@ -2147,6 +2147,19 @@ class Database
|
|
|
$pg = Dever::input('pg', 1);
|
|
|
$cur = Dever::input('search_limit', 0);
|
|
|
$num = $this->getNumConfig($config);
|
|
|
+
|
|
|
+ # 新增排序
|
|
|
+ $list_order = $view_order = array();
|
|
|
+ foreach ($config['struct'] as $ki => $vi) {
|
|
|
+ if (isset($v1['list_order'])) {
|
|
|
+ $list_order[] = $v1['list_order'];
|
|
|
+ } else {
|
|
|
+ $list_order[] = 1;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ if ($list_order) {
|
|
|
+ //array_multisort($list_order, SORT_DESC, SORT_NUMERIC, $config['struct']);
|
|
|
+ }
|
|
|
foreach ($data as $k => $v) {
|
|
|
$data[$k] = $this->getAdminInfo($data[$k]);
|
|
|
$data[$k]['i'] = $i;
|
|
@@ -2177,7 +2190,7 @@ class Database
|
|
|
if (isset($vi['sync']) && strpos($ki, '-')) {
|
|
|
$temp = explode('-', $ki);
|
|
|
$load = Dever::load($temp[0] . '/' . $temp[1] . '-one', array('option_' . $vi['sync'][1] => $v[$vi['sync'][0]]));
|
|
|
- $v[$ki] = isset($load[$temp[2]]) ? $load[$temp[2]] : $vi['default'];
|
|
|
+ $data[$k][$ki] = $v[$ki] = isset($load[$temp[2]]) ? $load[$temp[2]] : $vi['default'];
|
|
|
}
|
|
|
|
|
|
if (isset($vi['list']) && $vi['list']) {
|