Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[SSE] Fix checkboxes in pivot settings

Browse source
This commit is contained in:
Julia Radzhabova 2019-12-12 12:20:18 +03:00
parent df4acc4bb8
commit 462d066d85
1 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
apps/spreadsheeteditor/main/app/view/PivotSettings.js
View file

@ -107,19 +107,19 @@ define([
itemTemplate: _.template([ itemTemplate: _.template([
'<div>', '<div>',
'<label class="checkbox-indeterminate" style="position:absolute;">', '<label class="checkbox-indeterminate" style="position:absolute;">',
'<% if (check) { %>', '<input id="pvcheckbox-<%= id %>" type="checkbox" class="button__checkbox">',
'<input type="button" class="checked button__checkbox"/>', '<label for="pvcheckbox-<%= id %>" class="checkbox__shape" />',
'<% } else { %>',
'<input type="button" class="button__checkbox"/>',
'<% } %>',
'<span class="checkmark"/>',
'</label>', '</label>',
'<div id="<%= id %>" class="list-item" style="pointer-events:none;"><span style="background-color: transparent;"><%= Common.Utils.String.htmlEncode(value) %></span></div>', '<div id="<%= id %>" class="list-item" style="pointer-events:none;"><span style="background-color: transparent;"><%= Common.Utils.String.htmlEncode(value) %></span></div>',
'<div class="listitem-icon img-commonctrl"></div>', '<div class="listitem-icon img-commonctrl"></div>',
'</div>' '</div>'
].join('')) ].join(''))
}); });
this.fieldsList.on('item:click', _.bind(this.onFieldsCheck, this)); this.fieldsList.on({
'item:change': this.onItemChanged.bind(this),
'item:add': this.onItemChanged.bind(this),
'item:click': this.onFieldsCheck.bind(this)
});
this.fieldsList.$el.on('dragenter', _.bind(this.onDragEnter, this)); this.fieldsList.$el.on('dragenter', _.bind(this.onDragEnter, this));
this.fieldsList.$el.on('dragover', _.bind(this.onDragOver, this, this.fieldsList)); this.fieldsList.$el.on('dragover', _.bind(this.onDragOver, this, this.fieldsList));
this.fieldsList.$el.on('dragleave', _.bind(this.onDragLeave, this, this.fieldsList)); this.fieldsList.$el.on('dragleave', _.bind(this.onDragLeave, this, this.fieldsList));
@ -546,7 +546,7 @@ define([
// if (this.checkCellTrigerBlock) // if (this.checkCellTrigerBlock)
// return; // return;
var target = '', type = '', isLabel = false, bound = null; var target = '', isLabel = false, bound = null;
var event = window.event ? window.event : window._event; var event = window.event ? window.event : window._event;
if (event) { if (event) {
@ -632,7 +632,6 @@ define([
return; return;
} }
type = event.target.type;
target = $(event.currentTarget).find('.list-item'); target = $(event.currentTarget).find('.list-item');
if (target.length) { if (target.length) {
@ -645,7 +644,7 @@ define([
} }
} }
if (type === 'button' || isLabel || event.target.className.match('checkmark')) { if (isLabel || event.target.className.match('checkbox')) {
this.updateFieldCheck(listView, record); this.updateFieldCheck(listView, record);
_.delay(function () { _.delay(function () {
@ -657,7 +656,7 @@ define([
updateFieldCheck: function (listView, record) { updateFieldCheck: function (listView, record) {
if (record && listView) { if (record && listView) {
listView.isSuspendEvents = true; // listView.isSuspendEvents = true;
record.set('check', !record.get('check')); record.set('check', !record.get('check'));
if (this.api && !this._locked){ if (this.api && !this._locked){
@ -668,7 +667,7 @@ define([
} }
} }
listView.isSuspendEvents = false; // listView.isSuspendEvents = false;
listView.scroller.update({minScrollbarLength : 40, alwaysVisibleY: true, suppressScrollX: true}); listView.scroller.update({minScrollbarLength : 40, alwaysVisibleY: true, suppressScrollX: true});
} }
}, },
@ -969,6 +968,13 @@ define([
} }
}, },
onItemChanged: function (view, record) {
var state = record.model.get('check');
if ( state == 'indeterminate' )
$('input[type=checkbox]', record.$el).prop('indeterminate', true);
else $('input[type=checkbox]', record.$el).prop({checked: state, indeterminate: false});
},
textFields: 'Select Fields', textFields: 'Select Fields',
textValues : 'Values', textValues : 'Values',
textRows : 'Rows', textRows : 'Rows',