代码生成器生成模型文件功能优化

resources/views/helpers/scaffold.blade.php

@@ -42,7 +42,7 @@
 
                     <div class="col-sm-2 ">
                         <div class="input-group">
-                            <input type="text" name="table_name" class="form-control text-capitalize" id="inputTableName" placeholder="{{(trans('admin.scaffold.table'))}}" value="{{ old('table_name') }}">
+                            <input type="text" name="table_name" class="form-control" id="inputTableName" placeholder="{{(trans('admin.scaffold.table'))}}" value="{{ old('table_name') }}">
 
                         </div>
                     </div>

src/Scaffold/ModelCreator.php

@@ -72,6 +72,7 @@ class ModelCreator
         $stub = $this->replaceClass($stub, $this->name)
             ->replaceNamespace($stub, $this->name)
             ->replaceSoftDeletes($stub, $softDeletes)
+            ->replaceDatetimeFormatter($stub)
             ->replaceTable($stub, $this->name)
             ->replaceTimestamp($stub, $timestamps)
             ->replacePrimaryKey($stub, $keyName)
@@ -159,8 +160,8 @@ class ModelCreator
         $import = $use = '';
 
         if ($softDeletes) {
-            $import = "use Illuminate\\Database\\Eloquent\\SoftDeletes;\n";
-            $use = "use SoftDeletes;\n";
+            $import = "use Illuminate\\Database\\Eloquent\\SoftDeletes;";
+            $use = "use SoftDeletes;";
         }
 
         $stub = str_replace(['DummyImportSoftDeletesTrait', 'DummyUseSoftDeletesTrait'], [$import, $use], $stub);
@@ -168,6 +169,28 @@ class ModelCreator
         return $this;
     }
 
+    /**
+     * Replace datetimeFormatter dummy.
+     *
+     * @param string $stub
+     * @param bool   $softDeletes
+     *
+     * @return $this
+     */
+    protected function replaceDatetimeFormatter(&$stub)
+    {
+        $import = $use = '';
+
+        if (version_compare(app()->version(), '7.0.0') >= 0) {
+            $import = "use Dcat\\Admin\\Traits\\HasDateTimeFormatter;";
+            $use = "use HasDateTimeFormatter;";
+        }
+
+        $stub = str_replace(['DummyImportDateTimeFormatterTrait', 'DummyUseDateTimeFormatterTrait'], [$import, $use], $stub);
+
+        return $this;
+    }
+
     /**
      * Replace primarykey dummy.
      *

src/Scaffold/stubs/model.stub

@@ -2,16 +2,17 @@
 
 namespace DummyNamespace;
 
-use Illuminate\Database\Eloquent\Model;
+DummyImportDateTimeFormatterTrait
 DummyImportSoftDeletesTrait
+use Illuminate\Database\Eloquent\Model;
 
 class DummyClass extends Model
 {
+	DummyUseDateTimeFormatterTrait
     DummyUseSoftDeletesTrait
 
     DummyModelTable
-
     DummyModelKey
-
     DummyTimestamp
+
 }