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

[SSE] Fix rule format settings

Browse source
This commit is contained in:
Julia Radzhabova 2021-01-28 14:00:40 +03:00
parent d622183c6a
commit 2daa2b013c
2 changed files with 61 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -509,14 +509,15 @@ define([
// }); // });
// this.btnSubscript.on('click', _.bind(this.onSubscriptClick, this)); // this.btnSubscript.on('click', _.bind(this.onSubscriptClick, this));
var initNewColor = function(btn, picker_el) { var initNewColor = function(btn, picker_el, transparent) {
if (btn && btn.cmpEl) { if (btn && btn.cmpEl) {
btn.currentColor = '#000000'; btn.currentColor = '#000000';
var colorVal = $('<div class="btn-color-value-line"></div>'); var colorVal = $('<div class="btn-color-value-line"></div>');
$('button:first-child', btn.cmpEl).append(colorVal); $('button:first-child', btn.cmpEl).append(colorVal);
colorVal.css('background-color', btn.currentColor); colorVal.css('background-color', btn.currentColor);
var picker = new Common.UI.ThemeColorPalette({ var picker = new Common.UI.ThemeColorPalette({
el: $(picker_el) el: $(picker_el),
transparent: transparent
}); });
picker.currentColor = btn.currentColor; picker.currentColor = btn.currentColor;
} }
@ -558,7 +559,7 @@ define([
] ]
}) })
}); });
this.mnuFillColorPicker = initNewColor(this.btnFillColor, "#format-rules-menu-fillcolor"); this.mnuFillColorPicker = initNewColor(this.btnFillColor, "#format-rules-menu-fillcolor", true);
this.mnuFillColorPicker.on('select', _.bind(me.onFormatFillColorSelect, me)); this.mnuFillColorPicker.on('select', _.bind(me.onFormatFillColorSelect, me));
this.btnFillColor.on('click', _.bind(me.onFormatFillColor, me)); this.btnFillColor.on('click', _.bind(me.onFormatFillColor, me));
@ -1157,36 +1158,35 @@ define([
this.refreshRules(rec.get('index'), ruleType); this.refreshRules(rec.get('index'), ruleType);
} }
this.xfsFormat = new AscCommonExcel.CellXfs();
if (props) { if (props) {
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) {
var xfs = props.asc_getDxf(); this.xfsFormat = props.asc_getDxf();
this.btnBold.toggle(xfs.asc_getFontBold() === true, true);
this.btnItalic.toggle(xfs.asc_getFontItalic() === true, true);
this.btnUnderline.toggle(xfs.asc_getFontUnderline() === true, true);
this.btnStrikeout.toggle(xfs.asc_getFontStrikeout() === true, true);
var color = setColor(xfs.asc_getFontColor(), null, this.mnuTextColorPicker);
this.btnTextColor.currentColor = color;
this.mnuTextColorPicker.currentColor = color;
color = (typeof(color) == 'object') ? color.color : color;
$('.btn-color-value-line', this.btnTextColor.cmpEl).css('background-color', '#' + color);
color = setColor(xfs.asc_getFillColor(), null, this.mnuFillColorPicker);
this.btnFillColor.currentColor = color;
this.mnuFillColorPicker.currentColor = color;
color = (typeof(color) == 'object') ? color.color : color;
$('.btn-color-value-line', this.btnFillColor.cmpEl).css('background-color', '#' + color);
var val = xfs.asc_getNumFormatInfo();
val && this.cmbNumberFormat.setValue(val.asc_getType(), this.textCustom);
this.xfsFormat = xfs;
} }
} else {
} }
if (!this.xfsFormat) { if (this.xfsFormat) {
this.xfsFormat = new AscCommonExcel.CellXfs(); var xfs = this.xfsFormat;
this.btnBold.toggle(xfs.asc_getFontBold() === true, true);
this.btnItalic.toggle(xfs.asc_getFontItalic() === true, true);
this.btnUnderline.toggle(xfs.asc_getFontUnderline() === true, true);
this.btnStrikeout.toggle(xfs.asc_getFontStrikeout() === true, true);
var color = setColor(xfs.asc_getFontColor(), null, this.mnuTextColorPicker);
this.btnTextColor.currentColor = color;
this.mnuTextColorPicker.currentColor = color;
color = (typeof(color) == 'object') ? color.color : color;
$('.btn-color-value-line', this.btnTextColor.cmpEl).css('background-color', '#' + color);
color = setColor(xfs.asc_getFillColor(), null, this.mnuFillColorPicker);
this.btnFillColor.currentColor = color;
this.mnuFillColorPicker.currentColor = color;
color = (typeof(color) == 'object') ? color.color : color;
$('.btn-color-value-line', this.btnFillColor.cmpEl).css('background-color', color=='transparent' ? 'transparent' : '#' + color);
var val = xfs.asc_getNumFormatInfo();
val && this.cmbNumberFormat.setValue(val.asc_getType(), this.textCustom);
} }
this.api.asc_getPreviewCF('format-rules-edit-preview-format', this.xfsFormat, this.exampleText); this.api.asc_getPreviewCF('format-rules-edit-preview-format', this.xfsFormat, this.exampleText);
}, },
@ -1466,10 +1466,10 @@ 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.btnFillColor.currentColor = color; this.btnFillColor.currentColor = color;
$('.btn-color-value-line', this.btnFillColor.cmpEl).css('background-color', '#' + clr); $('.btn-color-value-line', this.btnFillColor.cmpEl).css('background-color', clr=='transparent' ? 'transparent' : '#' + clr);
picker.currentColor = color; picker.currentColor = color;
this.xfsFormat.asc_setFillColor(Common.Utils.ThemeColor.getRgbColor(this.mnuFillColorPicker.currentColor)); this.xfsFormat.asc_setFillColor(this.mnuFillColorPicker.currentColor == 'transparent' ? null : Common.Utils.ThemeColor.getRgbColor(this.mnuFillColorPicker.currentColor));
this.api.asc_getPreviewCF('format-rules-edit-preview-format', this.xfsFormat, this.exampleText); this.api.asc_getPreviewCF('format-rules-edit-preview-format', this.xfsFormat, this.exampleText);
}, },

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

