add Spin when loading; fix wrong current_page when page size change

zhangchunlin · zhangchunlin · commit 2ab113854936 · 2019-01-30T18:11:20.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
@@ -4,6 +4,7 @@
     props: ["table_name","config","func_init","func_change_params"],
     template: `<div>
     <div v-if="config_editable && config_add_fields!=null"><i-button type="primary" @click="add">Add</i-button> <br><br> </div>
+    <Spin size="large" fix v-if="loading"></Spin>
     <i-table stripe border :columns="tcolumns" :data="tlist" @on-sort-change="table_on_sort_change"></i-table>
     <page :total="total" :page-size="query_count" :current.sync="current_page" :page-size-opts="[10, 20, 50, 100]" show-sizer @on-change="page_on_change" @on-page-size-change="page_on_page_size_change"></page>
     <modal v-model="modal_add" title="Add">
@@ -37,6 +38,7 @@
     data: function(){
         var thisp = this
         return {
+            loading: false,
             modal_view: false,
             viewedit_items: [],
 
@@ -125,12 +127,14 @@
             if (thisp.func_change_params!=null) {
                 params = thisp.func_change_params("apijson_get",params)
             }
+            thisp.loading = true
             $.ajax({
                 type: "POST",
                 url: "{{=url_for('uliweb_apijson.apijson.views.ApiJson.get')}}",
                 contentType: 'application/json',
                 data: JSON.stringify(params),
                 success: function (data) {
+                    thisp.loading = false
                     if (data.code==200) {
                         var arr = data["[]"]
                         if (!thisp.tcolumns_init) {
@@ -340,7 +344,7 @@
         },
         page_on_page_size_change: function(data) {
             this.query_count = data
-            this.current_page = 0
+            this.current_page = 1
             this.update_list()
         }
     },
