From 66790f8fb83be8783427308c2d3db7eb98951d50 Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期三, 25 二月 2026 15:27:03 +0800
Subject: [PATCH] 站点初始化，复制改为当前
---
rsf-admin/src/page/basicInfo/basStation/BasStationInitModal.jsx | 47 ++++++++++++++++++++++++++++++++++++++---------
1 files changed, 38 insertions(+), 9 deletions(-)
diff --git a/rsf-admin/src/page/basicInfo/basStation/BasStationInitModal.jsx b/rsf-admin/src/page/basicInfo/basStation/BasStationInitModal.jsx
index 865aa26..d967b43 100644
--- a/rsf-admin/src/page/basicInfo/basStation/BasStationInitModal.jsx
+++ b/rsf-admin/src/page/basicInfo/basStation/BasStationInitModal.jsx
@@ -30,7 +30,7 @@
const defaultPair = () => ({ stationName: '', stationId: '' });
-const BasStationInitModal = ({ open, setOpen }) => {
+const BasStationInitModal = ({ open, setOpen, initialData = null, onClose }) => {
const translate = useTranslate();
const notify = useNotify();
const refresh = useRefresh();
@@ -81,19 +81,48 @@
request.post('/dictData/page', { dictTypeCode: 'sys_container_type', current: 1, pageSize: 100 })
.then((res) => {
if (res?.data?.code === 200 && res?.data?.data?.records) {
- setContainerTypeOptions(res.data.data.records.map((item) => ({
+ const options = res.data.data.records.map((item) => ({
id: item.id,
+ value: item.value,
label: item.label ?? item.value ?? item.id,
- })));
+ }));
+ setContainerTypeOptions(options);
+ if (initialData?.common?.containerTypes?.length) {
+ const list = initialData.common.containerTypes;
+ const mapped = list.map((item) => {
+ const byId = options.find((o) => Number(o.id) === Number(item) || String(o.id) === String(item));
+ if (byId) return String(byId.value);
+ const byVal = options.find((o) => String(o.value) === String(item) || o.value == item);
+ if (byVal) return String(byVal.value);
+ return item;
+ });
+ setCommon((prev) => ({ ...prev, containerTypes: mapped }));
+ }
}
})
.catch(() => {});
}, [open]);
-
+ useEffect(() => {
+ if (!open) return;
+ if (initialData?.pairs?.length) {
+ setPairs(initialData.pairs);
+ }
+ if (initialData?.common) {
+ setCommon({
+ type: initialData.common.type ?? 0,
+ useStatus: initialData.common.useStatus ?? '',
+ areaIds: Array.isArray(initialData.common.areaIds) ? [...initialData.common.areaIds] : [],
+ containerTypes: Array.isArray(initialData.common.containerTypes) ? [...initialData.common.containerTypes] : [],
+ inAble: initialData.common.inAble ?? 0,
+ outAble: initialData.common.outAble ?? 0,
+ });
+ }
+ }, [open, initialData]);
const handleClose = (event, reason) => {
if (reason !== "backdropClick") {
setOpen(false);
setPairs([defaultPair()]);
+ if (typeof onClose === 'function') onClose();
}
};
@@ -133,9 +162,9 @@
type: common.type,
useStatus: common.useStatus || undefined,
areaIds: common.areaIds,
- containerTypes: common.containerTypes,
- inAble: common.inAble,
- outAble: common.outAble,
+ containerTypes: (common.containerTypes || []).map((v) => Number(v)),
+ inAble: Number(common.inAble),
+ outAble: Number(common.outAble),
};
try {
const res = await request.post('/basStation/save', body);
@@ -299,12 +328,12 @@
onChange={(e) => setCommon((c) => ({ ...c, containerTypes: e.target.value }))}
renderValue={(selected) =>
(selected || [])
- .map((id) => containerTypeOptions.find((c) => c.id === id)?.label ?? id)
+ .map((val) => containerTypeOptions.find((c) => String(c.value) === String(val))?.label ?? val)
.join(', ')
}
>
{containerTypeOptions.map((opt) => (
- <MenuItem key={opt.id} value={opt.id}>
+ <MenuItem key={opt.value} value={opt.value}>
{opt.label}
</MenuItem>
))}
--
Gitblit v1.9.1