Merge pull request #34 from zhangchunlin/master

Sync

Author: TommyLemon

demo/apps/apijson_demo/templates/index.html

@@ -6,6 +6,14 @@
 {{use "ui.vue"}}
 {{use "ui.iview"}}
 
+<style>
+    .notice
+    {
+        color:red;
+        font-size:150%;
+    }
+</style>
+
 <div id="app" class='box'>
 <div class="box-body">
     <tabs v-model:value="tab_current" type="card" :animated="false">
@@ -29,10 +37,10 @@
             <i-col span="8"><i-input value="/apijson/get" readonly/></i-col>
     </Row>
     <Row v-if="tab_current==='tab_get'">
-        <i-col span="3"><div align="center"><strong>apijson get</strong> request examples</div></i-col>
+        <i-col span="3"><div align="center"><strong>apijson get</strong> request <span class="notice">{request_get.length}</span> examples</div></i-col>
         <i-col span="8">
             <i-select v-model="select_current">
-                <i-option v-for="item in request_get" :value="item.value" :key="item.value">{ item.label }</i-option>
+                <i-option v-for="(item,index) in request_get" :value="item.value" :key="item.value">{index+1}. {item.label}</i-option>
             </i-select>
         </i-col>
     </Row>
@@ -42,10 +50,10 @@
         <i-col span="8"><i-input value="/apijson/head" readonly/></i-col>
     </Row>
     <Row v-if="tab_current==='tab_head'">
-        <i-col span="3"><div align="center"><strong>apijson head</strong> request examples</div></i-col>
+        <i-col span="3"><div align="center"><strong>apijson head</strong> request <span class="notice">{request_head.length}</span> examples</div></i-col>
         <i-col span="8">
             <i-select v-model="select_current">
-                <i-option v-for="item in request_head" :value="item.value" :key="item.value">{ item.label }</i-option>
+                <i-option v-for="(item,index) in request_head" :value="item.value" :key="item.value">{index+1}. {item.label}</i-option>
             </i-select>
         </i-col>
     </Row>
@@ -55,10 +63,10 @@
             <i-col span="8"><i-input value="/apijson/post" readonly/></i-col>
     </Row>
     <Row v-if="tab_current==='tab_post'">
-        <i-col span="3"><div align="center"><strong>apijson post</strong> request examples</div></i-col>
+        <i-col span="3"><div align="center"><strong>apijson post</strong> request <span class="notice">{request_post.length}</span> examples</div></i-col>
         <i-col span="8">
             <i-select v-model="select_current">
-                <i-option v-for="item in request_post" :value="item.value" :key="item.value">{ item.label }</i-option>
+                <i-option v-for="(item,index) in request_post" :value="item.value" :key="item.value">{index+1}. {item.label}</i-option>
             </i-select>
         </i-col>
     </Row>
@@ -68,10 +76,10 @@
         <i-col span="8"><i-input value="/apijson/put" readonly/></i-col>
     </Row>
     <Row v-if="tab_current==='tab_put'">
-        <i-col span="3"><div align="center"><strong>apijson put</strong> request examples</div></i-col>
+        <i-col span="3"><div align="center"><strong>apijson put</strong> request <span class="notice">{request_put.length}</span> examples</div></i-col>
         <i-col span="8">
             <i-select v-model="select_current">
-                <i-option v-for="item in request_put" :value="item.value" :key="item.value">{ item.label }</i-option>
+                <i-option v-for="(item,index) in request_put" :value="item.value" :key="item.value">{index+1}. {item.label}</i-option>
             </i-select>
         </i-col>
     </Row>
@@ -81,10 +89,10 @@
         <i-col span="8"><i-input value="/apijson/delete" readonly/></i-col>
     </Row>
     <Row v-if="tab_current==='tab_delete'">
-        <i-col span="3"><div align="center"><strong>apijson delete</strong> request examples</div></i-col>
+        <i-col span="3"><div align="center"><strong>apijson delete</strong> request <span class="notice">{request_delete.length}</span> examples</div></i-col>
         <i-col span="8">
             <i-select v-model="select_current">
-                <i-option v-for="item in request_delete" :value="item.value" :key="item.value">{ item.label }</i-option>
+                <i-option v-for="(item,index) in request_delete" :value="item.value" :key="item.value">{index+1}. {item.label}</i-option>
             </i-select>
         </i-col>
     </Row>

setup.py

@@ -13,7 +13,7 @@ def fpath(name):
 def read(fname, default=''):
     filename = fpath(fname)
     if os.path.exists(filename):
-        return open(fpath(fname)).read()
+        return open(fpath(fname),encoding="utf8").read()
     else:
         return default
 

uliweb_apijson/__init__.py

@@ -1,4 +1,4 @@
-__version__ = '0.1.3'
+__version__ = '0.2.0'
 __url__ = 'https://github.com/zhangchunlin/uliweb-apijson'
 __author__ = 'Chunlin Zhang'
 __email__ = '[email protected]'

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

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