Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
sdkjs
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boris Kocherov
sdkjs
Commits
24a31a87
Commit
24a31a87
authored
May 05, 2016
by
GoshaZotov
Committed by
Alexander.Trofimov
May 19, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
save ColorFilter in co-editing
parent
d4b9632f
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
29 additions
and
1 deletion
+29
-1
cell/model/UndoRedo.js
cell/model/UndoRedo.js
+2
-0
cell/model/WorkbookElems.js
cell/model/WorkbookElems.js
+27
-1
No files found.
cell/model/UndoRedo.js
View file @
24a31a87
...
...
@@ -382,6 +382,7 @@ var UndoRedoDataTypes = new function() {
this
.
CustomFilters
=
36
;
this
.
CustomFilter
=
37
;
this
.
ColorFilter
=
38
;
this
.
DefinedName
=
39
;
this
.
DefinedNamesChange
=
40
;
...
...
@@ -452,6 +453,7 @@ var UndoRedoDataTypes = new function() {
case
this
.
AutoFilterObj
:
return
new
AscCommonExcel
.
AutoFilterObj
();
break
;
case
this
.
CustomFilters
:
return
new
Asc
.
CustomFilters
();
break
;
case
this
.
CustomFilter
:
return
new
Asc
.
CustomFilter
();
break
;
case
this
.
ColorFilter
:
return
new
Asc
.
ColorFilter
();
break
;
case
this
.
AutoFiltersOptionsElements
:
return
new
AscCommonExcel
.
AutoFiltersOptionsElements
();
break
;
case
this
.
AddFormatTableOptions
:
return
new
AscCommonExcel
.
AddFormatTableOptions
();
break
;
case
this
.
SingleProperty
:
return
new
UndoRedoData_SingleProperty
();
break
;
...
...
cell/model/WorkbookElems.js
View file @
24a31a87
...
...
@@ -5902,11 +5902,37 @@ DynamicFilter.prototype.asc_setType = function (val) { this.Type = val; };
DynamicFilter
.
prototype
.
asc_setVal
=
function
(
val
)
{
this
.
Val
=
val
;
};
DynamicFilter
.
prototype
.
asc_setMaxVal
=
function
(
val
)
{
this
.
MaxVal
=
val
;
};
var
g_oColorFilter
=
{
CellColor
:
0
,
dxf
:
1
};
/** @constructor */
function
ColorFilter
()
{
this
.
Properties
=
g_oColorFilter
;
this
.
CellColor
=
null
;
this
.
dxf
=
null
;
}
ColorFilter
.
prototype
.
getType
=
function
()
{
return
UndoRedoDataTypes
.
ColorFilter
;
};
ColorFilter
.
prototype
.
getProperties
=
function
()
{
return
this
.
Properties
;
};
ColorFilter
.
prototype
.
getProperty
=
function
(
nType
)
{
switch
(
nType
)
{
case
this
.
Properties
.
CellColor
:
return
this
.
CellColor
;
break
;
case
this
.
Properties
.
dxf
:
return
this
.
dxf
;
break
;
}
return
null
;
};
ColorFilter
.
prototype
.
setProperty
=
function
(
nType
,
value
)
{
switch
(
nType
)
{
case
this
.
Properties
.
CellColor
:
this
.
CellColor
=
value
;
break
;
case
this
.
Properties
.
dxf
:
this
.
dxf
=
value
;
break
;
}
};
ColorFilter
.
prototype
.
clone
=
function
()
{
var
res
=
new
ColorFilter
();
res
.
CellColor
=
this
.
CellColor
;
...
...
@@ -5950,7 +5976,7 @@ ColorFilter.prototype.isHideValue = function(cell) {
else
{
var
color
=
cell
.
getStyle
();
if
(
color
!==
null
&&
color
.
fill
&&
color
.
fill
.
bg
&&
fontColor
.
rgb
===
filterColor
.
rgb
)
if
(
color
!==
null
&&
color
.
fill
&&
color
.
fill
.
bg
&&
color
.
fill
.
bg
.
rgb
===
filterColor
.
rgb
)
{
res
=
false
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment