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

[DE] Add format string for numbering

Browse source
This commit is contained in:
Julia Radzhabova 2022-10-11 15:20:04 +03:00
parent 58bd480a74
commit 9ab4244863
1 changed files with 16 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
apps/documenteditor/main/app/view/ListSettingsDialog.js
View file

@ -174,6 +174,12 @@ define([
'<div id="id-dlg-bullet-align" class="input-group-nr" style="width: 100%;margin-bottom: 10px;"></div>', '<div id="id-dlg-bullet-align" class="input-group-nr" style="width: 100%;margin-bottom: 10px;"></div>',
'</td>', '</td>',
'</tr>', '</tr>',
'<tr>',
'<td colspan="2" style="width: 100%;">',
'<label class="input-label">' + this.txtNumFormatString + '</label>',
'<div id="id-dlg-numbering-format-str" style="width: 100%;height:22px;margin-bottom: 10px;"></div>',
'</td>',
'</tr>',
'</table>', '</table>',
'<table cols="2" style="width: 100%;">', '<table cols="2" style="width: 100%;">',
'<tr>', '<tr>',
@ -780,9 +786,7 @@ define([
if (!levelProps) return; if (!levelProps) return;
this.cmbAlign.setValue((levelProps.get_Align()!==undefined) ? levelProps.get_Align() : ''); this.cmbAlign.setValue((levelProps.get_Align()!==undefined) ? levelProps.get_Align() : '');
this.spnStart.setValue(levelProps.get_Start(), true);
var format = levelProps.get_Format(), var format = levelProps.get_Format(),
textPr = levelProps.get_TextPr(),
text = levelProps.get_Text(); text = levelProps.get_Text();
if (text && format == Asc.c_oAscNumberingFormat.Bullet) { if (text && format == Asc.c_oAscNumberingFormat.Bullet) {
this.bulletProps.symbol = text[0].get_Value(); this.bulletProps.symbol = text[0].get_Value();
@ -824,11 +828,6 @@ define([
} }
this.btnColor.setColor(color); this.btnColor.setColor(color);
this.spnAlign.setValue(Common.Utils.Metric.fnRecalcFromMM(levelProps.get_NumberPosition()), true);
this.spnIndents.setValue(Common.Utils.Metric.fnRecalcFromMM(levelProps.get_IndentSize()), true);
this.cmbFollow.setValue(levelProps.get_Suff());
this.chRestart.setValue(levelProps.get_Restart()===-1);
if (this.type>0) { if (this.type>0) {
if (format == Asc.c_oAscNumberingFormat.Bullet) { if (format == Asc.c_oAscNumberingFormat.Bullet) {
if (!this.cmbFormat.store.findWhere({value: Asc.c_oAscNumberingFormat.Bullet, symbol: this.bulletProps.symbol, font: this.bulletProps.font})) if (!this.cmbFormat.store.findWhere({value: Asc.c_oAscNumberingFormat.Bullet, symbol: this.bulletProps.symbol, font: this.bulletProps.font}))
@ -839,13 +838,19 @@ define([
this.cmbFormat.setValue((format!==undefined) ? format : ''); this.cmbFormat.setValue((format!==undefined) ? format : '');
} }
if (this.type===1) { if (this.type===1) {
this.makeFormatStr(levelProps);
} else if (this.type===2) { } else if (this.type===2) {
this.spnStart.setValue(levelProps.get_Start(), true);
this.spnAlign.setValue(Common.Utils.Metric.fnRecalcFromMM(levelProps.get_NumberPosition()), true);
this.spnIndents.setValue(Common.Utils.Metric.fnRecalcFromMM(levelProps.get_IndentSize()), true);
this.cmbFollow.setValue(levelProps.get_Suff());
this.chRestart.setValue(levelProps.get_Restart()===-1);
this.txtNumFormat.setDisabled(format == Asc.c_oAscNumberingFormat.Bullet); this.txtNumFormat.setDisabled(format == Asc.c_oAscNumberingFormat.Bullet);
this.spnStart.setDisabled(format == Asc.c_oAscNumberingFormat.Bullet); this.spnStart.setDisabled(format == Asc.c_oAscNumberingFormat.Bullet);
this.cmbFonts.setDisabled(format == Asc.c_oAscNumberingFormat.Bullet); // this.cmbFonts.setDisabled(format == Asc.c_oAscNumberingFormat.Bullet);
this.btnBold.setDisabled(format == Asc.c_oAscNumberingFormat.Bullet); // this.btnBold.setDisabled(format == Asc.c_oAscNumberingFormat.Bullet);
this.btnItalic.setDisabled(format == Asc.c_oAscNumberingFormat.Bullet); // this.btnItalic.setDisabled(format == Asc.c_oAscNumberingFormat.Bullet);
this.chRestart.setDisabled(this.level===0); this.chRestart.setDisabled(this.level===0);
var arr = []; var arr = [];