pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-04-07 14:06:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

[DE][PE] Update chart settings

Browse Source
This commit is contained in:
Julia Radzhabova
2023-10-26 12:22:20 +03:00
parent 28bad4d1af
commit c917a36b99
10 changed files with 66 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
apps/documenteditor/main/resources/img/toolbar/1.25x/btn-update.png → apps/common/main/resources/img/toolbar/1.25x/btn-update.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 485 B

After

Width:  |  Height:  |  Size: 485 B

0
apps/documenteditor/main/resources/img/toolbar/1.5x/btn-update.png → apps/common/main/resources/img/toolbar/1.5x/btn-update.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 548 B

After

Width:  |  Height:  |  Size: 548 B

0
apps/documenteditor/main/resources/img/toolbar/1.75x/btn-update.png → apps/common/main/resources/img/toolbar/1.75x/btn-update.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 674 B

After

Width:  |  Height:  |  Size: 674 B

0
apps/documenteditor/main/resources/img/toolbar/1x/btn-update.png → apps/common/main/resources/img/toolbar/1x/btn-update.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 407 B

After

Width:  |  Height:  |  Size: 407 B

0
apps/documenteditor/main/resources/img/toolbar/2.5x/btn-update.svg → apps/common/main/resources/img/toolbar/2.5x/btn-update.svg
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 477 B

After

Width:  |  Height:  |  Size: 477 B

0
apps/documenteditor/main/resources/img/toolbar/2x/btn-update.png → apps/common/main/resources/img/toolbar/2x/btn-update.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 789 B

After

Width:  |  Height:  |  Size: 789 B

8
apps/documenteditor/main/app/template/ChartSettings.template
View File

@ -61,7 +61,7 @@
</tr>
<tr>
<td class="padding-small">
<label class="header"><%= scope.textData %></label>
<label class="header" id="chart-data-lbl"><%= scope.textData %></label>
</td>
</tr>
<tr class="open-link">
@ -71,17 +71,17 @@
</tr>
<tr>
<td class="padding-small">
<button type="button" class="btn btn-text-default auto" id="chart-button-edit-data" style="min-width:115px;" data-hint="1" data-hint-direction="bottom" data-hint-offset="big"><%= scope.textEditData %></button>
<div id="chart-button-edit-data" style="width:100%;"></div>
</td>
</tr>
<tr class="external-only">
<td class="padding-small">
<button type="button" class="btn btn-text-default auto" id="chart-button-update-data" style="min-width:115px;" data-hint="1" data-hint-direction="bottom" data-hint-offset="big"><%= scope.textUpdateData %></button>
<div id="chart-button-update-data" style="width:100%;"></div>
</td>
</tr>
<tr class="external-only">
<td class="padding-small">
<button type="button" class="btn btn-text-default auto" id="chart-button-edit-links" style="min-width:115px;" data-hint="1" data-hint-direction="bottom" data-hint-offset="big"><%= scope.textEditLinks %></button>
<div id="chart-button-edit-links" style="width:100%;"></div>
</td>
</tr>
</table>

32
apps/documenteditor/main/app/view/ChartSettings.js
View File

