Merge pull request #1627 from edwinhuish/fix_new_app_namespace

fix #1593 导致的 namespace 错误

resources/views/helpers/scaffold.blade.php

@@ -1,538 +1,538 @@
-@php
-    $timestamps = Dcat\Admin\Widgets\Checkbox::make('timestamps')->inline();
-    $timestamps->options([1 => 'Created_at & Updated_at'])->check(1);
-
-    $soft = Dcat\Admin\Widgets\Checkbox::make('soft_deletes')->inline();
-    $soft->options([1 => (trans('admin.scaffold.soft_delete'))]);
-
-    $actionCreators = Dcat\Admin\Widgets\Checkbox::make('create[]')->inline();
-    $actionCreators->options([
-        'migration' => (trans('admin.scaffold.create_migration')),
-        'model' => (trans('admin.scaffold.create_model')),
-        'repository' => (trans('admin.scaffold.create_repository')),
-        'controller' => (trans('admin.scaffold.create_controller')),
-        'migrate' => (trans('admin.scaffold.run_migrate')),
-        'lang' => (trans('admin.scaffold.create_lang')),
-    ])->checkAll(['migrate', 'migration']);
-@endphp
-<style>
-    .select2-container .select2-selection--single {
-        height: 30px !important;
-    }
-    .choose-exist-table {
-        width: 100%;
-    }
-</style>
-<div class="card">
-    <div style="height:10px"></div>
-    <!-- /.box-header -->
-    <div class="card-body" style="padding:18px 0 0">
-
-        <form method="post" action="{{$action}}" id="scaffold" pjax-container>
-
-            <div class="form-horizontal">
-
-                <div class="form-group row">
-
-{{--                    <label for="inputTableName" class="col-sm-1 control-label text-capitalize">{{(trans('admin.scaffold.table'))}}</label>--}}
-
-                    <div for="inputTableName"  class="col-sm-1 control-label text-capitalize">
-                        <span>{{(trans('admin.scaffold.table'))}}</span>
-                    </div>
-
-                    <div class="col-sm-2 ">
-                        <div class="input-group">
-                            <input type="text" name="table_name" class="form-control" id="inputTableName" placeholder="{{(trans('admin.scaffold.table'))}}" value="{{ old('table_name') }}">
-
-                        </div>
-                    </div>
-
-                    <div class=" col-sm-2" style="margin-left: -15px;">
-                        <select class="choose-exist-table"  name="exist-table">
-                            <option value="0" selected>{{trans('admin.scaffold.choose')}}</option>
-                            @foreach($tables as $db => $tb)
-                                <optgroup label="{!! $db !!}">
-                                    @foreach($tb as $v)
-                                        <option value="{{$db}}|{{$v}}">{{$v}}</option>
-                                    @endforeach
-                                </optgroup>
-                            @endforeach
-                        </select>
-                    </div>
-
-                    <span class="help-block " id="table-name-help" style="margin-left:150px;display: none">
-                        <i class="fa fa-info"></i>&nbsp; Table name can't be empty!
-                    </span>
-
-                </div>
-                <div class="form-group row">
-                    <span for="inputModelName" class="col-sm-1 control-label text-capitalize">{{(trans('admin.scaffold.model'))}}</span>
-
-                    <div class="col-sm-4">
-                        <input type="text" name="model_name" class="form-control text-capitalize" id="inputModelName" placeholder="{{(trans('admin.scaffold.model'))}}" value="{{ old('model_name', "App\\Models\\") }}">
-                    </div>
-                </div>
-
-                <div class="form-group row">
-                    <span for="inputControllerName" class="col-sm-1 control-label text-capitalize">{{(trans('admin.scaffold.controller'))}}</span>
-
-                    <div class="col-sm-4">
-                        <input type="text" name="controller_name" class="form-control text-capitalize" id="inputControllerName" placeholder="{{(trans('admin.scaffold.controller'))}}" value="{{ old('controller_name', "App\\".$app."\\Controllers\\") }}">
-                    </div>
-                </div>
-
-
-                <div class="form-group row">
-                    <span for="inputRepositoryName" class="col-sm-1 control-label text-capitalize">{{(trans('admin.scaffold.repository'))}}</span>
-
-                    <div class="col-sm-4">
-                        <input type="text" name="repository_name" class="form-control text-capitalize" id="inputRepositoryName" placeholder="{{(trans('admin.scaffold.repository'))}}" value="{{ old('repository_name', "App\\".$app."\\Repositories\\") }}">
-                    </div>
-                </div>
-
-
-                <div class="form-group row">
-                    <div class="offset-sm-1 col-sm-11 mt-1 text-capitalize">
-                        {!! $actionCreators->render(); !!}
-                    </div>
-                </div>
-
-            </div>
-
-            <table class="table table-hover responsive table-header-gray " id="table-fields" style="margin-top:25px;">
-                <thead>
-                <tr>
-                    <th style="width: 200px">{{trans('admin.scaffold.field_name')}}</th>
-                    <th>{{trans('admin.scaffold.translation')}}</th>
-                    <th>{{trans('admin.scaffold.type')}}</th>
-                    <th>{{trans('admin.scaffold.nullable')}}</th>
-                    <th>{{trans('admin.scaffold.key')}}</th>
-                    <th>{{trans('admin.scaffold.default')}}</th>
-                    <th>{{trans('admin.scaffold.comment')}}</th>
-                    <th>{{trans('admin.action')}}</th>
-                </tr>
-                </thead>
-                <tbody id="table-fields-sortable">
-                @if(old('fields'))
-                    @foreach(old('fields') as $index => $field)
-                        <tr>
-                            <td>
-                                <input type="text" name="fields[{{$index}}][name]" class="form-control" placeholder="{{trans('admin.scaffold.field')}}" value="{{$field['name']}}" />
-                            </td>
-                            <td>
-                                <input type="text" name="fields[{{$index}}][translation]" class="form-control" placeholder="{{trans('admin.scaffold.translation')}}" value="{{$field['translation']}}" />
-                            </td>
-                            <td>
-                                <select style="width: 200px" name="fields[{{$index}}][type]">
-                                    @foreach($dbTypes as $type)
-                                        <option value="{{ $type }}" {{$field['type'] == $type ? 'selected' : '' }}>{{$type}}</option>
-                                    @endforeach
-                                </select>
-                            </td>
-                            <td>
-                                <div class="vs-checkbox-con vs-checkbox-primary" >
-                                    <input name="fields[{{$index}}][nullable]" type="checkbox" {{ \Illuminate\Support\Arr::get($field, 'nullable') == 'on' ? 'checked': '' }}>
-                                    <span class="vs-checkbox vs-checkbox-">
-                                      <span class="vs-checkbox--check">
-                                        <i class="vs-icon feather icon-check"></i>
-                                      </span>
-                                    </span>
-                                </div>
-                            </td>
-                            <td>
-                                <select style="width: 150px" name="fields[{{$index}}][key]">
-                                    {{--<option value="primary">Primary</option>--}}
-                                    <option value="" {{$field['key'] == '' ? 'selected' : '' }}>NULL</option>
-                                    <option value="unique" {{$field['key'] == 'unique' ? 'selected' : '' }}>Unique</option>
-                                    <option value="index" {{$field['key'] == 'index' ? 'selected' : '' }}>Index</option>
-                                </select>
-                            </td>
-                            <td><input type="text" class="form-control" placeholder="{{trans('admin.scaffold.default')}}" name="fields[{{$index}}][default]" value="{{$field['default']}}"/></td>
-                            <td><input type="text" class="form-control" placeholder="{{trans('admin.scaffold.comment')}}" name="fields[{{$index}}][comment]" value="{{$field['comment']}}" /></td>
-                            <td>
-                                <button class="btn btn-sm btn-white table-field-sort-handle" type="button" title="{{trans('admin.order')}}"><i class="fa fa-sort"></i></button>
-                                <button class="btn btn-sm btn-white table-field-remove"><i class="feather icon-trash"></i></button>
-                            </td>
-                        </tr>
-                    @endforeach
-                @else
-                    <tr>
-                        <td>
-                            <input type="text" name="fields[0][name]" class="form-control" placeholder="{{trans('admin.scaffold.field')}}" />
-                        </td>
-                        <td>
-                            <input type="text" name="fields[0][translation]" class="form-control" placeholder="{{trans('admin.scaffold.translation')}}" />
-                        </td>
-                        <td>
-                            <select style="width: 200px" name="fields[0][type]">
-                                @foreach($dbTypes as $type)
-                                    <option value="{{ $type }}">{{$type}}</option>
-                                @endforeach
-                            </select>
-                        </td>
-                        <td>
-                            <div class="vs-checkbox-con vs-checkbox-primary" >
-                                <input name="fields[0][nullable]" type="checkbox"  />
-                                <span class="vs-checkbox vs-checkbox-">
-                                  <span class="vs-checkbox--check">
-                                    <i class="vs-icon feather icon-check"></i>
-                                  </span>
-                                </span>
-                            </div>
-                        <td>
-                            <select style="width: 150px" name="fields[0][key]">
-                                {{--<option value="primary">Primary</option>--}}
-                                <option value="" selected>NULL</option>
-                                <option value="unique">Unique</option>
-                                <option value="index">Index</option>
-                            </select>
-                        </td>
-                        <td><input type="text" class="form-control" placeholder="{{trans('admin.scaffold.default')}}" name="fields[0][default]"></td>
-                        <td><input type="text" class="form-control" placeholder="{{trans('admin.scaffold.comment')}}" name="fields[0][comment]"></td>
-                        <td>
-                            <button class="btn btn-sm btn-white table-field-sort-handle" type="button" title="{{trans('admin.order')}}"><i class="fa fa-sort"></i></button>
-                            <button class="btn btn-sm btn-white table-field-remove"><i class="feather icon-trash"></i></button>
-                        </td>
-                    </tr>
-                @endif
-                </tbody>
-            </table>
-
-            <hr style="margin-top: 0;"/>
-
-            <div class='form-inline d-flex justify-content-between' style="width: 100%; padding: 0 20px 12px;">
-
-                <div class='form-group'>
-                    <button type="button" class="btn btn-sm btn-primary btn-outline text-capitalize" id="add-table-field"><i class="feather icon-plus"></i>&nbsp;&nbsp;{{(trans('admin.scaffold.add_field'))}}</button>
-                    <button type="button" class="btn btn-sm btn-primary btn-outline text-capitalize ml-1" id="sync-translation-with-comment"><i class="feather icon-repeat"></i>&nbsp;&nbsp;{{(trans('admin.scaffold.sync_translation_with_comment'))}}</button>
-                </div>
-
-                <div class="row">
-                    <div class="form-group text-capitalize" style="margin-right: 20px;">
-                        <span for="titleTranslation">{{(trans('admin.scaffold.translate_title'))}}&nbsp;&nbsp;</span>
-                        <input type="text"
-                               name="translate_title"
-                               class="form-control"
-                               id="titleTranslation"
-                               placeholder="{{(trans('admin.scaffold.translate_title'))}}"
-                               value="{{ request('translate_title') }}"
-                               style="width: 150px;">
-                    </div>
-
-                    <div class="form-group text-capitalize" style="margin-right: 20px;">
-                        <span for="inputPrimaryKey">{{(trans('admin.scaffold.pk'))}}&nbsp;&nbsp;</span>
-                        <input
-                                type="text"
-                                name="primary_key"
-                                class="form-control"
-                                id="inputPrimaryKey"
-                                placeholder="{{(trans('admin.scaffold.pk'))}}"
-                                value="{{ request('primary_key') ?: 'id' }}"
-                                style="width: 100px;">
-                    </div>
-
-                    <div class='form-group text-capitalize'>
-                        {!! $timestamps->render() !!}
-                        {!! $soft->render() !!}
-                    </div>
-
-                </div>
-            </div>
-
-            <!-- /.box-body -->
-            <div class="box-footer d-flex justify-content-between">
-                <div></div>
-                <button type="submit" class="btn btn-primary text-capitalize"><i class="feather icon-save"></i> {{(trans('admin.submit'))}}</button>
-            </div>
-
-        {{ csrf_field() }}
-
-        </form>
-
-    </div>
-
-</div>
-
-<template id="table-field-tpl">
-    <tr>
-        <td>
-            <input type="text" value="{name}" name="fields[__index__][name]" class="form-control" placeholder="{{trans('admin.scaffold.field')}}" />
-        </td>
-        <td>
-            <input type="text" value="{translation}" name="fields[__index__][translation]" class="form-control" placeholder="{{trans('admin.scaffold.translation')}}" />
-        </td>
-        <td>
-            <select style="width: 200px" name="fields[__index__][type]">
-                @foreach($dbTypes as $type)
-                    <option value="{{ $type }}">{{$type}}</option>
-                @endforeach
-            </select>
-        </td>
-        <td>
-            <div class="vs-checkbox-con vs-checkbox-primary" >
-                <input {nullable} name="fields[__index__][nullable]" type="checkbox"  />
-                <span class="vs-checkbox vs-checkbox-">
-                  <span class="vs-checkbox--check">
-                    <i class="vs-icon feather icon-check"></i>
-                  </span>
-                </span>
-            </div>
-        <td>
-            <select style="width: 150px" name="fields[__index__][key]">
-                <option value="" selected>NULL</option>
-                <option value="unique">Unique</option>
-                <option value="index">Index</option>
-            </select>
-        </td>
-        <td><input value="{default}" type="text" class="form-control" placeholder="{{trans('admin.scaffold.default')}}" name="fields[__index__][default]"></td>
-        <td><input value="{comment}" type="text" class="form-control" placeholder="{{trans('admin.scaffold.comment')}}" name="fields[__index__][comment]"></td>
-        <td>
-            <button class="btn btn-sm btn-white table-field-sort-handle" type="button" title="{{trans('admin.order')}}"><i class="fa fa-sort"></i></button>
-            <button class="btn btn-sm btn-white table-field-remove"><i class="feather icon-trash"></i></button>
-        </td>
-    </tr>
-</template>
-
-<script>
-    Dcat.ready(function () {
-        var $model = $('#inputModelName'),
-            $controller = $('#inputControllerName'),
-            $repository = $('#inputRepositoryName'),
-            $table = $('#inputTableName'),
-            $fieldsBody = $('#table-fields tbody'),
-            tpl = $('#table-field-tpl').html(),
-            modelNamespace = 'App\\Models\\',
-            repositoryNamespace = 'App\\{{$app}}\\Repositories\\',
-            controllerNamespace = 'App\\{{$app}}\\Controllers\\',
-            dataTypeMap = {!! json_encode($dataTypeMap) !!},
-            helpers = Dcat.helpers;
-
-        var withSingularName = helpers.debounce(function (table) {
-            $.ajax('{{ url(request()->path()) }}?singular=' + table, {
-                success: function (data) {
-                    writeController(data.value);
-                    writeModel(data.value);
-                    witeRepository(data.value);
-                }
-            });
-        }, 500);
-
-        $('select').select2();
-
-        var sortable = Sortable.create(document.getElementById("table-fields-sortable"),{
-            handle:'.table-field-sort-handle',
-            onEnd: function () {
-                getTR().each(function(index){
-                    $(this).find("[name^='fields']").each(function(){
-                        var newName = $(this).attr('name').replace(/fields\[(\d)\]/, `fields[${index}]`);
-                        $(this).attr('name', newName);
-                    })
-                });
-            }
-        });
-
-        $('#add-table-field').click(function (event) {
-            addField();
-        });
-
-        $('#sync-translation-with-comment').click(function (event) {
-            var element = $('#table-fields-sortable tr');
-            if (element.length > 0) {
-                element.each(function (i, v) {
-                    var translation = $(v).find('input[name="fields[' + i + '][translation]"]');
-                    var comment = $(v).find('input[name="fields[' + i + '][comment]"]');
-                    if (translation.val() !== "" && comment.val() === "") {
-                        comment.val(translation.val());
-                    }
-                    if (translation.val() === "" && comment.val() !== "") {
-                        translation.val(comment.val());
-                    }
-                });
-            }
-        });
-
-        $('#table-fields').on('click', '.table-field-remove', function(event) {
-            $(event.target).closest('tr').remove();
-        });
-
-        $('#scaffold').on('submit', function (event) {
-
-            //event.preventDefault();
-
-            if ($table.val() == '') {
-                $table.closest('.form-group').addClass('has-error');
-                $('#table-name-help').show();
-
-                return false;
-            }
-
-            return true;
-        });
-
-        $('.choose-exist-table').on('change', function () {
-            var val = $(this).val(), tb, db;
-            if (val == '0') {
-                $table.val('');
-                getTR().remove();
-                return;
-            }
-            val = val.split('|');
-            db = val[0];
-            tb = val[1];
-
-            Dcat.loading();
-            $table.val(tb);
-
-            withSingularName(tb);
-
-            $.post({
-                url: '{{ admin_url('helpers/scaffold/table') }}',
-                data: {db: db, tb: tb},
-                success: function (res) {
-                    Dcat.loading(false);
-
-                    if (!res.list) return;
-                    var i, list = res.list, $id = $('#inputPrimaryKey'), updated, created, soft;
-
-                    getTR().remove();
-                    for (i in list) {
-                        if (list[i].id) {
-                            $id.val(i);
-                            continue;
-                        }
-                        if (i == 'updated_at') {
-                            updated = list[i];
-                            continue;
-                        }
-                        if (i == 'created_at') {
-                            created = list[i];
-                            continue;
-                        }
-                        if (i == 'deleted_at') {
-                            soft = list[i];
-                            continue;
-                        }
-
-                        var c = helpers.replace(list[i].comment, '"', '');
-                        addField({
-                            name: i,
-                            lang: c,
-                            type: list[i].type,
-                            default: helpers.replace(list[i].default, '"', ''),
-                            comment: c,
-                            nullable: list[i].nullable != 'NO',
-                        });
-                    }
-
-                    addTimestamps(updated, created);
-                    addSoftdelete(soft);
-                }
-            });
-
-        });
-
-        $table.on('keyup', function (e) {
-            withSingularName($(this).val());
-        });
-
-        function addTimestamps(updated, created) {
-            if (updated && created) {
-                return;
-            }
-            $('[name="timestamps"]').prop('checked', false);
-
-            var c;
-            if (updated) {
-                c = helpers.replace(updated.comment, '"', '');
-                addField({
-                    name: 'updated_at',
-                    lang: c,
-                    type: updated.type,
-                    default: helpers.replace(updated.default, '"', ''),
-                    comment: c,
-                    nullable: updated.nullable != 'NO',
-                });
-            }
-            if (created) {
-                c = helpers.replace(created.comment, '"', '');
-                addField({
-                    name: 'created_at',
-                    lang: c,
-                    type: created.type,
-                    default: helpers.replace(created.default, '"', ''),
-                    comment: c,
-                    nullable: created.nullable != 'NO',
-                });
-            }
-        }
-
-        function addSoftdelete(soft) {
-            if (soft) {
-                $('[name="soft_deletes"]').prop('checked', true);
-            }
-        }
-
-        function addField(val) {
-            val = val || {};
-
-            var idx = getTR().length,
-                $field = $(
-                    tpl
-                        .replace(/__index__/g, idx)
-                        .replace(/{name}/g, val.name || '')
-                        .replace(/{translation}/g, val.lang || '')
-                        .replace(/{default}/g, val.default || '')
-                        .replace(/{comment}/g, val.comment || '')
-                        .replace(/{nullable}/g, val.nullable ? 'checked' : '')
-                ),
-                i;
-
-            $fieldsBody.append($field);
-            $('select').select2();
-
-            // 选中字段类型
-            for (i in dataTypeMap) {
-                if (val.type == i) {
-                    $field.find('[name="fields['+ idx +'][type]"]')
-                        .val(dataTypeMap[i])
-                        .trigger("change");
-                }
-            }
-
-        }
-
-        function writeController(val) {
-            val = ucfirst(toHump(toLine(val)));
-            $controller.val(val ? (controllerNamespace + val + 'Controller') : controllerNamespace);
-        }
-        function writeModel(val) {
-            $model.val(modelNamespace + ucfirst(ucfirst(toHump(toLine(val)))));
-        }
-        function witeRepository(val) {
-            $repository.val(repositoryNamespace + ucfirst(ucfirst(toHump(toLine(val)))))
-        }
-
-        function getTR() {
-            return $('#table-fields tbody tr');
-        }
-
-        // 下划线转换驼峰
-        function toHump(name) {
-            return name.replace(/\_(\w)/g, function (all, letter) {
-                return letter.toUpperCase();
-            });
-        }
-
-        // 驼峰转换下划线
-        function toLine(name) {
-            return name.replace(/([A-Z])/g,"_$1").toLowerCase();
-        }
-
-        function ucfirst(str) {
-            var reg = /\b(\w)|\s(\w)/g;
-            return str.replace(reg,function(m){
-                return m.toUpperCase()
-            });
-        }
-    });
+@php
+    $timestamps = Dcat\Admin\Widgets\Checkbox::make('timestamps')->inline();
+    $timestamps->options([1 => 'Created_at & Updated_at'])->check(1);
+
+    $soft = Dcat\Admin\Widgets\Checkbox::make('soft_deletes')->inline();
+    $soft->options([1 => (trans('admin.scaffold.soft_delete'))]);
+
+    $actionCreators = Dcat\Admin\Widgets\Checkbox::make('create[]')->inline();
+    $actionCreators->options([
+        'migration' => (trans('admin.scaffold.create_migration')),
+        'model' => (trans('admin.scaffold.create_model')),
+        'repository' => (trans('admin.scaffold.create_repository')),
+        'controller' => (trans('admin.scaffold.create_controller')),
+        'migrate' => (trans('admin.scaffold.run_migrate')),
+        'lang' => (trans('admin.scaffold.create_lang')),
+    ])->checkAll(['migrate', 'migration']);
+@endphp
+<style>
+    .select2-container .select2-selection--single {
+        height: 30px !important;
+    }
+    .choose-exist-table {
+        width: 100%;
+    }
+</style>
+<div class="card">
+    <div style="height:10px"></div>
+    <!-- /.box-header -->
+    <div class="card-body" style="padding:18px 0 0">
+
+        <form method="post" action="{{$action}}" id="scaffold" pjax-container>
+
+            <div class="form-horizontal">
+
+                <div class="form-group row">
+
+{{--                    <label for="inputTableName" class="col-sm-1 control-label text-capitalize">{{(trans('admin.scaffold.table'))}}</label>--}}
+
+                    <div for="inputTableName"  class="col-sm-1 control-label text-capitalize">
+                        <span>{{(trans('admin.scaffold.table'))}}</span>
+                    </div>
+
+                    <div class="col-sm-2 ">
+                        <div class="input-group">
+                            <input type="text" name="table_name" class="form-control" id="inputTableName" placeholder="{{(trans('admin.scaffold.table'))}}" value="{{ old('table_name') }}">
+
+                        </div>
+                    </div>
+
+                    <div class=" col-sm-2" style="margin-left: -15px;">
+                        <select class="choose-exist-table"  name="exist-table">
+                            <option value="0" selected>{{trans('admin.scaffold.choose')}}</option>
+                            @foreach($tables as $db => $tb)
+                                <optgroup label="{!! $db !!}">
+                                    @foreach($tb as $v)
+                                        <option value="{{$db}}|{{$v}}">{{$v}}</option>
+                                    @endforeach
+                                </optgroup>
+                            @endforeach
+                        </select>
+                    </div>
+
+                    <span class="help-block " id="table-name-help" style="margin-left:150px;display: none">
+                        <i class="fa fa-info"></i>&nbsp; Table name can't be empty!
+                    </span>
+
+                </div>
+                <div class="form-group row">
+                    <span for="inputModelName" class="col-sm-1 control-label text-capitalize">{{(trans('admin.scaffold.model'))}}</span>
+
+                    <div class="col-sm-4">
+                        <input type="text" name="model_name" class="form-control text-capitalize" id="inputModelName" placeholder="{{(trans('admin.scaffold.model'))}}" value="{{ old('model_name', "App\\Models\\") }}">
+                    </div>
+                </div>
+
+                <div class="form-group row">
+                    <span for="inputControllerName" class="col-sm-1 control-label text-capitalize">{{(trans('admin.scaffold.controller'))}}</span>
+
+                    <div class="col-sm-4">
+                        <input type="text" name="controller_name" class="form-control text-capitalize" id="inputControllerName" placeholder="{{(trans('admin.scaffold.controller'))}}" value="{{ old('controller_name', $namespaceBase."\\Controllers\\") }}">
+                    </div>
+                </div>
+
+
+                <div class="form-group row">
+                    <span for="inputRepositoryName" class="col-sm-1 control-label text-capitalize">{{(trans('admin.scaffold.repository'))}}</span>
+
+                    <div class="col-sm-4">
+                        <input type="text" name="repository_name" class="form-control text-capitalize" id="inputRepositoryName" placeholder="{{(trans('admin.scaffold.repository'))}}" value="{{ old('repository_name', $namespaceBase."\\Repositories\\") }}">
+                    </div>
+                </div>
+
+
+                <div class="form-group row">
+                    <div class="offset-sm-1 col-sm-11 mt-1 text-capitalize">
+                        {!! $actionCreators->render(); !!}
+                    </div>
+                </div>
+
+            </div>
+
+            <table class="table table-hover responsive table-header-gray " id="table-fields" style="margin-top:25px;">
+                <thead>
+                <tr>
+                    <th style="width: 200px">{{trans('admin.scaffold.field_name')}}</th>
+                    <th>{{trans('admin.scaffold.translation')}}</th>
+                    <th>{{trans('admin.scaffold.type')}}</th>
+                    <th>{{trans('admin.scaffold.nullable')}}</th>
+                    <th>{{trans('admin.scaffold.key')}}</th>
+                    <th>{{trans('admin.scaffold.default')}}</th>
+                    <th>{{trans('admin.scaffold.comment')}}</th>
+                    <th>{{trans('admin.action')}}</th>
+                </tr>
+                </thead>
+                <tbody id="table-fields-sortable">
+                @if(old('fields'))
+                    @foreach(old('fields') as $index => $field)
+                        <tr>
+                            <td>
+                                <input type="text" name="fields[{{$index}}][name]" class="form-control" placeholder="{{trans('admin.scaffold.field')}}" value="{{$field['name']}}" />
+                            </td>
+                            <td>
+                                <input type="text" name="fields[{{$index}}][translation]" class="form-control" placeholder="{{trans('admin.scaffold.translation')}}" value="{{$field['translation']}}" />
+                            </td>
+                            <td>
+                                <select style="width: 200px" name="fields[{{$index}}][type]">
+                                    @foreach($dbTypes as $type)
+                                        <option value="{{ $type }}" {{$field['type'] == $type ? 'selected' : '' }}>{{$type}}</option>
+                                    @endforeach
+                                </select>
+                            </td>
+                            <td>
+                                <div class="vs-checkbox-con vs-checkbox-primary" >
+                                    <input name="fields[{{$index}}][nullable]" type="checkbox" {{ \Illuminate\Support\Arr::get($field, 'nullable') == 'on' ? 'checked': '' }}>
+                                    <span class="vs-checkbox vs-checkbox-">
+                                      <span class="vs-checkbox--check">
+                                        <i class="vs-icon feather icon-check"></i>
+                                      </span>
+                                    </span>
+                                </div>
+                            </td>
+                            <td>
+                                <select style="width: 150px" name="fields[{{$index}}][key]">
+                                    {{--<option value="primary">Primary</option>--}}
+                                    <option value="" {{$field['key'] == '' ? 'selected' : '' }}>NULL</option>
+                                    <option value="unique" {{$field['key'] == 'unique' ? 'selected' : '' }}>Unique</option>
+                                    <option value="index" {{$field['key'] == 'index' ? 'selected' : '' }}>Index</option>
+                                </select>
+                            </td>
+                            <td><input type="text" class="form-control" placeholder="{{trans('admin.scaffold.default')}}" name="fields[{{$index}}][default]" value="{{$field['default']}}"/></td>
+                            <td><input type="text" class="form-control" placeholder="{{trans('admin.scaffold.comment')}}" name="fields[{{$index}}][comment]" value="{{$field['comment']}}" /></td>
+                            <td>
+                                <button class="btn btn-sm btn-white table-field-sort-handle" type="button" title="{{trans('admin.order')}}"><i class="fa fa-sort"></i></button>
+                                <button class="btn btn-sm btn-white table-field-remove"><i class="feather icon-trash"></i></button>
+                            </td>
+                        </tr>
+                    @endforeach
+                @else
+                    <tr>
+                        <td>
+                            <input type="text" name="fields[0][name]" class="form-control" placeholder="{{trans('admin.scaffold.field')}}" />
+                        </td>
+                        <td>
+                            <input type="text" name="fields[0][translation]" class="form-control" placeholder="{{trans('admin.scaffold.translation')}}" />
+                        </td>
+                        <td>
+                            <select style="width: 200px" name="fields[0][type]">
+                                @foreach($dbTypes as $type)
+                                    <option value="{{ $type }}">{{$type}}</option>
+                                @endforeach
+                            </select>
+                        </td>
+                        <td>
+                            <div class="vs-checkbox-con vs-checkbox-primary" >
+                                <input name="fields[0][nullable]" type="checkbox"  />
+                                <span class="vs-checkbox vs-checkbox-">
+                                  <span class="vs-checkbox--check">
+                                    <i class="vs-icon feather icon-check"></i>
+                                  </span>
+                                </span>
+                            </div>
+                        <td>
+                            <select style="width: 150px" name="fields[0][key]">
+                                {{--<option value="primary">Primary</option>--}}
+                                <option value="" selected>NULL</option>
+                                <option value="unique">Unique</option>
+                                <option value="index">Index</option>
+                            </select>
+                        </td>
+                        <td><input type="text" class="form-control" placeholder="{{trans('admin.scaffold.default')}}" name="fields[0][default]"></td>
+                        <td><input type="text" class="form-control" placeholder="{{trans('admin.scaffold.comment')}}" name="fields[0][comment]"></td>
+                        <td>
+                            <button class="btn btn-sm btn-white table-field-sort-handle" type="button" title="{{trans('admin.order')}}"><i class="fa fa-sort"></i></button>
+                            <button class="btn btn-sm btn-white table-field-remove"><i class="feather icon-trash"></i></button>
+                        </td>
+                    </tr>
+                @endif
+                </tbody>
+            </table>
+
+            <hr style="margin-top: 0;"/>
+
+            <div class='form-inline d-flex justify-content-between' style="width: 100%; padding: 0 20px 12px;">
+
+                <div class='form-group'>
+                    <button type="button" class="btn btn-sm btn-primary btn-outline text-capitalize" id="add-table-field"><i class="feather icon-plus"></i>&nbsp;&nbsp;{{(trans('admin.scaffold.add_field'))}}</button>
+                    <button type="button" class="btn btn-sm btn-primary btn-outline text-capitalize ml-1" id="sync-translation-with-comment"><i class="feather icon-repeat"></i>&nbsp;&nbsp;{{(trans('admin.scaffold.sync_translation_with_comment'))}}</button>
+                </div>
+
+                <div class="row">
+                    <div class="form-group text-capitalize" style="margin-right: 20px;">
+                        <span for="titleTranslation">{{(trans('admin.scaffold.translate_title'))}}&nbsp;&nbsp;</span>
+                        <input type="text"
+                               name="translate_title"
+                               class="form-control"
+                               id="titleTranslation"
+                               placeholder="{{(trans('admin.scaffold.translate_title'))}}"
+                               value="{{ request('translate_title') }}"
+                               style="width: 150px;">
+                    </div>
+
+                    <div class="form-group text-capitalize" style="margin-right: 20px;">
+                        <span for="inputPrimaryKey">{{(trans('admin.scaffold.pk'))}}&nbsp;&nbsp;</span>
+                        <input
+                                type="text"
+                                name="primary_key"
+                                class="form-control"
+                                id="inputPrimaryKey"
+                                placeholder="{{(trans('admin.scaffold.pk'))}}"
+                                value="{{ request('primary_key') ?: 'id' }}"
+                                style="width: 100px;">
+                    </div>
+
+                    <div class='form-group text-capitalize'>
+                        {!! $timestamps->render() !!}
+                        {!! $soft->render() !!}
+                    </div>
+
+                </div>
+            </div>
+
+            <!-- /.box-body -->
+            <div class="box-footer d-flex justify-content-between">
+                <div></div>
+                <button type="submit" class="btn btn-primary text-capitalize"><i class="feather icon-save"></i> {{(trans('admin.submit'))}}</button>
+            </div>
+
+        {{ csrf_field() }}
+
+        </form>
+
+    </div>
+
+</div>
+
+<template id="table-field-tpl">
+    <tr>
+        <td>
+            <input type="text" value="{name}" name="fields[__index__][name]" class="form-control" placeholder="{{trans('admin.scaffold.field')}}" />
+        </td>
+        <td>
+            <input type="text" value="{translation}" name="fields[__index__][translation]" class="form-control" placeholder="{{trans('admin.scaffold.translation')}}" />
+        </td>
+        <td>
+            <select style="width: 200px" name="fields[__index__][type]">
+                @foreach($dbTypes as $type)
+                    <option value="{{ $type }}">{{$type}}</option>
+                @endforeach
+            </select>
+        </td>
+        <td>
+            <div class="vs-checkbox-con vs-checkbox-primary" >
+                <input {nullable} name="fields[__index__][nullable]" type="checkbox"  />
+                <span class="vs-checkbox vs-checkbox-">
+                  <span class="vs-checkbox--check">
+                    <i class="vs-icon feather icon-check"></i>
+                  </span>
+                </span>
+            </div>
+        <td>
+            <select style="width: 150px" name="fields[__index__][key]">
+                <option value="" selected>NULL</option>
+                <option value="unique">Unique</option>
+                <option value="index">Index</option>
+            </select>
+        </td>
+        <td><input value="{default}" type="text" class="form-control" placeholder="{{trans('admin.scaffold.default')}}" name="fields[__index__][default]"></td>
+        <td><input value="{comment}" type="text" class="form-control" placeholder="{{trans('admin.scaffold.comment')}}" name="fields[__index__][comment]"></td>
+        <td>
+            <button class="btn btn-sm btn-white table-field-sort-handle" type="button" title="{{trans('admin.order')}}"><i class="fa fa-sort"></i></button>
+            <button class="btn btn-sm btn-white table-field-remove"><i class="feather icon-trash"></i></button>
+        </td>
+    </tr>
+</template>
+
+<script>
+    Dcat.ready(function () {
+        var $model = $('#inputModelName'),
+            $controller = $('#inputControllerName'),
+            $repository = $('#inputRepositoryName'),
+            $table = $('#inputTableName'),
+            $fieldsBody = $('#table-fields tbody'),
+            tpl = $('#table-field-tpl').html(),
+            modelNamespace = 'App\\Models\\',
+            repositoryNamespace = '{{ $namespaceBase }}\\Repositories\\',
+            controllerNamespace = '{{ $namespaceBase }}\\Controllers\\',
+            dataTypeMap = {!! json_encode($dataTypeMap) !!},
+            helpers = Dcat.helpers;
+
+        var withSingularName = helpers.debounce(function (table) {
+            $.ajax('{{ url(request()->path()) }}?singular=' + table, {
+                success: function (data) {
+                    writeController(data.value);
+                    writeModel(data.value);
+                    witeRepository(data.value);
+                }
+            });
+        }, 500);
+
+        $('select').select2();
+
+        var sortable = Sortable.create(document.getElementById("table-fields-sortable"),{
+            handle:'.table-field-sort-handle',
+            onEnd: function () {
+                getTR().each(function(index){
+                    $(this).find("[name^='fields']").each(function(){
+                        var newName = $(this).attr('name').replace(/fields\[(\d)\]/, `fields[${index}]`);
+                        $(this).attr('name', newName);
+                    })
+                });
+            }
+        });
+
+        $('#add-table-field').click(function (event) {
+            addField();
+        });
+
+        $('#sync-translation-with-comment').click(function (event) {
+            var element = $('#table-fields-sortable tr');
+            if (element.length > 0) {
+                element.each(function (i, v) {
+                    var translation = $(v).find('input[name="fields[' + i + '][translation]"]');
+                    var comment = $(v).find('input[name="fields[' + i + '][comment]"]');
+                    if (translation.val() !== "" && comment.val() === "") {
+                        comment.val(translation.val());
+                    }
+                    if (translation.val() === "" && comment.val() !== "") {
+                        translation.val(comment.val());
+                    }
+                });
+            }
+        });
+
+        $('#table-fields').on('click', '.table-field-remove', function(event) {
+            $(event.target).closest('tr').remove();
+        });
+
+        $('#scaffold').on('submit', function (event) {
+
+            //event.preventDefault();
+
+            if ($table.val() == '') {
+                $table.closest('.form-group').addClass('has-error');
+                $('#table-name-help').show();
+
+                return false;
+            }
+
+            return true;
+        });
+
+        $('.choose-exist-table').on('change', function () {
+            var val = $(this).val(), tb, db;
+            if (val == '0') {
+                $table.val('');
+                getTR().remove();
+                return;
+            }
+            val = val.split('|');
+            db = val[0];
+            tb = val[1];
+
+            Dcat.loading();
+            $table.val(tb);
+
+            withSingularName(tb);
+
+            $.post({
+                url: '{{ admin_url('helpers/scaffold/table') }}',
+                data: {db: db, tb: tb},
+                success: function (res) {
+                    Dcat.loading(false);
+
+                    if (!res.list) return;
+                    var i, list = res.list, $id = $('#inputPrimaryKey'), updated, created, soft;
+
+                    getTR().remove();
+                    for (i in list) {
+                        if (list[i].id) {
+                            $id.val(i);
+                            continue;
+                        }
+                        if (i == 'updated_at') {
+                            updated = list[i];
+                            continue;
+                        }
+                        if (i == 'created_at') {
+                            created = list[i];
+                            continue;
+                        }
+                        if (i == 'deleted_at') {
+                            soft = list[i];
+                            continue;
+                        }
+
+                        var c = helpers.replace(list[i].comment, '"', '');
+                        addField({
+                            name: i,
+                            lang: c,
+                            type: list[i].type,
+                            default: helpers.replace(list[i].default, '"', ''),
+                            comment: c,
+                            nullable: list[i].nullable != 'NO',
+                        });
+                    }
+
+                    addTimestamps(updated, created);
+                    addSoftdelete(soft);
+                }
+            });
+
+        });
+
+        $table.on('keyup', function (e) {
+            withSingularName($(this).val());
+        });
+
+        function addTimestamps(updated, created) {
+            if (updated && created) {
+                return;
+            }
+            $('[name="timestamps"]').prop('checked', false);
+
+            var c;
+            if (updated) {
+                c = helpers.replace(updated.comment, '"', '');
+                addField({
+                    name: 'updated_at',
+                    lang: c,
+                    type: updated.type,
+                    default: helpers.replace(updated.default, '"', ''),
+                    comment: c,
+                    nullable: updated.nullable != 'NO',
+                });
+            }
+            if (created) {
+                c = helpers.replace(created.comment, '"', '');
+                addField({
+                    name: 'created_at',
+                    lang: c,
+                    type: created.type,
+                    default: helpers.replace(created.default, '"', ''),
+                    comment: c,
+                    nullable: created.nullable != 'NO',
+                });
+            }
+        }
+
+        function addSoftdelete(soft) {
+            if (soft) {
+                $('[name="soft_deletes"]').prop('checked', true);
+            }
+        }
+
+        function addField(val) {
+            val = val || {};
+
+            var idx = getTR().length,
+                $field = $(
+                    tpl
+                        .replace(/__index__/g, idx)
+                        .replace(/{name}/g, val.name || '')
+                        .replace(/{translation}/g, val.lang || '')
+                        .replace(/{default}/g, val.default || '')
+                        .replace(/{comment}/g, val.comment || '')
+                        .replace(/{nullable}/g, val.nullable ? 'checked' : '')
+                ),
+                i;
+
+            $fieldsBody.append($field);
+            $('select').select2();
+
+            // 选中字段类型
+            for (i in dataTypeMap) {
+                if (val.type == i) {
+                    $field.find('[name="fields['+ idx +'][type]"]')
+                        .val(dataTypeMap[i])
+                        .trigger("change");
+                }
+            }
+
+        }
+
+        function writeController(val) {
+            val = ucfirst(toHump(toLine(val)));
+            $controller.val(val ? (controllerNamespace + val + 'Controller') : controllerNamespace);
+        }
+        function writeModel(val) {
+            $model.val(modelNamespace + ucfirst(ucfirst(toHump(toLine(val)))));
+        }
+        function witeRepository(val) {
+            $repository.val(repositoryNamespace + ucfirst(ucfirst(toHump(toLine(val)))))
+        }
+
+        function getTR() {
+            return $('#table-fields tbody tr');
+        }
+
+        // 下划线转换驼峰
+        function toHump(name) {
+            return name.replace(/\_(\w)/g, function (all, letter) {
+                return letter.toUpperCase();
+            });
+        }
+
+        // 驼峰转换下划线
+        function toLine(name) {
+            return name.replace(/([A-Z])/g,"_$1").toLowerCase();
+        }
+
+        function ucfirst(str) {
+            var reg = /\b(\w)|\s(\w)/g;
+            return str.replace(reg,function(m){
+                return m.toUpperCase()
+            });
+        }
+    });
 </script>

src/Http/Controllers/ScaffoldController.php

@@ -78,7 +78,9 @@ class ScaffoldController extends Controller
         $dbTypes = static::$dbTypes;
         $dataTypeMap = static::$dataTypeMap;
         $action = URL::current();
-        $app = ucfirst(mb_substr(request()->path(), 0, mb_stripos(request()->path(), '/')));
+        $namespaceBase = 'App\\'.implode('\\', array_map(function ($name) {
+            return Str::studly($name);
+        }, explode(DIRECTORY_SEPARATOR, ltrim(config('admin.directory'), app_path().DIRECTORY_SEPARATOR))));
         $tables = collect($this->getDatabaseColumns())->map(function ($v) {
             return array_keys($v);
         })->toArray();
@@ -88,7 +90,7 @@ class ScaffoldController extends Controller
             ->description(' ')
             ->body(view(
                 'admin::helpers.scaffold',
-                compact('dbTypes', 'action', 'tables', 'dataTypeMap', 'app')
+                compact('dbTypes', 'action', 'tables', 'dataTypeMap', 'namespaceBase')
             ));
     }