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

zhangchunlin · zhangchunlin · commit 399aee7e99cf · 2019-01-28T11:44:46.000+08:00
diff --git 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
@@ -1,14 +1,16 @@
 <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>
     <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">
         <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
@@ -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()
 
