pengjunjie/sdkjs-forms
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/sdkjs-forms.git synced 2026-02-10 18:05:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

[oform] Fix color management

Browse Source
This commit is contained in:
KirillovIlya
2022-11-28 20:28:27 +03:00
parent 81c7af9ee7
commit 6cfc7ab50f
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
oform/Role.js
View File

@ -51,7 +51,7 @@
let r = new CRoleSettings();
r.setName(this.UserMaster.getRole());
r.setColor(this.UserMaster.getColor());
return new CRoleSettings();
return r;
};
CRole.prototype.getRole = function()
{
@ -97,17 +97,19 @@
{
return this.Color;
};
CRoleSettings.prototype.setAscColor = function(r, g, b)
CRoleSettings.prototype.setAscColor = function(ascColor)
{
if (undefined === r || null === r)
if (undefined === ascColor || null === ascColor)
this.Color = null;
else
this.Color = new AscWord.CDocumentColor(r, g, b);
this.Color = new AscWord.CDocumentColor(ascColor.get_r(), ascColor.get_g(), ascColor.get_b());
}
CRoleSettings.prototype.getAscColor = function()
{
// TODO: Надо отдавать в интерфейс цвет AscColor
return this.Color;
if (!this.Color)
return null;
return new Asc.asc_CColor(this.Color.r, this.Color.g, this.Color.b);
};
CRoleSettings.prototype.haveColor = function()
{