@ -139,6 +139,7 @@ define([
this.chartProps = props.get_ChartProperties();
var externalRef = this.chartProps.getExternalReference();
this.lblLinkData.text(externalRef ? this.textLinkedData : this.textData);
this.btnEditData.setCaption(externalRef ? this.textSelectData : this.textEditData);
this.ExternalOnlySettings.toggleClass('settings-hidden', !externalRef);
var text = externalRef ? (externalRef.asc_getSource() || '').replace(new RegExp("%20",'g')," ") : '';
@ -360,19 +361,40 @@ define([
this.lockedControls.push(this.btnChartType);
this.btnEditData = new Common.UI.Button({
el: $('#chart-button-edit-data')
parentEl: $('#chart-button-edit-data'),
cls : 'btn-toolbar align-left',
iconCls : 'toolbar__icon btn-select-range',
caption : this.textEditData,
style : 'width: 100%;',
dataHint : '1',
dataHintDirection: 'left',
dataHintOffset: 'small'
});
this.lockedControls.push(this.btnEditData);
this.btnEditData.on('click', _.bind(this.setEditData, this));
this.btnUpdateData = new Common.UI.Button({
el: $('#chart-button-update-data')
parentEl: $('#chart-button-update-data'),
cls : 'btn-toolbar align-left',
iconCls : 'toolbar__icon btn-update',
caption : this.textUpdateData,
style : 'width: 100%;',
dataHint : '1',
dataHintDirection: 'left',
dataHintOffset: 'small'
});
this.lockedControls.push(this.btnUpdateData);
this.btnUpdateData.on('click', _.bind(this.onUpdateData, this));
this.btnEditLinks = new Common.UI.Button({
el: $('#chart-button-edit-links')
parentEl: $('#chart-button-edit-links'),
cls : 'btn-toolbar align-left',
iconCls : 'toolbar__icon btn-inserthyperlink',
caption : this.textEditLinks,
style : 'width: 100%;',
dataHint : '1',
dataHintDirection: 'left',
dataHintOffset: 'small'
});
this.lockedControls.push(this.btnEditLinks);
this.btnEditLinks.on('click', _.bind(this.onEditLinks, this));
@ -642,6 +664,7 @@ define([
$(this.el).on('click', '#chart-advanced-link', _.bind(this.openAdvancedSettings, this));
this.linkExternalSrc = $('#chart-open-external-link');
$(this.el).on('click', '#chart-open-external-link', _.bind(this.openLink, this));
this.lblLinkData = $('#chart-data-lbl');
},
createDelayedElements: function() {
@ -1084,7 +1107,8 @@ define([
textUpdateData: 'Update Data',
textSelectData: 'Select Data',
textData: 'Data',
textEditLinks: 'Edit links'
textEditLinks: 'Edit Links',
textLinkedData: 'Linked Data'
}, DE.Views.ChartSettings || {}));
});

8
apps/presentationeditor/main/app/template/ChartSettings.template
View File

@ -46,7 +46,7 @@
</tr>
<tr>
<td class="padding-small">
<label class="header"><%= scope.textData %></label>
<label class="header" id="chart-data-lbl"><%= scope.textData %></label>
</td>
</tr>
<tr class="open-link">
@ -56,17 +56,17 @@
</tr>
<tr>
<td class="padding-small">
<button type="button" class="btn btn-text-default auto" id="chart-button-edit-data" style="min-width:115px;" data-hint="1" data-hint-direction="bottom" data-hint-offset="big"><%= scope.textEditData %></button>
<div id="chart-button-edit-data" style="width:100%;"></div>
</td>
</tr>
<tr class="external-only">
<td class="padding-small">
<button type="button" class="btn btn-text-default auto" id="chart-button-update-data" style="min-width:115px;" data-hint="1" data-hint-direction="bottom" data-hint-offset="big"><%= scope.textUpdateData %></button>
<div id="chart-button-update-data" style="width:100%;"></div>
</td>
</tr>
<tr class="external-only">
<td class="padding-small">
<button type="button" class="btn btn-text-default auto" id="chart-button-edit-links" style="min-width:115px;" data-hint="1" data-hint-direction="bottom" data-hint-offset="big"><%= scope.textEditLinks %></button>
<div id="chart-button-edit-links" style="width:100%;"></div>
</td>
</tr>
</table>

36
apps/presentationeditor/main/app/view/ChartSettings.js
View File

@ -120,6 +120,7 @@ define([
this.chartProps = props.get_ChartProperties();
var externalRef = this.chartProps.getExternalReference();
this.lblLinkData.text(externalRef ? this.textLinkedData : this.textData);
this.btnEditData.setCaption(externalRef ? this.textSelectData : this.textEditData);
this.ExternalOnlySettings.toggleClass('settings-hidden', !externalRef);
var text = externalRef ? (externalRef.asc_getSource() || '').replace(new RegExp("%20",'g')," ") : '';
@ -295,19 +296,40 @@ define([
this.lockedControls.push(this.btnChartType);
this.btnEditData = new Common.UI.Button({
el: $('#chart-button-edit-data')
parentEl: $('#chart-button-edit-data'),
cls : 'btn-toolbar align-left',
iconCls : 'toolbar__icon btn-select-range',
caption : this.textEditData,
style : 'width: 100%;',
dataHint : '1',
dataHintDirection: 'left',
dataHintOffset: 'small'
});
this.btnEditData.on('click', _.bind(this.setEditData, this));
this.lockedControls.push(this.btnEditData);
this.btnEditData.on('click', _.bind(this.setEditData, this));
this.btnUpdateData = new Common.UI.Button({
el: $('#chart-button-update-data')
parentEl: $('#chart-button-update-data'),
cls : 'btn-toolbar align-left',
iconCls : 'toolbar__icon btn-update',
caption : this.textUpdateData,
style : 'width: 100%;',
dataHint : '1',
dataHintDirection: 'left',
dataHintOffset: 'small'
});
this.btnUpdateData.on('click', _.bind(this.onUpdateData, this));
this.lockedControls.push(this.btnUpdateData);
this.btnUpdateData.on('click', _.bind(this.onUpdateData, this));
this.btnEditLinks = new Common.UI.Button({
el: $('#chart-button-edit-links')
parentEl: $('#chart-button-edit-links'),
cls : 'btn-toolbar align-left',
iconCls : 'toolbar__icon btn-inserthyperlink',
caption : this.textEditLinks,
style : 'width: 100%;',
dataHint : '1',
dataHintDirection: 'left',
dataHintOffset: 'small'
});
this.lockedControls.push(this.btnEditLinks);
this.btnEditLinks.on('click', _.bind(this.onEditLinks, this));
@ -577,6 +599,7 @@ define([
$(this.el).on('click', '#chart-advanced-link', _.bind(this.openAdvancedSettings, this));
this.linkExternalSrc = $('#chart-open-external-link');
$(this.el).on('click', '#chart-open-external-link', _.bind(this.openLink, this));
this.lblLinkData = $('#chart-data-lbl');
this.NotCombinedSettings = $('.not-combined');
this.Chart3DContainer = $('#chart-panel-3d-rotate');
@ -982,6 +1005,7 @@ define([
textUpdateData: 'Update Data',
textSelectData: 'Select Data',
textData: 'Data',
textEditLinks: 'Edit links'
textEditLinks: 'Edit Links',
textLinkedData: 'Linked Data'
}, PE.Views.ChartSettings || {}));
});