Skip to content

S
sdkjs
Commit 70195567 authored by Alexey.Musinov's avatar Alexey.Musinov Committed by Alexander.Trofimov
Browse files
Options

[ios] tables 

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@62916 954022d7-b5bf-4e40-9824-e11837661b57
parent a6c2cae6
Hide whitespace changes
Inline Side-by-side
Showing with 94 additions and 52 deletions
Excel/native/DrawingContext.js
View file @ 70195567
...@@ -413,7 +413,6 @@ ...@@ -413,7 +413,6 @@
this.ppiX = parseInt(this.ppiX * this.deviceScale, 10); this.ppiX = parseInt(this.ppiX * this.deviceScale, 10);
this.ppiY = parseInt(this.ppiY * this.deviceScale, 10); this.ppiY = parseInt(this.ppiY * this.deviceScale, 10);
ppiTest.remove(); ppiTest.remove();
this._mct = new Matrix(); // units transform this._mct = new Matrix(); // units transform
...@@ -423,6 +422,8 @@ ...@@ -423,6 +422,8 @@
this._mift = new Matrix(); // inverted full transform this._mift = new Matrix(); // inverted full transform
this._im = new Matrix(); this._im = new Matrix();
this.nppiX = parseInt(this.ppiX * this.deviceScale, 10);
this.scaleFactor = 1; this.scaleFactor = 1;
this.units = 3/*mm*/; this.units = 3/*mm*/;
...@@ -863,7 +864,9 @@ ...@@ -863,7 +864,9 @@
this.font.copyFrom(font); this.font.copyFrom(font);
// sample: 132 (ipad) * device_scale(is_retina=2) / 96 (default) * 2.54 // sample: 132 (ipad) * device_scale(is_retina=2) / 96 (default) * 2.54
this.font.FontSize = this.font.FontSize * this.deviceDPI * this.deviceScale / this.ppiX * 2.54;
///var rel = this.ppiX / this.nppiX
this.font.FontSize = this.font.FontSize * this.deviceDPI * this.deviceScale / this.nppiX * 2.54 * this.scaleFactor * this.deviceScale;// * rel;
italic = true === font.Italic; italic = true === font.Italic;
bold = true === font.Bold; bold = true === font.Bold;
...@@ -925,17 +928,17 @@ ...@@ -925,17 +928,17 @@
this.nctx["PD_LoadFont"](_info.Path, _info.FaceIndex, this.font.FontSize, flag); this.nctx["PD_LoadFont"](_info.Path, _info.FaceIndex, this.font.FontSize, flag);
var dKoef = g_dKoef_pt_to_mm * font.FontSize / napi_fontInfo[3]; //var dKoef = g_dKoef_pt_to_mm * font.FontSize / napi_fontInfo[3];
//
this.napi_fmt[0].m_lUnits_Per_Em = napi_fontInfo[3]; //this.napi_fmt[0].m_lUnits_Per_Em = napi_fontInfo[3];
this.napi_fmt[0].m_lAscender = napi_fontInfo[0];// * dKoef; //this.napi_fmt[0].m_lAscender = napi_fontInfo[0];// * dKoef;
this.napi_fmt[0].m_lDescender = napi_fontInfo[2];// * dKoef; //this.napi_fmt[0].m_lDescender = napi_fontInfo[2];// * dKoef;
this.napi_fmt[0].m_lLineHeight = napi_fontInfo[2];// * dKoef; //this.napi_fmt[0].m_lLineHeight = napi_fontInfo[2];// * dKoef;
//
this.napi_fmt[3].m_lUnits_Per_Em = napi_fontInfo[3]; //this.napi_fmt[3].m_lUnits_Per_Em = napi_fontInfo[3];
this.napi_fmt[3].m_lAscender = napi_fontInfo[0];// * dKoef; //this.napi_fmt[3].m_lAscender = napi_fontInfo[0];// * dKoef;
this.napi_fmt[3].m_lDescender = napi_fontInfo[2];// * dKoef; //this.napi_fmt[3].m_lDescender = napi_fontInfo[2];// * dKoef;
this.napi_fmt[3].m_lLineHeight = napi_fontInfo[2];// * dKoef; //this.napi_fmt[3].m_lLineHeight = napi_fontInfo[2];// * dKoef;
r = true; r = true;
......
Excel/native/native.js
View file @ 70195567
...@@ -23,6 +23,43 @@ window.NATIVE_EDITOR_ENJINE_SYNC_RECALC = true; ...@@ -23,6 +23,43 @@ window.NATIVE_EDITOR_ENJINE_SYNC_RECALC = true;
var document = {}; var document = {};
window.document = document; window.document = document;
//-------------------------------------------------------------------------------------------------
aStandartNumFormats = [];
aStandartNumFormats[0] = "General";
aStandartNumFormats[1] = "0";
aStandartNumFormats[2] = "0.00";
aStandartNumFormats[3] = "#,##0";
aStandartNumFormats[4] = "#,##0.00";
aStandartNumFormats[9] = "0%";
aStandartNumFormats[10] = "0.00%";
aStandartNumFormats[11] = "0.00E+00";
aStandartNumFormats[12] = "# ?/?";
aStandartNumFormats[13] = "# ??/??";
aStandartNumFormats[14] = "m/d/yyyy";
aStandartNumFormats[15] = "d-mmm-yy";
aStandartNumFormats[16] = "d-mmm";
aStandartNumFormats[17] = "mmm-yy";
aStandartNumFormats[18] = "h:mm AM/PM";
aStandartNumFormats[19] = "h:mm:ss AM/PM";
aStandartNumFormats[20] = "h:mm";
aStandartNumFormats[21] = "h:mm:ss";
aStandartNumFormats[22] = "m/d/yyyy h:mm";
aStandartNumFormats[37] = "#,##0_);(#,##0)";
aStandartNumFormats[38] = "#,##0_);[Red](#,##0)";
aStandartNumFormats[39] = "#,##0.00_);(#,##0.00)";
aStandartNumFormats[40] = "#,##0.00_);[Red](#,##0.00)";
aStandartNumFormats[45] = "mm:ss";
aStandartNumFormats[46] = "[h]:mm:ss";
aStandartNumFormats[47] = "mm:ss.0";
aStandartNumFormats[48] = "##0.0E+0";
aStandartNumFormats[49] = "@";
aStandartNumFormatsId = {};
for(var i in aStandartNumFormats)
{
aStandartNumFormatsId[aStandartNumFormats[i]] = i - 0;
}
//-------------------------------------------------------------------------------------------------
function ConvertJSC_Array(_array) function ConvertJSC_Array(_array)
{ {
var _len = _array.length; var _len = _array.length;
...@@ -760,6 +797,7 @@ function CFontManager() ...@@ -760,6 +797,7 @@ function CFontManager()
{ {
this.m_oLibrary = {}; this.m_oLibrary = {};
this.Initialize = function(){}; this.Initialize = function(){};
this.ClearFontsRasterCache = function(){};
}; };
function CStylesPainter() function CStylesPainter()
...@@ -1185,21 +1223,26 @@ var FT_Common = new _FT_Common(); ...@@ -1185,21 +1223,26 @@ var FT_Common = new _FT_Common();
// internal invoke // internal invoke
//-------------------------------------------------------------------------------- //--------------------------------------------------------------------------------
function internal_drawWorksheet(sheet, corner, frozenPaneLines) { function internal_drawWorksheet(sheet, corner, frozenPaneLines, selection) {
sheet._clean(); //sheet._clean();
if (corner) sheet._drawCorner(); if (corner) sheet._drawCorner();
sheet._drawColumnHeaders(); sheet._drawColumnHeaders();
sheet._drawRowHeaders(); sheet._drawRowHeaders();
sheet._drawGrid(); sheet._drawGrid();
sheet._drawCellsAndBorders(); sheet._drawCellsAndBorders();
sheet._drawFrozenPane(); sheet._drawFrozenPane();
if (frozenPaneLines) sheet._drawFrozenPaneLines(); if (frozenPaneLines) sheet._drawFrozenPaneLines();
sheet._fixSelectionOfMergedCells(); sheet._fixSelectionOfMergedCells();
sheet._drawAutoF(); sheet._drawAutoF();
sheet.cellCommentator.drawCommentCells(); sheet.cellCommentator.drawCommentCells();
// sheet.objectRender.showDrawingObjectsEx(true); // sheet.objectRender.showDrawingObjectsEx(true);
if (sheet.overlayCtx) {
if (selection && sheet.overlayCtx) {
sheet._drawSelection(); sheet._drawSelection();
} }
} }
...@@ -1208,6 +1251,12 @@ function internal_drawWorksheet(sheet, corner, frozenPaneLines) { ...@@ -1208,6 +1251,12 @@ function internal_drawWorksheet(sheet, corner, frozenPaneLines) {
// native invoke // native invoke
//-------------------------------------------------------------------------------- //--------------------------------------------------------------------------------
var PageType = {
PageDefaultType: 0,
PageTopType: 1,
PageLeftType: 2,
PageCornerType: 3
};
var scrollIndX = 0; var scrollIndX = 0;
var scrollIndY = 0; var scrollIndY = 0;
var deviceScale = 1; var deviceScale = 1;
...@@ -1223,7 +1272,7 @@ function napi_openFile() { ...@@ -1223,7 +1272,7 @@ function napi_openFile() {
window.g_file_path = "native_open_file"; window.g_file_path = "native_open_file";
window.NATIVE_DOCUMENT_TYPE = window.native.GetEditorType(); window.NATIVE_DOCUMENT_TYPE = window.native.GetEditorType();
_api = new window["Asc"]["spreadsheet_api"](); _api = new window["Asc"]["spreadsheet_api"]();
_api.asc_nativeOpenFile(window.native["GetFileString"]()); _api.asc_nativeOpenFile(window.native["GetFileString"]());
} }
function napi_drawWorksheet(x, y, width, height, xind, yind) { function napi_drawWorksheet(x, y, width, height, xind, yind) {
...@@ -1232,7 +1281,7 @@ function napi_drawWorksheet(x, y, width, height, xind, yind) { ...@@ -1232,7 +1281,7 @@ function napi_drawWorksheet(x, y, width, height, xind, yind) {
_null_object.width = width; _null_object.width = width;
_null_object.height = height; _null_object.height = height;
var worksheet = _api.wb.getWorksheet(0), indX = 0, indY = 0, offX = 0, offY = 0; var worksheet = _api.wb.getWorksheet(0), indX = 0, indY = 0, offX = 0, offY = 0, i = 0;
x = x / deviceScale * (72.0 / 96.0) + worksheet.headersWidth; x = x / deviceScale * (72.0 / 96.0) + worksheet.headersWidth;
y = y / deviceScale * (72.0 / 96.0) + worksheet.headersHeight; y = y / deviceScale * (72.0 / 96.0) + worksheet.headersHeight;
...@@ -1251,7 +1300,7 @@ function napi_drawWorksheet(x, y, width, height, xind, yind) { ...@@ -1251,7 +1300,7 @@ function napi_drawWorksheet(x, y, width, height, xind, yind) {
if (0 == xind && scrollIndX != 0) if (0 == xind && scrollIndX != 0)
{ {
for (var i = scrollIndX; i >= 0; --i) for (i = scrollIndX; i >= 0; --i)
worksheet.scrollHorizontal(-1); worksheet.scrollHorizontal(-1);
scrollIndX = 0; scrollIndX = 0;
...@@ -1259,7 +1308,7 @@ function napi_drawWorksheet(x, y, width, height, xind, yind) { ...@@ -1259,7 +1308,7 @@ function napi_drawWorksheet(x, y, width, height, xind, yind) {
if (0 == yind && scrollIndY != 0) if (0 == yind && scrollIndY != 0)
{ {
for (var i = scrollIndY; i >= 0; --i) for (i = scrollIndY; i >= 0; --i)
worksheet.scrollVertical(-1); worksheet.scrollVertical(-1);
scrollIndY = 0; scrollIndY = 0;
...@@ -1267,7 +1316,7 @@ function napi_drawWorksheet(x, y, width, height, xind, yind) { ...@@ -1267,7 +1316,7 @@ function napi_drawWorksheet(x, y, width, height, xind, yind) {
// ищем ячейку для начальной точки отрисовки // ищем ячейку для начальной точки отрисовки
for (var i = 0; i < worksheet.cols.length; ++i) { for (i = 0; i < worksheet.cols.length; ++i) {
if (worksheet.cols[i].left <= x && x < worksheet.cols[i].left + worksheet.cols[i].width) { if (worksheet.cols[i].left <= x && x < worksheet.cols[i].left + worksheet.cols[i].width) {
// if (xind == 1 && yind == 1) { // if (xind == 1 && yind == 1) {
...@@ -1283,7 +1332,7 @@ function napi_drawWorksheet(x, y, width, height, xind, yind) { ...@@ -1283,7 +1332,7 @@ function napi_drawWorksheet(x, y, width, height, xind, yind) {
} }
} }
for (var i = 0; i < worksheet.rows.length; ++i) { for (i = 0; i < worksheet.rows.length; ++i) {
// if ((xind == 1 || xind == 0)&& yind == 1) // if ((xind == 1 || xind == 0)&& yind == 1)
// console.log('top-height: ' + worksheet.rows[i].top + ',' + worksheet.rows[i].height); // console.log('top-height: ' + worksheet.rows[i].top + ',' + worksheet.rows[i].height);
...@@ -1311,7 +1360,7 @@ function napi_drawWorksheet(x, y, width, height, xind, yind) { ...@@ -1311,7 +1360,7 @@ function napi_drawWorksheet(x, y, width, height, xind, yind) {
// //
if (indX - scrollIndX > 0) { if (indX - scrollIndX > 0) {
for (var i = scrollIndX; i < indX; ++i) for (i = scrollIndX; i < indX; ++i)
worksheet.scrollHorizontal(1); worksheet.scrollHorizontal(1);
scrollIndX = indX; scrollIndX = indX;
...@@ -1319,7 +1368,7 @@ function napi_drawWorksheet(x, y, width, height, xind, yind) { ...@@ -1319,7 +1368,7 @@ function napi_drawWorksheet(x, y, width, height, xind, yind) {
if (indY - scrollIndY > 0) { if (indY - scrollIndY > 0) {
for (var i = scrollIndY; i < indY; ++i) for (i = scrollIndY; i < indY; ++i)
worksheet.scrollVertical(1); worksheet.scrollVertical(1);
scrollIndY = indY; scrollIndY = indY;
...@@ -1335,19 +1384,13 @@ function napi_drawWorksheet(x, y, width, height, xind, yind) { ...@@ -1335,19 +1384,13 @@ function napi_drawWorksheet(x, y, width, height, xind, yind) {
} }
} }
function napi_drawWorksheetHeader(x, y, width, height, xind, yind, type) { function napi_drawWorksheetHeader(x, y, width, height, xind, yind, type) {
// direction
// 0 - default
// 1 - top pages
// -1 - left pages
// 2 - top_left rectangle
if (_api) { if (_api) {
_null_object.width = width; _null_object.width = width;
_null_object.height = height; _null_object.height = height;
var worksheet = _api.wb.getWorksheet(0), indX = 0, indY = 0, offX = 0, offY = 0; var worksheet = _api.wb.getWorksheet(0), indX = 0, indY = 0, offX = 0, offY = 0, i = 0;
x = x / deviceScale * (72.0 / 96.0) + worksheet.headersWidth; x = x / deviceScale * (72.0 / 96.0) + worksheet.headersWidth;
y = y / deviceScale * (72.0 / 96.0) + worksheet.headersHeight; y = y / deviceScale * (72.0 / 96.0) + worksheet.headersHeight;
...@@ -1365,7 +1408,7 @@ function napi_drawWorksheetHeader(x, y, width, height, xind, yind, type) { ...@@ -1365,7 +1408,7 @@ function napi_drawWorksheetHeader(x, y, width, height, xind, yind, type) {
if (0 == xind && scrollIndX != 0) if (0 == xind && scrollIndX != 0)
{ {
for (var i = scrollIndX; i >= 0; --i) for (i = scrollIndX; i >= 0; --i)
worksheet.scrollHorizontal(-1); worksheet.scrollHorizontal(-1);
scrollIndX = 0; scrollIndX = 0;
...@@ -1373,7 +1416,7 @@ function napi_drawWorksheetHeader(x, y, width, height, xind, yind, type) { ...@@ -1373,7 +1416,7 @@ function napi_drawWorksheetHeader(x, y, width, height, xind, yind, type) {
if (0 == yind && scrollIndY != 0) if (0 == yind && scrollIndY != 0)
{ {
for (var i = scrollIndY; i >= 0; --i) for (i = scrollIndY; i >= 0; --i)
worksheet.scrollVertical(-1); worksheet.scrollVertical(-1);
scrollIndY = 0; scrollIndY = 0;
...@@ -1381,7 +1424,7 @@ function napi_drawWorksheetHeader(x, y, width, height, xind, yind, type) { ...@@ -1381,7 +1424,7 @@ function napi_drawWorksheetHeader(x, y, width, height, xind, yind, type) {
// ищем ячейку для начальной точки отрисовки // ищем ячейку для начальной точки отрисовки
for (var i = 0; i < worksheet.cols.length; ++i) { for (i = 0; i < worksheet.cols.length; ++i) {
if (worksheet.cols[i].left <= x && x < worksheet.cols[i].left + worksheet.cols[i].width) { if (worksheet.cols[i].left <= x && x < worksheet.cols[i].left + worksheet.cols[i].width) {
indX = i; indX = i;
offX = x - worksheet.cols[i].left; offX = x - worksheet.cols[i].left;
...@@ -1389,7 +1432,7 @@ function napi_drawWorksheetHeader(x, y, width, height, xind, yind, type) { ...@@ -1389,7 +1432,7 @@ function napi_drawWorksheetHeader(x, y, width, height, xind, yind, type) {
} }
} }
for (var i = 0; i < worksheet.rows.length; ++i) { for (i = 0; i < worksheet.rows.length; ++i) {
if (worksheet.rows[i].top <= y && y < worksheet.rows[i].top + worksheet.rows[i].height) { if (worksheet.rows[i].top <= y && y < worksheet.rows[i].top + worksheet.rows[i].height) {
indY = i; indY = i;
offY = y - worksheet.rows[i].top; offY = y - worksheet.rows[i].top;
...@@ -1399,7 +1442,7 @@ function napi_drawWorksheetHeader(x, y, width, height, xind, yind, type) { ...@@ -1399,7 +1442,7 @@ function napi_drawWorksheetHeader(x, y, width, height, xind, yind, type) {
if (indX - scrollIndX > 0) { if (indX - scrollIndX > 0) {
for (var i = scrollIndX; i < indX; ++i) for (i = scrollIndX; i < indX; ++i)
worksheet.scrollHorizontal(1); worksheet.scrollHorizontal(1);
scrollIndX = indX; scrollIndX = indX;
...@@ -1407,7 +1450,7 @@ function napi_drawWorksheetHeader(x, y, width, height, xind, yind, type) { ...@@ -1407,7 +1450,7 @@ function napi_drawWorksheetHeader(x, y, width, height, xind, yind, type) {
if (indY - scrollIndY > 0) { if (indY - scrollIndY > 0) {
for (var i = scrollIndY; i < indY; ++i) for (i = scrollIndY; i < indY; ++i)
worksheet.scrollVertical(1); worksheet.scrollVertical(1);
scrollIndY = indY; scrollIndY = indY;
...@@ -1416,22 +1459,15 @@ function napi_drawWorksheetHeader(x, y, width, height, xind, yind, type) { ...@@ -1416,22 +1459,15 @@ function napi_drawWorksheetHeader(x, y, width, height, xind, yind, type) {
worksheet.cellsLeft = -offX; worksheet.cellsLeft = -offX;
worksheet.cellsTop = -offY; worksheet.cellsTop = -offY;
if ((0 == yind && type == 1) || type == 2) { if ((0 == yind && type == PageType.PageTopType) || type == PageType.PageCornerType) {
worksheet.cellsTop += worksheet.headersHeight; worksheet.cellsTop += worksheet.headersHeight;
} }
if ((0 == xind && type == -1) || type == 2) { if ((0 == xind && type == PageType.PageLeftType) || type == PageType.PageCornerType) {
worksheet.cellsLeft += worksheet.headersWidth; worksheet.cellsLeft += worksheet.headersWidth;
} }
if (type == 2) internal_drawWorksheet(worksheet, true);
{
internal_drawWorksheet(worksheet, true);
}
else
{
internal_drawWorksheet(worksheet);
}
} }
} }
...@@ -1444,7 +1480,6 @@ function napi_getContentMaxSizeX() { ...@@ -1444,7 +1480,6 @@ function napi_getContentMaxSizeX() {
return 50000; return 50000;
} }
function napi_getContentMaxSizeY() { function napi_getContentMaxSizeY() {
// высота таблицы с учетом размеров ячеек // высота таблицы с учетом размеров ячеек
...@@ -1455,3 +1490,7 @@ function napi_getContentMaxSizeY() { ...@@ -1455,3 +1490,7 @@ function napi_getContentMaxSizeY() {
return 50000; return 50000;
} }
function napi_setZoom(zoom) {
_api.asc_setZoom(zoom);
}
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