rabin 3 jaren geleden
bovenliggende
commit
a9fe6e85ca
2 gewijzigde bestanden met toevoegingen van 27 en 17 verwijderingen
  1. 25 15
      src/Database.php
  2. 2 2
      template/layadmin/project/database/list.php

+ 25 - 15
src/Database.php

@@ -544,26 +544,36 @@ class Database
         }
 
         if (isset($this->config[$path][$table])) {
-            if (!isset($this->config[$path][$table]['info'])) {
-                $this->config[$path][$table]['info'] = '';
-            }
-            if (!isset($this->config[$path][$table]['desc'])) {
-                $this->config[$path][$table]['desc'] = '';
-            }
-            $manage = Dever::config('base')->manage;
-            if ($manage) {
-                if (isset($manage['info'])) {
-                    $this->config[$path][$table]['info'] = $manage['info'];
-                }
-                if (isset($manage['desc'])) {
-                    $this->config[$path][$table]['desc'] = $manage['desc'];
-                }
-            }
             return $this->config[$path][$table];
         }
         return $this->config[$path];
     }
 
+    # 得到重写的配置
+    public function getConfig()
+    {
+        $config = $this->config();
+
+        if (!isset($config['info'])) {
+            $config['info'] = '';
+        }
+        if (!isset($config['desc'])) {
+            $config['desc'] = '';
+        }
+
+        $manage = Dever::config('base')->manage;
+        if ($manage) {
+            if (isset($manage['info'])) {
+                $config['info'] = $manage['info'];
+            }
+            if (isset($manage['desc'])) {
+                $config['desc'] = $manage['desc'];
+            }
+        }
+
+        return $config;
+    }
+
     /**
      * 对database配置文件进行解析
      *

+ 2 - 2
template/layadmin/project/database/list.php

@@ -43,8 +43,8 @@ $view
 # 数据列表的标题 
 ->loop('#list-thead tr', 'manage/database.list_thead')   
 
-->fetch('#info',    'manage/database.config#info', 'none')
-->fetch('#desc',    'manage/database.config#desc', 'none')   
+->fetch('#info',    'manage/database.getConfig#info', 'none')
+->fetch('#desc',    'manage/database.getConfig#desc', 'none')    
 
 # 统计数据 
 ->loop('#stat_data','manage/database.list_data')