Commit a2c1c6e3 authored by GoshaZotov's avatar GoshaZotov

add specialFilteringMode flag(lock functions: add autofilter,...

add specialFilteringMode flag(lock functions: add autofilter, changeFormatTableInfo; do not LockedAll into next functions: applyAutoFilter, reApplyAutoFilter)
parent 2acde66c
...@@ -5258,5 +5258,8 @@ ...@@ -5258,5 +5258,8 @@
prot["asc_getDisplayName"] = prot.asc_getDisplayName; prot["asc_getDisplayName"] = prot.asc_getDisplayName;
prot["asc_getType"] = prot.asc_getType; prot["asc_getType"] = prot.asc_getType;
prot["asc_getImage"] = prot.asc_getImage; prot["asc_getImage"] = prot.asc_getImage;
window['AscCommonExcel'] = window['AscCommonExcel'] || {};
window['AscCommonExcel'].specialFilteringMode = false;
} }
)(window); )(window);
...@@ -11900,6 +11900,10 @@ ...@@ -11900,6 +11900,10 @@
return; return;
} }
if(true === window['AscCommonExcel'].specialFilteringMode){
return;
}
var t = this; var t = this;
var ar = this.model.selectionRange.getLast().clone(); var ar = this.model.selectionRange.getLast().clone();
...@@ -12130,7 +12134,11 @@ ...@@ -12130,7 +12134,11 @@
t.objectRender.updateSizeDrawingObjects({target: c_oTargetType.RowResize, row: minChangeRow}); t.objectRender.updateSizeDrawingObjects({target: c_oTargetType.RowResize, row: minChangeRow});
} }
}; };
this._isLockedAll(onChangeAutoFilterCallback); if(true === window['AscCommonExcel'].specialFilteringMode){
onChangeAutoFilterCallback();
}else{
this._isLockedAll(onChangeAutoFilterCallback);
}
}; };
WorksheetView.prototype.reapplyAutoFilter = function (tableName) { WorksheetView.prototype.reapplyAutoFilter = function (tableName) {
...@@ -12195,7 +12203,11 @@ ...@@ -12195,7 +12203,11 @@
t.objectRender.updateSizeDrawingObjects({target: c_oTargetType.RowResize, row: minChangeRow}); t.objectRender.updateSizeDrawingObjects({target: c_oTargetType.RowResize, row: minChangeRow});
} }
}; };
this._isLockedAll(onChangeAutoFilterCallback); if(true === window['AscCommonExcel'].specialFilteringMode){
onChangeAutoFilterCallback();
}else{
this._isLockedAll(onChangeAutoFilterCallback);
}
}; };
WorksheetView.prototype.applyAutoFilterByType = function (autoFilterObject) { WorksheetView.prototype.applyAutoFilterByType = function (autoFilterObject) {
...@@ -12293,9 +12305,16 @@ ...@@ -12293,9 +12305,16 @@
if (null === isAddAutoFilter)//do not add autoFilter if (null === isAddAutoFilter)//do not add autoFilter
{ {
this._isLockedAll(onChangeAutoFilterCallback); if(true === window['AscCommonExcel'].specialFilteringMode){
onChangeAutoFilterCallback();
}else{
this._isLockedAll(onChangeAutoFilterCallback);
}
} else//add autofilter + apply } else//add autofilter + apply
{ {
if(true === window['AscCommonExcel'].specialFilteringMode){
return;
}
if (t._checkAddAutoFilter(ar, null, autoFilterObject, true) === true) { if (t._checkAddAutoFilter(ar, null, autoFilterObject, true) === true) {
this._isLockedAll(onChangeAutoFilterCallback); this._isLockedAll(onChangeAutoFilterCallback);
this._isLockedDefNames(null, null); this._isLockedDefNames(null, null);
...@@ -13381,6 +13400,10 @@ ...@@ -13381,6 +13400,10 @@
return false; return false;
} }
if(true === window['AscCommonExcel'].specialFilteringMode){
return;
}
var isChangeTableInfo = this.af_checkChangeTableInfo(tablePart, optionType); var isChangeTableInfo = this.af_checkChangeTableInfo(tablePart, optionType);
if (isChangeTableInfo !== false) { if (isChangeTableInfo !== false) {
var callback = function (isSuccess) { var callback = function (isSuccess) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment