Skip to content

Commit dc0bae1

Browse files
committed
add custom_tcolumns_render_generator prop; deault component is input in add modal; add Notice top config
1 parent 463878a commit dc0bae1

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

uliweb_apijson/apijson/templates/vue/inc_apijson_table.html

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
props: [
55
"table_name",
66
"config",
7+
"custom_tcolumns_render_generator",
78
"hook_init",
89
"hook_ajax_params"
910
],
@@ -139,7 +140,13 @@
139140
for (var k in this.tcolumns) {
140141
var c = this.tcolumns[k]
141142
if (c.component!=null) {
142-
var g = this.tcolumns_render_generator[c.component]
143+
var g = null
144+
if (this.custom_tcolumns_render_generator!=null) {
145+
g = this.custom_tcolumns_render_generator[c.component]
146+
}
147+
if (g==null) {
148+
g = this.tcolumns_render_generator[c.component]
149+
}
143150
if (g!=null){
144151
c.render = g(c.key)
145152
}
@@ -397,6 +404,7 @@
397404
for (var k in this.add_items){
398405
var d = this.add_items[k]
399406
d.value = null
407+
d.component = d.component || "input"
400408
}
401409
this.modal_add = true
402410
},
@@ -453,7 +461,7 @@
453461
this.config_table_fields = this.config.table_fields || null
454462
this.config_viewedit_fields = this.config.viewedit_fields || null
455463
this.config_add_fields = this.config.add_fields || null
456-
if (this.config.add_fields!=null) {
464+
if (this.config_add_fields!=null) {
457465
this.add_items = this.config_add_fields
458466
}
459467
if (this.config.default_page_size!=null) {
@@ -462,6 +470,8 @@
462470
this.config_delete_set_deleted = this.config.delete_set_deleted || false
463471
this.config_deleted_field_name = this.config.deleted_field_name || "deleted"
464472
}
473+
//if not do this, the first notice will hide behind the navigation bar in uliweb apps
474+
this.$Notice.config({top: 100,duration: 8});
465475
if (this.hook_init!=null) {
466476
this.hook_init(this)
467477
}

0 commit comments

Comments
 (0)