From 9f4a1cf5f91f85c49d3e609f19c9e833a08ca8ee Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 22 三月 2024 08:29:48 +0800
Subject: [PATCH] #

---
 zy-asrs-flow/src/pages/map/utils.js |   20 +++++++++++---------
 1 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/zy-asrs-flow/src/pages/map/utils.js b/zy-asrs-flow/src/pages/map/utils.js
index ec2a53f..227f565 100644
--- a/zy-asrs-flow/src/pages/map/utils.js
+++ b/zy-asrs-flow/src/pages/map/utils.js
@@ -112,7 +112,7 @@
 }
 
 // sprite be beSettings from sprite click event
-export const beSettings = (sprite, setSpriteBySettings, setDidClickSprite) => {
+export const beSettings = (sprite, setSpriteBySettings) => {
     sprite.off('pointerup');
     sprite.off('pointermove');
     sprite.off('pointerdown');
@@ -122,18 +122,18 @@
 
     function onClick(event) {
         setSpriteBySettings(sprite);
-        // setDidClickSprite(true);
     }
 }
 
 // sprites be movable from select box
 // the scale was dynamic
-export const spriteListBeMovable = (selectedSprites, scale, resetFn) => {
+export const spriteListBeMovable = (selectedSprites, resetFn) => {
     if (selectedSprites && selectedSprites.length > 0) {
         let batchMove = false;
         let batchMoveStartPos = null;
 
         const batchMoving = (event) => {
+            const scale = mapContainer.scale.x;
             if (batchMove && batchMoveStartPos) {
                 // offset move val
                 var mouseMovement = {
@@ -141,8 +141,8 @@
                     y: (event.global.y - batchMoveStartPos.y) / scale
                 };
                 for (let sprite of selectedSprites) {
-                    sprite.position.x = sprite.data.batchMoveStartPos.x + mouseMovement.x;
-                    sprite.position.y = sprite.data.batchMoveStartPos.y + mouseMovement.y;
+                    sprite.position.x = sprite.batchMoveStartPos.x + mouseMovement.x;
+                    sprite.position.y = sprite.batchMoveStartPos.y + mouseMovement.y;
                 }
             }
         }
@@ -158,13 +158,15 @@
             mapContainer.parent.off('mousemove');
             mapContainer.parent.off('mouseup');
 
-            resetFn();
+            if (resetFn) {
+                resetFn();
+            }
         }
 
         const batchMoveStart = (event) => {
             batchMoveStartPos = { x: event.data.global.clone().x, y: event.data.global.clone().y };
             selectedSprites.forEach(child => {
-                child.data.batchMoveStartPos = { x: child.position.x, y: child.position.y };
+                child.batchMoveStartPos = { x: child.position.x, y: child.position.y };
             })
 
             batchMove = true;
@@ -397,10 +399,10 @@
     })
 
     const closeLoading = message.loading({ content: intl.formatMessage({ id: 'common.loading.api.message', defaultMessage: '绛夊緟鏈嶅姟鍣�......' }), duration: API_TIMEOUT });
-    await Http.doPostPromise('api/map/save', { 
+    await Http.doPostPromise('api/map/save', {
         itemList: mapItemList,
         floor: floor
-     }, (res) => {
+    }, (res) => {
         closeLoading();
     }).catch((error) => {
         closeLoading();

--
Gitblit v1.9.1