From a417999def85db42319c2b2d565f5bcef6ef0e34 Mon Sep 17 00:00:00 2001 From: pushuo <229102104@qq.com> Date: Mon, 11 Jul 2022 21:10:40 +0800 Subject: [PATCH] wip --- .../Http/Controllers/DesignController.php | 2 +- .../Admin/Providers/AdminServiceProvider.php | 16 ++----- .../{SlideShow/Editor.php => SlideShow.php} | 6 +-- .../View/DesignBuilders/SlideShow/Render.php | 42 ------------------- .../Shop/Http/Controllers/HomeController.php | 2 +- .../builder/component/link_selector.blade.php | 0 .../pages}/design/builder/index.blade.php | 0 .../pages/design/module/slideshow.blade.php | 0 .../design/module/slideshow/editor/factory.js | 33 --------------- .../index.blade.php => slideshow.blade.php} | 0 10 files changed, 8 insertions(+), 93 deletions(-) rename beike/Admin/View/DesignBuilders/{SlideShow/Editor.php => SlideShow.php} (84%) delete mode 100644 beike/Admin/View/DesignBuilders/SlideShow/Render.php rename {themes/default => resources/beike/admin/views/pages}/design/builder/component/link_selector.blade.php (100%) rename {themes/default => resources/beike/admin/views/pages}/design/builder/index.blade.php (100%) rename themes/default/design/module/slideshow/editor/index.blade.php => resources/beike/admin/views/pages/design/module/slideshow.blade.php (100%) delete mode 100644 themes/default/design/module/slideshow/editor/factory.js rename themes/default/design/{module/slideshow/render/index.blade.php => slideshow.blade.php} (100%) diff --git a/beike/Admin/Http/Controllers/DesignController.php b/beike/Admin/Http/Controllers/DesignController.php index ad97a485..b23a3ab1 100644 --- a/beike/Admin/Http/Controllers/DesignController.php +++ b/beike/Admin/Http/Controllers/DesignController.php @@ -14,7 +14,7 @@ class DesignController extends Controller 'editors' => ['editor-slide_show'], 'design_settings' => setting('system.design_setting'), ]; - return view('design.builder.index', $data); + return view('admin::pages.design.builder.index', $data); } diff --git a/beike/Admin/Providers/AdminServiceProvider.php b/beike/Admin/Providers/AdminServiceProvider.php index 15ea08b6..a0189419 100644 --- a/beike/Admin/Providers/AdminServiceProvider.php +++ b/beike/Admin/Providers/AdminServiceProvider.php @@ -99,21 +99,11 @@ class AdminServiceProvider extends ServiceProvider $componentName = Str::studly($folderName); $classBaseName = "\\Beike\\Admin\\View\\DesignBuilders\\{$componentName}"; - $editorClass = $classBaseName . '\\Editor'; - if (!class_exists($editorClass)) { - throw new \Exception("请先定义自定义模板类 {$editorClass}"); + if (!class_exists($classBaseName)) { + throw new \Exception("请先定义自定义模板类 {$classBaseName}"); } $this->loadViewComponentsAs('editor', [ - $aliasName => $editorClass - ]); - - $renderClass = $classBaseName . '\\Render'; - if (!class_exists($renderClass)) { - throw new \Exception("请先定义自定义模板类 {$renderClass}"); - } - - $this->loadViewComponentsAs('render', [ - $aliasName => $renderClass + $aliasName => $classBaseName ]); } } diff --git a/beike/Admin/View/DesignBuilders/SlideShow/Editor.php b/beike/Admin/View/DesignBuilders/SlideShow.php similarity index 84% rename from beike/Admin/View/DesignBuilders/SlideShow/Editor.php rename to beike/Admin/View/DesignBuilders/SlideShow.php index 2dd09e7a..e3623ada 100644 --- a/beike/Admin/View/DesignBuilders/SlideShow/Editor.php +++ b/beike/Admin/View/DesignBuilders/SlideShow.php @@ -9,12 +9,12 @@ * @modified 2022-07-08 17:09:15 */ -namespace Beike\Admin\View\DesignBuilders\SlideShow; +namespace Beike\Admin\View\DesignBuilders; use Illuminate\View\Component; use Illuminate\Contracts\View\View; -class Editor extends Component +class SlideShow extends Component { /** * Create a new component instance. @@ -39,6 +39,6 @@ class Editor extends Component 'icon' => '', ]; - return view('design.module.slideshow.editor.index', $data); + return view('admin::pages.design.module.slideshow', $data); } } diff --git a/beike/Admin/View/DesignBuilders/SlideShow/Render.php b/beike/Admin/View/DesignBuilders/SlideShow/Render.php deleted file mode 100644 index 968c4928..00000000 --- a/beike/Admin/View/DesignBuilders/SlideShow/Render.php +++ /dev/null @@ -1,42 +0,0 @@ - - * @created 2022-07-08 17:09:15 - * @modified 2022-07-08 17:09:15 - */ - -namespace Beike\Admin\View\DesignBuilders\SlideShow; - -use Illuminate\View\Component; -use Illuminate\Contracts\View\View; - -class Render extends Component -{ - private $settings; - - /** - * Create a new component instance. - * - * @return void - */ - public function __construct($settings = []) - { - if ($settings) { - $this->settings = $settings; - } - } - - /** - * Get the view / contents that represent the component. - * - * @return View| - */ - public function render(): View - { - return view('design.module.slideshow.render.index', $this->settings); - } -} diff --git a/beike/Shop/Http/Controllers/HomeController.php b/beike/Shop/Http/Controllers/HomeController.php index d656b618..14324284 100644 --- a/beike/Shop/Http/Controllers/HomeController.php +++ b/beike/Shop/Http/Controllers/HomeController.php @@ -19,7 +19,7 @@ class HomeController extends Controller foreach ($modules as $module) { $code = $module['code']; $content = $module['content']; - $viewPath = "design.module.{$code}.render.index"; + $viewPath = "design.{$code}"; if (view()->exists($viewPath)) { $html .= view($viewPath, $content)->render(); } diff --git a/themes/default/design/builder/component/link_selector.blade.php b/resources/beike/admin/views/pages/design/builder/component/link_selector.blade.php similarity index 100% rename from themes/default/design/builder/component/link_selector.blade.php rename to resources/beike/admin/views/pages/design/builder/component/link_selector.blade.php diff --git a/themes/default/design/builder/index.blade.php b/resources/beike/admin/views/pages/design/builder/index.blade.php similarity index 100% rename from themes/default/design/builder/index.blade.php rename to resources/beike/admin/views/pages/design/builder/index.blade.php diff --git a/themes/default/design/module/slideshow/editor/index.blade.php b/resources/beike/admin/views/pages/design/module/slideshow.blade.php similarity index 100% rename from themes/default/design/module/slideshow/editor/index.blade.php rename to resources/beike/admin/views/pages/design/module/slideshow.blade.php diff --git a/themes/default/design/module/slideshow/editor/factory.js b/themes/default/design/module/slideshow/editor/factory.js deleted file mode 100644 index f72b5e7e..00000000 --- a/themes/default/design/module/slideshow/editor/factory.js +++ /dev/null @@ -1,33 +0,0 @@ -(function () { - $globalConfig.factories.slideshow = { - make: function () { - return { - content: { - style: { - background_color: '' - }, - full: true, - floor: languagesFill(''), - images: [ - { - image: languagesFill('catalog/demo/slideshow/2.jpg'), - show: true, - link: { - type: 'product', - value:'' - } - }, - { - image: languagesFill('catalog/demo/slideshow/1.jpg'), - show: false, - link: { - type: 'product', - value:'' - } - } - ], - } - } - } - } -})(); diff --git a/themes/default/design/module/slideshow/render/index.blade.php b/themes/default/design/slideshow.blade.php similarity index 100% rename from themes/default/design/module/slideshow/render/index.blade.php rename to themes/default/design/slideshow.blade.php