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

[DE] Form settings: add empty placeholder item to combobox and dropdown

Browse source
This commit is contained in:
Julia Radzhabova 2020-10-31 18:31:41 +03:00
parent 13c54668b7
commit 63c6b519e8
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
apps/documenteditor/main/app/view/DocumentHolder.js
View file

@ -4239,6 +4239,7 @@ define([
var type = obj.type, var type = obj.type,
props = obj.pr, props = obj.pr,
specProps = (type == Asc.c_oAscContentControlSpecificType.ComboBox) ? props.get_ComboBoxPr() : props.get_DropDownListPr(), specProps = (type == Asc.c_oAscContentControlSpecificType.ComboBox) ? props.get_ComboBoxPr() : props.get_DropDownListPr(),
isForm = !!props.get_FormPr(),
menu = this.listControlMenu, menu = this.listControlMenu,
menuContainer = menu ? this.cmpEl.find(Common.Utils.String.format('#menu-container-{0}', menu.id)) : null, menuContainer = menu ? this.cmpEl.find(Common.Utils.String.format('#menu-container-{0}', menu.id)) : null,
me = this; me = this;
@ -4275,14 +4276,25 @@ define([
}); });
} }
if (specProps) { if (specProps) {
if (isForm){ // for dropdown and combobox form control always add placeholder item
menu.addItem(new Common.UI.MenuItem({
caption : props.get_PlaceholderText(),
value : '',
template : _.template([
'<a id="<%= id %>" tabindex="-1" type="menuitem" style="<% if (options.value=="") { %> opacity: 0.6 <% } %>">',
'<%= caption %>',
'</a>'
].join(''))
}));
}
var count = specProps.get_ItemsCount(); var count = specProps.get_ItemsCount();
for (var i=0; i<count; i++) { for (var i=0; i<count; i++) {
menu.addItem(new Common.UI.MenuItem({ (specProps.get_ItemValue(i)!=='' || !isForm) && menu.addItem(new Common.UI.MenuItem({
caption : specProps.get_ItemDisplayText(i), caption : specProps.get_ItemDisplayText(i),
value : specProps.get_ItemValue(i) value : specProps.get_ItemValue(i)
})); }));
} }
if (count<1) { if (!isForm && menu.items.length<1) {
menu.addItem(new Common.UI.MenuItem({ menu.addItem(new Common.UI.MenuItem({
caption : this.txtEmpty, caption : this.txtEmpty,
value : -1 value : -1

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

@ -580,7 +580,7 @@ define([
var count = specProps.get_ItemsCount(); var count = specProps.get_ItemsCount();
var arr = []; var arr = [];
for (var i=0; i<count; i++) { for (var i=0; i<count; i++) {
arr.push({ (specProps.get_ItemValue(i)!=='') && arr.push({
value: specProps.get_ItemValue(i), value: specProps.get_ItemValue(i),
name: specProps.get_ItemDisplayText(i) name: specProps.get_ItemDisplayText(i)
}); });