diff --git a/beike/Admin/Providers/AdminServiceProvider.php b/beike/Admin/Providers/AdminServiceProvider.php index 9adfdc5c..2ca19803 100644 --- a/beike/Admin/Providers/AdminServiceProvider.php +++ b/beike/Admin/Providers/AdminServiceProvider.php @@ -19,6 +19,7 @@ use Beike\Admin\View\Components\Form\InputLocale; use Beike\Admin\View\Components\Form\Select; use Beike\Admin\View\Components\Form\SwitchRadio; use Beike\Admin\View\Components\Form\Textarea; +use Beike\Admin\View\Components\Form\Richtext; use Beike\Admin\View\Components\Header; use Beike\Admin\View\Components\NoData; use Beike\Admin\View\Components\Sidebar; @@ -139,6 +140,7 @@ class AdminServiceProvider extends ServiceProvider 'form-select' => Select::class, 'form-image' => Image::class, 'form-textarea' => Textarea::class, + 'form-richtext' => Richtext::class, 'no-data' => NoData::class, ]); } diff --git a/beike/Admin/View/Components/Form/Richtext.php b/beike/Admin/View/Components/Form/Richtext.php new file mode 100644 index 00000000..25f6dc86 --- /dev/null +++ b/beike/Admin/View/Components/Form/Richtext.php @@ -0,0 +1,29 @@ +name = $name; + $this->title = $title; + $this->value = $value; + $this->required = $required; + } + + public function render() + { + return view('admin::components.form.richtext'); + } +} diff --git a/beike/Admin/View/Components/Form/Textarea.php b/beike/Admin/View/Components/Form/Textarea.php index a4bd0972..6d260042 100644 --- a/beike/Admin/View/Components/Form/Textarea.php +++ b/beike/Admin/View/Components/Form/Textarea.php @@ -14,15 +14,12 @@ class Textarea extends Component public bool $required; - public bool $html; - - public function __construct(string $name, string $title, ?string $value, bool $required = false, bool $html = false) + public function __construct(string $name, string $title, ?string $value, bool $required = false) { $this->name = $name; $this->title = $title; $this->value = $value; $this->required = $required; - $this->html = $html; } public function render() diff --git a/resources/beike/admin/views/components/form/richtext.blade.php b/resources/beike/admin/views/components/form/richtext.blade.php new file mode 100644 index 00000000..7b8b04f0 --- /dev/null +++ b/resources/beike/admin/views/components/form/richtext.blade.php @@ -0,0 +1,10 @@ +@push('header') + +@endpush + + +
+ +
+ {{ $slot }} +
diff --git a/resources/beike/admin/views/components/form/textarea.blade.php b/resources/beike/admin/views/components/form/textarea.blade.php index b6d87edd..9b7e0606 100644 --- a/resources/beike/admin/views/components/form/textarea.blade.php +++ b/resources/beike/admin/views/components/form/textarea.blade.php @@ -1,12 +1,6 @@ -@if (isset($html) && $html) - @push('header') - - @endpush -@endif - -
- +
+
{{ $slot }} diff --git a/resources/beike/admin/views/pages/plugins/form.blade.php b/resources/beike/admin/views/pages/plugins/form.blade.php index f3418d75..2cbc9e4e 100644 --- a/resources/beike/admin/views/pages/plugins/form.blade.php +++ b/resources/beike/admin/views/pages/plugins/form.blade.php @@ -52,13 +52,25 @@ :name="$column['name']" :title="$column['label']" :required="$column['required'] ? true : false" - :html="isset($column['html']) ? true : false" :value="old($column['name'], $column['value'] ?? '')"> @if (isset($column['description']))
{{ $column['description'] }}
@endif @endif + + @if ($column['type'] == 'richtext') + + @if (isset($column['description'])) +
{{ $column['description'] }}
+ @endif +
+ @endif + @endforeach