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

[SSE] Fix rules settings

Browse source
This commit is contained in:
Julia Radzhabova 2021-01-28 00:57:04 +03:00
parent d29a058ce6
commit d622183c6a
2 changed files with 68 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/spreadsheeteditor/main/app/view/FormatRulesEditDlg.js
View file

@ -692,9 +692,6 @@ define([
}); });
this.btnBorders.menu.on('item:click', _.bind(this.onBordersMenu, this)); this.btnBorders.menu.on('item:click', _.bind(this.onBordersMenu, this));
this.btnBorders.on('click', _.bind(this.onBorders, this)); this.btnBorders.on('click', _.bind(this.onBorders, this));
var colorVal = $('<div class="btn-color-value-line"></div>');
$('button:first-child', this.btnBorders.cmpEl).append(colorVal);
colorVal.css('background-color', this.btnBorders.currentColor || 'transparent');
this.mnuBorderColorPicker = new Common.UI.ThemeColorPalette({ this.mnuBorderColorPicker = new Common.UI.ThemeColorPalette({
el: $('#format-rules-borders-menu-bordercolor') el: $('#format-rules-borders-menu-bordercolor')
}); });
@ -1161,8 +1158,6 @@ define([
} }
if (props) { if (props) {
// var val = props.asc_getLocation();
// this.txtScope.setValue((val) ? val : '');
if (type == Asc.c_oAscCFType.containsText || type == Asc.c_oAscCFType.notContainsText || type == Asc.c_oAscCFType.beginsWith || if (type == Asc.c_oAscCFType.containsText || type == Asc.c_oAscCFType.notContainsText || type == Asc.c_oAscCFType.beginsWith ||
type == Asc.c_oAscCFType.endsWith || type == Asc.c_oAscCFType.timePeriod || type == Asc.c_oAscCFType.aboveAverage || type == Asc.c_oAscCFType.endsWith || type == Asc.c_oAscCFType.timePeriod || type == Asc.c_oAscCFType.aboveAverage ||
type == Asc.c_oAscCFType.top10 || type == Asc.c_oAscCFType.cellIs || type == Asc.c_oAscCFType.expression) { type == Asc.c_oAscCFType.top10 || type == Asc.c_oAscCFType.cellIs || type == Asc.c_oAscCFType.expression) {
@ -1470,8 +1465,8 @@ define([
onFormatFillColorSelect: function(picker, color, fromBtn) { onFormatFillColorSelect: function(picker, color, fromBtn) {
var clr = (typeof(color) == 'object') ? color.color : color; var clr = (typeof(color) == 'object') ? color.color : color;
this.mnuFillColorPicker.currentColor = color; this.btnFillColor.currentColor = color;
$('.btn-color-value-line', this.mnuFillColorPicker.cmpEl).css('background-color', '#' + clr); $('.btn-color-value-line', this.btnFillColor.cmpEl).css('background-color', '#' + clr);
picker.currentColor = color; picker.currentColor = color;
this.xfsFormat.asc_setFillColor(Common.Utils.ThemeColor.getRgbColor(this.mnuFillColorPicker.currentColor)); this.xfsFormat.asc_setFillColor(Common.Utils.ThemeColor.getRgbColor(this.mnuFillColorPicker.currentColor));

82
apps/spreadsheeteditor/main/app/view/FormatRulesManagerDlg.js
View file

@ -58,10 +58,23 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesManagerDlg.templa
me.template = me.options.template || me.template; me.template = me.options.template || me.template;
me.listenTo(me.model, 'change:sort', function() { me.listenTo(me.model, 'change:name', function() {
me.render(); me.render();
me.trigger('change', me, me.model); me.trigger('change', me, me.model);
}); });
me.listenTo(me.model, 'change:tip', function() {
var el = me.$el || $(me.el),
tip = el.data('bs.tooltip');
if (tip) {
var zIndex = tip.options.zIndex;
el.removeData('bs.tooltip');
el.tooltip({
title : me.model.get('tip'),
placement : 'cursor',
zIndex : zIndex
});
}
});
me.listenTo(me.model, 'change:selected', function() { me.listenTo(me.model, 'change:selected', function() {
var el = me.$el || $(me.el); var el = me.$el || $(me.el);
el.toggleClass('selected', me.model.get('selected') && me.model.get('allowSelected')); el.toggleClass('selected', me.model.get('selected') && me.model.get('allowSelected'));
@ -107,19 +120,13 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesManagerDlg.templa
this.cmbScope = new Common.UI.ComboBox({ this.cmbScope = new Common.UI.ComboBox({
el : $('#format-manager-combo-scope'), el : $('#format-manager-combo-scope'),
menuStyle : 'min-width: 100%;', menuStyle : 'min-width: 100%;max-height: 211px;',
editable : false, editable : false,
cls : 'input-group-nr', cls : 'input-group-nr',
data : [ data : []
{ value: Asc.c_oAscSelectionForCFType.selection, displayValue: this.textSelection },
{ value: Asc.c_oAscSelectionForCFType.worksheet, displayValue: this.textThisSheet },
{ value: Asc.c_oAscSelectionForCFType.table, displayValue: this.textThisTable },
{ value: Asc.c_oAscSelectionForCFType.pivot, displayValue: this.textThisPivot }
]
}).on('selected', function(combo, record) { }).on('selected', function(combo, record) {
me.refreshRuleList(record.value); me.refreshRuleList(record);
}); });
this.cmbScope.setValue(Asc.c_oAscSelectionForCFType.selection);
this.rulesList = new Common.UI.ListView({ this.rulesList = new Common.UI.ListView({
el: $('#format-manager-rules-list', this.$window), el: $('#format-manager-rules-list', this.$window),
@ -130,7 +137,7 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesManagerDlg.templa
'<div class="list-item" style="width: 100%;display:inline-block;" id="format-manager-item-<%= levelIndex %>">', '<div class="list-item" style="width: 100%;display:inline-block;" id="format-manager-item-<%= levelIndex %>">',
'<div style="width:181px;padding-right: 10px;display: inline-block;vertical-align: middle;overflow: hidden; text-overflow: ellipsis; white-space: nowrap;"><%= name %></div>', '<div style="width:181px;padding-right: 10px;display: inline-block;vertical-align: middle;overflow: hidden; text-overflow: ellipsis; white-space: nowrap;"><%= name %></div>',
'<div style="width:181px;padding-right: 10px;display: inline-block;vertical-align: middle;"><div id="format-manager-txt-rule-<%= levelIndex %>" style=""></div></div>', '<div style="width:181px;padding-right: 10px;display: inline-block;vertical-align: middle;"><div id="format-manager-txt-rule-<%= levelIndex %>" style=""></div></div>',
'<div style="width:94px;display: inline-block;vertical-align: middle;"></div>', '<div style="width:112px;display: inline-block;vertical-align: middle;"><div id="format-manager-item-preview-<%= levelIndex %>" style="height:22px;"></div></div>',
'</div>' '</div>'
].join('')) ].join(''))
}); });
@ -184,23 +191,50 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesManagerDlg.templa
_setDefaults: function (props) { _setDefaults: function (props) {
this.rulesList.on('item:add', _.bind(this.addControls, this)); this.rulesList.on('item:add', _.bind(this.addControls, this));
this.rulesList.on('item:change', _.bind(this.addControls, this)); this.rulesList.on('item:change', _.bind(this.addControls, this));
this.refreshRuleList(this.cmbScope.getValue()); this.refreshScopeList();
this.refreshRuleList(this.cmbScope.getSelectedRecord());
},
refreshScopeList: function() {
var wc = this.api.asc_getWorksheetsCount(), i = -1,
currentSheet = this.api.asc_getActiveWorksheetIndex();
var items = [
{ value: Asc.c_oAscSelectionForCFType.selection, displayValue: this.textSelection },
{ value: Asc.c_oAscSelectionForCFType.worksheet, displayValue: this.textThisSheet, sheetIndex: currentSheet },
{ value: Asc.c_oAscSelectionForCFType.table, displayValue: this.textThisTable },
{ value: Asc.c_oAscSelectionForCFType.pivot, displayValue: this.textThisPivot }
];
if (wc>1) {
while (++i < wc) {
if (!this.api.asc_isWorksheetHidden(i) && i!==currentSheet) {
items.push({
displayValue:this.api.asc_getWorksheetName(i),
value: Asc.c_oAscSelectionForCFType.worksheet,
sheetIndex: i
});
}
}
}
this.cmbScope.setData(items);
this.cmbScope.setValue(Asc.c_oAscSelectionForCFType.selection);
}, },
refreshRuleList: function(scope) { refreshRuleList: function(scope) {
var obj = this.api.asc_getCF(scope, (scope==Asc.c_oAscSelectionForCFType.worksheet) ? this.api.asc_getActiveWorksheetIndex() : undefined); var obj = this.api.asc_getCF(scope.value, (scope.value==Asc.c_oAscSelectionForCFType.worksheet) ? scope.sheetIndex : undefined);
var levels = obj[0]; var levels = obj[0];
this.currentRange = obj[1]; this.currentRange = obj[1];
var arr = []; var arr = [];
if (levels) { if (levels) {
for (var i=0; i<levels.length; i++) { for (var i=0; i<levels.length; i++) {
var level = levels[i], var level = levels[i],
name = this.getRuleName(level); name = this.getRuleName(level),
location = level.asc_getLocation();
arr.push({ arr.push({
levelIndex: i, levelIndex: i,
name: name, name: name,
tip: name, tip: name,
range: level.asc_getLocation(), range: location[1],
activeSheet: location[0],
props: level props: level
}); });
} }
@ -395,6 +429,7 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesManagerDlg.templa
style : 'width: 100%;', style : 'width: 100%;',
btnHint : this.textSelectData, btnHint : this.textSelectData,
allowBlank : true, allowBlank : true,
disabled : !item.get('activeSheet'),
validateOnChange: true validateOnChange: true
}).on('button:click', _.bind(this.onSelectData, this, level)); }).on('button:click', _.bind(this.onSelectData, this, level));
@ -402,12 +437,24 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesManagerDlg.templa
(val!==null) && input.setValue(val); (val!==null) && input.setValue(val);
level.txtDataRange = input; level.txtDataRange = input;
level.dataRangeValid = val; level.dataRangeValid = val;
level.previewDiv = 'format-manager-item-preview-' + i;
me.drawRulePreview(item);
cmpEl.on('mousedown', 'input', function(){ cmpEl.on('mousedown', 'input', function(){
me.rulesList.selectRecord(item); me.rulesList.selectRecord(item);
}); });
}, },
drawRulePreview: function(rule) {
var props = rule.get('props'),
type = props.asc_getType();
if (type == Asc.c_oAscCFType.containsText || type == Asc.c_oAscCFType.notContainsText || type == Asc.c_oAscCFType.beginsWith ||
type == Asc.c_oAscCFType.endsWith || type == Asc.c_oAscCFType.timePeriod || type == Asc.c_oAscCFType.aboveAverage ||
type == Asc.c_oAscCFType.top10 || type == Asc.c_oAscCFType.cellIs || type == Asc.c_oAscCFType.expression) {
this.api.asc_getPreviewCF(this.levels[rule.get('levelIndex')].previewDiv, props.asc_getDxf(), this.exampleText);
}
},
onSelectData: function(item, cmp) { onSelectData: function(item, cmp) {
var me = this; var me = this;
if (me.api) { if (me.api) {
@ -453,6 +500,7 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesManagerDlg.templa
rec.set('name', name); rec.set('name', name);
rec.set('tip', name); rec.set('tip', name);
rec.set('props', settings); rec.set('props', settings);
me.drawRulePreview(rec);
} else { } else {
var store = me.rulesList.store, var store = me.rulesList.store,
index = rec ? store.indexOf(rec)+1 : store.length; index = rec ? store.indexOf(rec)+1 : store.length;
@ -462,6 +510,7 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesManagerDlg.templa
name: name, name: name,
tip: name, tip: name,
range: me.currentRange, range: me.currentRange,
activeSheet: true,
props: settings props: settings
}, {at: index}); }, {at: index});
} }
@ -544,7 +593,8 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesManagerDlg.templa
textRules: 'Rules', textRules: 'Rules',
textApply: 'Apply to', textApply: 'Apply to',
textFormat: 'Format', textFormat: 'Format',
textSelectData: 'Select data' textSelectData: 'Select data',
exampleText: 'AaBbCcYyZz'
}, SSE.Views.FormatRulesManagerDlg || {})); }, SSE.Views.FormatRulesManagerDlg || {}));
}); });