@ -108,7 +108,7 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesManagerDlg.templa
this.handler = options.handler; this.handler = options.handler;
this.props = options.props; this.props = options.props;
this.langId = options.langId; this.langId = options.langId;
this.levels = []; this.rules = [];
this.rulesStore = new Common.UI.DataViewStore(); this.rulesStore = new Common.UI.DataViewStore();
@ -134,10 +134,10 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesManagerDlg.templa
emptyText: '', emptyText: '',
template: _.template(['<div class="listview inner" style=""></div>'].join('')), template: _.template(['<div class="listview inner" style=""></div>'].join('')),
itemTemplate: _.template([ itemTemplate: _.template([
'<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-<%= ruleIndex %>">',
'<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-<%= ruleIndex %>" style=""></div></div>',
'<div style="width:112px;display: inline-block;vertical-align: middle;"><div id="format-manager-item-preview-<%= levelIndex %>" style="height:22px;"></div></div>', '<div style="width:112px;display: inline-block;vertical-align: middle;"><div id="format-manager-item-preview-<%= ruleIndex %>" style="height:22px;"></div></div>',
'</div>' '</div>'
].join('')) ].join(''))
}); });
@ -220,22 +220,25 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesManagerDlg.templa
}, },
refreshRuleList: function(scope) { refreshRuleList: function(scope) {
this.rules = [];
var obj = this.api.asc_getCF(scope.value, (scope.value==Asc.c_oAscSelectionForCFType.worksheet) ? scope.sheetIndex : undefined); var obj = this.api.asc_getCF(scope.value, (scope.value==Asc.c_oAscSelectionForCFType.worksheet) ? scope.sheetIndex : undefined);
var levels = obj[0]; var rules = obj[0];
this.currentRange = obj[1]; this.currentRange = obj[1];
var arr = []; var arr = [];
if (levels) { if (rules) {
for (var i=0; i<levels.length; i++) { for (var i=0; i<rules.length; i++) {
var level = levels[i], var rule = rules[i],
name = this.getRuleName(level), name = this.getRuleName(rule),
location = level.asc_getLocation(); location = rule.asc_getLocation();
arr.push({ arr.push({
levelIndex: i, ruleIndex: i,
ruleId: rule.asc_getId(),
name: name, name: name,
tip: name, tip: name,
range: location[1], range: location[1],
activeSheet: location[0], activeSheet: location[0],
props: level props: rule
}); });
} }
} }
@ -418,11 +421,11 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesManagerDlg.templa
if (!item) return; if (!item) return;
var me = this, var me = this,
i = item.get('levelIndex'), i = item.get('ruleIndex'),
cmpEl = this.rulesList.cmpEl.find('#format-manager-item-' + i); cmpEl = this.rulesList.cmpEl.find('#format-manager-item-' + i);
if (!this.levels[i]) if (!this.rules[i])
this.levels[i] = {}; this.rules[i] = {};
var level = this.levels[i]; var rule = this.rules[i];
var input = new Common.UI.InputFieldBtn({ var input = new Common.UI.InputFieldBtn({
el : cmpEl.find('#format-manager-txt-rule-' + i), el : cmpEl.find('#format-manager-txt-rule-' + i),
name : 'range', name : 'range',
@ -431,13 +434,13 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesManagerDlg.templa
allowBlank : true, allowBlank : true,
disabled : !item.get('activeSheet'), disabled : !item.get('activeSheet'),
validateOnChange: true validateOnChange: true
}).on('button:click', _.bind(this.onSelectData, this, level)); }).on('button:click', _.bind(this.onSelectData, this, rule));
var val = item.get('range'); var val = item.get('range');
(val!==null) && input.setValue(val); (val!==null) && input.setValue(val);
level.txtDataRange = input; rule.txtDataRange = input;
level.dataRangeValid = val; rule.dataRangeValid = val;
level.previewDiv = 'format-manager-item-preview-' + i; rule.previewDiv = 'format-manager-item-preview-' + i;
me.drawRulePreview(item); me.drawRulePreview(item);
cmpEl.on('mousedown', 'input', function(){ cmpEl.on('mousedown', 'input', function(){
@ -451,7 +454,7 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesManagerDlg.templa
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) {
this.api.asc_getPreviewCF(this.levels[rule.get('levelIndex')].previewDiv, props.asc_getDxf(), this.exampleText); this.api.asc_getPreviewCF(this.rules[rule.get('ruleIndex')].previewDiv, props.asc_getDxf(), this.exampleText);
} }
}, },
@ -486,7 +489,8 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesManagerDlg.templa
onEditRule: function (isEdit) { onEditRule: function (isEdit) {
var me = this, var me = this,
xy = me.$window.offset(), xy = me.$window.offset(),
rec = this.rulesList.getSelectedRec(); rec = this.rulesList.getSelectedRec(),
previewRec;
var win = new SSE.Views.FormatRulesEditDlg({ var win = new SSE.Views.FormatRulesEditDlg({
api: me.api, api: me.api,
@ -500,13 +504,13 @@ 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); previewRec = 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;
settings.asc_setLocation(me.currentRange); settings.asc_setLocation(me.currentRange);
store.add({ previewRec = store.add({
levelIndex: index, ruleIndex: index,
name: name, name: name,
tip: name, tip: name,
range: me.currentRange, range: me.currentRange,
@ -518,6 +522,7 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesManagerDlg.templa
} }
}).on('close', function() { }).on('close', function() {
me.show(); me.show();
previewRec && me.drawRulePreview(previewRec);
}); });
me.hide(); me.hide();
@ -528,8 +533,8 @@ define([ 'text!spreadsheeteditor/main/app/template/FormatRulesManagerDlg.templa
var store = this.rulesList.store, var store = this.rulesList.store,
rec = this.rulesList.getSelectedRec(); rec = this.rulesList.getSelectedRec();
if (rec) { if (rec) {
var index = rec.get('levelIndex'); var index = rec.get('ruleIndex');
this.levels[index] = undefined; this.rules[index] = undefined;
index = store.indexOf(rec); index = store.indexOf(rec);
store.remove(rec); store.remove(rec);
(store.length>0) && this.rulesList.selectByIndex(index<store.length ? index : store.length-1); (store.length>0) && this.rulesList.selectByIndex(index<store.length ? index : store.length-1);