Merge pull request #5 from zhongshaofa/fix-curd

判断关联模型文件是否存在, 存在就不重新生成文件, 防止关联模型文件被覆盖
zhongshaofa · Jun 17, 2020 · f8527e4 · f8527e4
2 parents 82e2656 + 261c8a2
commit f8527e4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -12,4 +12,5 @@ runtime/temp
 public/conf
 public/WowOss.exe
 app/index/controller/Test.php
-composer.phar
+composer.phar
+app/test/
diff --git a/vendor/zhongshaofa/easy-admin/src/curd/BuildCurd.php b/vendor/zhongshaofa/easy-admin/src/curd/BuildCurd.php
@@ -1062,6 +1062,16 @@ protected function renderModel()
         // 关联模型
         foreach ($this->relationArray as $key => $val) {
             $relationModelFile = "{$this->rootDir}app{$this->DS}admin{$this->DS}model{$this->DS}{$val['modelFilename']}.php";
+
+            // todo 判断关联模型文件是否存在, 存在就不重新生成文件, 防止关联模型文件被覆盖
+            $relationModelClass = "\\app\\admin\\model\\{$val['modelFilename']}";
+            if (class_exists($relationModelClass) && method_exists(new $relationModelClass, 'getName')) {
+                $tableName = (new $relationModelClass)->getName();
+                if (CommonTool::humpToLine(lcfirst($tableName)) == CommonTool::humpToLine(lcfirst($key))) {
+                    continue;
+                }
+            }
+
             $relationModelValue = CommonTool::replaceTemplate(
                 $this->getTemplate("model{$this->DS}model"),
                 [