Skip to content

S
sdkjs
Commit af3ac6e5 authored by Alexander.Trofimov's avatar Alexander.Trofimov
Browse files
Options

delete argument skipNLCheck

parent 1a300e3b
Hide whitespace changes
Inline Side-by-side
Showing with 193 additions and 199 deletions
cell/view/CellEditorView.js
View file @ af3ac6e5
......@@ -319,9 +319,9 @@
};
CellEditor.prototype.close = function (saveValue) {
var opt = this.options, ret;
var opt = this.options;
if (saveValue && "function" === typeof opt.saveValueCallback) {
if (saveValue) {
var isFormula = this.isFormula();
// Для формул делаем пересчет всегда. Для остального - только если мы изменили что-то. http://bugzilla.onlyoffice.com/show_bug.cgi?id=31889
// Сюда же добавляется и ячейка с wrap-текстом, у которой выключен wrap.
......@@ -336,8 +336,7 @@
this.noUpdateMode = false;
}
ret = opt.saveValueCallback(opt.fragments, this.textFlags, /*skip NL check*/ret);
if (!ret) {
if (!opt.saveValueCallback(opt.fragments, this.textFlags)) {
// При ошибке нужно выставить флаг, чтобы по стрелкам не закрывался редактор
this.handlers.trigger('setStrictClose', true);
return false;
......@@ -786,7 +785,7 @@
this.options.fragments), t = this, ret = false, range, wsOPEN = this.handlers.trigger(
"getCellFormulaEnterWSOpen"), ws = wsOPEN ? wsOPEN.model : this.handlers.trigger("getActiveWS");
if (s.length < 1 || s.charAt(0) !== "=" || this.options.cellNumFormat == Asc.c_oAscNumFormatType.Text) {
if (Asc.c_oAscNumFormatType.Text === this.options.cellNumFormat || s.length < 1 || s.charAt(0) !== "=") {
return ret;
}
......
cell/view/WorksheetView.js
View file @ af3ac6e5
......@@ -11261,8 +11261,8 @@
newValue = [];
newValue[0] = new AscCommonExcel.Fragment({text: cellValue, format: v[0].format.clone()});
if (!t._saveCellValueAfterEdit(oCellEdit, c, newValue, /*flags*/undefined, /*skipNLCheck*/false,
/*isNotHistory*/true, /*lockDraw*/true)) {
if (!t._saveCellValueAfterEdit(oCellEdit, c, newValue, /*flags*/undefined, /*isNotHistory*/true,
/*lockDraw*/true)) {
options.error = true;
t.draw(lockDraw);
return callback(options);
......@@ -11466,223 +11466,218 @@
return mergedRange ? mergedRange : new asc_Range(col, row, col, row);
};
WorksheetView.prototype._saveCellValueAfterEdit =
function (oCellEdit, c, val, flags, skipNLCheck, isNotHistory, lockDraw) {
var t = this;
var oldMode = t.isFormulaEditMode;
t.isFormulaEditMode = false;
if (!isNotHistory) {
History.Create_NewPoint();
History.StartTransaction();
}
WorksheetView.prototype._saveCellValueAfterEdit = function (oCellEdit, c, val, flags, isNotHistory, lockDraw) {
var t = this;
var oldMode = this.isFormulaEditMode;
this.isFormulaEditMode = false;
var isFormula = t._isFormula(val);
if (!isNotHistory) {
History.Create_NewPoint();
History.StartTransaction();
}
if (isFormula) {
var ftext = val.reduce(function (pv, cv) {
return pv + cv.text;
}, "");
var ret = true;
// ToDo - при вводе формулы в заголовок автофильтра надо писать "0"
c.setValue(ftext, function (r) {
ret = r;
});
if (!ret) {
t.isFormulaEditMode = oldMode;
History.EndTransaction();
return false;
}
isFormula = c.isFormula();
t.model.autoFilters.renameTableColumn(oCellEdit);
} else {
c.setValue2(val);
// Вызываем функцию пересчета для заголовков форматированной таблицы
t.model.autoFilters.renameTableColumn(oCellEdit);
}
var isFormula = this._isFormula(val);
if (isFormula) {
var ftext = val.reduce(function (pv, cv) {
return pv + cv.text;
}, "");
var ret = true;
// ToDo - при вводе формулы в заголовок автофильтра надо писать "0"
c.setValue(ftext, function (r) {
ret = r;
});
if (!ret) {
this.isFormulaEditMode = oldMode;
History.EndTransaction();
return false;
}
isFormula = c.isFormula();
this.model.autoFilters.renameTableColumn(oCellEdit);
} else {
c.setValue2(val);
// Вызываем функцию пересчета для заголовков форматированной таблицы
this.model.autoFilters.renameTableColumn(oCellEdit);
}
if (!isFormula) {
// Нужно ли выставлять WrapText (ищем символ новой строки в тексте)
if (!skipNLCheck) {
for (var i = 0; i < val.length; ++i) {
if (-1 !== val[i].text.indexOf(kNewLine)) {
c.setWrap(true);
break;
}
}
}
}
if (!isFormula) {
for (var i = 0; i < val.length; ++i) {
if (-1 !== val[i].text.indexOf(kNewLine)) {
c.setWrap(true);
break;
}
}
}
t._updateCellsRange(oCellEdit, isNotHistory ? c_oAscCanChangeColWidth.none : c_oAscCanChangeColWidth.numbers,
lockDraw);
this._updateCellsRange(oCellEdit, isNotHistory ? c_oAscCanChangeColWidth.none : c_oAscCanChangeColWidth.numbers,
lockDraw);
if (!isNotHistory) {
History.EndTransaction();
}
if (!isNotHistory) {
History.EndTransaction();
}
// если вернуть false, то редактор не закроется
return true;
};
// если вернуть false, то редактор не закроется
return true;
};
WorksheetView.prototype.openCellEditor =
function (editor, fragments, cursorPos, isFocus, isClearCell, isHideCursor, isQuickInput, selectionRange) {
var t = this, tc = this.cols, tr = this.rows, col, row, c, fl, mc, bg, isMerged;
WorksheetView.prototype.openCellEditor =
function (editor, fragments, cursorPos, isFocus, isClearCell, isHideCursor, isQuickInput, selectionRange) {
var t = this, tc = this.cols, tr = this.rows, col, row, c, fl, mc, bg, isMerged;
if (selectionRange) {
this.model.selectionRange = selectionRange;
}
if (selectionRange) {
this.model.selectionRange = selectionRange;
}
if (0 < this.arrActiveFormulaRanges.length) {
this.cleanSelection();
this.cleanFormulaRanges();
this._drawSelection();
}
var cell = this.model.selectionRange.activeCell;
function getVisibleRangeObject() {
var vr = t.visibleRange.clone(), offsetX = 0, offsetY = 0;
if (t.topLeftFrozenCell) {
var cFrozen = t.topLeftFrozenCell.getCol0();
var rFrozen = t.topLeftFrozenCell.getRow0();
if (0 < cFrozen) {
if (col >= cFrozen) {
offsetX = tc[cFrozen].left - tc[0].left;
} else {
vr.c1 = 0;
vr.c2 = cFrozen - 1;
}
}
if (0 < rFrozen) {
if (row >= rFrozen) {
offsetY = tr[rFrozen].top - tr[0].top;
} else {
vr.r1 = 0;
vr.r2 = rFrozen - 1;
}
}
}
return {vr: vr, offsetX: offsetX, offsetY: offsetY};
}
var cell = this.model.selectionRange.activeCell;
col = cell.col;
row = cell.row;
// Возможно стоит заменить на ячейку из кеша
c = this._getVisibleCell(col, row);
fl = this._getCellFlags(c);
isMerged = fl.isMerged();
if (isMerged) {
mc = fl.merged;
c = this._getVisibleCell(mc.c1, mc.r1);
fl = this._getCellFlags(c);
}
function getVisibleRangeObject() {
var vr = t.visibleRange.clone(), offsetX = 0, offsetY = 0;
if (t.topLeftFrozenCell) {
var cFrozen = t.topLeftFrozenCell.getCol0();
var rFrozen = t.topLeftFrozenCell.getRow0();
if (0 < cFrozen) {
if (col >= cFrozen) {
offsetX = tc[cFrozen].left - tc[0].left;
} else {
vr.c1 = 0;
vr.c2 = cFrozen - 1;
}
}
if (0 < rFrozen) {
if (row >= rFrozen) {
offsetY = tr[rFrozen].top - tr[0].top;
} else {
vr.r1 = 0;
vr.r2 = rFrozen - 1;
}
}
}
return {vr: vr, offsetX: offsetX, offsetY: offsetY};
}
col = cell.col;
row = cell.row;
// Возможно стоит заменить на ячейку из кеша
c = this._getVisibleCell(col, row);
fl = this._getCellFlags(c);
isMerged = fl.isMerged();
if (isMerged) {
mc = fl.merged;
c = this._getVisibleCell(mc.c1, mc.r1);
fl = this._getCellFlags(c);
}
// Выставляем режим 'не редактируем' (иначе мы попытаемся переместить редактор, который еще не открыт)
this.isCellEditMode = false;
this.handlers.trigger("onScroll", this._calcActiveCellOffset());
this.isCellEditMode = true;
// Выставляем режим 'не редактируем' (иначе мы попытаемся переместить редактор, который еще не открыт)
this.isCellEditMode = false;
this.handlers.trigger("onScroll", this._calcActiveCellOffset());
this.isCellEditMode = true;
bg = c.getFill();
this.isFormulaEditMode = false;
bg = c.getFill();
this.isFormulaEditMode = false;
var font = c.getFont();
// Скрываем окно редактирования комментария
this.model.workbook.handlers.trigger("asc_onHideComment");
if (fragments === undefined) {
var _fragmentsTmp = c.getValueForEdit2();
fragments = [];
for (var i = 0; i < _fragmentsTmp.length; ++i) {
fragments.push(_fragmentsTmp[i].clone());
}
}
// Скрываем окно редактирования комментария
this.model.workbook.handlers.trigger("asc_onHideComment");
if (fragments === undefined) {
var _fragmentsTmp = c.getValueForEdit2();
fragments = [];
for (var i = 0; i < _fragmentsTmp.length; ++i) {
fragments.push(_fragmentsTmp[i].clone());
}
}
var arrAutoComplete = this.getCellAutoCompleteValues(cell, kMaxAutoCompleteCellEdit);
var arrAutoCompleteLC = asc.arrayToLowerCase(arrAutoComplete);
var arrAutoComplete = this.getCellAutoCompleteValues(cell, kMaxAutoCompleteCellEdit);
var arrAutoCompleteLC = asc.arrayToLowerCase(arrAutoComplete);
editor.open({
fragments: fragments,
flags: fl,
editor.open({
fragments: fragments,
flags: fl,
font: new asc.FontProperties(font.getName(), font.getSize()),
background: bg || this.settings.cells.defaultState.background,
background: bg || this.settings.cells.defaultState.background,
textColor: font.getColor() || this.settings.cells.defaultState.color,
cursorPos: cursorPos,
zoom: this.getZoom(),
focus: isFocus,
isClearCell: isClearCell,
isHideCursor: isHideCursor,
isQuickInput: isQuickInput,
isAddPersentFormat: isQuickInput && Asc.c_oAscNumFormatType.Percent === c.getNumFormat().getType(),
autoComplete: arrAutoComplete,
autoCompleteLC: arrAutoCompleteLC,
cellName: c.getName(),
cellNumFormat: c.getNumFormatType(),
saveValueCallback: function (val, flags, skipNLCheck) {
var oCellEdit = isMerged ? new asc_Range(mc.c1, mc.r1, mc.c1, mc.r1) :
new asc_Range(col, row, col, row);
return t._saveCellValueAfterEdit(oCellEdit, c, val, flags, skipNLCheck, /*isNotHistory*/false,
/*lockDraw*/false);
},
getSides: function () {
var _c1, _r1, _c2, _r2, ri = 0, bi = 0;
if (isMerged) {
_c1 = mc.c1;
_c2 = mc.c2;
_r1 = mc.r1;
_r2 = mc.r2;
} else {
_c1 = _c2 = col;
_r1 = _r2 = row;
}
var vro = getVisibleRangeObject();
var i, w, h, arrLeftS = [], arrRightS = [], arrBottomS = [];
var offsX = tc[vro.vr.c1].left - tc[0].left - vro.offsetX;
var offsY = tr[vro.vr.r1].top - tr[0].top - vro.offsetY;
var cellX = tc[_c1].left - offsX, cellY = tr[_r1].top - offsY;
for (i = _c1; i >= vro.vr.c1; --i) {
if (t.width_1px < tc[i].width) {
arrLeftS.push(tc[i].left - offsX);
}
}
cursorPos: cursorPos,
zoom: this.getZoom(),
focus: isFocus,
isClearCell: isClearCell,
isHideCursor: isHideCursor,
isQuickInput: isQuickInput,
isAddPersentFormat: isQuickInput && Asc.c_oAscNumFormatType.Percent === c.getNumFormatType(),
autoComplete: arrAutoComplete,
autoCompleteLC: arrAutoCompleteLC,
cellName: c.getName(),
cellNumFormat: c.getNumFormatType(),
saveValueCallback: function (val, flags) {
var oCellEdit = isMerged ? new asc_Range(mc.c1, mc.r1, mc.c1, mc.r1) :
new asc_Range(col, row, col, row);
return t._saveCellValueAfterEdit(oCellEdit, c, val, flags, /*isNotHistory*/false,
/*lockDraw*/false);
},
getSides: function () {
var _c1, _r1, _c2, _r2, ri = 0, bi = 0;
if (isMerged) {
_c1 = mc.c1;
_c2 = mc.c2;
_r1 = mc.r1;
_r2 = mc.r2;
} else {
_c1 = _c2 = col;
_r1 = _r2 = row;
}
var vro = getVisibleRangeObject();
var i, w, h, arrLeftS = [], arrRightS = [], arrBottomS = [];
var offsX = tc[vro.vr.c1].left - tc[0].left - vro.offsetX;
var offsY = tr[vro.vr.r1].top - tr[0].top - vro.offsetY;
var cellX = tc[_c1].left - offsX, cellY = tr[_r1].top - offsY;
for (i = _c1; i >= vro.vr.c1; --i) {
if (t.width_1px < tc[i].width) {
arrLeftS.push(tc[i].left - offsX);
}
}
if (_c2 > vro.vr.c2) {
_c2 = vro.vr.c2;
}
for (i = _c1; i <= vro.vr.c2; ++i) {
w = tc[i].width;
if (t.width_1px < w) {
arrRightS.push(tc[i].left + w - offsX);
}
if (_c2 === i) {
ri = arrRightS.length - 1;
}
}
w = t.drawingCtx.getWidth();
if (arrRightS[arrRightS.length - 1] > w) {
arrRightS[arrRightS.length - 1] = w;
}
if (_c2 > vro.vr.c2) {
_c2 = vro.vr.c2;
}
for (i = _c1; i <= vro.vr.c2; ++i) {
w = tc[i].width;
if (t.width_1px < w) {
arrRightS.push(tc[i].left + w - offsX);
}
if (_c2 === i) {
ri = arrRightS.length - 1;
}
}
w = t.drawingCtx.getWidth();
if (arrRightS[arrRightS.length - 1] > w) {
arrRightS[arrRightS.length - 1] = w;
}
if (_r2 > vro.vr.r2) {
_r2 = vro.vr.r2;
}
for (i = _r1; i <= vro.vr.r2; ++i) {
h = tr[i].height;
if (t.height_1px < h) {
arrBottomS.push(tr[i].top + h - offsY);
}
if (_r2 === i) {
bi = arrBottomS.length - 1;
}
}
h = t.drawingCtx.getHeight();
if (arrBottomS[arrBottomS.length - 1] > h) {
arrBottomS[arrBottomS.length - 1] = h;
}
return {l: arrLeftS, r: arrRightS, b: arrBottomS, cellX: cellX, cellY: cellY, ri: ri, bi: bi};
}
});
return true;
};
if (_r2 > vro.vr.r2) {
_r2 = vro.vr.r2;
}
for (i = _r1; i <= vro.vr.r2; ++i) {
h = tr[i].height;
if (t.height_1px < h) {
arrBottomS.push(tr[i].top + h - offsY);
}
if (_r2 === i) {
bi = arrBottomS.length - 1;
}
}
h = t.drawingCtx.getHeight();
if (arrBottomS[arrBottomS.length - 1] > h) {
arrBottomS[arrBottomS.length - 1] = h;
}
return {l: arrLeftS, r: arrRightS, b: arrBottomS, cellX: cellX, cellY: cellY, ri: ri, bi: bi};
}
});
return true;
};
WorksheetView.prototype.openCellEditorWithText = function (editor, text, cursorPos, isFocus, selectionRange) {
var t = this;
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7