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
ed8d2958
Commit
ed8d2958
authored
Oct 31, 2017
by
Sergey Konovalov
1
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
for column styles
parent
7c0efb2b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
22 deletions
+10
-22
cell/model/Serialize.js
cell/model/Serialize.js
+2
-2
cell/model/Workbook.js
cell/model/Workbook.js
+1
-1
cell/model/WorkbookElems.js
cell/model/WorkbookElems.js
+7
-19
No files found.
cell/model/Serialize.js
View file @
ed8d2958
...
...
@@ -6034,14 +6034,14 @@
oTo
.
BestFit
=
oFrom
.
BestFit
;
oTo
.
setHidden
(
oFrom
.
hd
);
if
(
null
!=
oFrom
.
xfs
)
oTo
.
xfs
=
oFrom
.
xfs
.
clone
(
);
oTo
.
setStyle
(
oFrom
.
xfs
);
else
if
(
null
!=
oFrom
.
xfsid
)
{
var
xfs
=
oThis
.
aCellXfs
[
oFrom
.
xfsid
];
if
(
null
!=
xfs
)
{
oFrom
.
xfs
=
xfs
;
oTo
.
xfs
=
xfs
.
clone
(
);
oTo
.
setStyle
(
xfs
);
}
}
if
(
null
!=
oFrom
.
width
)
...
...
cell/model/Workbook.js
View file @
ed8d2958
...
...
@@ -6192,7 +6192,7 @@
}
};
Cell
.
prototype
.
setStyleInternal
=
function
(
xfs
)
{
this
.
xfs
=
xfs
;
this
.
xfs
=
g_StyleCache
.
addXf
(
xfs
)
;
this
.
_hasChanged
=
true
;
};
Cell
.
prototype
.
getFormula
=
function
(){
...
...
cell/model/WorkbookElems.js
View file @
ed8d2958
...
...
@@ -3211,25 +3211,14 @@ Col.prototype =
setStyle
:
function
(
xfs
)
{
var
oldVal
=
this
.
xfs
;
var
newVal
=
null
;
this
.
xfs
=
null
;
if
(
null
!=
xfs
)
{
this
.
xfs
=
xfs
.
clone
();
newVal
=
xfs
;
}
if
(
History
.
Is_On
()
&&
false
==
((
null
==
oldVal
&&
null
==
newVal
)
||
(
null
!=
oldVal
&&
null
!=
newVal
&&
true
==
oldVal
.
isEqual
(
newVal
))))
{
if
(
null
!=
oldVal
)
oldVal
=
oldVal
.
clone
();
if
(
null
!=
newVal
)
newVal
=
newVal
.
clone
();
History
.
Add
(
AscCommonExcel
.
g_oUndoRedoCol
,
AscCH
.
historyitem_RowCol_SetStyle
,
this
.
ws
.
getId
(),
this
.
_getUpdateRange
(),
new
UndoRedoData_IndexSimpleProp
(
this
.
index
,
false
,
oldVal
,
newVal
));
this
.
setStyleInternal
(
xfs
);
if
(
History
.
Is_On
()
&&
oldVal
!==
this
.
xfs
)
{
History
.
Add
(
AscCommonExcel
.
g_oUndoRedoCol
,
AscCH
.
historyitem_RowCol_SetStyle
,
this
.
ws
.
getId
(),
this
.
_getUpdateRange
(),
new
UndoRedoData_IndexSimpleProp
(
this
.
index
,
false
,
oldVal
,
this
.
xfs
));
}
},
setStyleInternal
:
function
(
xfs
)
{
this
.
xfs
=
xfs
;
this
.
xfs
=
g_StyleCache
.
addXf
(
xfs
)
;
},
setCellStyle
:
function
(
val
)
{
...
...
@@ -3524,15 +3513,14 @@ Row.prototype =
setStyle
:
function
(
xfs
)
{
var
oldVal
=
this
.
xfs
;
this
.
xfs
=
xfs
;
this
.
_hasChanged
=
true
;
if
(
History
.
Is_On
()
&&
oldVal
!=
this
.
xfs
)
{
this
.
setStyleInternal
(
xfs
);
if
(
History
.
Is_On
()
&&
oldVal
!==
this
.
xfs
)
{
History
.
Add
(
AscCommonExcel
.
g_oUndoRedoRow
,
AscCH
.
historyitem_RowCol_SetStyle
,
this
.
ws
.
getId
(),
this
.
_getUpdateRange
(),
new
UndoRedoData_IndexSimpleProp
(
this
.
index
,
true
,
oldVal
,
this
.
xfs
));
}
},
setStyleInternal
:
function
(
xfs
)
{
this
.
xfs
=
xfs
;
this
.
xfs
=
g_StyleCache
.
addXf
(
xfs
)
;
this
.
_hasChanged
=
true
;
},
setCellStyle
:
function
(
val
)
...
...
Boris Kocherov
@bk
mentioned in commit
1602d4b9
·
Nov 14, 2017
mentioned in commit
1602d4b9
mentioned in commit 1602d4b93ec6bbc710a67b8a9a73fb050bc88582
Toggle commit list
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