bugfix
This commit is contained in:
parent
32305d3db7
commit
6a23ff18b0
@ -283,8 +283,10 @@ bricks.buildUrlwidgetHandler = function(w, target, rtdata, desc){
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
var options = objcopy(desc.options||{});
|
var options = objcopy(desc.options||{});
|
||||||
|
var params = options.params || {};
|
||||||
options = bricks.apply_data(options, rtdata);
|
options = bricks.apply_data(options, rtdata);
|
||||||
bricks.extend(options.params, rtdata);
|
options.params = bricks.extend(params, rtdata);
|
||||||
|
|
||||||
var opts = {
|
var opts = {
|
||||||
"widgettype":"urlwidget",
|
"widgettype":"urlwidget",
|
||||||
"options":options
|
"options":options
|
||||||
|
@ -298,6 +298,9 @@ bricks.DynamicAccordion = class extends bricks.VScrollPanel {
|
|||||||
async dataHandle(d){
|
async dataHandle(d){
|
||||||
var data = d.rows;
|
var data = d.rows;
|
||||||
var page = d.add_page;
|
var page = d.add_page;
|
||||||
|
if (!data){
|
||||||
|
return;
|
||||||
|
}
|
||||||
await this.renderAccordionItems(data, page);
|
await this.renderAccordionItems(data, page);
|
||||||
if (d.delete_page){
|
if (d.delete_page){
|
||||||
this.delete_page(d.delete_page);
|
this.delete_page(d.delete_page);
|
||||||
@ -397,6 +400,9 @@ bricks.DynamicAccordion = class extends bricks.VScrollPanel {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
async toggle_content(info, content, record, event){
|
async toggle_content(info, content, record, event){
|
||||||
|
if(! this.content_view){
|
||||||
|
return;
|
||||||
|
}
|
||||||
var h = this.container.dom_element.offsetHeight - 3 * info.dom_element.offsetHeight;
|
var h = this.container.dom_element.offsetHeight - 3 * info.dom_element.offsetHeight;
|
||||||
content.set_style('height', h + 'px');
|
content.set_style('height', h + 'px');
|
||||||
if (this.active_content){
|
if (this.active_content){
|
||||||
|
@ -24,13 +24,13 @@ bricks.add_ViewBuilder('code', function(opts){
|
|||||||
var txt = opts.useer_data[textField] || opts.user_data[valueField]||'';
|
var txt = opts.useer_data[textField] || opts.user_data[valueField]||'';
|
||||||
var options = bricks.extend({}, opts);
|
var options = bricks.extend({}, opts);
|
||||||
options.otext = txt;
|
options.otext = txt;
|
||||||
options.i18n = True;
|
options.i18n = true;
|
||||||
return new bricks.Text(options);
|
return new bricks.Text(options);
|
||||||
});
|
});
|
||||||
bricks.add_ViewBuilder('password', function(opts){
|
bricks.add_ViewBuilder('password', function(opts){
|
||||||
var options = bricks.extend({}, opts);
|
var options = bricks.extend({}, opts);
|
||||||
options.otext = '******';
|
options.otext = '******';
|
||||||
options.i18n = True;
|
options.i18n = true;
|
||||||
return new bricks.Text(options);
|
return new bricks.Text(options);
|
||||||
});
|
});
|
||||||
bricks.add_ViewBuilder('hide', function(opts){
|
bricks.add_ViewBuilder('hide', function(opts){
|
||||||
|
Loading…
Reference in New Issue
Block a user