#

Junjie

2024-03-29 b7eca0757905d152b031a053116fb8c077314517

 zy-asrs-flow/src/pages/map/index.jsx

@@ -85,9 +85,11 @@
    const [dataFetched, setDataFetched] = React.useState(false);
    const [curSprite, setCurSPrite] = React.useState(null);
    const prevCurSpriteRef = React.useRef();
    const hasFloor = true;
    // const [hasFloor, setHasFloor] = React.useState(true);
    const [curFloor, setCurFloor] = React.useState(1);
    const [floorList, setFloorList] = React.useState([]);
    const [curFloor, setCurFloor] = React.useState(() => {
        const storedValue = localStorage.getItem('curFloor');
        return storedValue !== null ? JSON.parse(storedValue) : null;
    });
    const [batchSprites, setBatchSprites] = React.useState([]);
    const [batchDrawerVisible, setBatchDrawerVisible] = React.useState(false);

@@ -109,7 +111,11 @@
            };
            window.addEventListener('resize', handleResize);

            await Utils.fetchMapData(curFloor);
            const mapFloorData = await Utils.fetchMapFloor();
            setFloorList(mapFloorData);
            let defaultFloor = curFloor || mapFloorData?.[0]?.value;
            setCurFloor(defaultFloor);
            await Utils.fetchMapData(defaultFloor);
            setDataFetched(true);
            setModel(MapModel.OBSERVER_MODEL)
            setTimeout(() => {
@@ -141,6 +147,8 @@
        setDrawerVisible(false);
        setSpriteBySettings(null);
        setSettingsVisible(false);
        setBatchSprites([]);
        setBatchDrawerVisible(false);

        switch (model) {
            case MapModel.OBSERVER_MODEL:
@@ -244,6 +252,7 @@
            return;
        }
        switchFloor(curFloor);
        localStorage.setItem('curFloor', JSON.stringify(curFloor));
    }, [curFloor]);

    // watch spriteBySettings
@@ -264,10 +273,15 @@
    }, [spriteBySettings])
    const prevSpriteBySettings = prevSpriteBySettingsRef.current;

    // watch batchSprites
    React.useEffect(() => {
        if (!mapContainer) {
            return;
        }
        if (batchSprites?.length > 0) {
            setBatchDrawerVisible(true)
        } else {
            player.clearSelectedSprites();
            setBatchDrawerVisible(false)
        }
    }, [batchSprites])
@@ -284,6 +298,7 @@
                                    model={model}
                                    setModel={setModel}
                                    ModelEnum={MapModel}
                                    curFloor={curFloor}
                                    curSprite={curSprite}
                                    setCurSPrite={setCurSPrite}
                                    setSpriteBySettings={setSpriteBySettings}
@@ -356,8 +371,9 @@
                <Content ref={contentRef} className={styles.content}>
                    <div ref={mapRef} />

                    {hasFloor && (
                    {floorList.length > 0 && (
                        <MapFloor
                            floorList={floorList}
                            curFloor={curFloor}
                            setCurFloor={setCurFloor}
                        />
@@ -416,6 +432,7 @@
            <MapDrawer
                open={drawerVisible}
                curSprite={curSprite}
                curFloor={curFloor}
                refCurr={mapRef.current}
                onCancel={() => {
                    setCurSPrite(null);
@@ -427,8 +444,10 @@
                open={batchDrawerVisible}
                batchSprites={batchSprites}
                refCurr={mapRef.current}
                model={model}
                ModelEnum={MapModel}
                onCancel={() => {
                    setBatchSprites(null);
                    setBatchSprites([]);
                    setBatchDrawerVisible(false);
                }}
            />