Keep query field order when using Batch Edit

specifyweb/backend/stored_queries/batch_edit.py

@@ -1095,7 +1095,24 @@ def _get_orig_column(string_id: str):
 
     # We would have arbitarily sorted the columns, so our columns will not be correct.
     # Rather than sifting the data, we just add a default visual order.
-    visual_order = Func.first(headers_enumerated)
+    visual_order: list[int | None] = [None for _ in key_and_headers]
+    new_columns: list[int] = []
+    for index, (key, _header) in headers_enumerated:
+        # Find the column's original position if it existed in the origin query
+        original_place = key[0]
+        if original_place < len(fields) and visual_order[original_place] is None:
+            visual_order[original_place] = index
+        else:
+            # New field/column. Add it to the end of the dataset.
+            new_columns.append(index)
+
+    # Fill in the gaps with the new columns
+    if new_columns:
+        for index, column in enumerate(visual_order):
+            if column is None:
+                visual_order[index] = new_columns.pop(0)
+                if len(new_columns) == 0:
+                    break
 
     headers = Func.second(key_and_headers)