From 6a87994bdf131e362369e3becfe129f66d8cd62d Mon Sep 17 00:00:00 2001 From: yumoqing Date: Wed, 5 Jun 2024 15:48:00 +0800 Subject: [PATCH] bugfix --- bricks/dynamicaccordion.js | 1 - bricks/jsoncall.js | 7 ++++--- bricks/tree.js | 19 ++++++------------- 3 files changed, 10 insertions(+), 17 deletions(-) diff --git a/bricks/dynamicaccordion.js b/bricks/dynamicaccordion.js index 3bdd6a3..8090f59 100644 --- a/bricks/dynamicaccordion.js +++ b/bricks/dynamicaccordion.js @@ -453,7 +453,6 @@ bricks.DynamicAccordion = class extends bricks.VScrollPanel { return; } - var jc = new bricks.HttpJson(); var w; w = await bricks.widgetBuild(this.content_view, content, record); if (w){ diff --git a/bricks/jsoncall.js b/bricks/jsoncall.js index df6bb65..f7616f7 100755 --- a/bricks/jsoncall.js +++ b/bricks/jsoncall.js @@ -76,11 +76,12 @@ bricks.HttpText = class { } return params; } - params = Object.assign(this.params, params); + var p = bricks.extend({}, this.params); + p = bricks.extend(p, params); if (session){ - bricks.extend(params,{session:session}); + bricks.extend(p,{session:session}); } - return params; + return p; } add_own_headers(headers){ if (! headers){ diff --git a/bricks/tree.js b/bricks/tree.js index 99acd71..fed4314 100755 --- a/bricks/tree.js +++ b/bricks/tree.js @@ -11,7 +11,7 @@ bricks.TreeNode = class extends bricks.VBox { this.children_loaded = false; this.user_data = data; this.is_leaf = this.user_data.is_leaf; - this.params = {id:this.user_data[this.tree.opts.idField]}; + this.params = bricks.extend(this.tree.params, {id:this.user_data[this.tree.opts.idField]}); if (this.tree.multitype_tree){ this.params['type'] = this.user_data[this.tree.opts.typeField]; } @@ -181,6 +181,7 @@ bricks.Tree = class extends bricks.VScrollPanel { this.add_widget(this.container); this.data_id = null; if (this.opts.dataurl){ + this.params = opts.params || {}; schedule_once(this.get_children_data.bind(this, this), 0.1); } else { this.user_data = { @@ -411,26 +412,18 @@ bricks.Tree = class extends bricks.VScrollPanel { node_selected(node, flag){ console.log('node_selected():node=', node, flag); node.selected(flag); - var d = { - node:node, - data:node.getValue(), - id:node.get_id(), + var d = bricks.extend(node.user_data, { selected:flag - } + }); + this.dispatch('node_selected', d); } async node_checked(node, event){ var cb = event.target.bricks_widget; var stat = cb.getValue().check; node.user_data[this.checkField] = stat; - var d = { - node:node, - data:node.getValue(), - id: node.get_id(), - check_stat:stat - } console.log('value=', cb.getValue(), 'node=', node); - this.dispatch('check_changed', d); + this.dispatch('check_changed', node.user_data); } node_info_log(event){ if (event.params.selected == false){