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
cabad702
Commit
cabad702
authored
Sep 29, 2017
by
GoshaZotov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
for specialFilteringMode
parent
1d9eb47e
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
62 additions
and
5 deletions
+62
-5
cell/view/WorksheetView.js
cell/view/WorksheetView.js
+62
-5
No files found.
cell/view/WorksheetView.js
View file @
cabad702
...
...
@@ -8548,11 +8548,13 @@
t
.
model
.
excludeHiddenRows
(
false
);
// Если нужно удалить автофильтры - удаляем
if
(
true
!==
window
[
'
AscCommonExcel
'
].
specialFilteringMode
){
if
(
val
===
c_oAscCleanOptions
.
All
||
val
===
c_oAscCleanOptions
.
Text
)
{
t
.
model
.
autoFilters
.
isEmptyAutoFilters
(
arn
);
}
else
if
(
val
===
c_oAscCleanOptions
.
Format
)
{
t
.
model
.
autoFilters
.
cleanFormat
(
arn
);
}
}
// Вызываем функцию пересчета для заголовков форматированной таблицы
if
(
val
===
c_oAscCleanOptions
.
All
||
val
===
c_oAscCleanOptions
.
Text
)
{
...
...
@@ -10362,6 +10364,12 @@
t
.
handlers
.
trigger
(
"
selectionMathInfoChanged
"
,
t
.
getSelectionMathInfo
());
};
var
checkLocalChange
=
function
(
val
){
if
(
true
===
window
[
'
AscCommonExcel
'
].
specialFilteringMode
)
{
History
.
LocalChange
=
val
;
}
};
switch
(
prop
)
{
case
"
colWidth
"
:
functionModelAction
=
function
()
{
...
...
@@ -10375,19 +10383,23 @@
break
;
case
"
showCols
"
:
functionModelAction
=
function
()
{
checkLocalChange
(
true
);
t
.
model
.
setColHidden
(
false
,
arn
.
c1
,
arn
.
c2
);
oRecalcType
=
AscCommonExcel
.
recalcType
.
full
;
reinitRanges
=
true
;
updateDrawingObjectsInfo
=
{
target
:
c_oTargetType
.
ColumnResize
,
col
:
arn
.
c1
};
checkLocalChange
(
false
);
};
this
.
_isLockedAll
(
onChangeWorksheetCallback
);
break
;
case
"
hideCols
"
:
functionModelAction
=
function
()
{
checkLocalChange
(
true
);
t
.
model
.
setColHidden
(
true
,
arn
.
c1
,
arn
.
c2
);
oRecalcType
=
AscCommonExcel
.
recalcType
.
full
;
reinitRanges
=
true
;
updateDrawingObjectsInfo
=
{
target
:
c_oTargetType
.
ColumnResize
,
col
:
arn
.
c1
};
checkLocalChange
(
false
);
};
this
.
_isLockedAll
(
onChangeWorksheetCallback
);
break
;
...
...
@@ -10405,25 +10417,36 @@
return
this
.
_isLockedAll
(
onChangeWorksheetCallback
);
case
"
showRows
"
:
functionModelAction
=
function
()
{
checkLocalChange
(
true
);
t
.
model
.
setRowHidden
(
false
,
arn
.
r1
,
arn
.
r2
);
t
.
model
.
autoFilters
.
reDrawFilter
(
arn
);
oRecalcType
=
AscCommonExcel
.
recalcType
.
full
;
reinitRanges
=
true
;
updateDrawingObjectsInfo
=
{
target
:
c_oTargetType
.
RowResize
,
row
:
arn
.
r1
};
checkLocalChange
(
false
);
};
this
.
_isLockedAll
(
onChangeWorksheetCallback
);
break
;
case
"
hideRows
"
:
functionModelAction
=
function
()
{
checkLocalChange
(
true
);
t
.
model
.
setRowHidden
(
true
,
arn
.
r1
,
arn
.
r2
);
t
.
model
.
autoFilters
.
reDrawFilter
(
arn
);
oRecalcType
=
AscCommonExcel
.
recalcType
.
full
;
reinitRanges
=
true
;
updateDrawingObjectsInfo
=
{
target
:
c_oTargetType
.
RowResize
,
row
:
arn
.
r1
};
checkLocalChange
(
false
);
};
this
.
_isLockedAll
(
onChangeWorksheetCallback
);
break
;
case
"
insCell
"
:
if
(
true
===
window
[
'
AscCommonExcel
'
].
specialFilteringMode
){
if
(
val
===
c_oAscInsertOptions
.
InsertCellsAndShiftRight
||
val
===
c_oAscInsertOptions
.
InsertColumns
){
return
;
}
}
range
=
t
.
model
.
getRange3
(
arn
.
r1
,
arn
.
c1
,
arn
.
r2
,
arn
.
c2
);
switch
(
val
)
{
case
c_oAscInsertOptions
.
InsertCellsAndShiftRight
:
...
...
@@ -10533,6 +10556,13 @@
}
break
;
case
"
delCell
"
:
if
(
true
===
window
[
'
AscCommonExcel
'
].
specialFilteringMode
){
if
(
val
===
c_oAscDeleteOptions
.
DeleteCellsAndShiftLeft
||
val
===
c_oAscDeleteOptions
.
DeleteColumns
){
return
;
}
}
range
=
t
.
model
.
getRange3
(
checkRange
.
r1
,
checkRange
.
c1
,
checkRange
.
r2
,
checkRange
.
c2
);
switch
(
val
)
{
case
c_oAscDeleteOptions
.
DeleteCellsAndShiftLeft
:
...
...
@@ -13427,7 +13457,7 @@
}
if
(
true
===
window
[
'
AscCommonExcel
'
].
specialFilteringMode
){
return
;
return
false
;
}
var
isChangeTableInfo
=
this
.
af_checkChangeTableInfo
(
tablePart
,
optionType
);
...
...
@@ -13685,6 +13715,10 @@
var
deleteTableCallback
=
function
(
ref
)
{
if
(
true
===
window
[
'
AscCommonExcel
'
].
specialFilteringMode
){
return
false
;
}
var
callback
=
function
(
isSuccess
)
{
if
(
false
===
isSuccess
)
{
return
;
...
...
@@ -13745,6 +13779,14 @@
var
ws
=
this
.
model
;
var
res
=
true
;
if
(
true
===
window
[
'
AscCommonExcel
'
].
specialFilteringMode
){
if
(
val
===
c_oAscInsertOptions
.
InsertCellsAndShiftRight
||
val
===
c_oAscInsertOptions
.
InsertColumns
){
return
false
;
}
else
if
(
val
===
c_oAscDeleteOptions
.
DeleteCellsAndShiftLeft
||
val
===
c_oAscDeleteOptions
.
DeleteColumns
){
return
false
;
}
}
var
intersectionTableParts
=
ws
.
autoFilters
.
getTableIntersectionRange
(
activeRange
);
var
isPartTablePartsUnderRange
=
ws
.
autoFilters
.
_isPartTablePartsUnderRange
(
activeRange
);
var
isPartTablePartsRightRange
=
ws
.
autoFilters
.
isPartTablePartsRightRange
(
activeRange
);
...
...
@@ -13909,11 +13951,22 @@
formatTableInfo
.
isDeleteColumn
=
true
;
formatTableInfo
.
isDeleteTable
=
true
;
if
(
true
===
window
[
'
AscCommonExcel
'
].
specialFilteringMode
){
formatTableInfo
.
isDeleteColumn
=
false
;
formatTableInfo
.
isInsertColumnRight
=
false
;
formatTableInfo
.
isInsertColumnLeft
=
false
;
}
};
WorksheetView
.
prototype
.
af_convertTableToRange
=
function
(
tableName
)
{
var
t
=
this
;
if
(
true
===
window
[
'
AscCommonExcel
'
].
specialFilteringMode
){
return
;
}
var
callback
=
function
(
isSuccess
)
{
if
(
false
===
isSuccess
)
{
return
;
...
...
@@ -13955,6 +14008,10 @@
var
t
=
this
;
range
=
AscCommonExcel
.
g_oRangeCache
.
getAscRange
(
range
);
if
(
true
===
window
[
'
AscCommonExcel
'
].
specialFilteringMode
){
return
;
}
var
callback
=
function
(
isSuccess
)
{
if
(
false
===
isSuccess
)
{
return
;
...
...
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