From c1063b1c52568ced60ce895a7c4bb519ec654236 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 25 三月 2024 15:14:39 +0800
Subject: [PATCH] Merge branch 'Four-Way-Rack' of http://47.97.1.152:5880/r/zy-asrs-master into Four-Way-Rack
---
zy-asrs-flow/src/pages/map/header/search.jsx | 32 ++++++++++++++++++++++++++------
1 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/zy-asrs-flow/src/pages/map/header/search.jsx b/zy-asrs-flow/src/pages/map/header/search.jsx
index 7e58a14..6fe61e4 100644
--- a/zy-asrs-flow/src/pages/map/header/search.jsx
+++ b/zy-asrs-flow/src/pages/map/header/search.jsx
@@ -37,6 +37,17 @@
)
})
break;
+ case Utils.SENSOR_TYPE.POINT:
+ options.push({
+ value: value,
+ label:
+ (
+ <>
+ <span style={{ fontWeight: 'bold' }} >{intl.formatMessage({ id: 'map.sensor.type.point', defaultMessage: '瀹氫綅鐐�' })}</span>
+ </>
+ )
+ })
+ break;
default:
break;
}
@@ -76,16 +87,22 @@
const [filterSensorList, setFilterSensorList] = React.useState([]);
const [curSensorLabel, setCurSensorLabel] = React.useState(null);
- // first select
- React.useEffect(() => {
- if (!Utils.getMapContainer()) { return; }
+ const resetSearch = () => {
let sensorListAll = getAllSensorList(curSensorType);
setSensorList(sensorListAll);
setFilterSensorList(sensorListAll);
setCurSensorLabel(null);
- }, [curSensorType])
+ }
- // second select
+ // first select and switch floor
+ React.useEffect(() => {
+ if (!Utils.getMapContainer()) { return }
+ setTimeout(() => {
+ resetSearch();
+ }, 200)
+ }, [curSensorType, props.curFloor])
+
+ // second select condition
React.useEffect(() => {
if (!Utils.getMapContainer()) { return; }
if ((curSensorLabel !== null || curSensorLabel != undefined)
@@ -106,7 +123,10 @@
break;
case ModelEnum.MOVABLE_MODEL:
setModel(ModelEnum.SETTINGS_MODEL);
- setSpriteBySettings(selectSensor);
+ // avoid model modify which will clear spriteBySettings
+ setTimeout(() => {
+ setSpriteBySettings(selectSensor);
+ }, 200)
break;
case ModelEnum.SETTINGS_MODEL:
setSpriteBySettings(selectSensor);
--
Gitblit v1.9.1