From 399aee7e99cf641288d43c4b5ba035103ff2a598 Mon Sep 17 00:00:00 2001
From: Chunlin Zhang <zhangchunlin@gmail.com>
Date: Mon, 28 Jan 2019 11:44:46 +0800
Subject: [PATCH 1/7] add  model_name config in APIJSON_TABLES; add
 func_change_get_params to apijson-table; add other 2 type in apijson-table
 add modal; add query parameter in _query_array

---
 uliweb_apijson/apijson/__init__.py                     | 10 ++++++++--
 .../apijson/templates/vue/inc_apijson_table.html       |  7 ++++++-
 uliweb_apijson/apijson/views.py                        |  4 ++++
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/uliweb_apijson/apijson/__init__.py b/uliweb_apijson/apijson/__init__.py
index 130a65a..19bff7e 100644
--- a/uliweb_apijson/apijson/__init__.py
+++ b/uliweb_apijson/apijson/__init__.py
@@ -2,13 +2,19 @@
 
 def get_apijson_tables(role="UNKNOWN"):
     from uliweb import settings
-    apijson_tables = dict(settings.APIJSON_TABLES.iteritems())
+
+    s = settings.APIJSON_TABLES
+    if s:
+        apijson_tables = dict(s.iteritems())
+    else:
+        return {}
     for n in apijson_tables:
         c = apijson_tables[n]
         editable = c["editable"]
+        model_name = c.get("model_name") or n
         if editable=="auto":
             editable = False
-            POST = settings.APIJSON_MODELS[n]["POST"]
+            POST = settings.APIJSON_MODELS[model_name]["POST"]
             if POST:
                 roles = POST["roles"]
                 if roles:
