改进分组路由的url生成

This commit is contained in:
thinkphp
2016-10-26 17:44:15 +08:00
parent 82b94b555f
commit 9062808a05

View File

@@ -307,7 +307,8 @@ class Route
}
$vars = self::parseVar($rule);
if (isset($name)) {
$key = $group ? $group . '/' . $rule : $rule;
$rule = ltrim($rule, '/');
$key = $group ? $group . ($rule ? '/' . $rule : '') : $rule;
self::name(strtolower($name), [$key, $vars, self::$domain]);
}
if ($group) {
@@ -428,7 +429,8 @@ class Route
$vars = self::parseVar($key);
$item[] = ['rule' => $key, 'route' => $route, 'var' => $vars, 'option' => $options, 'pattern' => $patterns];
// 设置路由标识
self::name($route, [$name . '/' . $key, $vars, self::$domain]);
$key = ltrim($key, '/');
self::name($route, [$name . ($key ? '/' . $key : ''), $vars, self::$domain]);
}
self::$rules['*'][$name] = ['rule' => $item, 'route' => '', 'var' => [], 'option' => $option, 'pattern' => $pattern];
}