fix: Read only mode for color input

- fix style color readonly field
- fix case where color control is hidden

(cherry picked from commit 0d20d1a5d5)
This commit is contained in:
Suraj Shetty 2021-03-24 17:36:23 +05:30 committed by mergify-bot
parent 4854b7952b
commit 8137bf5d82
3 changed files with 19 additions and 4 deletions

View file

@ -76,7 +76,7 @@ frappe.ui.form.ControlColor = frappe.ui.form.ControlData.extend({
refresh() {
this._super();
let color = this.get_color();
if (this.picker.color !== color) {
if (this.picker && this.picker.color !== color) {
this.picker.color = color;
this.picker.refresh();
}

View file

@ -293,6 +293,12 @@ frappe.form.formatters = {
return frappe.format(value, link_field, options, row);
});
return formatted_values.join(', ');
},
Color: (value) => {
return `<div>
<div class="selected-color" style="background-color: ${value}"></div>
<span class="color-value">${value}</span>
</div>`;
}
}

View file

@ -92,7 +92,7 @@
}
}
.frappe-control[data-fieldtype='Color'] {
.frappe-control[data-fieldtype='Color'] {
input {
padding-left: 40px;
}
@ -104,11 +104,20 @@
background-color: red;
position: absolute;
top: calc(50% + 1px);
left: 5px;
left: 8px;
content: ' ';
&.no-value {
background: url('/assets/frappe/images/color-circle.png');
background-size: contain;
}
}
}
.like-disabled-input {
.color-value {
padding-left: 25px;
}
.selected-color {
top: 20%;
cursor: default;
}
}
}