Merge branch 'zhangchunlin:master' into master

TommyLemon · web-flow · commit f4a6efdd56ea · 2022-07-14T19:12:18.000+08:00
diff --git a/uliweb_apijson/apijson/templates/vue/inc_apijson_table.html b/uliweb_apijson/apijson/templates/vue/inc_apijson_table.html
@@ -196,7 +196,9 @@
                     if (data.code==200) {
                         var arr = data["[]"]
                         for (var i=0;i<arr.length;i++) {
-                            arr[i] = arr[i][thisp.table.model_name]
+                            var o = JSON.parse(JSON.stringify(arr[i][thisp.table.model_name]))
+                            o._fields = JSON.parse(JSON.stringify(arr[i]))
+                            arr[i] = o
                         }
 
                         if (!thisp.tcolumns_init) {
diff --git a/uliweb_apijson/apijson/templates/vue/inc_apijson_viewedit.html b/uliweb_apijson/apijson/templates/vue/inc_apijson_viewedit.html
@@ -5,7 +5,9 @@
         "table",
         "id",
         "hook_init",
-        "hook_ajax_params"
+        "hook_ajax_params",
+        "hook_ajax_post_result"
+
     ],
     template: `<div>
 <Spin size="large" fix v-if="loading"></Spin>
@@ -111,12 +113,19 @@
                             title: 'success update #'+thisp.row.id+' in table '+thisp.table.model_name,
                             desc: data.msg
                         })
+                        if(thisp.hook_ajax_post_result){
+                            thisp.hook_ajax_post_result(true, params, thisp.row_saved)
+                        }
                     }
                     else {
                         thisp.$Notice.error({
                             title: 'error when update #'+thisp.row.id+' in table '+thisp.table.model_name,
                             desc: data.msg
                         })
+                        if(thisp.hook_ajax_post_result){
+                            thisp.hook_ajax_post_result(false, params, thisp.row_saved)
+                        }
+
                     }
                 }
             })
