From f26ca2c67d4f9e7116949e4be939718250384f93 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期二, 16 十二月 2025 10:11:33 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/map/areaSettings/AreaBasicTab.jsx | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/zy-acs-flow/src/map/areaSettings/AreaBasicTab.jsx b/zy-acs-flow/src/map/areaSettings/AreaBasicTab.jsx
index be99b31..e61d24c 100644
--- a/zy-acs-flow/src/map/areaSettings/AreaBasicTab.jsx
+++ b/zy-acs-flow/src/map/areaSettings/AreaBasicTab.jsx
@@ -30,20 +30,22 @@
const icon = <CheckBoxOutlineBlankIcon fontSize="small" />;
const checkedIcon = <CheckBoxIcon fontSize="small" />;
- const getOptionLabel = (option) => {
- return option?.uuid ?? '';
- };
-
- const checkoutAgvNo = (agvId) => {
- if (agvId == null) {
+ const normalizeAgvId = (agv) => {
+ if (agv == null) {
return '';
}
- const match = (agvOptions || []).find((item) => item.id === agvId);
- return match?.uuid ?? '';
+ if (typeof agv === 'object') {
+ return String(agv.id ?? '');
+ }
+ return String(agv);
};
const getOptionId = (option) => {
- return option?.id;
+ return normalizeAgvId(option)
+ };
+
+ const getOptionLabel = (option) => {
+ return option?.uuid ?? '';
};
const handleSaveClick = () => {
@@ -90,7 +92,7 @@
value={agvList || []}
getOptionLabel={getOptionLabel}
isOptionEqualToValue={(option, value) => {
- return getOptionId(option) === value;
+ return getOptionId(option) === getOptionId(value);
}}
onChange={(event, newValue) => {
setAgvList(newValue);
@@ -99,8 +101,8 @@
value.map((option, index) => (
<Chip
{...getTagProps({ index })}
- key={index}
- label={checkoutAgvNo(option)}
+ key={getOptionId(option) || index}
+ label={normalizeAgvId(option)}
size="small"
sx={{ mr: 0.5, fontWeight: 'bold' }}
/>
--
Gitblit v1.9.1