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

[DE] Form settings: use auto size of cell width

Browse source
This commit is contained in:
Julia Radzhabova 2020-10-30 21:55:58 +03:00
parent 1ddd5b23d5
commit 5c8231afd9
2 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/common/main/lib/component/MetricSpinner.js
View file

@ -448,7 +448,7 @@ define([
val = _.isEmpty(val) ? me.oldValue : Common.Utils.String.parseFloat(val); val = _.isEmpty(val) ? me.oldValue : Common.Utils.String.parseFloat(val);
} else if(me.getValue() !== '') { } else if(me.getValue() !== '') {
if (me.checkAutoText(me.getValue())) { if (me.checkAutoText(me.getValue())) {
val = me.options.minValue-me.options.step; val = me.options.defaultValue-me.options.step;
} else } else
val = Common.Utils.String.parseFloat(me.getValue()); val = Common.Utils.String.parseFloat(me.getValue());
if (isNaN(val)) if (isNaN(val))
@ -536,6 +536,10 @@ define([
return v_out; return v_out;
}, },
setDefaultValue: function(value) {
this.options.defaultValue = value;
},
checkAutoText: function(value) { checkAutoText: function(value) {
if (this.options.allowAuto && typeof value == 'string') { if (this.options.allowAuto && typeof value == 'string') {
var val = value.toLowerCase(); var val = value.toLowerCase();

6
apps/documenteditor/main/app/view/FormSettings.js
View file

@ -653,6 +653,12 @@ define([
this._state.Width=val; this._state.Width=val;
} }
val = this.api.asc_GetTextFormAutoWidth();
if ( (this._state.WidthPlaceholder!==val) || Math.abs(this._state.WidthPlaceholder-val)>0.01) {
this.spnWidth.setDefaultValue(val!==undefined && val!==null ? Common.Utils.Metric.fnRecalcFromMM(val) : this.spnWidth.options.minValue);
this._state.WidthPlaceholder=val;
}
val = formTextPr.get_MaxCharacters(); val = formTextPr.get_MaxCharacters();
this.chMaxChars.setValue(val && val>=0); this.chMaxChars.setValue(val && val>=0);
this.spnMaxChars.setDisabled(!val || val<0); this.spnMaxChars.setDisabled(!val || val<0);