From 9b6a24872542f853fa1db1afdcfecd22f64f75ec Mon Sep 17 00:00:00 2001
From: Tim <135014430+nagisa77@users.noreply.github.com>
Date: Mon, 21 Jul 2025 11:42:31 +0800
Subject: [PATCH 1/2] feat: optimize dropdown for mobile

---
 open-isle-cli/src/components/Dropdown.vue     | 68 +++++++++++++++++--
 .../src/components/HeaderComponent.vue        | 23 ++++++-
 .../src/components/SearchDropdown.vue         | 37 ++++++++--
 3 files changed, 116 insertions(+), 12 deletions(-)

diff --git a/open-isle-cli/src/components/Dropdown.vue b/open-isle-cli/src/components/Dropdown.vue
index 2eac4fbb4..d16645fed 100644
--- a/open-isle-cli/src/components/Dropdown.vue
+++ b/open-isle-cli/src/components/Dropdown.vue
@@ -32,7 +32,7 @@
         <i class="fas fa-caret-down dropdown-caret"></i>
       </slot>
     </div>
-    <div v-if="open && (loading || filteredOptions.length > 0 || showSearch)" :class="['dropdown-menu', menuClass]">
+    <div v-if="open && !isMobile && (loading || filteredOptions.length > 0 || showSearch)" :class="['dropdown-menu', menuClass]">
       <div v-if="showSearch" class="dropdown-search">
         <i class="fas fa-search search-icon"></i>
         <input type="text" v-model="search" placeholder="搜索" />
@@ -53,12 +53,40 @@
         </div>
       </template>
     </div>
+    <div v-if="open && isMobile" class="dropdown-mobile-page">
+      <div class="dropdown-mobile-header">
+        <i class="fas fa-arrow-left" @click="close"></i>
+        <span class="mobile-title">{{ placeholder }}</span>
+      </div>
+      <div class="dropdown-mobile-menu">
+        <div v-if="showSearch" class="dropdown-search">
+          <i class="fas fa-search search-icon"></i>
+          <input type="text" v-model="search" placeholder="搜索" />
+        </div>
+        <div v-if="loading" class="dropdown-loading">
+          <l-hatch size="20" stroke="4" speed="3.5" color="var(--primary-color)"></l-hatch>
+        </div>
+        <template v-else>
+          <div v-for="o in filteredOptions" :key="o.id" @click="select(o.id)"
+            :class="['dropdown-option', optionClass, { 'selected': isSelected(o.id) }]">
+            <slot name="option" :option="o" :isSelected="isSelected(o.id)">
+              <template v-if="o.icon">
+                <img v-if="isImageIcon(o.icon)" :src="o.icon" class="option-icon" />
+                <i v-else :class="['option-icon', o.icon]"></i>
+              </template>
+              <span>{{ o.name }}</span>
+            </slot>
+          </div>
+        </template>
+      </div>
+    </div>
   </div>
 </template>
 
 <script>
 import { ref, computed, watch, onMounted, onBeforeUnmount } from 'vue'
 import { hatch } from 'ldrs'
