fix json response structure to be same as original apijson api (java); because api changed, version restart with 0.2.0

zhangchunlin · zhangchunlin · commit d8e44abf62f2 · 2019-09-05T08:21:49.000+08:00
diff --git a/uliweb_apijson/__init__.py b/uliweb_apijson/__init__.py
@@ -1,4 +1,4 @@
-__version__ = '0.1.4'
+__version__ = '0.2.0'
 __url__ = 'https://github.com/zhangchunlin/uliweb-apijson'
 __author__ = 'Chunlin Zhang'
 __email__ = 'zhangchunlin@gmail.com'
diff --git a/uliweb_apijson/apijson/templates/vue/inc_apijson_table.html b/uliweb_apijson/apijson/templates/vue/inc_apijson_table.html
@@ -175,7 +175,7 @@
                 "@page":thisp.current_page-1,
                 "@query":2
             }
-            arr_params[this.model_name] = {
+            arr_params[thisp.model_name] = {
                 "@order":thisp.sort_key+thisp.sort_order,
                 "@role":"{{=role}}"
             }
@@ -194,6 +194,10 @@
                     thisp.loading = false
                     if (data.code==200) {
                         var arr = data["[]"]
+                        for (var i=0;i<arr.length;i++) {
+                            arr[i] = arr[i][thisp.model_name]
+                        }
+
                         if (!thisp.tcolumns_init) {
                             if (thisp.config_table_fields!=null){
                                 thisp.tcolumns = thisp.config_table_fields
@@ -210,6 +214,7 @@
                                             var col = {title:k,key:k}
                                             if (typeof item[k] ==="boolean") {
                                                 col["width"] = 80
+                                                col["component"] = "checkbox"
                                             }
                                             else if (typeof item[k] ==="number") {
                                                 col["width"] = 100
diff --git a/uliweb_apijson/apijson/views.py b/uliweb_apijson/apijson/views.py
@@ -237,6 +237,7 @@ def _get_array(self,key):
                     q = q.order_by(getattr(column,sort_order)())
 
             def _get_info(i):
+                resultd = {}
                 d = i.to_dict()
                 if secret_fields:
                     for k in secret_fields:
@@ -246,7 +247,8 @@ def _get_info(i):
                     for k in keys:
                         if k not in model_column_set:
                             del d[k]
-                return d
+                resultd[model_name] = d
+                return resultd
             l = [_get_info(i) for i in q]
             self.rdict[key] = l
 
