Kingsmai/pokopiawiki.tootaio.com
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(pokemon): decouple official data ID from display ID during fetch

Browse Source 
Allow fetching data and images using official identifiers regardless of the custom display ID.
Extract data ID directly from image paths instead of relying on the display ID.
Only auto-fill display ID from fetched data if the field is currently empty.
This commit is contained in:
xiaomai
2026-05-03 22:23:29 +08:00
parent deb0b54e71
commit df212a4e27
3 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
frontend/src/views/PokemonEdit.vue
View File

@@ -253,14 +253,9 @@ function mergeFetchedTranslations(fetchedTranslations: TranslationMap | undefine
}
function applyFetchedPokemon(fetchedPokemon: PokemonFetchResult): boolean {
if (isEditing.value && fetchedPokemon.id !== pokemonIdForSave()) {
message.value = t('pages.pokemon.fetchIdMismatch', { id: fetchedPokemon.id });
return false;
}
pokemonForm.value = {
...pokemonForm.value,
id: isEditing.value ? pokemonForm.value.id : String(fetchedPokemon.id),
id: pokemonForm.value.id.trim() === '' ? String(fetchedPokemon.id) : pokemonForm.value.id,
name: fetchedPokemon.name,
genus: fetchedPokemon.genus,
heightInches: fetchedPokemon.heightInches,
@@ -477,7 +472,7 @@ async function fetchPokemonByIdentifier(identifierValue?: string) {
return;
}
const identifier = (identifierValue ?? fetchIdentifier.value).trim() || pokemonForm.value.id.trim();
const identifier = (identifierValue ?? fetchIdentifier.value).trim();
if (!identifier) {
message.value = t('pages.pokemon.fetchIdentifierRequired');
return;
@@ -552,7 +547,7 @@ async function fetchPokemonImages() {
return;
}
const identifier = fetchIdentifier.value.trim() || pokemonForm.value.id.trim();
const identifier = fetchIdentifier.value.trim();
if (!identifier) {
message.value = t('pages.pokemon.fetchIdentifierRequired');
return;
@@ -563,12 +558,6 @@ async function fetchPokemonImages() {
try {
const result = await api.fetchPokemonImageOptions(identifier);
const currentId = pokemonIdForSave();
if (Number.isInteger(currentId) && currentId > 0 && result.id !== currentId) {
message.value = t('pages.pokemon.fetchIdMismatch', { id: result.id });
return;
}
fetchIdentifier.value = result.identifier;
imageOptions.value = result.images;