diff --git a/uliweb_apijson/apijson/templates/vue/inc_apijson_table.html b/uliweb_apijson/apijson/templates/vue/inc_apijson_table.html
index c79a8f5..6f74052 100644
--- a/uliweb_apijson/apijson/templates/vue/inc_apijson_table.html
+++ b/uliweb_apijson/apijson/templates/vue/inc_apijson_table.html
@@ -1,7 +1,7 @@
 <script>
 Vue.component('apijson-table', {
     delimiters: ['{', '}'],
-    props: ["table_name","config"],
+    props: ["table_name","config","func_change_get_params"],
     template: `<div>
     <div v-if="config_editable && config_add_fields!=null"><i-button type="primary" @click="add">Add</i-button> <br><br> </div>
     <i-table stripe border :columns="tcolumns" :data="tlist" @on-sort-change="table_on_sort_change"></i-table>
@@ -9,6 +9,8 @@
     <modal v-model="modal_add" title="Add" @on-ok="real_add">
         <i-form @submit.native.prevent :label-width="80">
             <form-item v-for="item in add_items" :key="item.key" :label="item.title">
+                <i-input v-if="item.type=='input'" v-model="item.value"></i-input>
+                <checkbox v-if="item.type=='checkbox'" v-model="item.value"></checkbox>
                 <i-input v-if="item.type=='textarea'" v-model="item.value" type="textarea" :autosize="{minRows: 2,maxRows: 5}"></i-input>
             </form-item>
         </i-form>
@@ -117,6 +119,9 @@
                 "[]":arr_params,
                 "total@":"/[]/total"
             }
+            if (thisp.func_change_get_params!=null) {
+                params = thisp.func_change_get_params(params)
+            }
             $.ajax({
                 type: "POST",
                 url: "{{=url_for('uliweb_apijson.apijson.views.ApiJson.get')}}",
diff --git a/uliweb_apijson/apijson/views.py b/uliweb_apijson/apijson/views.py
index 29d2ccc..5dab81e 100644
--- a/uliweb_apijson/apijson/views.py
+++ b/uliweb_apijson/apijson/views.py
@@ -195,6 +195,10 @@ def _get_array(self,key):
             if not owner_filtered:
                 return  json({"code":400,"msg":"'%s' cannot filter with owner"%(modelname)})
 
+        for n in model_param:
+            if n[0]!="@" and hasattr(model,n):
+                q = q.filter(getattr(model.c,n)==model_param[n])
+
         if query_type in [1,2]:
             self.vars["/%s/total"%(key)] = q.count()
 

From 4807dfd7d4e23e0933a0119ef68729e60d724a97 Mon Sep 17 00:00:00 2001
From: Chunlin Zhang <zhangchunlin@gmail.com>
Date: Mon, 28 Jan 2019 11:56:02 +0800
Subject: [PATCH 2/7] fix AttributeError

---
 uliweb_apijson/apijson/views.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/uliweb_apijson/apijson/views.py b/uliweb_apijson/apijson/views.py
index 5dab81e..0e303a9 100644
--- a/uliweb_apijson/apijson/views.py
+++ b/uliweb_apijson/apijson/views.py
@@ -439,7 +439,8 @@ def _put_one(self,key,tag):
             log.error("try to find model '%s' but not found: '%s'"%(modelname,e))
             return json({"code":400,"msg":"model '%s' not found"%(modelname)})
         
-        request_tag = settings.APIJSON_REQUESTS.get(tag,{})
+        APIJSON_REQUESTS = settings.APIJSON_REQUESTS or {}
+        request_tag = APIJSON_REQUESTS.get(tag,{})
         request_tag_tag = request_tag.get(tag,{})
         if not request_tag_tag:
             return json({"code":400,"msg":"tag '%s' not found"%(tag)})

From f30a2bf69df27745703dff76bdf2daec16e599b0 Mon Sep 17 00:00:00 2001
From: Chunlin Zhang <zhangchunlin@gmail.com>
Date: Mon, 28 Jan 2019 15:48:02 +0800
Subject: [PATCH 3/7] _model_name -< @model_name in settings

---
 uliweb_apijson/apijson/__init__.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/uliweb_apijson/apijson/__init__.py b/uliweb_apijson/apijson/__init__.py
index 19bff7e..8cdfa5f 100644
--- a/uliweb_apijson/apijson/__init__.py
+++ b/uliweb_apijson/apijson/__init__.py
@@ -11,10 +11,10 @@ def get_apijson_tables(role="UNKNOWN"):
     for n in apijson_tables:
         c = apijson_tables[n]
         editable = c["editable"]
-        model_name = c.get("model_name") or n
+        _model_name = c.get("@model_name") or n
         if editable=="auto":
             editable = False
-            POST = settings.APIJSON_MODELS[model_name]["POST"]
+            POST = settings.APIJSON_MODELS[_model_name]["POST"]
             if POST:
                 roles = POST["roles"]
                 if roles:

From 46d4ac8b628a8ba782150ebd5f6b73e30aab3f13 Mon Sep 17 00:00:00 2001
From: Chunlin Zhang <zhangchunlin@gmail.com>
Date: Mon, 28 Jan 2019 15:48:31 +0800
Subject: [PATCH 4/7] func_change_get_params -> func_change_params; move action
 from OK button to Add button

---
 .../templates/vue/inc_apijson_table.html      | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/uliweb_apijson/apijson/templates/vue/inc_apijson_table.html b/uliweb_apijson/apijson/templates/vue/inc_apijson_table.html
index 6f74052..e8f6c78 100644
--- a/uliweb_apijson/apijson/templates/vue/inc_apijson_table.html
+++ b/uliweb_apijson/apijson/templates/vue/inc_apijson_table.html
@@ -1,18 +1,21 @@
 <script>
 Vue.component('apijson-table', {
     delimiters: ['{', '}'],
-    props: ["table_name","config","func_change_get_params"],
+    props: ["table_name","config","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>
     <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" @on-ok="real_add">
+    <modal v-model="modal_add" title="Add">
         <i-form @submit.native.prevent :label-width="80">
             <form-item v-for="item in add_items" :key="item.key" :label="item.title">
                 <i-input v-if="item.type=='input'" v-model="item.value"></i-input>
                 <checkbox v-if="item.type=='checkbox'" v-model="item.value"></checkbox>
                 <i-input v-if="item.type=='textarea'" v-model="item.value" type="textarea" :autosize="{minRows: 2,maxRows: 5}"></i-input>
             </form-item>
+            <form-item v-if="config_editable" label="action">
+                <i-button type="info" icon="plus" @click="real_add">Add</i-button>
+            </form-item>
         </i-form>
     </modal>
     <modal v-model="modal_view" :title="viewedit_label">
@@ -119,8 +122,8 @@
                 "[]":arr_params,
                 "total@":"/[]/total"
             }
-            if (thisp.func_change_get_params!=null) {
-                params = thisp.func_change_get_params(params)
+            if (thisp.func_change_params!=null) {
+                params = thisp.func_change_params("apijson_get",params)
             }
             $.ajax({
                 type: "POST",
@@ -219,6 +222,9 @@
                 }
             }
             params[thisp.table_name] = record_params
+            if (thisp.func_change_params!=null) {
+                params = thisp.func_change_params("apijson_put",params)
+            }
             $.ajax({
                 type: "POST",
                 url: "{{=url_for('uliweb_apijson.apijson.views.ApiJson.put')}}",
@@ -230,6 +236,7 @@
                             title: 'success update #'+row.id+' in table '+thisp.table_name,
                             desc: data.msg
                         })
+                        thisp.modal_view = false
                         thisp.update_list()
                     }
                     else {
@@ -296,7 +303,9 @@
                 post_params[d.key] = d.value
             }
             params[this.table_name] = post_params
-            
+            if (thisp.func_change_params!=null) {
+                params = thisp.func_change_params("apijson_post",params)
+            }
             $.ajax({
                 type: "POST",
                 url: "{{=url_for('uliweb_apijson.apijson.views.ApiJson.post')}}",
@@ -316,6 +325,7 @@
                         desc: result.msg
                     })
                     thisp.update_list()
+                    thisp.modal_add = false
                 }
             })
         },

From 1d994d08fcb03c6b59073823679485894a870eb7 Mon Sep 17 00:00:00 2001
From: Chunlin Zhang <zhangchunlin@gmail.com>
Date: Mon, 28 Jan 2019 15:49:45 +0800
Subject: [PATCH 5/7] @model_name in  APIJSON_REQUESTS settings support for
 post/put/delete

---
 uliweb_apijson/apijson/views.py | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/uliweb_apijson/apijson/views.py b/uliweb_apijson/apijson/views.py
index 0e303a9..34294e2 100644
--- a/uliweb_apijson/apijson/views.py
+++ b/uliweb_apijson/apijson/views.py
@@ -338,10 +338,11 @@ def _post_one(self,key,tag):
             return json({"code":400,"msg":"model '%s' not found"%(modelname)})
 
         request_tag = settings.APIJSON_REQUESTS.get(tag,{})
-        request_tag_tag = request_tag.get(tag,{})
-        if not request_tag_tag:
+        _model_name = request_tag.get("@model_name") or tag
+        request_tag_config = request_tag.get(_model_name,{})
+        if not request_tag_config:
             return json({"code":400,"msg":"tag '%s' not found"%(tag)})
-        tag_POST =  request_tag_tag.get("POST",{})
+        tag_POST =  request_tag_config.get("POST",{})
         ADD = tag_POST.get("ADD")
         if ADD:
             ADD_role = ADD.get("@role")
@@ -441,10 +442,11 @@ def _put_one(self,key,tag):
         
         APIJSON_REQUESTS = settings.APIJSON_REQUESTS or {}
         request_tag = APIJSON_REQUESTS.get(tag,{})
-        request_tag_tag = request_tag.get(tag,{})
-        if not request_tag_tag:
+        _model_name = request_tag.get("@model_name") or tag
+        request_tag_config = request_tag.get(_model_name,{})
+        if not request_tag_config:
             return json({"code":400,"msg":"tag '%s' not found"%(tag)})
-        tag_PUT = request_tag_tag.get("PUT",{})
+        tag_PUT = request_tag_config.get("PUT",{})
         ADD = tag_PUT.get("ADD")
         if ADD:
             ADD_role = ADD.get("@role")
@@ -542,10 +544,11 @@ def _delete_one(self,key,tag):
             return json({"code":400,"msg":"model '%s' not found"%(modelname)})
         
         request_tag = settings.APIJSON_REQUESTS.get(tag,{})
-        request_tag_tag = request_tag.get(tag,{})
-        if not request_tag_tag:
+        _model_name = request_tag.get("@model_name") or tag
+        request_tag_config = request_tag.get(_model_name,{})
+        if not request_tag_config:
             return json({"code":400,"msg":"tag '%s' not found"%(tag)})
-        tag_DELETE =  request_tag_tag.get("DELETE",{})
+        tag_DELETE =  request_tag_config.get("DELETE",{})
         ADD = tag_DELETE.get("ADD")
         if ADD:
             ADD_role = ADD.get("@role")

From 9a508fc7eb6969ad8451751fd53979b6caac036f Mon Sep 17 00:00:00 2001
From: Chunlin Zhang <zhangchunlin@gmail.com>
Date: Mon, 28 Jan 2019 15:57:36 +0800
Subject: [PATCH 6/7] invoke func_change_params when deleting

---
 uliweb_apijson/apijson/templates/vue/inc_apijson_table.html | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/uliweb_apijson/apijson/templates/vue/inc_apijson_table.html b/uliweb_apijson/apijson/templates/vue/inc_apijson_table.html
index e8f6c78..48d8f1e 100644
--- a/uliweb_apijson/apijson/templates/vue/inc_apijson_table.html
+++ b/uliweb_apijson/apijson/templates/vue/inc_apijson_table.html
@@ -256,6 +256,9 @@
             params[thisp.table_name] = {
                 "id": thisp.delete_params.row.id
             }
+            if (thisp.func_change_params!=null) {
+                params = thisp.func_change_params("apijson_delete",params)
+            }
             $.ajax({
                 type: "POST",
                 url: "{{=url_for('uliweb_apijson.apijson.views.ApiJson.delete')}}",

From add1e5b746f55791ddd091dcf8bfad6bd563f616 Mon Sep 17 00:00:00 2001
From: Chunlin Zhang <zhangchunlin@gmail.com>
Date: Mon, 28 Jan 2019 16:36:12 +0800
Subject: [PATCH 7/7] add func_init prop

---
 uliweb_apijson/apijson/templates/vue/inc_apijson_table.html | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/uliweb_apijson/apijson/templates/vue/inc_apijson_table.html b/uliweb_apijson/apijson/templates/vue/inc_apijson_table.html
index 48d8f1e..19818cc 100644
--- a/uliweb_apijson/apijson/templates/vue/inc_apijson_table.html
+++ b/uliweb_apijson/apijson/templates/vue/inc_apijson_table.html
@@ -1,7 +1,7 @@
 <script>
 Vue.component('apijson-table', {
     delimiters: ['{', '}'],
-    props: ["table_name","config","func_change_params"],
+    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>
     <i-table stripe border :columns="tcolumns" :data="tlist" @on-sort-change="table_on_sort_change"></i-table>
@@ -354,6 +354,9 @@
                 this.add_items = this.config_add_fields
             }
         }
+        if (this.func_init!=null) {
+            this.func_init(this)
+        }
         this.update_list()
     }
 })