From f45495b6fb2919a899961c9fae94e4d4c0273398 Mon Sep 17 00:00:00 2001
From: vine_liutk <961510893@qq.com>
Date: Wed, 21 Sep 2022 16:56:40 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4banner?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/banner/src/Http/Admin/BannerAdController.php | 10 +++++++++-
 packages/banner/src/Http/Admin/BannerController.php   |  4 ++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/packages/banner/src/Http/Admin/BannerAdController.php b/packages/banner/src/Http/Admin/BannerAdController.php
index e4c0b0a..60ec379 100644
--- a/packages/banner/src/Http/Admin/BannerAdController.php
+++ b/packages/banner/src/Http/Admin/BannerAdController.php
@@ -24,6 +24,10 @@ class BannerAdController extends AdminController
             $query->where('name', 'like', '%'.$request->input('q').'%');
         }
 
+        if ($request->filled('id')) {
+            $query->where('id',$request->input('id'));
+        }
+
         $query->select(['id', 'name as text', 'width', 'height']);
 
         if ($request->filled('_paginate')) {
@@ -74,7 +78,11 @@ class BannerAdController extends AdminController
     {
         return Form::make(new BannerAd(), function (Form $form) {
             $form->text('name')->required();
-            $form->text('key')->required()->rules([Rule::unique((new BannerAd())->getTable())]);
+            $unique = Rule::unique((new BannerAd())->getTable());
+            if ($form->isEditing()) {
+                $unique->ignore($form->getKey());
+            }
+            $form->text('key')->required()->rules([$unique]);
             $form->number('width')->min(0);
             $form->number('height')->min(0);
             $form->switch('is_enable')->default(1);
diff --git a/packages/banner/src/Http/Admin/BannerController.php b/packages/banner/src/Http/Admin/BannerController.php
index e7ec072..96ab942 100644
--- a/packages/banner/src/Http/Admin/BannerController.php
+++ b/packages/banner/src/Http/Admin/BannerController.php
@@ -87,6 +87,7 @@ class BannerController extends AdminController
             Admin::script(
                 <<<JS
                     $('body').on('select2:select', 'select.field_ad_id', function(e){
+                        console.log( e.params.data.id);
                         let url_path = '/admin/api/banner-ads?id=' + e.params.data.id
                         $.ajax({
                             type: 'get',
@@ -96,10 +97,13 @@ class BannerController extends AdminController
                                 //异步渲染提示尺寸；
                                 let cicun = '未设置';
                                 if(result[0]){
+                                    console.log(result[0]);
                                     if(result[0].width || result[0].height){
+                                        console.log(654321)
                                         cicun = result[0].width + '*' + result[0].height;
                                     }
                                 }
+                                console.log(cicun);
                                 $('input[name=path]').parent().find('span.help-block').html('<i class="fa feather icon-help-circle"></i>&nbsp;建议尺寸：'+ cicun);
                             }
                         });