fix: should change table columns orders when drag items in section, i…

…ssue running-elephant#1899
Cuiyansong · Aug 22, 2022 · 5211ce6 · 5211ce6
1 parent 0be21a9
commit 5211ce6
Showing 1 changed file with 16 additions and 4 deletions.
diff --git a/...omponents/ChartOperationPanel/components/ChartDraggable/ChartDraggableTargetContainer.tsx b/...omponents/ChartOperationPanel/components/ChartDraggable/ChartDraggableTargetContainer.tsx
@@ -161,7 +161,7 @@ export const ChartDraggableTargetContainer: FC<ChartDataConfigSectionProps> =
         },
         canDrop: (item: ChartDataSectionField, monitor) => {
           let items = Array.isArray(item) ? item : [item];
-          const currentRowNames = currentConfig.rows?.map(col => col.colName);
+
           if (
             [CHART_DRAG_ELEMENT_TYPE.DATASET_COLUMN_GROUP].includes(
               monitor.getItemType() as any,
@@ -194,6 +194,16 @@ export const ChartDraggableTargetContainer: FC<ChartDataConfigSectionProps> =
             return false;
           }
 
+          const currentSectionDimensionRowNames = currentConfig.rows
+            ?.filter(
+              r =>
+                !items
+                  ?.map(i => i?.uid)
+                  ?.filter(Boolean)
+                  .includes(r?.uid),
+            )
+            ?.map(col => col.colName);
+
           if (
             items[0].category ===
             ChartDataViewFieldCategory.DateLevelComputedField
@@ -207,8 +217,10 @@ export const ChartDraggableTargetContainer: FC<ChartDataConfigSectionProps> =
             ) {
               return false;
             }
-            return currentRowNames
-              ? currentRowNames.every(v => !v?.includes(items[0].colName))
+            return currentSectionDimensionRowNames
+              ? currentSectionDimensionRowNames.every(
+                  v => !v?.includes(items[0].colName),
+                )
               : true;
           }
 
@@ -217,7 +229,7 @@ export const ChartDraggableTargetContainer: FC<ChartDataConfigSectionProps> =
           }
 
           const isNotExist = items.every(
-            i => !currentRowNames?.includes(i.colName),
+            i => !currentSectionDimensionRowNames?.includes(i.colName),
           );
           return isNotExist;
         },