tryton-sao 6.0.20 → 6.0.21
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG +3 -0
- package/dist/tryton-sao.js +6 -4
- package/dist/tryton-sao.min.js +2 -2
- package/package.json +1 -1
- package/src/view/form.js +6 -4
package/CHANGELOG
CHANGED
package/dist/tryton-sao.js
CHANGED
|
@@ -14558,7 +14558,7 @@ function eval_pyson(value){
|
|
|
14558
14558
|
i = 0;
|
|
14559
14559
|
row.children().map(function() {
|
|
14560
14560
|
var cell = jQuery(this);
|
|
14561
|
-
var colspan = Math.min(Number(cell.attr('colspan')), col);
|
|
14561
|
+
var colspan = Math.min(Number(cell.attr('colspan')), col || 1);
|
|
14562
14562
|
if (cell.hasClass('xexpand') &&
|
|
14563
14563
|
(!jQuery.isEmptyObject(cell.children())) &&
|
|
14564
14564
|
(cell.children(':not(.tooltip)').css('display') != 'none')) {
|
|
@@ -14578,7 +14578,7 @@ function eval_pyson(value){
|
|
|
14578
14578
|
var reduce = function(previous, current) {
|
|
14579
14579
|
var cell = current[0];
|
|
14580
14580
|
var colspan = Math.min(
|
|
14581
|
-
Number(cell.attr('colspan')), col);
|
|
14581
|
+
Number(cell.attr('colspan')), col || 1);
|
|
14582
14582
|
return previous + colspan;
|
|
14583
14583
|
};
|
|
14584
14584
|
return a.reduce(reduce, 0) - b.reduce(reduce, 0);
|
|
@@ -14593,7 +14593,8 @@ function eval_pyson(value){
|
|
|
14593
14593
|
xexpands.forEach(function(e) {
|
|
14594
14594
|
var cell = e[0];
|
|
14595
14595
|
i = e[1];
|
|
14596
|
-
var colspan = Math.min(
|
|
14596
|
+
var colspan = Math.min(
|
|
14597
|
+
Number(cell.attr('colspan')), col || 1);
|
|
14597
14598
|
var current_width = 0;
|
|
14598
14599
|
for (j = 0; j < colspan; j++) {
|
|
14599
14600
|
current_width += widths[i + j] || 0;
|
|
@@ -14621,7 +14622,8 @@ function eval_pyson(value){
|
|
|
14621
14622
|
i = 0;
|
|
14622
14623
|
row.children().map(function() {
|
|
14623
14624
|
var cell = jQuery(this);
|
|
14624
|
-
var colspan = Math.min(
|
|
14625
|
+
var colspan = Math.min(
|
|
14626
|
+
Number(cell.attr('colspan')), col || 1);
|
|
14625
14627
|
if (cell.hasClass('xexpand') &&
|
|
14626
14628
|
(cell.children(':not(.tooltip)').css('display') !=
|
|
14627
14629
|
'none')) {
|