[IMP] spreadsheet: update o_spreadsheet to latest version
https://github.com/odoo/o-spreadsheet/commit/300da461 [IMP] style: add vertical text align option https://github.com/odoo/o-spreadsheet/commit/b4c1339c [IMP] doc: improve custom function documentation https://github.com/odoo/o-spreadsheet/commit/329d1aaa [FIX] figure: Prevent the figure from moving to far. https://github.com/odoo/o-spreadsheet/commit/5eb41878 [FIX] format: SET_DECIMAL of cells with default format https://github.com/odoo/o-spreadsheet/commit/606cbb27 [FIX] composer: display raw content of NumberCell https://github.com/odoo/o-spreadsheet/commit/218052ac [FIX] renderer: negative number with lot of decimal are overflowing https://github.com/odoo/o-spreadsheet/commit/8dc32cef [IMP] figures: insert images https://github.com/odoo/o-spreadsheet/commit/4e3a8254 [FIX] tests: typo https://github.com/odoo/o-spreadsheet/commit/6107b266 [FIX] link display: items are not vertically aligned https://github.com/odoo/o-spreadsheet/commit/e92c401a [FIX] scorecard chart: Fix empty translation string https://github.com/odoo/o-spreadsheet/commit/0c76423b [IMP] menu: remove call to isDashboard as menu are never called in dashboard mode https://github.com/odoo/o-spreadsheet/commit/7548f5b7 [REF] tests: reorganize spreadsheet tests https://github.com/odoo/o-spreadsheet/commit/08c620dd [REF] bottom_bar(tests): Use generic helper to mount bottom bar https://github.com/odoo/o-spreadsheet/commit/1fe66362 [FIX] scrollbar: fix the scrollbar full size closes odoo/odoo#107372 Related: odoo/enterprise#34727 Signed-off-by: Pierre Rousseau (pro) <pro@odoo.com>
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
.o-chart-menu {
|
||||
.o-chart-menu-item {
|
||||
.o-figure-menu {
|
||||
.o-figure-menu-item {
|
||||
padding-left: 7px;
|
||||
}
|
||||
|
||||
|
||||
@@ -1,9 +1,9 @@
|
||||
<odoo>
|
||||
<div t-name="spreadsheet.ChartFigure" t-inherit="o-spreadsheet-ChartFigure" t-inherit-mode="extension" owl="1">
|
||||
<xpath expr="//div[hasclass('o-chart-menu-item')]" position="before">
|
||||
<xpath expr="//div[hasclass('o-figure-menu-item')]" position="before">
|
||||
<div
|
||||
t-if="hasOdooMenu and !env.isDashboard()"
|
||||
class="o-chart-menu-item o-chart-external-link"
|
||||
class="o-figure-menu-item o-chart-external-link"
|
||||
t-on-click="navigateToOdooMenu">
|
||||
<span class="fa fa-external-link" />
|
||||
</div>
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -364,8 +364,8 @@
|
||||
t-on-keydown="(ev) => this.onKeyDown(ev)"
|
||||
t-on-keyup.stop="">
|
||||
<t
|
||||
t-component="figureRegistry.get(this.props.figure.tag).Component"
|
||||
t-key="this.props.figure.id"
|
||||
t-component="figureRegistry.get(props.figure.tag).Component"
|
||||
t-key="props.figure.id"
|
||||
sidePanelIsOpen="props.sidePanelIsOpen"
|
||||
onFigureDeleted="props.onFigureDeleted"
|
||||
figure="displayedFigure"
|
||||
@@ -422,9 +422,9 @@
|
||||
class="o-chart-container"
|
||||
t-ref="chartContainer"
|
||||
t-on-contextmenu.prevent.stop="(ev) => !env.isDashboard() and this.onContextMenu(ev)">
|
||||
<div class="o-chart-menu" t-if="!env.isDashboard()">
|
||||
<div class="o-figure-menu" t-if="!env.isDashboard()">
|
||||
<div
|
||||
class="o-chart-menu-item"
|
||||
class="o-figure-menu-item"
|
||||
t-on-click="showMenu"
|
||||
t-ref="menuButton"
|
||||
t-on-contextmenu.prevent.stop="showMenu">
|
||||
@@ -458,6 +458,30 @@
|
||||
</div>
|
||||
</t>
|
||||
|
||||
<t t-name="o-spreadsheet-ImageFigure" owl="1">
|
||||
<div class="o-figure-menu" t-if="!env.isDashboard()">
|
||||
<div
|
||||
class="o-figure-menu-item"
|
||||
t-on-click="showMenu"
|
||||
t-ref="menuButton"
|
||||
t-on-contextmenu.prevent.stop="showMenu">
|
||||
<t t-call="o-spreadsheet-Icon.LIST"/>
|
||||
</div>
|
||||
</div>
|
||||
<img
|
||||
t-ref="o-image"
|
||||
t-att-src="getImagePath"
|
||||
class="w-100 h-100"
|
||||
t-on-contextmenu.prevent.stop="(ev) => !env.isDashboard() and this.onContextMenu(ev)"
|
||||
/>
|
||||
<Menu
|
||||
t-if="menuState.isOpen"
|
||||
position="menuState.position"
|
||||
menuItems="menuState.menuItems"
|
||||
onClose="() => this.menuState.isOpen=false"
|
||||
/>
|
||||
</t>
|
||||
|
||||
<t t-name="o-spreadsheet-FilterIcon" owl="1">
|
||||
<div class="o-filter-icon" t-att-style="style" t-on-click="props.onClick">
|
||||
<t t-if="props.isActive" t-call="o-spreadsheet-Icon.FILTER_ICON_ACTIVE"/>
|
||||
@@ -1355,7 +1379,7 @@
|
||||
</t>
|
||||
|
||||
<t t-name="o-spreadsheet-LinkDisplay" owl="1">
|
||||
<div class="o-link-tool">
|
||||
<div class="o-link-tool d-flex align-items-center">
|
||||
<!-- t-key to prevent owl from re-using the previous img element when the link changes.
|
||||
The wrong/previous image would be displayed while the new one loads -->
|
||||
<img
|
||||
|
||||
@@ -20,7 +20,7 @@ const chartId = "uuid1";
|
||||
* able to interact with it.
|
||||
*/
|
||||
async function showChartMenu(fixture) {
|
||||
const chartMenu = fixture.querySelector(".o-chart-menu");
|
||||
const chartMenu = fixture.querySelector(".o-figure-menu");
|
||||
chartMenu.style.display = "flex";
|
||||
await nextTick();
|
||||
}
|
||||
@@ -28,7 +28,7 @@ async function showChartMenu(fixture) {
|
||||
/** Click on external link of the first chart found in the page*/
|
||||
async function clickChartExternalLink(fixture) {
|
||||
await showChartMenu(fixture);
|
||||
const chartMenuItem = fixture.querySelector(".o-chart-menu-item.o-chart-external-link");
|
||||
const chartMenuItem = fixture.querySelector(".o-figure-menu-item.o-chart-external-link");
|
||||
await click(chartMenuItem);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user