修复自定义扩展初始化项目文件

Author: SmallRuralDog

src/Components/Component.php

@@ -19,6 +19,7 @@ class Component extends AdminJsonBuilder
     protected $componentValue;
 
 
+
     public function __construct($value = null)
     {
         $this->componentValue($value);

src/Console/ExtendCommand.php

@@ -32,7 +32,7 @@ public function handle()
 
 
         $this->replace('{{ namespace }}', $this->extendNamespace(), $this->extendPath() . '/src/ExtendServiceProvider.stub');
-        $this->replace('{{ component }}', $this->extendName(), $this->extendPath() . '/src/ExtendServiceProvider.stub');
+        $this->replace('{{ component }}', $this->extendVendor()."-".$this->extendName(), $this->extendPath() . '/src/ExtendServiceProvider.stub');
 
         (new Filesystem)->move(
             $this->extendPath() . '/src/ExtendServiceProvider.stub',

src/Console/extend-stubs/resources/js/components/FormItemTemplate.vue

@@ -1,3 +1,3 @@
 VueAdmin.booting((Vue, router, store) => {
-
+    //Vue.component('组件名称',require('./components/xxx.vue').default);
 });

src/Console/extend-stubs/resources/js/components/FormTemplate.vue

@@ -75,7 +75,8 @@ protected function grid()
             ->tree()
             ->emptyText("暂无菜单")
             ->quickSearch(["title"])
-            ->defaultExpandAll(false);
+            ->defaultExpandAll(false)
+        ->dialogForm($this->form()->isDialog()->labelPosition("top")->backButtonName("关闭"));
 
         $grid->column('id', "ID")->width(80);
         $grid->column('icon', "图标")->component(Icon::make())->width(80);
@@ -100,10 +101,10 @@ protected function form()
                 return SelectOption::make($item->id, $item->title);
             })->prepend(SelectOption::make(0, '根目录'));
         }));
-        $form->item('title', '名称')->required()->inputWidth(4);
+        $form->item('title', '名称')->required();
         $form->item('icon', trans('admin::admin.icon'))->component(IconChoose::make())->inputWidth(3)->required();
 
-        $form->item('uri', trans('admin::admin.uri'))->required()->inputWidth(4);
+        $form->item('uri', trans('admin::admin.uri'))->required();
         $form->item('order', trans('admin::admin.order'))->component(InputNumber::make(1)->min(0));
         $form->item('roles', trans('admin::admin.roles'))->component(Select::make()->block()->multiple()->options(function () use ($roleModel) {
             return $roleModel::all()->map(function ($role) {

src/Console/extend-stubs/resources/js/components/RowActionTemplate.vue

@@ -50,6 +50,8 @@ class Form extends Component implements JsonSerializable
 
     protected $updates = [];
 
+    protected $isEdit = false;
+
     /**
      * Data for save to model's relations from input.
      *
@@ -219,6 +221,16 @@ public function model()
         return $this->model;
     }
 
+    /**
+     * @return bool
+     */
+    public function isEdit()
+    {
+        return $this->isEdit;
+    }
+
+
+
     /**
      * 添加表单验证规则
      * @param $rules
@@ -284,10 +296,7 @@ public function input($key, $value = null)
     protected function prepare($data = [])
     {
 
-        //触发表单提交前事件
-        if (($response = $this->callSubmitted()) instanceof Response) {
-            return $response;
-        }
+
         //处理要过滤的字段
         $this->inputs = array_merge($this->removeIgnoredFields($data), $this->inputs);
         //处理表单提交时事件
@@ -466,6 +475,8 @@ public function destroy($id)
      */
     public function update($id, $data = null)
     {
+        $this->isEdit = true;
+
         if (($result = $this->callSubmitted()) instanceof Response) {
             return $result;
         }