yumoqing/bricks
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bugfix

Browse Source
This commit is contained in:
yumoqing 2026-04-17 23:32:43 +08:00
parent 58c7838ac3
commit 02520995a6
1 changed files with 75 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
bricks/bricks.js
View File

@ -288,6 +288,9 @@ bricks.buildEventHandler = async function(w, desc, event){
case 'urlwidget': case 'urlwidget':
return bricks.buildUrlwidgetHandler(w, target, rtdata, desc); return bricks.buildUrlwidgetHandler(w, target, rtdata, desc);
break; break;
case 'urldata':
return bricks.buildUrldataHandler(w, target, rtdata, desc);
break;
case 'bricks': case 'bricks':
return bricks.buildBricksHandler(w, target, rtdata, desc); return bricks.buildBricksHandler(w, target, rtdata, desc);
break; break;
@ -380,28 +383,80 @@ bricks.buildNewWindowHandler = function(w, target, rtdata, desc){
} }
return _buildWidget.bind(null, w, target, desc.mode || 'replace', opts, desc); return _buildWidget.bind(null, w, target, desc.mode || 'replace', opts, desc);
} }
var _add_event_data = function(params, event_data, rtdata, params_mapping){
if (event_data instanceof FormData){
var p = event_data;
for ( const [key, value] of Object.entries(rtdata)){
p.append(key, value);
}
for ( const [key, value] of Object.entries(params||{})){
p.append(key, value);
}
return p;
} else {
var p = bricks.extend(rtdata, event_data);
if (params_mapping){
p = bricks.map(p, params_mapping.mapping, params_mapping.need_others);
}
p = bricks.extend(p, rtdata);
return p;
}
}
_buildDataHandler = async function(obj, from_widget, target, options, desc){
var jc = new bricks.HttpJson();
var method = options.method or 'GET';
if (options.params instanceof FormData) {
method = 'POST';
var data = await jc.httpcall(url, {
method: method,
params: options.params
});
var newdesc = desc.status_of[data.status];
var w = await widgetBuild(from_widget, newdesc, data.data)
if (!w){
console.log('build error,newdesc=', newdesc, 'data=', data.data);
return;
}
if (w instanceof bricks.Popup) {
return;
}
if (w instanceof bricks.NewWindow) {
return;
}
if (desc.mode == 'replace'){
target.clear_widgets();
target.add_widget(w);
} else if (desc.mode == 'insert'){
target.add_widget(w, 0);
} else {
target.add_widget(w);
}
if (target instanceof bricks.Popup || target instanceof bricks.PopupWindow) {
target.open();
}
}
bricks.buildUrldataHandler = function(w, target, rtdata, desc){
var options = objcopy(desc.options||{});
var params = _add_event_data(options.params || {},
desc.event_params,
rtdata,desc.params_mapping);
options.params = params;
var opts = {
"widgettype":"urlwidget",
"options":options
}
return _buildDataHandler.bind(null, w, target, options, desc);
}
bricks.buildUrlwidgetHandler = function(w, target, rtdata, desc){ bricks.buildUrlwidgetHandler = function(w, target, rtdata, desc){
var options = objcopy(desc.options||{}); var options = objcopy(desc.options||{});
var params = options.params || {}; var params = _add_event_data(options.params || {},
if (desc.event_params instanceof FormData){ desc.event_params,
var params = desc.event_params; rtdata,desc.params_mapping);
for ( const [key, value] of Object.entries(rtdata)){ options.params = params;
params.append(key, value);
}
options = bricks.apply_data(options, rtdata);
for ( const [key, value] of Object.entries(options.params||{})){
params.append(key, value);
}
options.params = params;
options.method = "POST";
} else {
rtdata = bricks.extend(rtdata, desc.event_params);
options = bricks.apply_data(options, rtdata);
if (desc.params_mapping){
rtdata = bricks.map(rtdata, desc.params_mapping.mapping, desc.params_mapping.need_others);
}
options.params = bricks.extend(params, rtdata);
}
var opts = { var opts = {
"widgettype":"urlwidget", "widgettype":"urlwidget",
"options":options "options":options