Custom Database Custom Query modal looses changes from CMD+S

OS: Mac
Wappler Version: all (tested on v7 beta 17 and stable)

Issue
Pressing CMD+S while the Database Custom Query modal is open saves the underlying server action, but any changes are lost in the Database Custom Query modal.

To replicate

  1. Add a Database Custom Query to an already saved server action.
  2. Edit and type any query, save the modal. Save the server action.
  3. Edit the custom query and add to the query, press CMD+S.
  4. Click Save on the modal.
  5. Re-open the custom database query - the changes are lost.

Expected Behaviour
When any edit modal is open, CMD+S should not do anything. The current behaviour and losing changes is confusing.

Bumping this again... tested and not fixed in v7 Beta 18, 19 or 20 or 21.