Skip to content

fix(web): 保留游戏选择字段模板卡片展示 #TAP-7019017887 #967

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
apollopy merged 1 commit into from
Jun 15, 2026
Merged

fix(web): 保留游戏选择字段模板卡片展示 #TAP-7019017887 #967

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 15 additions & 24 deletions next/web/src/App/Admin/Tickets/Ticket/components/CustomFields.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,10 @@ export function CustomFields({
const { previewTemplate, id } = field;
const value = values[id]?.value;
const defaultContent = renderDefaultContent(field, value, values[id]?.files);
const useDefaultContent =
defaultContent &&
(!previewTemplate || (isGameField(field) && isGameIdObjectValue(value)));
const previewValue = getPreviewValue(field, value);
const useDefaultContent = !previewTemplate && isGameField(field) && defaultContent;
const DEFAULT_CONTENT_PLACEHOLDER = '#DEFAULT#';
if (previewTemplate && !useDefaultContent) {
if (previewTemplate) {
const showPreviewAnyway = previewTemplate.startsWith('!');
if (showPreviewAnyway || value !== undefined) {
const template = showPreviewAnyway ? previewTemplate.slice(1) : previewTemplate;
Expand All @@ -107,7 +106,11 @@ export function CustomFields({
)}
>
{template.startsWith(DEFAULT_CONTENT_PLACEHOLDER) && defaultContent}
<CustomFieldPreview template={templateWithoutDefault} value={value} user={user} />
<CustomFieldPreview
template={templateWithoutDefault}
value={previewValue}
user={user}
/>
{template.endsWith(DEFAULT_CONTENT_PLACEHOLDER) && defaultContent}
</ErrorBoundary>
);
Expand Down Expand Up @@ -263,30 +266,18 @@ function getGameId(value: any): string | undefined {
}
}

function isGameIdObjectValue(value: any) {
if (value && typeof value === 'object') {
return typeof value.id === 'string' || typeof value.id === 'number';
}
if (typeof value === 'string') {
try {
const parsedValue = JSON.parse(value);
return (
parsedValue &&
typeof parsedValue === 'object' &&
(typeof parsedValue.id === 'string' || typeof parsedValue.id === 'number')
);
} catch (error) {
return false;
}
}
return false;
}

function formatGameId(value: string | number): string | undefined {
const id = String(value);
return /^\d+$/.test(id) ? id : undefined;
}

function getPreviewValue(field: CustomField, value: any) {
if (!isGameField(field)) {
return value;
}
return getGameId(value) ?? value;
}

function formatFieldValue(value: any) {
if (
value === undefined ||
Expand Down
Loading