hitsword
/
fastadmin
mirror of https://gitee.com/karson/fastadmin.git
1
0
Fork 0
Code Issues Releases Wiki Activity

优化菜单导入时软删除判断逻辑

pull/101/MERGE
Karson 2019-03-02 08:45:08 +08:00
parent d5bdcd1cd6
commit 539cf051fc
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/admin/command/Menu.php
View File

@ -192,7 +192,9 @@ class Menu extends Command
//判断是否有启用软删除 //判断是否有启用软删除
$softDeleteMethods = ['destroy', 'restore', 'recyclebin']; $softDeleteMethods = ['destroy', 'restore', 'recyclebin'];
$withSofeDelete = false; $withSofeDelete = false;
preg_match_all("/\\\$this\->model\s*=\s*model\('(\w+)'\);/", $classContent, $matches); $modelRegexArr = ["/\\\$this\->model\s*=\s*model\(['|\"](\w+)['|\"]\);/", "/\\\$this\->model\s*=\s*new\s+([a-zA-Z\\\]+);/"];
$modelRegex = preg_match($modelRegexArr[0], $classContent) ? $modelRegexArr[0] : $modelRegexArr[1];
preg_match_all($modelRegex, $classContent, $matches);
if (isset($matches[1]) && isset($matches[1][0]) && $matches[1][0]) { if (isset($matches[1]) && isset($matches[1][0]) && $matches[1][0]) {
\think\Request::instance()->module('admin'); \think\Request::instance()->module('admin');
$model = model($matches[1][0]); $model = model($matches[1][0]);