Skip to content

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

Перенес insertHyperlink и removeHyperlink в WorkbookView. 

Заделал функцию для removeHyperlink из ячеек.
ToDo удаление гиперссылки из range. Баг http://bugzserver/show_bug.cgi?id=22162

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@53879 954022d7-b5bf-4e40-9824-e11837661b57
parent 99909438
Hide whitespace changes
Inline Side-by-side
Showing with 109 additions and 100 deletions
Excel/api.js
View file @ c0e3bb39
...@@ -2876,22 +2876,11 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS"; ...@@ -2876,22 +2876,11 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
}, },
asc_insertHyperlink: function (options) { asc_insertHyperlink: function (options) {
var ws = this.wb.getWorksheet(); this.wb.insertHyperlink(options);
if ( ws.objectRender.selectedGraphicObjectsExists() ) {
if ( ws.objectRender.controller.canAddHyperlink() )
ws.objectRender.controller.insertHyperlink(options);
}
else {
// На всякий случай проверка (вдруг кто собирается вызвать...)
this.wb.closeCellEditor();
this.wb.getWorksheet().setSelectionInfo("hyperlink", options);
this.wb.restoreFocus();
}
}, },
asc_removeHyperlink: function () { asc_removeHyperlink: function () {
if ( ws.objectRender.selectedGraphicObjectsExists() ) this.wb.removeHyperlink();
ws.objectRender.controller.removeHyperlink();
}, },
asc_insertFormula: function (functionName, autoComplet) { asc_insertFormula: function (functionName, autoComplet) {
......
Excel/view/WorkbookView.js
View file @ c0e3bb39
...@@ -1570,6 +1570,27 @@ ...@@ -1570,6 +1570,27 @@
this._lockDraw = true; this._lockDraw = true;
}; };
WorkbookView.prototype.insertHyperlink = function (options) {
var ws = this.getWorksheet();
if ( ws.objectRender.selectedGraphicObjectsExists() ) {
if ( ws.objectRender.controller.canAddHyperlink() )
ws.objectRender.controller.insertHyperlink(options);
} else {
// На всякий случай проверка (вдруг кто собирается вызвать...)
this.closeCellEditor();
ws.setSelectionInfo("hyperlink", options);
this.restoreFocus();
}
};
WorkbookView.prototype.removeHyperlink = function () {
var ws = this.getWorksheet();
if (ws.objectRender.selectedGraphicObjectsExists())
ws.objectRender.controller.removeHyperlink();
else {
ws.setSelectionInfo("rh");
}
};
/* /*
* @param {c_oAscRenderingModeType} mode Режим отрисовки * @param {c_oAscRenderingModeType} mode Режим отрисовки
* @param {Boolean} isInit инициализация или нет * @param {Boolean} isInit инициализация или нет
......
Excel/view/WorksheetView.js
View file @ c0e3bb39
...@@ -7269,18 +7269,18 @@ ...@@ -7269,18 +7269,18 @@
var checkRange = null; var checkRange = null;
var arn = t.activeRange.clone(true); var arn = t.activeRange.clone(true);
if (onlyActive) { if (onlyActive) {
checkRange = new asc_Range(arn.startCol, arn.startRow, arn.startCol, arn.startRow); checkRange = new asc_Range(arn.startCol, arn.startRow, arn.startCol, arn.startRow);
} else {
if (c_oAscSelectionType.RangeMax === arn.type) {
checkRange = new asc_Range(0, 0, gc_nMaxCol0, gc_nMaxRow0);
} else if (c_oAscSelectionType.RangeCol === arn.type) {
checkRange = new asc_Range(arn.c1, 0, arn.c2, gc_nMaxRow0);
} else if (c_oAscSelectionType.RangeRow === arn.type) {
checkRange = new asc_Range(0, arn.r1, gc_nMaxCol0, arn.r2);
} else { } else {
if (c_oAscSelectionType.RangeMax === arn.type) { checkRange = arn;
checkRange = new asc_Range(0, 0, gc_nMaxCol0, gc_nMaxRow0);
} else if (c_oAscSelectionType.RangeCol === arn.type) {
checkRange = new asc_Range(arn.c1, 0, arn.c2, gc_nMaxRow0);
} else if (c_oAscSelectionType.RangeRow === arn.type) {
checkRange = new asc_Range(0, arn.r1, gc_nMaxCol0, arn.r2);
} else {
checkRange = arn;
}
} }
}
var onSelectionCallback = function (isSuccess) { var onSelectionCallback = function (isSuccess) {
if (false === isSuccess) if (false === isSuccess)
...@@ -7291,36 +7291,36 @@ ...@@ -7291,36 +7291,36 @@
var bIsUpdate = true; var bIsUpdate = true;
if (onlyActive) { if (onlyActive) {
range = t.model.getRange3(arn.startRow, arn.startCol, arn.startRow, arn.startCol); range = t.model.getRange3(arn.startRow, arn.startCol, arn.startRow, arn.startCol);
} else {
if (c_oAscSelectionType.RangeMax === arn.type) {
range = t.model.getRange3(/*arn.r1*/0, /*arn.c1*/0, gc_nMaxRow0, gc_nMaxCol0);
} else if (c_oAscSelectionType.RangeCol === arn.type) {
range = t.model.getRange3(/*arn.r1*/0, arn.c1, gc_nMaxRow0, arn.c2);
} else if (c_oAscSelectionType.RangeRow === arn.type) {
range = t.model.getRange3(arn.r1, /*arn.c1*/0, arn.r2, gc_nMaxCol0);
} else { } else {
if (c_oAscSelectionType.RangeMax === arn.type) { range = t.model.getRange3(arn.r1, arn.c1, arn.r2, arn.c2);
range = t.model.getRange3(/*arn.r1*/0, /*arn.c1*/0, gc_nMaxRow0, gc_nMaxCol0);
} else if (c_oAscSelectionType.RangeCol === arn.type) {
range = t.model.getRange3(/*arn.r1*/0, arn.c1, gc_nMaxRow0, arn.c2);
} else if (c_oAscSelectionType.RangeRow === arn.type) {
range = t.model.getRange3(arn.r1, /*arn.c1*/0, arn.r2, gc_nMaxCol0);
} else {
range = t.model.getRange3(arn.r1, arn.c1, arn.r2, arn.c2);
}
} }
}
var isLargeRange = t._isLargeRange(range), callTrigger = false; var isLargeRange = t._isLargeRange(range), callTrigger = false;
var res; var res;
var mc, r, c, cell; var mc, r, c, cell;
function makeBorder(b) { function makeBorder(b) {
var border = new BorderProp(); var border = new BorderProp();
if (b === false) { if (b === false) {
border.setStyle(c_oAscBorderStyles.None); border.setStyle(c_oAscBorderStyles.None);
} else if (b) { } else if (b) {
if (b.style !== null && b.style !== undefined) {border.setStyle(b.style);} if (b.style !== null && b.style !== undefined) {border.setStyle(b.style);}
if (b.color !== null && b.color !== undefined) { if (b.color !== null && b.color !== undefined) {
if(b.color instanceof CAscColor) if(b.color instanceof CAscColor)
border.c = CorrectAscColor(b.color); border.c = CorrectAscColor(b.color);
}
} }
return border;
} }
return border;
}
selectionRange = arn.clone(); selectionRange = arn.clone();
History.Create_NewPoint(); History.Create_NewPoint();
...@@ -7343,14 +7343,15 @@ ...@@ -7343,14 +7343,15 @@
case "value": range.setValue(val); break; case "value": range.setValue(val); break;
case "format": range.setNumFormat(val); canChangeColWidth = c_oAscCanChangeColWidth.numbers; break; case "format": range.setNumFormat(val); canChangeColWidth = c_oAscCanChangeColWidth.numbers; break;
case "angle": range.setAngle(val); break; case "angle": range.setAngle(val); break;
case "rh": /*ToDo удаление гиперссылки из range*/ break;
case "border": case "border":
if (isLargeRange) { callTrigger = true; t.handlers.trigger("slowOperation", true); } if (isLargeRange) { callTrigger = true; t.handlers.trigger("slowOperation", true); }
// None // None
if (val.length < 1) { if (val.length < 1) {
range.setBorder(null); range.setBorder(null);
break; break;
} }
res = new Border(); res = new Border();
// Diagonal // Diagonal
res.d = makeBorder( val[c_oAscBorderOptions.DiagD] || val[c_oAscBorderOptions.DiagU] ); res.d = makeBorder( val[c_oAscBorderOptions.DiagD] || val[c_oAscBorderOptions.DiagU] );
...@@ -7370,16 +7371,14 @@ ...@@ -7370,16 +7371,14 @@
case "merge": case "merge":
if (isLargeRange) { callTrigger = true; t.handlers.trigger("slowOperation", true); } if (isLargeRange) { callTrigger = true; t.handlers.trigger("slowOperation", true); }
switch (val) { switch (val) {
case c_oAscMergeOptions.Unmerge: range.unmerge(); break; case c_oAscMergeOptions.Unmerge: range.unmerge(); break;
case c_oAscMergeOptions.MergeCenter: range.merge(val); break; case c_oAscMergeOptions.MergeCenter: range.merge(val); break;
case c_oAscMergeOptions.MergeAcross: case c_oAscMergeOptions.MergeAcross:
for (res = arn.r1; res <= arn.r2; ++res) for (res = arn.r1; res <= arn.r2; ++res)
{ t.model.getRange3(res, arn.c1, res, arn.c2).merge(val);
t.model.getRange3(res, arn.c1, res, arn.c2).merge(val); break;
} case c_oAscMergeOptions.Merge: range.merge(val); break;
break; }
case c_oAscMergeOptions.Merge: range.merge(val); break;
}
// Должны обновить больший range, т.к. мы продолжаем строки в ячейках... // Должны обновить больший range, т.к. мы продолжаем строки в ячейках...
arn.c1 = 0; arn.c1 = 0;
arn.c2 = gc_nMaxCol0; arn.c2 = gc_nMaxCol0;
...@@ -7431,13 +7430,13 @@ ...@@ -7431,13 +7430,13 @@
r = mc ? mc.r1 : arn.startRow; r = mc ? mc.r1 : arn.startRow;
cell = t._getVisibleCell(c, r); cell = t._getVisibleCell(c, r);
if (undefined !== cell) { if (undefined !== cell) {
var oldFontSize = cell.getFontsize(); var oldFontSize = cell.getFontsize();
var newFontSize = asc_incDecFonSize(val, oldFontSize); var newFontSize = asc_incDecFonSize(val, oldFontSize);
if (null !== newFontSize) { if (null !== newFontSize) {
range.setFontsize(newFontSize); range.setFontsize(newFontSize);
canChangeColWidth = c_oAscCanChangeColWidth.numbers; canChangeColWidth = c_oAscCanChangeColWidth.numbers;
}
} }
}
break; break;
case "style": case "style":
range.setCellStyle(val); canChangeColWidth = c_oAscCanChangeColWidth.numbers; break; range.setCellStyle(val); canChangeColWidth = c_oAscCanChangeColWidth.numbers; break;
...@@ -7476,7 +7475,7 @@ ...@@ -7476,7 +7475,7 @@
unLockDraw(t.model.workbook); unLockDraw(t.model.workbook);
arn = selectData[0]; arn = selectData[0];
selectionRange = arn.clone(true); selectionRange = arn.clone(true);
//добавляем автофильтры и форматированные таблицы //добавляем автофильтры и форматированные таблицы
if(isLocal === true && val.lStorage && val.lStorage.autoFilters && val.lStorage.autoFilters.length) if(isLocal === true && val.lStorage && val.lStorage.autoFilters && val.lStorage.autoFilters.length)
{ {
...@@ -7498,7 +7497,7 @@ ...@@ -7498,7 +7497,7 @@
var range; var range;
var tablePartRange; var tablePartRange;
var activeRange = window["Asc"]["editor"].wb.clipboard.activeRange; var activeRange = window["Asc"]["editor"].wb.clipboard.activeRange;
var refInsertBinary = t.autoFilters._refToRange(activeRange); var refInsertBinary = t.autoFilters._refToRange(activeRange);
var diffRow; var diffRow;
var diffCol; var diffCol;
for(var aF = 0; aF < aFilters.length; aF++) for(var aF = 0; aF < aFilters.length; aF++)
...@@ -7514,7 +7513,7 @@ ...@@ -7514,7 +7513,7 @@
t.autoFilters.addAutoFilter(null, range.bbox, null, null, true); t.autoFilters.addAutoFilter(null, range.bbox, null, null, true);
} }
} }
// Должны обновить больший range, т.к. мы продолжаем строки в ячейках... // Должны обновить больший range, т.к. мы продолжаем строки в ячейках...
arn.c1 = 0; arn.c1 = 0;
arn.c2 = gc_nMaxCol0; arn.c2 = gc_nMaxCol0;
...@@ -7567,12 +7566,12 @@ ...@@ -7567,12 +7566,12 @@
} }
var positionX = null; var positionX = null;
var positionY = null; var positionY = null;
if (t.cols && val.addImages[im].curCell && val.addImages[im].curCell.col != undefined && t.cols[val.addImages[im].curCell.col].left != undefined) if (t.cols && val.addImages[im].curCell && val.addImages[im].curCell.col != undefined && t.cols[val.addImages[im].curCell.col].left != undefined)
positionX = t.cols[val.addImages[im].curCell.col].left - t.getCellLeft(0, 1); positionX = t.cols[val.addImages[im].curCell.col].left - t.getCellLeft(0, 1);
if (t.rows && val.addImages[im].curCell && val.addImages[im].curCell.row != undefined && t.rows[val.addImages[im].curCell.row].top != undefined) if (t.rows && val.addImages[im].curCell && val.addImages[im].curCell.row != undefined && t.rows[val.addImages[im].curCell.row].top != undefined)
positionY = t.rows[val.addImages[im].curCell.row].top - t.getCellTop(0, 1); positionY = t.rows[val.addImages[im].curCell.row].top - t.getCellTop(0, 1);
var Drawing; var Drawing;
switch(first_string) { switch(first_string) {
case "TeamLabImageSheets": { case "TeamLabImageSheets": {
...@@ -7639,29 +7638,29 @@ ...@@ -7639,29 +7638,29 @@
return; return;
case "hyperlink": case "hyperlink":
if (val && val.hyperlinkModel) { if (val && val.hyperlinkModel) {
if (c_oAscHyperlinkType.RangeLink === val.asc_getType()) { if (c_oAscHyperlinkType.RangeLink === val.asc_getType()) {
var hyperlinkRangeTmp = t.model.getRange2(val.asc_getRange ()); var hyperlinkRangeTmp = t.model.getRange2(val.asc_getRange ());
if (null === hyperlinkRangeTmp) { if (null === hyperlinkRangeTmp) {
bIsUpdate = false; bIsUpdate = false;
break; break;
}
}
val.hyperlinkModel.Ref = range;
range.setHyperlink(val.hyperlinkModel);
// Вставим текст в активную ячейку (а не так, как MSExcel в первую ячейку диапазона)
mc = t.model.getMergedByCell(arn.startRow, arn.startCol);
c = mc ? mc.c1 : arn.startCol;
r = mc ? mc.r1 : arn.startRow;
if (null !== val.asc_getText()) {
t.model.getRange3(r, c, r, c).setValue(val.asc_getText());
// Вызываем функцию пересчета для заголовков форматированной таблицы
t.autoFilters._renameTableColumn(arn);
} }
break;
} else {
bIsUpdate = false;
break;
} }
val.hyperlinkModel.Ref = range;
range.setHyperlink(val.hyperlinkModel);
// Вставим текст в активную ячейку (а не так, как MSExcel в первую ячейку диапазона)
mc = t.model.getMergedByCell(arn.startRow, arn.startCol);
c = mc ? mc.c1 : arn.startCol;
r = mc ? mc.r1 : arn.startRow;
if (null !== val.asc_getText()) {
t.model.getRange3(r, c, r, c).setValue(val.asc_getText());
// Вызываем функцию пересчета для заголовков форматированной таблицы
t.autoFilters._renameTableColumn(arn);
}
break;
} else {
bIsUpdate = false;
break;
}
default: default:
bIsUpdate = false; bIsUpdate = false;
...@@ -7669,22 +7668,22 @@ ...@@ -7669,22 +7668,22 @@
} }
if (bIsUpdate) { if (bIsUpdate) {
if (callTrigger) { t.handlers.trigger("slowOperation", false); } if (callTrigger) { t.handlers.trigger("slowOperation", false); }
t.isChanged = true; t.isChanged = true;
t._updateCellsRange(arn, canChangeColWidth); t._updateCellsRange(arn, canChangeColWidth);
} }
History.EndTransaction(); History.EndTransaction();
}; };
if ("paste" === prop) { if ("paste" === prop) {
// Для past свой диапазон // Для past свой диапазон
if(isLocal === "binary") if(isLocal === "binary")
checkRange = t._pasteFromBinary(val, true); checkRange = t._pasteFromBinary(val, true);
else if(isLocal === true) else if(isLocal === true)
checkRange = t._pasteFromLS(val, true); checkRange = t._pasteFromLS(val, true);
else else
checkRange = t._setInfoAfterPaste(val, onlyActive, true); checkRange = t._setInfoAfterPaste(val, onlyActive, true);
} }
this._isLockedCells (checkRange, /*subType*/null, onSelectionCallback); this._isLockedCells (checkRange, /*subType*/null, onSelectionCallback);
}; };
......
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