From 1e0fbce1d51907af62dbae60f978faf2cec5f456 Mon Sep 17 00:00:00 2001 From: yumoqing Date: Mon, 3 Jun 2024 19:04:30 +0800 Subject: [PATCH] bugfix --- bricks/bricks.js | 5 ++++- bricks/css/bricks.css | 2 +- bricks/datarow.js | 7 +++++-- bricks/menu.js | 11 +++++++---- bricks/modal.js | 2 ++ bricks/tabular.js | 15 +++++++++------ bricks/utils.js | 1 + 7 files changed, 29 insertions(+), 14 deletions(-) diff --git a/bricks/bricks.js b/bricks/bricks.js index 679c9a7..0170117 100755 --- a/bricks/bricks.js +++ b/bricks/bricks.js @@ -263,6 +263,9 @@ var _buildWidget = async function(from_widget, target, mode, options){ bricks.debug('options=', options, 'widgetBuild() failed'); return; } + + if (w.parent) return; + if (mode == 'replace'){ target.clear_widgets(); target.add_widget(w); @@ -375,7 +378,7 @@ bricks.getWidgetById = function(id, from_widget){ return from_widget; } if (typeof(id) != 'string') return id; - var ids = id.split('/'); + var ids = id.split('.'); var el = from_widget.dom_element; var new_el = null; var j = 0; diff --git a/bricks/css/bricks.css b/bricks/css/bricks.css index 1bd7f56..ee658fa 100755 --- a/bricks/css/bricks.css +++ b/bricks/css/bricks.css @@ -24,8 +24,8 @@ body { } .menuitem { - height: 40px; backgroud-color: #eeeeee; + align-items: center; border: 1px solid #ccc; cursor: pointer; } diff --git a/bricks/datarow.js b/bricks/datarow.js index 644e1f3..f30158b 100644 --- a/bricks/datarow.js +++ b/bricks/datarow.js @@ -38,7 +38,7 @@ bricks.DataRow = class extends bricks.HBox { w = new bricks.BlankIcon({}); } else { w = new bricks.UiCheck({name:this.checkField,value:this.user_data[this.checkField]}); - w.bind(changed, this.get_check_state.bind(this)); + w.bind('changed', this.get_check_state.bind(this)); } this.add_widget(w); } @@ -50,7 +50,7 @@ bricks.DataRow = class extends bricks.HBox { this._build_fields(false, this.record_w); } get_check_state(e){ - d = e.target.getValue() + var d = e.target.bricks_widget.getValue() this.user_data[this.checkField] = d[this.checkField]; this.dispatch('check_changed', this); } @@ -100,6 +100,9 @@ bricks.DataRow = class extends bricks.HBox { if (this.browserfields && this.browserfields.cwidths){ cwidths = this.browserfields.cwidths; } + if (this.checkField){ + exclouded.push(this.checkField); + } for (var i=0;i