From a88c04a9a7c32ef019dcfca1d94e9c300d8f1db5 Mon Sep 17 00:00:00 2001 From: Edwin Xu Date: Fri, 17 Sep 2021 10:47:04 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=8D=95=E5=9B=BE/?= =?UTF-8?q?=E5=A4=9A=E5=9B=BE=E8=A7=86=E5=9B=BE=EF=BC=8C=E5=B9=B6=E5=9C=A8?= =?UTF-8?q?grid=E5=88=97=E5=8F=AA=E6=98=BE=E7=A4=BA=E9=A6=96=E5=9B=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/views/gallery.blade.php | 8 ------ resources/views/gallerys.blade.php | 30 +++++++++++++++------- src/GalleryServiceProvider.php | 4 +-- src/Grid/Gallery.php | 41 +++++++++--------------------- 4 files changed, 34 insertions(+), 49 deletions(-) delete mode 100755 resources/views/gallery.blade.php diff --git a/resources/views/gallery.blade.php b/resources/views/gallery.blade.php deleted file mode 100755 index 44d5562..0000000 --- a/resources/views/gallery.blade.php +++ /dev/null @@ -1,8 +0,0 @@ - - - - diff --git a/resources/views/gallerys.blade.php b/resources/views/gallerys.blade.php index 52b0a3b..b0f8ab8 100644 --- a/resources/views/gallerys.blade.php +++ b/resources/views/gallerys.blade.php @@ -1,14 +1,26 @@ -@php - $rand = rand(1,999999); -@endphp -
- @foreach ($src as $v) + + + + diff --git a/src/GalleryServiceProvider.php b/src/GalleryServiceProvider.php index b0353b9..b5bb643 100755 --- a/src/GalleryServiceProvider.php +++ b/src/GalleryServiceProvider.php @@ -37,9 +37,7 @@ class GalleryServiceProvider extends ServiceProvider Admin::requireAssets('@dengje.gallery'); // 加载插件 - Admin::booting(function () { - Column::extend('gallery', Gallery::class); - }); + Column::extend('gallery', Gallery::class); } diff --git a/src/Grid/Gallery.php b/src/Grid/Gallery.php index 255aa53..29fc35a 100755 --- a/src/Grid/Gallery.php +++ b/src/Grid/Gallery.php @@ -1,4 +1,5 @@ value instanceof Arrayable) { $this->value = $this->value->toArray(); } - if(!is_array($this->value)){ - if (url()->isValidUrl($this->value) || mb_strpos($this->value, 'data:image') === 0) { - $src = $this->value; + $groupId = $this->grid->getTableId() . '_' . $this->getKey() . '_' . $this->column->getName() . '_gallery_group'; + + $src = []; // 避免 $src 未定义 + + foreach ((array)$this->value as $k => $v) { + if (url()->isValidUrl($v) || mb_strpos($v, 'data:image') === 0) { + $src[] = $v; } elseif ($server) { - $src = rtrim($server, '/') . '/' . ltrim($this->value, '/'); + $src[] = rtrim($server, '/') . '/' . ltrim($v, '/'); } else { - $src = Storage::disk(config('admin.upload.disk'))->url($this->value); + $src[] = Storage::disk(config('admin.upload.disk'))->url($v); } - return Admin::view('dengje.gallery::gallery', ['src' => $src, 'width' => $width, 'height' => $height]); - }else{ - foreach ($this->value as $k=>$v){ - if (url()->isValidUrl($v) || mb_strpos($v, 'data:image') === 0) { - $src[] = $v; - } elseif ($server) { - $src[] = rtrim($server, '/') . '/' . ltrim($v, '/'); - } else { - $src[] = Storage::disk(config('admin.upload.disk'))->url($v); - - } - } - return Admin::view('dengje.gallery::gallerys', ['src' => $src, 'width' => $width, 'height' => $height]); } - - - - - - - - - + return Admin::view('dengje.gallery::gallerys', ['src' => $src, 'width' => $width, 'height' => $height, 'id' => $groupId]); } } - -- Gitee From c5f477d4dd9528e86d1331e9caab8a6c73b57481 Mon Sep 17 00:00:00 2001 From: Edwin Xu Date: Sun, 10 Oct 2021 19:54:13 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/views/gallerys.blade.php | 2 +- src/GalleryServiceProvider.php | 18 +++++------------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/resources/views/gallerys.blade.php b/resources/views/gallerys.blade.php index b0f8ab8..dd329c8 100644 --- a/resources/views/gallerys.blade.php +++ b/resources/views/gallerys.blade.php @@ -21,6 +21,6 @@ @endforeach
- diff --git a/src/GalleryServiceProvider.php b/src/GalleryServiceProvider.php index b5bb643..d789a0f 100755 --- a/src/GalleryServiceProvider.php +++ b/src/GalleryServiceProvider.php @@ -13,11 +13,9 @@ use App\Admin\Extensions\Popover; class GalleryServiceProvider extends ServiceProvider { protected $js = [ -// 'js/index.js', 'js/viewer.js', - - ]; + protected $css = [ 'css/index.css', 'css/viewer.css', @@ -32,18 +30,12 @@ class GalleryServiceProvider extends ServiceProvider { parent::init(); - - // 加载静态文件 - Admin::requireAssets('@dengje.gallery'); - // 加载插件 Column::extend('gallery', Gallery::class); - - } - public function settingForm() - { - return new Setting($this); - } +// public function settingForm() +// { +// return new Setting($this); +// } } -- Gitee From c3b7950f21fbf73518bf1f59e4fa854497a3569d Mon Sep 17 00:00:00 2001 From: Edwin Xu Date: Mon, 11 Oct 2021 09:35:31 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=A4=9A=E5=9B=BE?= =?UTF-8?q?=E6=98=BE=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Grid/Gallery.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Grid/Gallery.php b/src/Grid/Gallery.php index 29fc35a..c666169 100755 --- a/src/Grid/Gallery.php +++ b/src/Grid/Gallery.php @@ -5,6 +5,7 @@ namespace Dengje\Gallery\Grid; use Dcat\Admin\Admin; use Dcat\Admin\Grid\Displayers\AbstractDisplayer; +use Dcat\Admin\Support\Helper; use Illuminate\Contracts\Support\Arrayable; use Illuminate\Support\Facades\Storage; @@ -21,7 +22,7 @@ class Gallery extends AbstractDisplayer $src = []; // 避免 $src 未定义 - foreach ((array)$this->value as $k => $v) { + foreach (Helper::array($this->value) as $k => $v) { if (url()->isValidUrl($v) || mb_strpos($v, 'data:image') === 0) { $src[] = $v; } elseif ($server) { -- Gitee From 5762a03dd411b361555ba8d0fa14d6e38b34fe15 Mon Sep 17 00:00:00 2001 From: Edwin Xu Date: Wed, 5 Jan 2022 00:12:35 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E7=BC=A9=E7=95=A5?= =?UTF-8?q?=E5=9B=BE=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/assets/css/index.css | 75 ++++++++++++++++++++++++++++-- resources/views/gallerys.blade.php | 25 ++++------ 2 files changed, 80 insertions(+), 20 deletions(-) diff --git a/resources/assets/css/index.css b/resources/assets/css/index.css index 7181983..aefc21c 100755 --- a/resources/assets/css/index.css +++ b/resources/assets/css/index.css @@ -3,11 +3,76 @@ cursor: pointer; } +.dengje-gallery-group { + position: relative; + margin: 5%; +} + +.dengje-gallery-group.multiple .gallery-img.bg-left, +.dengje-gallery-group.multiple .gallery-img.bg-right { + display: block; +} + +.dengje-gallery-group.multiple .gallery-img.bg-left { + top: 5%; + left: -5%; + -webkit-transform: rotate(-5deg); + -moz-transform: rotate(-5deg); + -o-transform: rotate(-5deg); + -ms-transform: rotate(-5deg); + transform: rotate(-5deg); +} + +.dengje-gallery-group.multiple .gallery-img.bg-left:before { + content: ""; + width: 100%; + height: 100%; + background: #eff4de; + display: block; +} + +.dengje-gallery-group.multiple .gallery-img.bg-right { + top: 5%; + left: 5%; + -webkit-transform: rotate(5deg); + -moz-transform: rotate(5deg); + -o-transform: rotate(5deg); + -ms-transform: rotate(5deg); + transform: rotate(5deg); +} + +.dengje-gallery-group.multiple .gallery-img.bg-right:before { + content: ""; + width: 100%; + height: 100%; + background: #768590; + display: block; +} + +.dengje-gallery-group .gallery-img { + padding: 3%; + background: #fff; + height: 100%; + width: 100%; + z-index: 1; + display: flex; + justify-content: center; + align-items: center; + position: absolute; + -webkit-box-shadow: .2em .2em .5em rgb(0 0 0 / 30%); + -moz-box-shadow: .2em .2em .5em rgba(0, 0, 0, 0.3); + box-shadow: .2em .2em .5em rgb(0 0 0 / 30%); +} + +.dengje-gallery-group .gallery-img > img { + max-width: 100%; + max-height: 100%; +} -.img-border{ - padding: .25rem; - background-color: #eff1f7; - border: 1px solid #dae1e7; - border-radius: .5rem; +.gallery-img.border.hide { + display: none; +} +.hide { + display: none; } diff --git a/resources/views/gallerys.blade.php b/resources/views/gallerys.blade.php index dd329c8..1dd4b69 100644 --- a/resources/views/gallerys.blade.php +++ b/resources/views/gallerys.blade.php @@ -1,24 +1,19 @@