更新:优化修改、发帖视图,支持在标签页面点击发帖时自动选择标签

zhuchunshu · Jan 14, 2023 · 6429a0d · 6429a0d
1 parent e0821d8
commit 6429a0d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/app/Plugins/Topic/resources/views/create.blade.php b/app/Plugins/Topic/resources/views/create.blade.php
@@ -33,7 +33,7 @@
 
                         <div class="card">
                             <div class="card-header">
-                                <h3 class="card-title">帖子信息</h3>
+                                <h3 class="card-title">发布帖子</h3>
                             </div>
                             <div class="card-body">
                                 @foreach(Itf()->get('topic-create-data') as $k=>$v)

diff --git a/app/Plugins/Topic/resources/views/create/basis.blade.php b/app/Plugins/Topic/resources/views/create/basis.blade.php
@@ -7,13 +7,10 @@
     <div class="mb-3">
         <label class="form-label">选择标签</label>
         <select type="text" x-model="tag" name="basis[tag]" class="form-select" id="select-topic-tags" required>
-            <option value="null"
-                    data-custom-properties="">
-                请选择
-            </option>
+
             @foreach(\App\Plugins\Topic\src\Models\TopicTag::query()->where('status','=',null)->get() as $topic_tags)
                 <option value="{{$topic_tags->id}}"
-                        data-custom-properties="&lt;span class=&quot;badge&quot; style=&quot;background-color: {{$topic_tags->color}} &quot; &gt;{{$topic_tags->icon}}&lt;/span&gt;" @if(request()->input('basis.tag') && request()->input('basis.tag')==$topic_tags->id){{"selected"}}@endif>
+                        data-custom-properties="&lt;span class=&quot;badge&quot; style=&quot;background-color: {{$topic_tags->color}} &quot; &gt;{{$topic_tags->icon}}&lt;/span&gt;" @if((int)request()->input('basis.tag')===(int)$topic_tags->id){{"selected"}}@endif>
                     {{$topic_tags->name}}
                 </option>
             @endforeach
@@ -46,10 +43,13 @@
                 return null;
             }),
             tag:(()=>{
+                @if(!request()->has('basis.tag'))
                 if(localStorage.getItem('create_topic_tag')){
                     return localStorage.getItem('create_topic_tag')
                 }
-                return null;
+                @else
+                    return {{request()->input('basis.tag')}};
+                @endif
             })
         }))
     })

diff --git a/app/Plugins/Topic/resources/views/edit.blade.php b/app/Plugins/Topic/resources/views/edit.blade.php
@@ -35,7 +35,7 @@
 
                         <div class="card">
                             <div class="card-header">
-                                <h3 class="card-title">帖子信息</h3>
+                                <h3 class="card-title">修改帖子</h3>
                             </div>
                             <div class="card-body">
                                 @foreach(Itf()->get('topic-edit-data') as $k=>$v)

diff --git a/app/Themes/CodeFec/resources/views/widget/topic/tags/right_start_1.blade.php b/app/Themes/CodeFec/resources/views/widget/topic/tags/right_start_1.blade.php
@@ -30,7 +30,7 @@
 
         <div class="card-footer">
             @if(auth()->check())
-                <a href="/topic/create" class="btn btn-dark">{{__("topic.create")}}</a>
+                <a href="/topic/create?basis[tag]={{$data->id}}" class="btn btn-dark">{{__("topic.create")}}</a>
                 @if(Authority()->check('topic_tag_create') && $data->user_id == auth()->id())
                     <a href="/tags/{{$data->id}}/edit" class="btn btn-primary">{{__("app.edit")}}</a>
                 @endif