From 1bc33546a044cbc84dd9595c19dbcd9a4e309fc9 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期六, 10 一月 2026 14:06:10 +0800
Subject: [PATCH] #
---
zy-acs-flow/src/map/areaSettings/AreaBasicTab.jsx | 48 +++++++++++++++++++++++++++---------------------
1 files changed, 27 insertions(+), 21 deletions(-)
diff --git a/zy-acs-flow/src/map/areaSettings/AreaBasicTab.jsx b/zy-acs-flow/src/map/areaSettings/AreaBasicTab.jsx
index bfb4546..c024488 100644
--- a/zy-acs-flow/src/map/areaSettings/AreaBasicTab.jsx
+++ b/zy-acs-flow/src/map/areaSettings/AreaBasicTab.jsx
@@ -1,4 +1,4 @@
-import React, { useMemo } from 'react';
+import React from 'react';
import {
Stack,
TextField,
@@ -30,23 +30,29 @@
const icon = <CheckBoxOutlineBlankIcon fontSize="small" />;
const checkedIcon = <CheckBoxIcon fontSize="small" />;
- const getOptionLabel = (option) => {
- return option?.uuid ?? '';
+ const normalizeAgvId = (agv) => {
+ if (agv == null) {
+ return '';
+ }
+ if (typeof agv === 'object') {
+ return String(agv.uuid ?? '');
+ }
+ return String(agv);
};
- const checkoutAgvNo = (agvId) => {
- return "1"
- }
-
const getOptionId = (option) => {
- return option?.id;
+ return normalizeAgvId(option)
+ };
+
+ const getOptionLabel = (option) => {
+ return option?.uuid ?? '';
};
const handleSaveClick = () => {
if (disableSave) {
return;
}
- const confirmMsg = translate('page.map.area.saveConfirm', { _: '纭淇濆瓨褰撳墠淇敼锛�' });
+ const confirmMsg = translate('page.map.area.confirm.save');
if (window.confirm(confirmMsg)) {
onSave?.();
}
@@ -56,17 +62,17 @@
if (!canDelete) {
return;
}
- const confirmMsg = translate('page.map.area.deleteConfirm', { _: '鍒犻櫎鍚庡皢鏃犳硶鎭㈠锛岀‘璁ゅ垹闄わ紵' });
+ const confirmMsg = translate('page.map.area.confirm.delete');
if (window.confirm(confirmMsg)) {
onDelete?.();
}
};
return (
- <Stack spacing={3}>
+ <Stack spacing={3} sx={{ mt: 1 }}>
<Stack direction="row" spacing={1} alignItems="center">
<TextField
- label={translate('page.map.area.name', { _: '鍚嶇О' })}
+ label={translate('page.map.area.form.name')}
size="small"
fullWidth
variant="outlined"
@@ -77,7 +83,7 @@
<Box >
<Typography variant="subtitle2" gutterBottom>
- {translate('page.map.area.agv', { _: '閫夋嫨AGV灏忚溅' })}
+ {translate('page.map.area.form.agv')}
</Typography>
<Autocomplete
multiple
@@ -86,7 +92,7 @@
value={agvList || []}
getOptionLabel={getOptionLabel}
isOptionEqualToValue={(option, value) => {
- return getOptionId(option) === value;
+ return getOptionId(option) === getOptionId(value);
}}
onChange={(event, newValue) => {
setAgvList(newValue);
@@ -95,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' }}
/>
@@ -137,7 +143,7 @@
{...params}
size="small"
variant="outlined"
- placeholder={translate('page.map.area.agv.placeholder', { _: '' })}
+ placeholder={translate('page.map.area.form.agvPlaceholder')}
/>
)}
/>
@@ -145,7 +151,7 @@
<Box>
<Typography variant="subtitle2" gutterBottom>
- {translate('page.map.area.barcodes', { _: '鍖哄煙鍐呮潯鐮侀泦鍚�' }) + " (" + codeList.length + ")"}
+ {translate('page.map.area.form.codes', { count: codeList.length })}
</Typography>
<Paper
variant="outlined"
@@ -170,7 +176,7 @@
))
) : (
<Typography variant="body2" color="text.secondary">
- {translate('page.map.area.barcodes.empty', { _: '鏆傛棤鏉＄爜' })}
+ {translate('page.map.area.form.codesEmpty')}
</Typography>
)}
</Paper>
@@ -178,10 +184,10 @@
<Box display="flex" justifyContent="space-between" alignItems="center">
<Button variant="contained" onClick={handleSaveClick} disabled={disableSave}>
- {translate('common.action.save', { _: '淇濆瓨' })}
+ {translate('ra.action.save')}
</Button>
<Button variant="text" color="error" onClick={handleDeleteClick} disabled={!canDelete}>
- {translate('common.action.delete', { _: '鍒犻櫎' })}
+ {translate('ra.action.delete')}
</Button>
</Box>
</Stack>
--
Gitblit v1.9.1