+import { isMobile } from '../utils/screen'
 hatch.register()
 
 export default {
@@ -74,8 +102,8 @@ export default {
     showSearch: { type: Boolean, default: true },
     initialOptions: { type: Array, default: () => [] }
   },
-  emits: ['update:modelValue'],
-  setup(props, { emit }) {
+  emits: ['update:modelValue', 'update:search', 'close'],
+  setup(props, { emit, expose }) {
     const open = ref(false)
     const search = ref('')
     const setSearch = (val) => {
@@ -88,10 +116,12 @@ export default {
 
     const toggle = () => {
       open.value = !open.value
+      if (!open.value) emit('close')
     }
 
     const close = () => {
       open.value = false
+      emit('close')
     }
 
     const select = id => {
@@ -157,6 +187,7 @@ export default {
     })
 
     watch(search, async val => {
+      emit('update:search', val)
       if (props.remote && open.value) {
         await loadOptions(val)
       }
@@ -190,9 +221,12 @@ export default {
       return /^https?:\/\//.test(icon) || icon.startsWith('/')
     }
 
+    expose({ toggle, close })
+
     return {
       open,
       toggle,
+      close,
       select,
       search,
       filteredOptions,
@@ -201,7 +235,8 @@ export default {
       isSelected,
       loading,
       isImageIcon,
-      setSearch
+      setSearch,
+      isMobile
     }
   }
 }
@@ -292,4 +327,29 @@ export default {
   justify-content: center;
   padding: 10px 0;
 }
+
+.dropdown-mobile-page {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: var(--menu-background-color);
+  z-index: 1000;
+  display: flex;
+  flex-direction: column;
+}
+
+.dropdown-mobile-header {
+  display: flex;
+  align-items: center;
+  gap: 10px;
+  padding: 10px;
+  border-bottom: 1px solid var(--normal-border-color);
+}
+
+.dropdown-mobile-menu {
+  flex: 1;
+  overflow-y: auto;
+}
 </style>
diff --git a/open-isle-cli/src/components/HeaderComponent.vue b/open-isle-cli/src/components/HeaderComponent.vue
index 601f4c9b7..0955d046f 100644
--- a/open-isle-cli/src/components/HeaderComponent.vue
+++ b/open-isle-cli/src/components/HeaderComponent.vue
@@ -13,6 +13,9 @@
       </div>
 
       <div v-if="isLogin" class="header-content-right">
+        <div v-if="isMobile" class="search-icon" @click="showSearch = true">
+          <i class="fas fa-search"></i>
+        </div>
         <DropdownMenu ref="userMenu" :items="headerMenuItems">
           <template #trigger>
             <div class="avatar-container">
@@ -24,21 +27,27 @@
       </div>
 
       <div v-else class="header-content-right">
+        <div v-if="isMobile" class="search-icon" @click="showSearch = true">
+          <i class="fas fa-search"></i>
+        </div>
         <div class="header-content-item-main" @click="goToLogin">登录</div>
         <div class="header-content-item-secondary" @click="goToSignup">注册</div>
       </div>
     </div>
   </header>
+  <SearchDropdown v-if="isMobile && showSearch" @close="showSearch = false" />
 </template>
 
 <script>
 import { authState, clearToken, loadCurrentUser } from '../utils/auth'
 import { watch } from 'vue'
 import DropdownMenu from './DropdownMenu.vue'
+import SearchDropdown from './SearchDropdown.vue'
+import { isMobile } from '../utils/screen'
 
 export default {
   name: 'HeaderComponent',
-  components: { DropdownMenu },
+  components: { DropdownMenu, SearchDropdown },
   props: {
     showMenuBtn: {
       type: Boolean,
@@ -47,13 +56,17 @@ export default {
   },
   data() {
     return {
-      avatar: ''
+      avatar: '',
+      showSearch: false
     }
   },
   computed: {
     isLogin() {
       return authState.loggedIn
     },
+    isMobile() {
+      return isMobile.value
+    },
     headerMenuItems() {
       return [
         { text: '设置', onClick: this.goToSettings },
@@ -80,6 +93,7 @@ export default {
 
     watch(() => this.$route.fullPath, () => {
       if (this.$refs.userMenu) this.$refs.userMenu.close()
+      this.showSearch = false
     })
   },
 
@@ -227,6 +241,11 @@ export default {
   background-color: var(--menu-selected-background-color);
 }
 
+.search-icon {
+  font-size: 18px;
+  cursor: pointer;
+}
+
 @media (max-width: 1200px) {
   .header-content {
     padding-left: 15px;
diff --git a/open-isle-cli/src/components/SearchDropdown.vue b/open-isle-cli/src/components/SearchDropdown.vue
index 36a72d83f..73f5e1de1 100644
--- a/open-isle-cli/src/components/SearchDropdown.vue
+++ b/open-isle-cli/src/components/SearchDropdown.vue
@@ -1,9 +1,12 @@
 <template>
   <div class="search-dropdown">
-    <Dropdown v-model="selected" :fetch-options="fetchResults" remote menu-class="search-menu"
-      option-class="search-option" :show-search="false">
+    <Dropdown ref="dropdown" v-model="selected" :fetch-options="fetchResults" remote menu-class="search-menu"
+      option-class="search-option" :show-search="isMobile" @update:search="keyword = $event" @close="onClose">
       <template #display="{ toggle, setSearch }">
-        <div class="search-input" @click="toggle">
+        <div v-if="isMobile" class="search-mobile-trigger" @click="toggle">
+          <i class="fas fa-search"></i>
+        </div>
+        <div v-else class="search-input" @click="toggle">
           <i class="search-input-icon fas fa-search"></i>
           <input class="text-input" v-model="keyword" placeholder="Search" @focus="toggle" @input="setSearch(keyword)" />
         </div>
@@ -23,7 +26,8 @@
 </template>
 
 <script>
-import { ref, watch } from 'vue'
+import { ref, watch, onMounted } from 'vue'
+import { isMobile } from '../utils/screen'
 import { useRouter } from 'vue-router'
 import Dropdown from './Dropdown.vue'
 import { API_BASE_URL } from '../main'
@@ -32,11 +36,15 @@ import { stripMarkdown } from '../utils/markdown'
 export default {
   name: 'SearchDropdown',
   components: { Dropdown },
-  setup() {
+  emits: ['close'],
+  setup(props, { emit }) {
     const router = useRouter()
     const keyword = ref('')
     const selected = ref(null)
     const results = ref([])
+    const dropdown = ref(null)
+
+    const onClose = () => emit('close')
 
     const fetchResults = async (kw) => {
       if (!kw) return []
@@ -68,6 +76,12 @@ export default {
       comment: 'fas fa-comment'
     }
 
+    onMounted(() => {
+      if (isMobile.value && dropdown.value) {
+        dropdown.value.toggle()
+      }
+    })
+
     watch(selected, val => {
       if (!val) return
       const opt = results.value.find(r => r.id === val)
@@ -85,7 +99,7 @@ export default {
       keyword.value = ''
     })
 
-    return { keyword, selected, fetchResults, highlight, iconMap }
+    return { keyword, selected, fetchResults, highlight, iconMap, isMobile, dropdown, onClose }
   }
 }
 </script>
@@ -96,6 +110,11 @@ export default {
   width: 500px;
 }
 
+.search-mobile-trigger {
+  padding: 10px;
+  font-size: 18px;
+}
+
 .search-input {
   padding: 10px;
   display: flex;
@@ -118,6 +137,12 @@ export default {
   max-width: 600px;
 }
 
+@media (max-width: 768px) {
+  .search-dropdown {
+    width: 100%;
+  }
+}
+
 .search-option-item {
   display: flex;
   gap: 10px;

From 0cee0141c3b37215889beb7bc801aed7fd5907e2 Mon Sep 17 00:00:00 2001
From: Tim <nagisa12164@163.com>
Date: Mon, 21 Jul 2025 14:51:09 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 open-isle-cli/src/components/Dropdown.vue     |  3 ++-
 .../src/components/HeaderComponent.vue        | 20 ++++++++++++----
 .../src/components/SearchDropdown.vue         | 23 ++++++++-----------
 3 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/open-isle-cli/src/components/Dropdown.vue b/open-isle-cli/src/components/Dropdown.vue
index d16645fed..1386ee07d 100644
--- a/open-isle-cli/src/components/Dropdown.vue
+++ b/open-isle-cli/src/components/Dropdown.vue
@@ -148,6 +148,7 @@ export default {
     })
 
     const clickOutside = e => {
+      if (isMobile) return
       if (wrapper.value && !wrapper.value.contains(e.target)) {
         close()
       }
@@ -269,7 +270,7 @@ export default {
   right: 0;
   background: var(--background-color);
   border: 1px solid var(--normal-border-color);
-  z-index: 10;
+  z-index: 10000;
   max-height: 200px;
   min-width: 350px;
   overflow-y: auto;
diff --git a/open-isle-cli/src/components/HeaderComponent.vue b/open-isle-cli/src/components/HeaderComponent.vue
index 0955d046f..4d5150c96 100644
--- a/open-isle-cli/src/components/HeaderComponent.vue
+++ b/open-isle-cli/src/components/HeaderComponent.vue
@@ -13,7 +13,7 @@
       </div>
 
       <div v-if="isLogin" class="header-content-right">
-        <div v-if="isMobile" class="search-icon" @click="showSearch = true">
+        <div v-if="isMobile" class="search-icon" @click="search">
           <i class="fas fa-search"></i>
         </div>
         <DropdownMenu ref="userMenu" :items="headerMenuItems">
@@ -27,20 +27,21 @@
       </div>
 
       <div v-else class="header-content-right">
-        <div v-if="isMobile" class="search-icon" @click="showSearch = true">
+        <div v-if="isMobile" class="search-icon" @click="search">
           <i class="fas fa-search"></i>
         </div>
         <div class="header-content-item-main" @click="goToLogin">登录</div>
         <div class="header-content-item-secondary" @click="goToSignup">注册</div>
       </div>
+      
+      <SearchDropdown ref="searchDropdown" v-if="isMobile && showSearch" @close="closeSearch" />
     </div>
   </header>
-  <SearchDropdown v-if="isMobile && showSearch" @close="showSearch = false" />
 </template>
 
 <script>
 import { authState, clearToken, loadCurrentUser } from '../utils/auth'
-import { watch } from 'vue'
+import { watch, nextTick } from 'vue'
 import DropdownMenu from './DropdownMenu.vue'
 import SearchDropdown from './SearchDropdown.vue'
 import { isMobile } from '../utils/screen'
@@ -104,6 +105,17 @@ export default {
         window.location.reload()
       })
     },
+    search() {
+      this.showSearch = true
+      nextTick(() => {
+        this.$refs.searchDropdown.toggle()
+      })
+    },
+    closeSearch() {
+      nextTick(() => {
+        this.showSearch = false
+      })
+    },
     goToLogin() {
       this.$router.push('/login')
     },
diff --git a/open-isle-cli/src/components/SearchDropdown.vue b/open-isle-cli/src/components/SearchDropdown.vue
index 73f5e1de1..6be3e0dac 100644
--- a/open-isle-cli/src/components/SearchDropdown.vue
+++ b/open-isle-cli/src/components/SearchDropdown.vue
@@ -2,13 +2,10 @@
   <div class="search-dropdown">
     <Dropdown ref="dropdown" v-model="selected" :fetch-options="fetchResults" remote menu-class="search-menu"
       option-class="search-option" :show-search="isMobile" @update:search="keyword = $event" @close="onClose">
-      <template #display="{ toggle, setSearch }">
-        <div v-if="isMobile" class="search-mobile-trigger" @click="toggle">
-          <i class="fas fa-search"></i>
-        </div>
-        <div v-else class="search-input" @click="toggle">
+      <template #display="{ setSearch }">
+        <div class="search-input">
           <i class="search-input-icon fas fa-search"></i>
-          <input class="text-input" v-model="keyword" placeholder="Search" @focus="toggle" @input="setSearch(keyword)" />
+          <input class="text-input" v-model="keyword" placeholder="Search" @input="setSearch(keyword)" />
         </div>
       </template>
       <template #option="{ option }">
@@ -26,7 +23,7 @@
 </template>
 
 <script>
-import { ref, watch, onMounted } from 'vue'
+import { ref, watch } from 'vue'
 import { isMobile } from '../utils/screen'
 import { useRouter } from 'vue-router'
 import Dropdown from './Dropdown.vue'
@@ -44,6 +41,10 @@ export default {
     const results = ref([])
     const dropdown = ref(null)
 
+    const toggle = () => {
+      dropdown.value.toggle()
+    }
+
     const onClose = () => emit('close')
 
     const fetchResults = async (kw) => {
@@ -76,12 +77,6 @@ export default {
       comment: 'fas fa-comment'
     }
 
-    onMounted(() => {
-      if (isMobile.value && dropdown.value) {
-        dropdown.value.toggle()
-      }
-    })
-
     watch(selected, val => {
       if (!val) return
       const opt = results.value.find(r => r.id === val)
@@ -99,7 +94,7 @@ export default {
       keyword.value = ''
     })
 
-    return { keyword, selected, fetchResults, highlight, iconMap, isMobile, dropdown, onClose }
+    return { keyword, selected, fetchResults, highlight, iconMap, isMobile, dropdown, onClose, toggle }
   }
 }
 </script>