diff --git a/src/components/IconPicker.vue b/src/components/IconPicker.vue index beba70c5..4daea8be 100644 --- a/src/components/IconPicker.vue +++ b/src/components/IconPicker.vue @@ -7,9 +7,8 @@
- @@ -47,6 +46,7 @@ + + diff --git a/src/components/ui/input-group/InputGroupAffix.vue b/src/components/ui/input-group/InputGroupAffix.vue new file mode 100644 index 00000000..4bf553b2 --- /dev/null +++ b/src/components/ui/input-group/InputGroupAffix.vue @@ -0,0 +1,50 @@ + + + diff --git a/src/components/ui/input-group/InputGroupCharCount.vue b/src/components/ui/input-group/InputGroupCharCount.vue deleted file mode 100644 index 79d4db13..00000000 --- a/src/components/ui/input-group/InputGroupCharCount.vue +++ /dev/null @@ -1,81 +0,0 @@ - - - diff --git a/src/components/ui/input-group/InputGroupField.vue b/src/components/ui/input-group/InputGroupField.vue new file mode 100644 index 00000000..128f53aa --- /dev/null +++ b/src/components/ui/input-group/InputGroupField.vue @@ -0,0 +1,124 @@ + + + diff --git a/src/components/ui/input-group/InputGroupSearch.vue b/src/components/ui/input-group/InputGroupSearch.vue new file mode 100644 index 00000000..137183c5 --- /dev/null +++ b/src/components/ui/input-group/InputGroupSearch.vue @@ -0,0 +1,42 @@ + + + diff --git a/src/components/ui/input-group/InputGroupTextareaField.vue b/src/components/ui/input-group/InputGroupTextareaField.vue new file mode 100644 index 00000000..cad27e49 --- /dev/null +++ b/src/components/ui/input-group/InputGroupTextareaField.vue @@ -0,0 +1,144 @@ + + + diff --git a/src/components/ui/input-group/index.js b/src/components/ui/input-group/index.js index c956624e..413a3674 100644 --- a/src/components/ui/input-group/index.js +++ b/src/components/ui/input-group/index.js @@ -6,7 +6,11 @@ export { default as InputGroupButton } from './InputGroupButton.vue'; export { default as InputGroupInput } from './InputGroupInput.vue'; export { default as InputGroupText } from './InputGroupText.vue'; export { default as InputGroupTextarea } from './InputGroupTextarea.vue'; -export { default as InputGroupCharCount } from './InputGroupCharCount.vue'; +export { default as InputGroupField } from './InputGroupField.vue'; +export { default as InputGroupTextareaField } from './InputGroupTextareaField.vue'; +export { default as InputGroupSearch } from './InputGroupSearch.vue'; +export { default as InputGroupAffix } from './InputGroupAffix.vue'; +export { default as InputGroupAction } from './InputGroupAction.vue'; export const inputGroupAddonVariants = cva( "text-muted-foreground flex h-auto cursor-text items-center justify-center gap-2 py-1.5 text-sm font-medium select-none [&>svg:not([class*='size-'])]:size-4 [&>kbd]:rounded-[calc(var(--radius)-5px)] group-data-[disabled=true]/input-group:opacity-50", diff --git a/src/views/Favorites/FavoritesAvatar.vue b/src/views/Favorites/FavoritesAvatar.vue index d336e466..5e00e199 100644 --- a/src/views/Favorites/FavoritesAvatar.vue +++ b/src/views/Favorites/FavoritesAvatar.vue @@ -27,9 +27,8 @@
- @@ -280,11 +279,11 @@ {{ t('view.favorite.avatars.new_group') }}
-
- @@ -297,6 +296,7 @@ import { computed, onBeforeMount, ref, watch } from 'vue'; import { MoreFilled, Refresh } from '@element-plus/icons-vue'; import { Button } from '@/components/ui/button'; + import { InputGroupSearch } from '@/components/ui/input-group'; import { ElMessageBox } from 'element-plus'; import { Ellipsis } from 'lucide-vue-next'; import { Spinner } from '@/components/ui/spinner'; diff --git a/src/views/Favorites/FavoritesWorld.vue b/src/views/Favorites/FavoritesWorld.vue index 2dfd7cef..72adbd0f 100644 --- a/src/views/Favorites/FavoritesWorld.vue +++ b/src/views/Favorites/FavoritesWorld.vue @@ -27,9 +27,8 @@
- @@ -266,11 +265,11 @@ {{ t('view.favorite.worlds.new_group') }}
-
- + input-class="resize-none" + @click="handleCopyAvatarExportData" /> @@ -63,6 +61,7 @@ import { Select, SelectContent, SelectGroup, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'; import { computed, ref, watch } from 'vue'; import { Checkbox } from '@/components/ui/checkbox'; + import { InputGroupTextareaField } from '@/components/ui/input-group'; import { storeToRefs } from 'pinia'; import { toast } from 'vue-sonner'; import { useI18n } from 'vue-i18n'; diff --git a/src/views/Favorites/dialogs/AvatarImportDialog.vue b/src/views/Favorites/dialogs/AvatarImportDialog.vue index eea0b079..7770f00c 100644 --- a/src/views/Favorites/dialogs/AvatarImportDialog.vue +++ b/src/views/Favorites/dialogs/AvatarImportDialog.vue @@ -20,13 +20,11 @@ - + style="margin-top: 10px" + input-class="resize-none" />
@@ -163,6 +161,7 @@ import { Select, SelectContent, SelectGroup, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'; import { computed, ref, watch } from 'vue'; import { Button } from '@/components/ui/button'; + import { InputGroupTextareaField } from '@/components/ui/input-group'; import { Loading } from '@element-plus/icons-vue'; import { Trash2 } from 'lucide-vue-next'; import { storeToRefs } from 'pinia'; diff --git a/src/views/Favorites/dialogs/FriendExportDialog.vue b/src/views/Favorites/dialogs/FriendExportDialog.vue index 717f9e8e..72d6a67f 100644 --- a/src/views/Favorites/dialogs/FriendExportDialog.vue +++ b/src/views/Favorites/dialogs/FriendExportDialog.vue @@ -21,15 +21,13 @@
- + input-class="resize-none" + @click="handleCopyFriendExportData" /> @@ -37,6 +35,7 @@ import { Select, SelectContent, SelectGroup, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select'; import { computed, ref, watch } from 'vue'; import { storeToRefs } from 'pinia'; + import { InputGroupTextareaField } from '@/components/ui/input-group'; import { toast } from 'vue-sonner'; import { useI18n } from 'vue-i18n'; diff --git a/src/views/Favorites/dialogs/FriendImportDialog.vue b/src/views/Favorites/dialogs/FriendImportDialog.vue index 54788058..d0f04629 100644 --- a/src/views/Favorites/dialogs/FriendImportDialog.vue +++ b/src/views/Favorites/dialogs/FriendImportDialog.vue @@ -20,13 +20,11 @@
- + style="margin-top: 10px" + input-class="resize-none" />