优化getParsenameData

pull/106/head
灰大狼 2019-03-09 16:47:06 +08:00
parent 065d05d0b4
commit d0c100f85e
1 changed files with 6 additions and 4 deletions

View File

@ -1076,19 +1076,21 @@ EOD;
*/ */
protected function getParseNameData($module, $name, $table, $type) protected function getParseNameData($module, $name, $table, $type)
{ {
$arr = [];
if (!$name) { if (!$name) {
$arr = [Loader::parseName($table, 1)]; $parseName = Loader::parseName($table, 1);
$parseArr = [$table];
} else { } else {
$name = str_replace(['.', '/', '\\'], '/', $name); $name = str_replace(['.', '/', '\\'], '/', $name);
$arr = explode('/', $name); $arr = explode('/', $name);
$parseName = ucfirst(array_pop($arr));
$parseArr = $arr;
array_push($parseArr, $parseName);
} }
$parseName = ucfirst(array_pop($arr));
$appNamespace = Config::get('app_namespace'); $appNamespace = Config::get('app_namespace');
$parseNamespace = "{$appNamespace}\\{$module}\\{$type}" . ($arr ? "\\" . implode("\\", $arr) : ""); $parseNamespace = "{$appNamespace}\\{$module}\\{$type}" . ($arr ? "\\" . implode("\\", $arr) : "");
$moduleDir = APP_PATH . $module . DS; $moduleDir = APP_PATH . $module . DS;
$parseFile = $moduleDir . $type . DS . ($arr ? implode(DS, $arr) . DS : '') . $parseName . '.php'; $parseFile = $moduleDir . $type . DS . ($arr ? implode(DS, $arr) . DS : '') . $parseName . '.php';
$parseArr = $arr;
$parseArr[] = Loader::parseName($parseName);
return [$parseNamespace, $parseName, $parseFile, $parseArr]; return [$parseNamespace, $parseName, $parseFile, $parseArr];
} }