diff --git a/bricks/conform.js b/bricks/conform.js index 8a6059a..adffbef 100644 --- a/bricks/conform.js +++ b/bricks/conform.js @@ -2,6 +2,7 @@ var bricks = window.bricks || {}; bricks.Conform = class extends bricks.PopupWindow { constructor(opts){ opts.timeout = 0; + opts.auto_open = true; super(opts); this.create_conform(); } diff --git a/bricks/dataviewer.js b/bricks/dataviewer.js index 4431249..4409696 100644 --- a/bricks/dataviewer.js +++ b/bricks/dataviewer.js @@ -193,7 +193,8 @@ bricks.DataViewer = class extends bricks.VBox { this.dispatch('row_check_changed', event.params.user_data); } async renew_record_view(form, row){ - var d = form.getValue(); + var d = form._getValue(); + d = form._getValue(); var record = bricks.extend(row.user_data, d); row.renew(record); } diff --git a/bricks/form.js b/bricks/form.js index f8782d4..0c857b3 100644 --- a/bricks/form.js +++ b/bricks/form.js @@ -176,13 +176,7 @@ bricks.FormBase = class extends bricks.Layout { w.reset(); } } - getValue(){ - if (this.data) { - var ret = this.data; - this.data = null; - return ret; - } - return this.get_formdata(); + _getValue(){ var data = {}; for (var name in this.name_inputs){ if (! this.name_inputs.hasOwnProperty(name)){ @@ -201,6 +195,14 @@ bricks.FormBase = class extends bricks.Layout { } return data; } + getValue(){ + if (this.data) { + var ret = this.data; + this.data = null; + return ret; + } + return this.get_formdata(); + } get_formdata(){ var data = new FormData(); for (var name in this.name_inputs){ diff --git a/bricks/modal.js b/bricks/modal.js index e1f8695..a0008ef 100644 --- a/bricks/modal.js +++ b/bricks/modal.js @@ -189,6 +189,9 @@ bricks.ModalForm = class extends bricks.PopupWindow { super(opts); this.build_form(); } + _getValue(){ + return this.form._getValue(); + } getValue(){ return this.form.getValue(); } diff --git a/bricks/tabular.js b/bricks/tabular.js index 9b931d4..d9a5f3e 100644 --- a/bricks/tabular.js +++ b/bricks/tabular.js @@ -59,6 +59,7 @@ bricks.Tabular = class extends bricks.DataViewer { } else { row.set_css('tabular-row-selected'); } + this.dispatch('row_selected', row.user_data); } } async toggle_content(row, flag){ @@ -111,7 +112,7 @@ bricks.Tabular = class extends bricks.DataViewer { this.dispatch('row_check_changed', event.params.user_data); } async renew_record_view(form, row){ - var d = form.getValue(); + var d = form._getValue(); var record = bricks.extend(row.user_data, d); if (this.content_view){ row.rec_widget.renew(record);