|
@@ -750,31 +750,31 @@ class Database
|
|
|
if (isset($config['manage']['list_type'])) {
|
|
|
$config['manage']['list_table'] = 'html';
|
|
|
}
|
|
|
- }
|
|
|
|
|
|
- $config['state'] = $this->getState();
|
|
|
- $config['project'] = $project;
|
|
|
-
|
|
|
- # 新增排序
|
|
|
- $l = isset($_GET['l']) ? $_GET['l'] : '';
|
|
|
- if ($l == 'project/database/list' || $l == 'database.list_excel') {
|
|
|
- $list_order = array();
|
|
|
- $i = 0;
|
|
|
- foreach ($config['struct'] as $ki => $vi) {
|
|
|
- if (isset($vi['list_order'])) {
|
|
|
- $list_order[] = $vi['list_order'];
|
|
|
- } else {
|
|
|
- $config['struct'][$ki]['list_order'] = $i;
|
|
|
- $list_order[] = $i;
|
|
|
+ # 新增排序
|
|
|
+ $l = isset($_GET['l']) ? $_GET['l'] : '';
|
|
|
+ if ($l == 'project/database/list' || $l == 'database.list_excel') {
|
|
|
+ $list_order = array();
|
|
|
+ $i = 0;
|
|
|
+ foreach ($config['struct'] as $ki => $vi) {
|
|
|
+ if (isset($vi['list_order'])) {
|
|
|
+ $list_order[] = $vi['list_order'];
|
|
|
+ } else {
|
|
|
+ $config['struct'][$ki]['list_order'] = $i;
|
|
|
+ $list_order[] = $i;
|
|
|
+ }
|
|
|
+ $i++;
|
|
|
}
|
|
|
- $i++;
|
|
|
- }
|
|
|
|
|
|
- if ($list_order) {
|
|
|
- array_multisort($list_order, SORT_ASC, SORT_NUMERIC, $config['struct']);
|
|
|
+ if ($list_order) {
|
|
|
+ array_multisort($list_order, SORT_ASC, SORT_NUMERIC, $config['struct']);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ $config['state'] = $this->getState();
|
|
|
+ $config['project'] = $project;
|
|
|
+
|
|
|
return $config;
|
|
|
}
|
|
|
|