From ca7d8f0bb0c3d19a3537fc836303b988cd8d3f6c Mon Sep 17 00:00:00 2001
From: "Destiny.Lin" <Destiny.Lin@fanruan.com>
Date: Sun, 9 Oct 2022 11:21:36 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-81307=20A=E5=88=97=E5=88=97=E5=AE=BD?=
 =?UTF-8?q?=E6=A6=82=E7=8E=87=E6=98=BE=E7=A4=BA=E4=B8=BAB=E5=88=97?=
 =?UTF-8?q?=E5=88=97=E5=AE=BD=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../grid/AbstractGridHeaderMouseHandler.java  | 35 ++++++++++++-------
 1 file changed, 22 insertions(+), 13 deletions(-)

diff --git a/designer-realize/src/main/java/com/fr/grid/AbstractGridHeaderMouseHandler.java b/designer-realize/src/main/java/com/fr/grid/AbstractGridHeaderMouseHandler.java
index 97e95a34f4..193d056f02 100644
--- a/designer-realize/src/main/java/com/fr/grid/AbstractGridHeaderMouseHandler.java
+++ b/designer-realize/src/main/java/com/fr/grid/AbstractGridHeaderMouseHandler.java
@@ -38,6 +38,8 @@ import java.lang.reflect.Method;
 public abstract class AbstractGridHeaderMouseHandler extends MouseInputAdapter {
     protected static final int FUZZY_EDGE = 10;
     protected static final int SEPARATOR_GAP = 5;
+    //只选中一个
+    private static final int ONLY_SELECT_ONE = 1;
 
     protected GridHeader gHeader;
     private int dragType = GridUtils.DRAG_NONE;
@@ -109,7 +111,7 @@ public abstract class AbstractGridHeaderMouseHandler extends MouseInputAdapter {
             if (between(evt, tmpSize1, tmpSize2)) {
                 if (index >= dragIndex) {
                     try {
-                        if(method != null) {
+                        if (method != null) {
                             method.invoke(report, dragIndex, FU.valueOfPix(evtOffset(evt, oldEndValueSize), resolution));
                         }
                     } catch (Exception e) {
@@ -118,7 +120,7 @@ public abstract class AbstractGridHeaderMouseHandler extends MouseInputAdapter {
                     //sizeList.set(dragIndex, FU.valueOfPix(evtOffset(evt, oldEndValueSize), resolution));
                 } else {
                     try {
-                        if(method != null) {
+                        if (method != null) {
                             method.invoke(report, index, FU.valueOfPix(evtOffset(evt, (int) tmpSize1), resolution));
                         }
                     } catch (Exception e) {
@@ -128,7 +130,7 @@ public abstract class AbstractGridHeaderMouseHandler extends MouseInputAdapter {
                     // from all to do.
                     for (int h = (dragIndex - 1); h > index; h--) {
                         try {
-                            if(method != null) {
+                            if (method != null) {
                                 method.invoke(report, h, UNIT.ZERO);
                             }
                         } catch (Exception e) {
@@ -219,7 +221,7 @@ public abstract class AbstractGridHeaderMouseHandler extends MouseInputAdapter {
         ePane.getGrid().stopEditing();// james 停止当前的所有编辑
 
         // peter:选中格子位置.
-        ColumnRow selectedCellPoint = GridUtils.getAdjustEventColumnRow_withresolution(ePane, evt.getX(), evt.getY(),resolution);
+        ColumnRow selectedCellPoint = GridUtils.getAdjustEventColumnRow_withresolution(ePane, evt.getX(), evt.getY(), resolution);
 
         iterateScrollBar(ePane, evt, PRESS_ACTION);
 
@@ -227,7 +229,7 @@ public abstract class AbstractGridHeaderMouseHandler extends MouseInputAdapter {
         if (SwingUtilities.isRightMouseButton(evt)) {
             Selection cs = ePane.getSelection();
             resetSelectionByRightButton(selectedCellPoint, cs, ePane);
-
+            checkEndMultiSelectIndex(cs);
             UIPopupMenu popupMenu = createPopupMenu(ePane, evt, Math.max(dragIndex, Math.max(this.startMultiSelectIndex, this.endMultiSelectIndex)));
             if (popupMenu != null) {
                 GUICoreUtils.showPopupMenu(popupMenu, gHeader, evt.getX() + 1, evt.getY() + 1);
@@ -246,6 +248,16 @@ public abstract class AbstractGridHeaderMouseHandler extends MouseInputAdapter {
         ePane.repaint();
     }
 
+    /**
+     * 如果行列中有只选中一个的情况，更新下endIndex，防止列宽或行宽不匹配
+     * @param selection
+     */
+    private void checkEndMultiSelectIndex(Selection selection) {
+        if (selection.getSelectedColumns().length == ONLY_SELECT_ONE || selection.getSelectedRows().length == ONLY_SELECT_ONE) {
+            this.endMultiSelectIndex = this.startMultiSelectIndex;
+        }
+    }
+
     protected abstract void resetSelectionByRightButton(ColumnRow mouseSelectedColumnRow, Selection cs, ElementCasePane ePane);
 
 
@@ -305,14 +317,11 @@ public abstract class AbstractGridHeaderMouseHandler extends MouseInputAdapter {
         StringBuilder sb = new StringBuilder();
         sb.append(String.format("%.2f", new Double(len)))
                 .append('/').append(String.format("%.2f", new Double(tlen)))
-                .append(unit);
-        if(!DesignerUIModeConfig.getInstance().simulateWebUIMode()){
-            sb.append('(')
-                    .append((int)(unitValue.toPixD(resolution))).append('/')
-                    .append((int)(totalUnitValue.toPixD(resolution)))
-                    .append(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Px"))
-                    .append(')');
-        }
+                .append(unit).append('(')
+                .append((int) (unitValue.toPixD(resolution))).append('/')
+                .append((int) (totalUnitValue.toPixD(resolution)))
+                .append(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Px"))
+                .append(')');
         return sb.toString();
     }