From d7a4efe4c9c8813678e5ff7022d27bd816d098dd Mon Sep 17 00:00:00 2001
From: David Lai <davidlatwe@gmail.com>
Date: Wed, 21 Oct 2020 00:39:31 +0800
Subject: [PATCH 1/2] update vendered qjsonmodel.py and move local change

This fixed the list element sorting.
---
 allzpark/model.py             | 8 ++++++++
 allzpark/vendor/qjsonmodel.py | 9 ++-------
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/allzpark/model.py b/allzpark/model.py
index 55a2292..17349b2 100644
--- a/allzpark/model.py
+++ b/allzpark/model.py
@@ -541,6 +541,9 @@ def poll(self):
 
 
 class JsonModel(qjsonmodel.QJsonModel):
+
+    JsonRole = QtCore.Qt.UserRole + 1
+
     def setData(self, index, value, role):
         # Support copy/paste, but prevent edits
         return False
@@ -562,8 +565,13 @@ def data(self, index, role):
             if index.column() == 1:
                 return item.value
 
+        if role == self.JsonRole:
+            return self.json(item)
+
         return super(JsonModel, self).data(index, role)
 
+    reset = qjsonmodel.QJsonModel.clear
+
 
 class EnvironmentModel(JsonModel):
     def load(self, data):
diff --git a/allzpark/vendor/qjsonmodel.py b/allzpark/vendor/qjsonmodel.py
index 2c396a3..55d0025 100644
--- a/allzpark/vendor/qjsonmodel.py
+++ b/allzpark/vendor/qjsonmodel.py
@@ -113,7 +113,7 @@ def load(self, value, parent=None, sort=True):
         elif isinstance(value, list):
             for index, value in enumerate(value):
                 child = self.load(value, rootItem)
-                child.key = str(index)
+                child.key = index
                 child.type = type(value)
                 rootItem.appendChild(child)
 
@@ -125,15 +125,13 @@ def load(self, value, parent=None, sort=True):
 
 
 class QJsonModel(QtCore.QAbstractItemModel):
-    JsonRole = QtCore.Qt.UserRole + 1
-
     def __init__(self, parent=None):
         super(QJsonModel, self).__init__(parent)
 
         self._rootItem = QJsonTreeItem()
         self._headers = ("key", "value")
 
-    def reset(self):
+    def clear(self):
         self.load({})
 
     def load(self, document):
@@ -190,9 +188,6 @@ def data(self, index, role):
             if index.column() == 1:
                 return item.value
 
-        if role == QJsonModel.JsonRole:
-            return self.json(item)
-
     def setData(self, index, value, role):
         if role == QtCore.Qt.EditRole:
             if index.column() == 1:

From 2ca472a72129bfcd09d33f015eb24f987753dcfb Mon Sep 17 00:00:00 2001
From: David Lai <davidlatwe@gmail.com>
Date: Tue, 20 Oct 2020 23:43:22 +0800
Subject: [PATCH 2/2] serialize with json.dumps() instead of str()

---
 allzpark/dock.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/allzpark/dock.py b/allzpark/dock.py
index f71cf0a..7560d66 100644
--- a/allzpark/dock.py
+++ b/allzpark/dock.py
@@ -708,7 +708,11 @@ def on_copy_full():
             else:
                 data = model_.json()
 
-            text = str(data)
+            text = json.dumps(data,
+                              indent=4,
+                              sort_keys=True,
+                              ensure_ascii=False)
+
             app = QtWidgets.QApplication.instance()
             app.clipboard().setText(text)