apijsontable: remove table_name; add sort_key/sort_order in tableui;

Author: zhangchunlin

uliweb_apijson/apijson/__init__.py

@@ -9,12 +9,11 @@
 
 
 class ApijsonTable(object):
-    def __init__(self, model_name, request_tag=None, role=None, tableui_name=None, table_name=None):
+    def __init__(self, model_name, request_tag=None, role=None, tableui_name=None):
         self.model_name = model_name
         self.request_tag = request_tag or self.model_name
         self.role = role
         self.tableui_name = tableui_name or self.model_name
-        self.table_name = table_name
         self._get_tableui()
         self._apply_auto()
 
@@ -39,34 +38,19 @@ def to_dict(self):
                     request_tag=self.request_tag,
                     role=self.role,
                     tableui_name=self.tableui_name,
-                    table_name=self.table_name,
                     tableui=self.tableui)
 
 
 def get_apijson_tables():
     def iter_table():
-        s = settings.APIJSON_TABLES
-        apijson_tables = dict(s.iteritems()) if s else {}
-        if apijson_tables:
-            for k in apijson_tables:
-                v = apijson_tables[k]
-                model_name = v.get("model_name") or k
-                tableui_name = v.get("tableui_name") or model_name
-                if not model_name:
-                    model_name = tableui_name
-                if model_name and tableui_name:
-                    request_tag = v.get("request_tag")
-                    role = v.get("role")
-                    yield(ApijsonTable(model_name=model_name, request_tag=request_tag, role=role, tableui_name=tableui_name, table_name=k))
-        else:
-            apison_table_ui = dict(
-                settings.APIJSON_TABLE_UI.iteritems())
-            for tableui_name in apison_table_ui:
-                tableui = apison_table_ui[tableui_name]
-                model_name = tableui.get("@model_name") or tableui_name
-                request_tag = model_name
-                role = None
-                yield(ApijsonTable(model_name=model_name, request_tag=request_tag, role=role, tableui_name=tableui_name))
+        apison_table_ui = dict(
+            settings.APIJSON_TABLE_UI.iteritems())
+        for tableui_name in apison_table_ui:
+            tableui = apison_table_ui[tableui_name]
+            model_name = tableui.get("@model_name") or tableui_name
+            request_tag = model_name
+            role = None
+            yield(ApijsonTable(model_name=model_name, request_tag=request_tag, role=role, tableui_name=tableui_name))
     return list(iter_table())
 
 

uliweb_apijson/apijson/templates/vue/inc_apijson_table.html

@@ -504,6 +504,12 @@
             }
             this.config_delete_set_deleted = this.table.tableui.delete_set_deleted || false
             this.config_deleted_field_name = this.table.tableui.deleted_field_name || "deleted"
+            if (this.table.tableui.sort_key!=null) {
+                this.sort_key = this.table.tableui.sort_key
+            }
+            if (this.table.tableui.sort_order!=null) {
+                this.sort_order = this.table.tableui.sort_order
+            }
         }
         //if not do this, the first notice will hide behind the navigation bar in uliweb apps
         this.$Notice.config({top: 100,duration: 8});

uliweb_apijson/apijson/templates/vue/inc_apijson_viewedit.html

@@ -67,7 +67,7 @@
                     }
                     else {
                         thisp.$Notice.error({
-                            title: 'error when get table '+thisp.table_name,
+                            title: 'error when get table '+thisp.tableui_name,
                             desc: data.msg
                         })
                     }

uliweb_apijson/tables/templates/Tables/inc/table_config.html

@@ -3,7 +3,6 @@
         delimiters: ['{', '}'],
         props: [
             "table",
-            "tableui",
             "model",
             "request"
         ],
@@ -12,15 +11,14 @@
     <row>
         <i-col span="4">
             <i-menu :active-name="current_menu_item" @on-select="on_select">
-                <menu-item name="table_config" @on-select="current_menu_item='table_config'">table config</menu-item>
+                <menu-item name="table_param" @on-select="current_menu_item='table_param'">table param</menu-item>
                 <menu-item name="tableui_config" @on-select="current_menu_item='tableui_config'">table ui config</menu-item>
                 <menu-item name="model_config" @on-select="current_menu_item='model_config'">model config</menu-item>
                 <menu-item name="request_config" @on-select="current_menu_item='request_config'">request config</menu-item>
             </i-menu>
         </i-col>
         <i-col span="8">
-            <div v-if="current_menu_item=='table_config'">
-                <h3>settings.APIJSON_TABLES.{table.table_name}</h3>
+            <div v-if="current_menu_item=='table_param'">
                 <pre>
 {table_json}
                 </pre>
@@ -38,7 +36,7 @@ <h3>settings.APIJSON_MODELS.{table.model_name}</h3>
                 </pre>
             </div>
             <div v-if="current_menu_item=='request_config'">
-                <h3>settings.APIJSON_TABLE_CONFIG.{table.request_tag||table.model_name}</h3>
+                <h3>settings.APIJSON_REQUESTS.{table.request_tag||table.model_name}</h3>
                 <pre style="height: 25pc; overflow-y: scroll;">
 {request_json}
                 </pre>
@@ -48,12 +46,14 @@ <h3>settings.APIJSON_TABLE_CONFIG.{table.request_tag||table.model_name}</h3>
 </div>`,
         data: function(){
             return {
-                current_menu_item: "table_config"
+                current_menu_item: "table_param",
+                table_param: {},
+                tableui: {}
             }
         },
         computed: {
             table_json: function(){
-                return JSON.stringify(this.table, null, 2)
+                return JSON.stringify(this.table_param, null, 2)
             },
             tableui_json: function(){
                 return JSON.stringify(this.tableui, null, 2)
@@ -69,6 +69,11 @@ <h3>settings.APIJSON_TABLE_CONFIG.{table.request_tag||table.model_name}</h3>
             on_select: function(data){
                 this.current_menu_item = data
             }
+        },
+        mounted: function(){
+            this.table_param = JSON.parse(JSON.stringify(this.table))
+            delete this.table_param.tableui
+            this.tableui = this.table.tableui
         }
     })
 </script>

uliweb_apijson/tables/templates/Tables/list.html

@@ -43,11 +43,8 @@
         tabs: function(){
             var l = []
             for (var i = 0; i < this.apijson_tables.length; i++) {
-                var t = this.apijson_tables[i]
-                var tableui = t.tableui
-                var table = JSON.parse(JSON.stringify(t))
-                delete table.tableui
-                l.push({index:i, name:t.config_name||t.model_name, table: table, tableui: tableui, model: this.models[i], request: this.requests[i]})
+                var table = this.apijson_tables[i]
+                l.push({index: i, name: table.tableui_name, table: table, model: this.models[i], request: this.requests[i]})
             }
             return l
         }

uliweb_apijson/tables/views.py

@@ -12,7 +12,11 @@ def list(self):
         apijson_tables = functions.get_apijson_tables()
         def _get_model(i):
             model_name = i.model_name
-            return settings.APIJSON_MODELS.get(model_name,{})
+            model = settings.APIJSON_MODELS.get(model_name,{})
+            if not i.role:
+                roles = model.get("GET",{}).get("roles")
+                i.role = roles[0] if isinstance(roles, list) else roles
+            return model
         models = [_get_model(i) for i in apijson_tables]
         def _get_request(i):
             request_tag = i.request_tag or i.model_name