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
15bc2dfc
Commit
15bc2dfc
authored
Dec 12, 2016
by
konovalovsergey
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
error after merge
parent
531487de
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
26 deletions
+8
-26
cell/model/Workbook.js
cell/model/Workbook.js
+8
-11
cell/view/WorksheetView.js
cell/view/WorksheetView.js
+0
-15
No files found.
cell/model/Workbook.js
View file @
15bc2dfc
...
@@ -2627,17 +2627,7 @@ Woorksheet.prototype.copyFrom=function(wsFrom, sName, tableNames){ var i, elem,
...
@@ -2627,17 +2627,7 @@ Woorksheet.prototype.copyFrom=function(wsFrom, sName, tableNames){ var i, elem,
this
.
sheetViews
[
j
].
pane
=
null
;
this
.
sheetViews
[
j
].
pane
=
null
;
}
}
}
}
this
.
setTableFormulaAfterOpen
();
if
(
this
.
TableParts
&&
this
.
TableParts
.
length
)
{
var
tableParts
=
this
.
TableParts
;
if
(
tableParts
)
{
for
(
var
i
=
0
;
i
<
tableParts
.
length
;
i
++
)
{
//TODO пока заменяем при открытии на TotalsRowFormula
tableParts
[
i
].
checkTotalRowFormula
();
}
}
}
this
.
_updateConditionalFormatting
(
null
);
this
.
_updateConditionalFormatting
(
null
);
this
.
handlers
=
handlers
;
this
.
handlers
=
handlers
;
...
@@ -4453,6 +4443,13 @@ Woorksheet.prototype.updateSparklineCache = function(sheet, ranges) {
...
@@ -4453,6 +4443,13 @@ Woorksheet.prototype.updateSparklineCache = function(sheet, ranges) {
for
(
var
i
=
0
;
i
<
this
.
TableParts
.
length
;
i
++
)
{
for
(
var
i
=
0
;
i
<
this
.
TableParts
.
length
;
i
++
)
{
var
table
=
this
.
TableParts
[
i
];
var
table
=
this
.
TableParts
[
i
];
this
.
autoFilters
.
_setColorStyleTable
(
table
.
Ref
,
table
);
this
.
autoFilters
.
_setColorStyleTable
(
table
.
Ref
,
table
);
}
}
};
Woorksheet
.
prototype
.
setTableFormulaAfterOpen
=
function
()
{
if
(
this
.
TableParts
&&
this
.
TableParts
.
length
)
{
for
(
var
i
=
0
;
i
<
this
.
TableParts
.
length
;
i
++
)
{
var
table
=
this
.
TableParts
[
i
];
//TODO пока заменяем при открытии на TotalsRowFormula
//TODO пока заменяем при открытии на TotalsRowFormula
table
.
checkTotalRowFormula
(
this
);
table
.
checkTotalRowFormula
(
this
);
}
}
...
...
cell/view/WorksheetView.js
View file @
15bc2dfc
...
@@ -11866,21 +11866,6 @@
...
@@ -11866,21 +11866,6 @@
return
arrResult
;
return
arrResult
;
};
};
WorksheetView
.
prototype
.
af_setStyleAfterOpen
=
function
()
{
var
worksheet
=
this
.
model
;
if
(
worksheet
.
TableParts
&&
worksheet
.
TableParts
.
length
)
{
var
tableParts
=
worksheet
.
TableParts
;
if
(
tableParts
)
{
for
(
var
i
=
0
;
i
<
tableParts
.
length
;
i
++
)
{
this
.
model
.
autoFilters
.
_setColorStyleTable
(
tableParts
[
i
].
Ref
,
tableParts
[
i
]);
//TODO пока заменяем при открытии на TotalsRowFormula
tableParts
[
i
].
checkTotalRowFormula
(
worksheet
);
}
}
}
};
WorksheetView
.
prototype
.
af_drawButtons
=
function
(
updatedRange
,
offsetX
,
offsetY
)
{
WorksheetView
.
prototype
.
af_drawButtons
=
function
(
updatedRange
,
offsetX
,
offsetY
)
{
var
ws
=
this
;
var
ws
=
this
;
var
aWs
=
this
.
model
;
var
aWs
=
this
.
model
;
...
...
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