From 041ed6979803f295557da0be33ce5fbc120c3b71 Mon Sep 17 00:00:00 2001
From: 灰大狼 <crazys@126.com>
Date: Sat, 9 Mar 2019 15:57:19 +0800
Subject: [PATCH] 修改crud，默认为TP5标准。
---
application/admin/command/Crud.php | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/application/admin/command/Crud.php b/application/admin/command/Crud.php
index 1b0a296..b534124 100755
--- a/application/admin/command/Crud.php
+++ b/application/admin/command/Crud.php
@@ -1076,20 +1076,21 @@ EOD;
*/
protected function getParseNameData($module, $name, $table, $type)
{
- if (!$name) {
- $arr = [Loader::parseName($table, 1)];
- } else {
+ $arr = [];
+ if ($name) {
$name = str_replace(['.', '/', '\\'], '/', $name);
$arr = explode('/', $name);
+ $parseName = ucfirst(array_pop($arr));
+ } else {
+ $parseName = Loader::parseName($table, 1);
}
- $parseName = ucfirst(array_pop($arr));
$appNamespace = Config::get('app_namespace');
$parseNamespace = "{$appNamespace}\\{$module}\\{$type}" . ($arr ? "\\" . implode("\\", $arr) : "");
$moduleDir = APP_PATH . $module . DS;
$parseFile = $moduleDir . $type . DS . ($arr ? implode(DS, $arr) . DS : '') . $parseName . '.php';
- $parseArr = $arr;
- $parseArr[] = Loader::parseName($parseName);
- return [$parseNamespace, $parseName, $parseFile, $parseArr];
+
+ array_push($arr, $parseName);
+ return [$parseNamespace, $parseName, $parseFile, $arr];
}
/**
--
libgit2 0.24.0