pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-07-25 10:59:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix button positioning

Browse Source
This commit is contained in:
Dmitry-Ilyushechkin
2025-05-07 15:54:52 +03:00
parent 846bcc2a09
commit 5887126ffa
2 changed files with 33 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
apps/spreadsheeteditor/main/app/controller/DocumentHolderExt.js
View File

@ -1419,7 +1419,7 @@ define([], function () {
LabelGroup5 = [14, 15].includes(type);
if (ComboChart) {
const comboType = chartProps.getSeries()?.[1]?.asc_getChartType(),
const comboType = chartProps.getSeries()?.[0]?.asc_getChartType(),
isInGroup1 = [0, 1, 2, 16, 17, 18].includes(comboType),
isInGroup2 = [0, 1, 2, 14, 15, 16, 17, 18].includes(comboType),
isInGroup3 = [0, 14, 15, 16].includes(comboType),
@ -3732,16 +3732,41 @@ define([], function () {
var x = asc_CRect.asc_getX();
var y = asc_CRect.asc_getY();
var width = asc_CRect.asc_getWidth();
chartContainer.css({
left: (x + width + 10) + 'px',
top: y + 'px'
}).show();
var height = asc_CRect.asc_getHeight();
var canvas = documentHolderView.cmpEl.find('#ws-canvas')[0];
if (canvas) {
var canvasRect = canvas.getBoundingClientRect();
var btnLeft = x + width + 10;
var btnTop = y;
if (btnLeft + 50 > canvasRect.width) {
btnLeft = x - 40;
if (btnLeft < 20) {
chartContainer.hide();
return;
}
}
if (btnTop + 30 > canvasRect.height) {
btnTop = canvasRect.height - 30;
}
if (btnTop < 18)
btnTop = 18;
chartContainer.css({
left: btnLeft + 'px',
top: btnTop + 'px'
}).show();
}
if (!me.btnChartElement) {
me.btnChartElement = new Common.UI.Button({
parentEl: $('#id-document-holder-btn-chart-element'),
cls: 'btn-toolbar',
iconCls: 'toolbar__icon btn-menu-chart',
iconCls: 'toolbar__icon btn-chart-elements',
menu: this.documentHolder.menuChartElement.menu
});

2
apps/spreadsheeteditor/main/resources/less/toolbar.less
View File

@ -84,6 +84,8 @@
#chart-element-container {
background-color: @background-toolbar;
border: var(--scaled-one-pixel, 1px) solid var(--border-regular-control);
border-radius: 3px;
}
#special-paste-container,