Skip to content

erp5
erp5
Commit c9402a2f authored by Romain Courteaud's avatar Romain Courteaud
Browse files
Options

[erp5_web_renderjs_ui] Listbox: Reduce number of DOM modification 

Try to reduce possible errors when 2 functions tries to update the listbox DOM
parent af65d1e9
Hide whitespace changes
Inline Side-by-side
Showing with 247 additions and 234 deletions
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_html.html
View file @ c9402a2f
...@@ -10,8 +10,6 @@ ...@@ -10,8 +10,6 @@
<script src="renderjs.js" type="text/javascript"></script> <script src="renderjs.js" type="text/javascript"></script>
<script src="jiodev.js" type="text/javascript"></script> <script src="jiodev.js" type="text/javascript"></script>
<script src="handlebars.js" type="text/javascript"></script> <script src="handlebars.js" type="text/javascript"></script>
<!-- custom script --> <!-- custom script -->
<script src="gadget_erp5_field_listbox.js" type="text/javascript"></script> <script src="gadget_erp5_field_listbox.js" type="text/javascript"></script>
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_html.xml
View file @ c9402a2f
...@@ -234,7 +234,7 @@ ...@@ -234,7 +234,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>954.45675.44850.53452</string> </value> <value> <string>954.47421.47694.22459</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -252,7 +252,7 @@ ...@@ -252,7 +252,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1476956055.1</float> <float>1476967547.86</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_js.js
View file @ c9402a2f
...@@ -39,21 +39,15 @@ ...@@ -39,21 +39,15 @@
error_message_template = Handlebars.compile(error_message_source); error_message_template = Handlebars.compile(error_message_source);
function renderListboxThead(gadget, template) { function renderListboxThead(gadget, template, head_value) {
if (template === undefined) { return gadget.translateHtml(template({
template = listbox_hidden_thead_template; head_value: gadget.props.head_value,
} show_anchor: gadget.state.show_anchor,
return gadget.translateHtml(template( line_icon: gadget.state.line_icon
{ }));
"head_value": gadget.props.head_value,
"show_anchor": gadget.props.field_json.show_anchor,
"line_icon": gadget.props.field_json.line_icon
}
));
} }
function renderEditableField(gadget, element) { function renderEditableField(gadget, element) {
var i, var i,
promise_list = [], promise_list = [],
...@@ -67,7 +61,7 @@ ...@@ -67,7 +61,7 @@
function renderSubCell(element, sub_field_json) { function renderSubCell(element, sub_field_json) {
var options = {}, var options = {},
queue; queue;
sub_field_json.editable = sub_field_json.editable && gadget.props.field_json.editable; // XXX sub_field_json.editable = sub_field_json.editable && gadget.state.editable; // XXX
queue = gadget.getFieldTypeGadgetUrl(sub_field_json.type); queue = gadget.getFieldTypeGadgetUrl(sub_field_json.type);
queue queue
.push(function (gadget_url) { .push(function (gadget_url) {
...@@ -120,22 +114,20 @@ ...@@ -120,22 +114,20 @@
} }
} }
promise_list.push(renderSubCell(element_list[i], promise_list.push(renderSubCell(element_list[i],
gadget.props.result.data.rows[line].value[gadget.props.field_json.column_list[column][0]] || "")); gadget.props.result.data.rows[line].value[gadget.state.column_list[column][0]] || ""));
} }
return RSVP.all(promise_list); return RSVP.all(promise_list);
} }
function renderListboxTbody(gadget, template) { function renderListboxTbody(gadget, template) {
var tmp; var tmp;
if (template === undefined) {
template = listbox_hidden_tbody_template;
}
return gadget.translateHtml(template( return gadget.translateHtml(template(
{ {
"body_value": gadget.props.body_value, "body_value": gadget.props.body_value,
"show_anchor": gadget.props.field_json.show_anchor, "show_anchor": gadget.state.show_anchor,
"column_list": gadget.props.field_json.column_list "column_list": gadget.state.column_list
} }
)) ))
.push(function (my_html) { .push(function (my_html) {
...@@ -144,13 +136,14 @@ ...@@ -144,13 +136,14 @@
return renderEditableField(gadget, tmp); return renderEditableField(gadget, tmp);
}) })
.push(function () { .push(function () {
var table = gadget.props.element.querySelector("table"), var table = gadget.element.querySelector("table"),
tbody = table.querySelector("tbody"); tbody = table.querySelector("tbody");
table.removeChild(tbody); table.removeChild(tbody);
table.appendChild(tmp); table.appendChild(tmp);
}); });
} }
function renderListboxTfoot(gadget) { function renderListboxTfoot(gadget) {
return gadget.translateHtml(listbox_tfoot_template( return gadget.translateHtml(listbox_tfoot_template(
{ {
...@@ -164,55 +157,18 @@ ...@@ -164,55 +157,18 @@
)); ));
} }
function renderListbox(gadget) {
return gadget.translateHtml(listbox_template(
{
"hide_class": gadget.props.hide_class,
"hide_sort": gadget.props.hide_sort,
"title": gadget.props.field_json.title
}
));
}
function renderErrorMessage(gadget) {
var options = {};
options.extended_search = undefined;
options[gadget.props.field_json.key + "_sort_list:json"] = undefined;
return gadget.getUrlFor({
command: 'store_and_change',
options: options
})
.push(function (url) {
return gadget.translateHtml(error_message_template(
{
'reset_url' : url
}
));
});
}
rJS(window) rJS(window)
///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////
// ready // ready
///////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////
// Init local properties // Init local properties
.ready(function (g) { .ready(function () {
g.props = { this.props = {
cell_gadget_list: [], cell_gadget_list: [],
listbox_uid_dict: {} listbox_uid_dict: {}
}; };
}) })
// Assign the element to a variable
.ready(function (g) {
return g.getElement()
.push(function (element) {
g.props.element = element;
});
})
////////////////////////////////////////////// //////////////////////////////////////////////
// acquired method // acquired method
////////////////////////////////////////////// //////////////////////////////////////////////
...@@ -224,28 +180,20 @@ ...@@ -224,28 +180,20 @@
.declareAcquiredMethod("renderEditorPanel", "renderEditorPanel") .declareAcquiredMethod("renderEditorPanel", "renderEditorPanel")
.declareAcquiredMethod("redirect", "redirect") .declareAcquiredMethod("redirect", "redirect")
.declareAcquiredMethod("translate", "translate") .declareAcquiredMethod("translate", "translate")
////////////////////////////////////////////// //////////////////////////////////////////////
// initialize the gadget content // initialize the gadget content
////////////////////////////////////////////// //////////////////////////////////////////////
.declareMethod('render', function (options) { .declareMethod('render', function (options) {
var gadget = this, var gadget = this,
field_json = options.field_json, field_json = options.field_json,
head_value = [],
class_value,
tmp,
i, i,
j; sort_column_list = [],
search_column_list = [];
gadget.props.field_json = field_json;
gadget.props.field_id = options.field_id;
gadget.props.extended_search = options.extended_search;
gadget.props.hide_class = options.hide_enabled ? "" : "ui-disabled";
gadget.props.sort_list = [];
gadget.props.command = field_json.command || 'index';
//only display which is in listbox's column list //only display which is in listbox's column list
if (field_json.sort_column_list.length) { if (field_json.sort_column_list.length) {
field_json.sort_column_list = field_json.sort_column_list.filter(function (n) { sort_column_list = field_json.sort_column_list.filter(function (n) {
for (i = 0; i < field_json.column_list.length; i += 1) { for (i = 0; i < field_json.column_list.length; i += 1) {
if (field_json.column_list[i][0] === n[0] && field_json.column_list[i][1] === n[1]) { if (field_json.column_list[i][0] === n[0] && field_json.column_list[i][1] === n[1]) {
return true; return true;
...@@ -254,10 +202,9 @@ ...@@ -254,10 +202,9 @@
return false; return false;
}); });
} }
gadget.props.hide_sort = field_json.sort_column_list.length ? "" : "ui-disabled";
if (field_json.search_column_list.length) { if (field_json.search_column_list.length) {
field_json.search_column_list = field_json.search_column_list.filter(function (n) { search_column_list = field_json.search_column_list.filter(function (n) {
for (i = 0; i < field_json.column_list.length; i += 1) { for (i = 0; i < field_json.column_list.length; i += 1) {
if (field_json.column_list[i][0] === n[0] && field_json.column_list[i][1] === n[1]) { if (field_json.column_list[i][0] === n[0] && field_json.column_list[i][1] === n[1]) {
return true; return true;
...@@ -266,62 +213,107 @@ ...@@ -266,62 +213,107 @@
return false; return false;
}); });
} }
field_json.search_column_list.push(["searchable_text", "Searchable Text"]); search_column_list.push(["searchable_text", "Searchable Text"]);
// Cancel previous line rendering to not conflict with the asynchronous render for now return RSVP.Queue()
gadget.renderContent(true);
return new RSVP.Queue()
.push(function () { .push(function () {
return renderListbox(gadget); // Cancel previous line rendering to not conflict with the asynchronous render for now
return gadget.renderContent(true);
}) })
.push(function (my_html) { .push(function () {
gadget.props.element.querySelector(".document_table").innerHTML = my_html;
// XXX Fix in case of multiple listboxes // XXX Fix in case of multiple listboxes
return RSVP.all([ return RSVP.all([
gadget.getUrlParameter(field_json.key + '_begin_from'), gadget.getUrlParameter(field_json.key + '_begin_from'),
gadget.getUrlParameter(field_json.key + '_sort_list:json') gadget.getUrlParameter(field_json.key + '_sort_list:json')
]); ]);
}) })
.push(function (all_result) { .push(function (result_list) {
var result = all_result[0]; return gadget.changeState({
gadget.props.sort_list = all_result[1] || []; key: field_json.key,
if (result === undefined) { title: field_json.title,
result = '0'; editable: field_json.editable,
}
for (i = 0; i < gadget.props.field_json.column_list.length; i += 1) { begin_from: parseInt(result_list[0] || '0', 10) || 0,
class_value = ""; sort_list: result_list[1] || [],
for (j = 0; j < gadget.props.sort_list.length; j += 1) {
tmp = gadget.props.sort_list[j]; show_anchor: field_json.show_anchor,
if (tmp[0] === gadget.props.field_json.column_list[i][0]) { line_icon: field_json.line_icon,
if (tmp[1] === "ascending") { query: field_json.query,
class_value = "ui-icon ui-icon-arrow-up"; lines: field_json.lines,
} else { list_method: field_json.list_method,
class_value = "ui-icon ui-icon-arrow-down"; list_method_template: field_json.list_method_template,
}
break; column_list: field_json.column_list,
} sort_column_list: sort_column_list,
search_column_list: search_column_list,
hide_sort: field_json.sort_column_list.length ? "" : "ui-disabled",
field_id: options.field_id,
extended_search: options.extended_search,
hide_class: options.hide_enabled ? "" : "ui-disabled",
command: field_json.command || 'index'
});
})
.push(function () {
// Force line calculation in any case
return gadget.renderContent();
});
})
.onStateChange(function () {
var gadget = this,
head_value = [],
class_value,
tmp,
i,
j;
for (i = 0; i < gadget.state.column_list.length; i += 1) {
class_value = "";
for (j = 0; j < gadget.state.sort_list.length; j += 1) {
tmp = gadget.state.sort_list[j];
if (tmp[0] === gadget.state.column_list[i][0]) {
if (tmp[1] === "ascending") {
class_value = "ui-icon ui-icon-arrow-up";
} else {
class_value = "ui-icon ui-icon-arrow-down";
} }
head_value.push({ break;
"data-i18n": field_json.column_list[i][1],
"class_value": class_value,
"text": field_json.column_list[i][1]
});
} }
gadget.props.head_value = head_value; }
gadget.props.begin_from = parseInt(result, 10) || 0; head_value.push({
return renderListboxThead(gadget); "data-i18n": gadget.state.column_list[i][1],
"class_value": class_value,
"text": gadget.state.column_list[i][1]
});
}
gadget.props.head_value = head_value;
return new RSVP.Queue()
.push(function () {
return RSVP.all([
gadget.translateHtml(listbox_template({
hide_class: gadget.state.hide_class,
hide_sort: gadget.state.hide_sort,
title: gadget.state.title
})),
renderListboxThead(gadget, listbox_hidden_thead_template)
]);
}) })
.push(function (my_html) { .push(function (result_list) {
gadget.props.element.querySelector(".thead").innerHTML = my_html; gadget.element.querySelector(".document_table").innerHTML = result_list[0];
gadget.renderContent(); gadget.element.querySelector(".thead").innerHTML = result_list[1];
}); });
}) })
.declareMethod('getListboxInfo', function () { .declareMethod('getListboxInfo', function () {
//XXXXX search column list is used for search editor to //XXXXX search column list is used for search editor to
//construct search panel //construct search panel
//hardcoded begin_from key to define search position //hardcoded begin_from key to define search position
return { "search_column_list": this.props.field_json.search_column_list, return {
"begin_from": this.props.field_json.key + "_begin_from"}; search_column_list: this.state.search_column_list,
begin_from: this.state.key + "_begin_from"
};
}) })
////////////////////////////////////////////// //////////////////////////////////////////////
...@@ -329,31 +321,32 @@ ...@@ -329,31 +321,32 @@
////////////////////////////////////////////// //////////////////////////////////////////////
.declareJob('renderContent', function (only_cancel) { .declareJob('renderContent', function (only_cancel) {
var gadget = this, var gadget = this,
props = gadget.props, // props = gadget.props,
field_json = props.field_json, // field_json = props.field_json,
begin_from = props.begin_from, begin_from = this.state.begin_from,
url_query = props.extended_search, url_query = this.state.extended_search,
query_string = new URI(field_json.query).query(true).query, query_string,
lines = field_json.lines, lines = this.state.lines,
select_list = [], select_list = [],
dataset, dataset,
counter, counter,
limit_options, limit_options,
queue,
i; i;
if (only_cancel) { if (only_cancel) {
return; return;
} }
if (field_json.query === undefined) { if (this.state.query === undefined) {
gadget.props.element.querySelector('tfoot').textContent = "Unsupported list method: '" + field_json.list_method + "'"; gadget.element.querySelector('tfoot').textContent =
"Unsupported list method: '" + this.state.list_method + "'";
return; return;
} }
// function buildQueryString(previous, next) { // function buildQueryString(previous, next) {
// return previous + next[0] + ':= "' + url_query + '" OR '; // return previous + next[0] + ':= "' + url_query + '" OR ';
// } // }
query_string = new URI(this.state.query).query(true).query;
if (url_query) { if (url_query) {
//query_string = field_json.column_list.reduce(buildQueryString, ' AND (').replace(new RegExp("OR " + '$'), ')'); //query_string = field_json.column_list.reduce(buildQueryString, ' AND (').replace(new RegExp("OR " + '$'), ')');
if (query_string) { if (query_string) {
...@@ -363,34 +356,26 @@ ...@@ -363,34 +356,26 @@
} }
} }
for (i = 0; i < field_json.column_list.length; i += 1) { for (i = 0; i < this.state.column_list.length; i += 1) {
select_list.push(field_json.column_list[i][0]); select_list.push(this.state.column_list[i][0]);
} }
select_list.push("uid"); select_list.push("uid");
if (lines === 0) { if (lines === 0) {
limit_options = undefined; limit_options = undefined;
} else { } else {
limit_options = [begin_from, lines + 1]; limit_options = [begin_from, lines + 1];
} }
queue = gadget.jio_allDocs({
return gadget.jio_allDocs({
// XXX Not jIO compatible, but until a better api is found... // XXX Not jIO compatible, but until a better api is found...
"list_method_template": field_json.list_method_template, "list_method_template": this.state.list_method_template,
"query": query_string, "query": query_string,
"limit": limit_options, "limit": limit_options,
"select_list": select_list, "select_list": select_list,
"sort_on": gadget.props.sort_list "sort_on": gadget.state.sort_list
}); })
queue
.push(undefined, function (error) {
//XXXXX hack to not crash interface
//this will catch all error, not only search criteria invalid error
console.warn(error);
return renderErrorMessage(gadget)
.push(function (error_html) {
gadget.props.element.querySelector(".document_table").innerHTML = error_html;
queue.cancel();
});
})
.push(function (result) { .push(function (result) {
var promise_list = [result]; var promise_list = [result];
if (lines === 0) { if (lines === 0) {
...@@ -402,103 +387,132 @@ ...@@ -402,103 +387,132 @@
for (i = 0; i < counter; i += 1) { for (i = 0; i < counter; i += 1) {
promise_list.push( promise_list.push(
gadget.getUrlFor({ gadget.getUrlFor({
command: gadget.props.command, command: gadget.state.command,
options: { options: {
jio_key: result.data.rows[i].id, jio_key: result.data.rows[i].id,
uid: result.data.rows[i].value.uid, uid: result.data.rows[i].value.uid,
selection_index: begin_from + i, selection_index: begin_from + i,
query: query_string, query: query_string,
list_method_template: field_json.list_method_template, list_method_template: gadget.state.list_method_template,
"sort_list:json": gadget.props.sort_list "sort_list:json": gadget.state.sort_list
} }
}) })
); );
} }
return RSVP.all(promise_list); return new RSVP.Queue()
.push(function () {
}).push(function (result_list) { return RSVP.all(promise_list);
var j, })
result = result_list[0], .push(function (result_list) {
value, var j,
body_value = [], allDocs_result = result_list[0],
tr_value = [], value,
tmp_url; body_value = [],
dataset = result; tr_value = [],
for (i = 0; i < counter; i += 1) { tmp_url;
tmp_url = result_list[i + 1]; dataset = allDocs_result;
tr_value = []; for (i = 0; i < counter; i += 1) {
for (j = 0; j < field_json.column_list.length; j += 1) { tmp_url = result_list[i + 1];
value = result.data.rows[i].value[field_json.column_list[j][0]] || ""; tr_value = [];
tr_value.push({ for (j = 0; j < gadget.state.column_list.length; j += 1) {
"type": value.type, value = allDocs_result.data.rows[i].value[gadget.state.column_list[j][0]] || "";
"editable": value.editable && field_json.editable, tr_value.push({
"href": tmp_url, "type": value.type,
"text": value, "editable": value.editable && gadget.state.editable,
"line": i, "href": tmp_url,
"column": j "text": value,
}); "line": i,
} "column": j
body_value.push({ });
"value": result.data.rows[i].value.uid, }
"jump": tmp_url, body_value.push({
"tr_value": tr_value, "value": allDocs_result.data.rows[i].value.uid,
"line_icon": field_json.line_icon "jump": tmp_url,
"tr_value": tr_value,
"line_icon": gadget.state.line_icon
});
}
gadget.props.body_value = body_value;
gadget.props.result = result;
return renderListboxTbody(gadget, listbox_hidden_tbody_template);
})
.push(function () {
var prev_param = {},
next_param = {};
function setNext() {
if (dataset.data.rows.length > lines) {
next_param[gadget.state.key + '_begin_from'] = begin_from + lines;
}
}
if (begin_from === 0) {
setNext();
} else {
prev_param[gadget.state.key + '_begin_from'] = begin_from - lines;
setNext();
}
return RSVP.all([
gadget.getUrlFor({command: 'change', options: prev_param}),
gadget.getUrlFor({command: 'change', options: next_param})
]);
})
.push(function (url_list) {
var foot = {};
foot.colspan = gadget.state.column_list.length + gadget.state.show_anchor +
(gadget.state.line_icon ? 1 : 0);
foot.default_colspan = foot.colspan;
foot.previous_classname = "ui-btn ui-icon-carat-l ui-btn-icon-left responsive ui-first-child";
foot.previous_url = url_list[0];
foot.next_classname = "ui-btn ui-icon-carat-r ui-btn-icon-right responsive ui-last-child";
foot.next_url = url_list[1];
if ((begin_from === 0) && (counter === 0)) {
foot.record = "No records";
} else if ((dataset.data.rows.length <= lines) && (begin_from === 0)) {
foot.record = counter + " Records";
} else {
foot.record = "Records " + (((begin_from + lines) / lines - 1) * lines + 1) + " - " + (((begin_from + lines) / lines - 1) * lines + counter);
}
if (begin_from === 0) {
foot.previous_classname += " ui-disabled";
}
if (dataset.data.rows.length <= lines) {
foot.next_classname += " ui-disabled";
}
gadget.props.foot = foot;
return renderListboxTfoot(gadget);
})
.push(function (my_html) {
gadget.element.querySelector(".tfoot").innerHTML = my_html;
}); });
}
gadget.props.body_value = body_value;
gadget.props.result = result;
return renderListboxTbody(gadget);
}).push(function () {
var prev_param = {},
next_param = {};
function setNext() {
if (dataset.data.rows.length > lines) {
next_param[gadget.props.field_json.key + '_begin_from'] = begin_from + lines;
}
}
if (begin_from === 0) {
setNext();
} else {
prev_param[gadget.props.field_json.key + '_begin_from'] = begin_from - lines;
setNext();
}
return RSVP.all([
gadget.getUrlFor({command: 'change', options: prev_param}),
gadget.getUrlFor({command: 'change', options: next_param})
]);
}).push(function (url_list) { }, function (error) {
var foot = {}; if (error instanceof RSVP.CancellationError) {
foot.colspan = field_json.column_list.length + field_json.show_anchor + throw error;
(field_json.line_icon ? 1 : 0);
foot.default_colspan = foot.colspan;
foot.previous_classname = "ui-btn ui-icon-carat-l ui-btn-icon-left responsive ui-first-child";
foot.previous_url = url_list[0];
foot.next_classname = "ui-btn ui-icon-carat-r ui-btn-icon-right responsive ui-last-child";
foot.next_url = url_list[1];
if ((begin_from === 0) && (counter === 0)) {
foot.record = "No records";
} else if ((dataset.data.rows.length <= lines) && (begin_from === 0)) {
foot.record = counter + " Records";
} else {
foot.record = "Records " + (((begin_from + lines) / lines - 1) * lines + 1) + " - " + (((begin_from + lines) / lines - 1) * lines + counter);
} }
if (begin_from === 0) { // do not crash interface if allDocs fails
foot.previous_classname += " ui-disabled"; //this will catch all error, not only search criteria invalid error
} console.warn(error);
if (dataset.data.rows.length <= lines) { var options = {extended_search: undefined};
foot.next_classname += " ui-disabled"; options[gadget.state.key + "_sort_list:json"] = undefined;
} return gadget.getUrlFor({
gadget.props.foot = foot; command: 'store_and_change',
return renderListboxTfoot(gadget); options: options
}).push(function (my_html) { })
gadget.props.element.querySelector(".tfoot").innerHTML = my_html; .push(function (url) {
return gadget.translateHtml(error_message_template({
reset_url: url
}));
})
.push(function (html) {
gadget.element.querySelector(".document_table").innerHTML = html;
});
}); });
return queue;
})
})
.declareMethod("getContent", function (options) { .declareMethod("getContent", function (options) {
var form_gadget = this, var form_gadget = this,
...@@ -532,18 +546,19 @@ ...@@ -532,18 +546,19 @@
return data; return data;
}); });
}) })
.onEvent('click', function (evt) { .onEvent('click', function (evt) {
var gadget = this, var gadget = this,
sort_button = gadget.props.element.querySelector('button[name="Sort"]'), sort_button = gadget.element.querySelector('button[name="Sort"]'),
hide_button = gadget.props.element.querySelector('button[name="Hide"]'), hide_button = gadget.element.querySelector('button[name="Hide"]'),
url, url,
options = {}; options = {};
if (evt.target === sort_button) { if (evt.target === sort_button) {
evt.preventDefault(); evt.preventDefault();
url = "gadget_erp5_sort_editor.html"; url = "gadget_erp5_sort_editor.html";
options.sort_column_list = gadget.props.field_json.sort_column_list; options.sort_column_list = gadget.state.sort_column_list;
options.sort_list = gadget.props.sort_list; options.sort_list = gadget.state.sort_list;
options.key = gadget.props.field_json.key + "_sort_list:json"; options.key = gadget.state.key + "_sort_list:json";
return gadget.renderEditorPanel(url, options); return gadget.renderEditorPanel(url, options);
} }
if (evt.target === hide_button) { if (evt.target === hide_button) {
...@@ -566,7 +581,7 @@ ...@@ -566,7 +581,7 @@
} else { } else {
//hide closed //hide closed
//maybe submit //maybe submit
all_hide_elements = gadget.props.element.querySelectorAll(".hide_element"); all_hide_elements = gadget.element.querySelectorAll(".hide_element");
for (i = 0; i < all_hide_elements.length; i += 1) { for (i = 0; i < all_hide_elements.length; i += 1) {
if (!all_hide_elements[i].checked) { if (!all_hide_elements[i].checked) {
hide_elements.push(all_hide_elements[i]); hide_elements.push(all_hide_elements[i]);
...@@ -581,8 +596,8 @@ ...@@ -581,8 +596,8 @@
value: hide_elements[i].getAttribute("value") value: hide_elements[i].getAttribute("value")
})); }));
} }
if (gadget.props.extended_search) { if (gadget.state.extended_search) {
search_query = QueryFactory.create(gadget.props.extended_search); search_query = QueryFactory.create(gadget.state.extended_search);
} }
if (search_query) { if (search_query) {
query_list.push(search_query); query_list.push(search_query);
...@@ -618,8 +633,8 @@ ...@@ -618,8 +633,8 @@
.push(function (all_innerHTML) { .push(function (all_innerHTML) {
//change hide button's text //change hide button's text
hide_button.innerHTML = all_innerHTML[3]; hide_button.innerHTML = all_innerHTML[3];
gadget.props.element.querySelector(".thead").innerHTML = all_innerHTML[0]; gadget.element.querySelector(".thead").innerHTML = all_innerHTML[0];
gadget.props.element.querySelector(".tfoot").innerHTML = all_innerHTML[2]; gadget.element.querySelector(".tfoot").innerHTML = all_innerHTML[2];
}); });
}); });
} }
......
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_js.xml
View file @ c9402a2f
...@@ -236,7 +236,7 @@ ...@@ -236,7 +236,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>954.46086.29232.63761</string> </value> <value> <string>954.47559.38051.59921</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -254,7 +254,7 @@ ...@@ -254,7 +254,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1476887535.66</float> <float>1476976330.15</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7