Commit 423e314b authored by Boris Kocherov's avatar Boris Kocherov

CUBEVALUE, CUBEMEMBER use new upstream api

parent 3043fbc8
......@@ -284,7 +284,7 @@
mdx_array.forEach(function (element) {
if (element instanceof cArea || element instanceof cArea3D ||
element instanceof cRef || element instanceof cRef3D) {
element.getRange().getCells().forEach(cellForge);
element.getRange()._foreach(cellForge);
} else {
stringForge(element);
}
......@@ -566,9 +566,9 @@
cCUBEMEMBER.prototype.constructor = cCUBEMEMBER;
cCUBEMEMBER.prototype.argumentsMin = 2;
cCUBEMEMBER.prototype.argumentsMax = 3;
cCUBEMEMBER.prototype.CalculateLazy = function (queue, range) {
cCUBEMEMBER.prototype.CalculateLazy = function (queue, bbox, isDefName, ws) {
var connection,
current_cell_id = range.getCells()[0].getId(),
current_cell_id = ws._getCell(bbox.r1, bbox.c2).getId(),
caption;
return queue
.push(function (arg) {
......@@ -695,11 +695,11 @@
cCUBEVALUE.prototype.constructor = cCUBEVALUE;
cCUBEVALUE.prototype.argumentsMin = 2;
cCUBEVALUE.prototype.argumentsMax = 5;
cCUBEVALUE.prototype.CalculateLazy = function (queue, range) {
cCUBEVALUE.prototype.CalculateLazy = function (queue, bbox, isDefName, ws) {
var scheme,
connection,
members = [],
current_cell_id = range.getCells()[0].getId(),
current_cell_id = ws._getCell(bbox.r1, bbox.c2).getId(),
waiter = AddCubeValueCalculate(current_cell_id);
return queue
.push(function (arg) {
......
......@@ -700,7 +700,7 @@ parserHelp.setDigitSeparator(AscCommon.g_oDefaultCultureInfo.NumberDecimalSepara
}
if (element instanceof cArea || element instanceof cArea3D ||
element instanceof cRef || element instanceof cRef3D) {
element.getRange().getCells().forEach(cellForge);
element.getRange()._foreach(cellForge);
}
}
return promise_flag;
......@@ -5286,7 +5286,10 @@ parserFormula.prototype.parse = function(local, digitDelim) {
formula.value = ret;
formula.value.numFormat = numFormat;
formula._endCalculate();
opt_bbox.updateOnScreen();
// updateOnScreen cell
formula.ws.workbook.handlers.trigger("cleanCellCache",
formula.ws.getId(), {0: opt_bbox},
AscCommonExcel.c_oAscCanChangeColWidth.none);
formula.queue = false;
// formula.lazy_value = null;
return formula.value;
......
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