onixbyte/delta-force-guide-web
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #13 from zihluwang/develop

Browse Source 
v1.2.2
This commit is contained in:
Zihlu Wang
2026-04-26 11:59:11 +08:00
committed by GitHub
parent e4acb7fd6f fbbef5c28b
commit a8959c28ec
5 changed files with 78 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/components/modification-create-modal/index.tsx
+1 -4
View File
@@ -50,7 +50,7 @@ export default function ModificationCreateModal({
form.setFieldsValue({
firearmId: lockedFirearmId ?? defaultFirearmId,
accessories: [{ slotName: "", accessoryName: "", tunings: [] }],
accessories: [],
tags: [],
})
}, [open, defaultFirearmId, lockedFirearmId, form])
@@ -95,6 +95,3 @@ export default function ModificationCreateModal({
</Modal>
)
}
src/components/modification-form/index.tsx
+19 -11
View File
@@ -1,6 +1,7 @@
import { useEffect, useMemo, useState } from "react"
import { FirearmApi } from "@/api"
import slotNames from "@/constant/slots.json"
import tuningNames from "@/constant/tunings.json"
import { Firearm, ModificationRequest } from "@/types"
import { AutoComplete, Button, Card, Form, Input, InputNumber, Select, Space } from "antd"
@@ -11,6 +12,7 @@ interface ModificationFormProps {
}
const slotOptions = slotNames.map((slotName) => ({ value: slotName }))
const tuningOptions = tuningNames.map((tuningName) => ({ value: tuningName }))
export default function ModificationForm({ form, onFinish, lockFirearmId }: ModificationFormProps) {
const [firearmOptions, setFirearmOptions] = useState<Array<{ value: number; label: string }>>([])
@@ -64,7 +66,10 @@ export default function ModificationForm({ form, onFinish, lockFirearmId }: Modi
}, [])
const mergedFirearmOptions = useMemo(() => {
if (lockFirearmId === undefined || firearmOptions.some((option) => option.value === lockFirearmId)) {
if (
lockFirearmId === undefined ||
firearmOptions.some((option) => option.value === lockFirearmId)
) {
return firearmOptions
}
@@ -164,14 +169,18 @@ export default function ModificationForm({ form, onFinish, lockFirearmId }: Modi
<Space key={tuningField.key} align="start" className="w-full" wrap>
<Form.Item
name={[tuningField.name, "tuningName"]}
label="调校项"
rules={[{ required: true, message: "请输入调校项" }]}>
<Input placeholder="例如：后坐控制" className="w-44" />
label="精校属性"
rules={[{ required: true, message: "请选择或输入精校属性" }]}>
<AutoComplete
options={tuningOptions}
placeholder="例如：后坐控制"
className="w-44"
/>
</Form.Item>
<Form.Item
name={[tuningField.name, "tuningValue"]}
label="调校值"
rules={[{ required: true, message: "请输入调校值" }]}>
label="精校值"
rules={[{ required: true, message: "请输入精校值" }]}>
<InputNumber className="w-32" placeholder="例如：0.35" />
</Form.Item>
<Button
@@ -185,8 +194,9 @@ export default function ModificationForm({ form, onFinish, lockFirearmId }: Modi
))}
<Button
type="dashed"
disabled={tuningFields.length >= 2}
onClick={() => addTuning({ tuningName: "", tuningValue: 0 })}>
添加调校
添加精校
</Button>
</div>
)}
@@ -194,7 +204,8 @@ export default function ModificationForm({ form, onFinish, lockFirearmId }: Modi
</Card>
))}
<Button
type="dashed"
variant="solid"
color="lime"
onClick={() => addAccessory({ slotName: "", accessoryName: "", tunings: [] })}>
添加配件
</Button>
@@ -204,6 +215,3 @@ export default function ModificationForm({ form, onFinish, lockFirearmId }: Modi
</Form>
)
}
src/constant/tunings.json
+1
View File
@@ -0,0 +1 @@
["安装位置", "厚度", "缩放倍率", "长度", "瞳距", "配重", "托腮板安装位置"]
src/page/firearms/index.tsx
+18 -12
View File
@@ -36,21 +36,20 @@ export default function FirearmsPage() {
const [editingFirearm, setEditingFirearm] = useState<Firearm | null>(null)
const [deletingId, setDeletingId] = useState<number | null>(null)
const loadFirearms = useCallback(() => {
return FirearmApi.getFirearms({
const loadFirearms = useCallback(async () => {
const pagedData = await FirearmApi.getFirearms({
page: page - 1,
size: 12,
sortBy: "id",
direction: "ASC",
type: typeFilter === allTypeValue ? undefined : typeFilter,
}).then((pagedData) => {
setFirearms(pagedData.items)
setTotal(pagedData.totalElements)
})
setFirearms(pagedData.items)
setTotal(pagedData.totalElements)
}, [page, typeFilter])
useEffect(() => {
loadFirearms()
void loadFirearms()
}, [loadFirearms])
async function handleDelete(firearm: Firearm) {
@@ -61,7 +60,7 @@ export default function FirearmsPage() {
if (firearms.length === 1 && page > 1) {
setPage(page - 1)
} else {
loadFirearms()
void loadFirearms()
}
} catch {
message.error("武器删除失败，请稍后重试")
@@ -114,8 +113,7 @@ export default function FirearmsPage() {
okText="删除"
cancelText="取消"
okButtonProps={{ danger: true, loading: deletingId === firearm.id }}
onConfirm={() => handleDelete(firearm)}
>
onConfirm={() => handleDelete(firearm)}>
<Button type="link" danger size="small" loading={deletingId === firearm.id}>
删除
</Button>
@@ -155,7 +153,15 @@ export default function FirearmsPage() {
<Typography.Paragraph
style={{ marginBottom: 0 }}
type="secondary"
ellipsis={{ rows: 3 }}
ellipsis={{
rows: 3,
tooltip: firearm.review
? {
title: <div style={{ whiteSpace: "pre-line" }}>{firearm.review}</div>,
placement: "topLeft",
}
: false,
}}
className="whitespace-pre-line">
{firearm.review || "暂无描述"}
</Typography.Paragraph>
@@ -190,7 +196,7 @@ export default function FirearmsPage() {
onCancel={() => setCreateModalOpen(false)}
onSuccess={() => {
setCreateModalOpen(false)
loadFirearms()
void loadFirearms()
}}
/>
@@ -200,7 +206,7 @@ export default function FirearmsPage() {
onCancel={() => setEditingFirearm(null)}
onSuccess={() => {
setEditingFirearm(null)
loadFirearms()
void loadFirearms()
}}
/>
</>
src/page/mod-codes/index.tsx
+39 -14
View File
@@ -1,4 +1,16 @@
import { App, Button, Card, Col, Pagination, Popconfirm, Row, Select, Space, Tag, Typography } from "antd"
import {
App,
Button,
Card,
Col,
Pagination,
Popconfirm,
Row,
Select,
Space,
Tag,
Typography,
} from "antd"
import { useCallback, useEffect, useMemo, useState } from "react"
import { Link, useSearchParams } from "react-router-dom"
import { ModificationApi, TagApi } from "@/api"
@@ -39,7 +51,7 @@ export default function ModCodesPage() {
})
}, [firearmId])
const loadModifications = useCallback(() => {
const loadModifications = useCallback(async () => {
return ModificationApi.getModifications({
page: page - 1,
size: pageSize,
@@ -54,7 +66,7 @@ export default function ModCodesPage() {
}, [page, firearmId, selectedTags])
useEffect(() => {
loadModifications()
void loadModifications()
}, [loadModifications])
async function handleDelete(modification: Modification) {
@@ -69,7 +81,7 @@ export default function ModCodesPage() {
if (modifications.length === 1 && page > 1) {
setPage(page - 1)
} else {
loadModifications()
void loadModifications()
}
} catch {
message.error("改枪码删除失败，请稍后重试")
@@ -114,8 +126,7 @@ export default function ModCodesPage() {
onClick={() => {
setSelectedTags([])
setPage(1)
}}
>
}}>
清除筛选
</Button>
</Link>
@@ -138,7 +149,10 @@ export default function ModCodesPage() {
extra={
user ? (
<div className="flex items-center gap-1">
<Button type="link" size="small" onClick={() => setEditingModification(modification)}>
<Button
type="link"
size="small"
onClick={() => setEditingModification(modification)}>
编辑
</Button>
<Popconfirm
@@ -147,9 +161,12 @@ export default function ModCodesPage() {
okText="删除"
cancelText="取消"
okButtonProps={{ danger: true, loading: deletingId === modification.id }}
onConfirm={() => handleDelete(modification)}
>
<Button type="link" danger size="small" loading={deletingId === modification.id}>
onConfirm={() => handleDelete(modification)}>
<Button
type="link"
danger
size="small"
loading={deletingId === modification.id}>
删除
</Button>
</Popconfirm>
@@ -195,15 +212,23 @@ export default function ModCodesPage() {
<div className="mt-2 overflow-x-auto">
<div className="grid min-w-275 grid-cols-5 gap-2">
{(modification.accessories || []).map((accessory, accessoryIndex) => (
<div key={`${modification.id}-accessory-${accessoryIndex}`} className="rounded border border-gray-100 p-2">
<div
key={`${modification.id}-accessory-${accessoryIndex}`}
className="rounded border border-gray-100 p-2">
<div className="flex items-center justify-between gap-2 rounded bg-gray-50 px-2 py-1">
<Tag color="blue" className="mr-0">{accessory.slotName || "未填写槽位"}</Tag>
<Tag className="mr-0">{accessory.accessoryName || "未填写配件"}</Tag>
<Typography color="blue" className="mr-0">
{accessory.slotName || "未填写槽位"}
</Typography>
<Typography className="mr-0 text-[#4C1D95]">
{accessory.accessoryName || "未填写配件"}
</Typography>
</div>
{(accessory.tunings?.length || 0) > 0 ? (
<div className="mt-2 flex flex-wrap gap-1">
{accessory.tunings.map((tuning, tuningIndex) => (
<Tag key={`${modification.id}-${accessoryIndex}-tuning-${tuningIndex}`} color="geekblue">
<Tag
key={`${modification.id}-${accessoryIndex}-tuning-${tuningIndex}`}
color="geekblue">
{tuning.tuningName || "未命名"}: {tuning.tuningValue ?? "-"}
</Tag>
))}