Skip to content

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

add select range button in chart 

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@47078 954022d7-b5bf-4e40-9824-e11837661b57
parent c93099ac
Show whitespace changes
Inline Side-by-side
Showing with 81 additions and 73 deletions
Excel/SpreadsheetTestMenu.html
View file @ 19633769
......@@ -2030,5 +2030,61 @@
<input id="valueFilterSelect2" class="dialogEntry"></input>
</td></tr></table>
</div>
<div id='drawingObjectsMenu'>
<div id='imageSelector' style='font-size: 12px; visibility: hidden;'>
<input type='text' id='imageSelectorUrl' style='width: 340px; margin: 10px;'/>
</div>
<div id='chartSelector' style='font-size: 12px; visibility: hidden;'>
<select id='chartType' style='width: 340px; margin: 10px;'>
<option value='Line' selected>Line</option>
<option value='Bar'>Bar</option>
<option value='HBar'>HBar</option>
<option value='Area'>Area</option>
<option value='Pie'>Pie</option>
<option value='Scatter'>Scatter</option>
<option value='Stock'>Stock</option>
</select>
<select id='chartSubType' style='width: 340px; margin: 10px;'>
<option value='Normal' selected>Normal</option>
<option value='stacked'>Stacked</option>
<option value='stackedPer'>100Stacked</option>
</select>
<fieldset>
<legend>Data</legend>
<input type='text' style='margin-left: 10px; width: 80%;' id='chartRange' value=''>
<img class='ToolbarIcon ToolbarChangeRange' id='changeRange'>
<br>
<input type='radio' name='dataRadio' id='dataRows' style='margin-left: 10px;'>Rows<br>
<input type='radio' name='dataRadio' id='dataColumns' style='margin-left: 10px;'>Columns<br>
</fieldset>
<fieldset>
<legend>Grid</legend>
<input type='checkbox' id='xGridShow' checked style='margin-left: 10px;'>Vertical<br>
<input type='checkbox' id='yGridShow' checked style='margin-left: 10px;'>Horizontal<br>
</fieldset>
<fieldset>
<legend>Axis</legend>
<input type='checkbox' id='xAxisShow' checked style='margin-left: 10px;'>Show X<br>
<input type='checkbox' id='yAxisShow' checked style='margin-left: 10px;'>Show Y<br>
</fieldset>
<fieldset>
<legend>Titles</legend>
<input type='text' style='margin-left: 10px;' id='chartTitle' value='Diagramm'><br>
<span style='margin-left: 10px;'>X axis title</span>
<input type='text' style='margin-left: 10px;' id='xAxisTitle' value='X axis'><br>
<span style='margin-left: 10px;'>Y axis title</span>
<input type='text' style='margin-left: 10px;' id='yAxisTitle' value='Y axis'><br>
<input type='checkbox' id='valueShow' style='margin-left: 10px;'>Show values<br>
</fieldset>
<fieldset>
<legend>Legend</legend>
<input type='checkbox' id='legendShow' checked style='margin-left: 10px;'>Show<br>
<input type='radio' name='legendRadio' id='legendLeft' checked style='margin-left: 10px;'>Left<br>
<input type='radio' name='legendRadio' id='legendRight' style='margin-left: 10px;'>Right<br>
<input type='radio' name='legendRadio' id='legendTop' style='margin-left: 10px;'>Top<br>
<input type='radio' name='legendRadio' id='legendBottom' style='margin-left: 10px;'>Bottom<br>
</fieldset>
</div>
</div>
</body>
</html>
Excel/menu/menu.js
View file @ 19633769
......@@ -1525,74 +1525,6 @@
}
});
// Image and chart dialogs
function BuildDrawingObjectMenu() {
var menu = $(
"<div id='drawingObjectsMenu'>\
<div id='imageSelector' style='font-size: 12px; visibility: hidden;'>\
<input type='text' id='imageSelectorUrl' style='width: 340px; margin: 10px;'/>\
</div>\
<div id='chartSelector' style='font-size: 12px; visibility: hidden;'>\
\
<select id='chartType' style='width: 340px; margin: 10px;'>\
<option value='Line' selected>Line</option>\
<option value='Bar'>Bar</option>\
<option value='HBar'>HBar</option>\
<option value='Area'>Area</option>\
<option value='Pie'>Pie</option>\
<option value='Scatter'>Scatter</option>\
<option value='Stock'>Stock</option>\
</select>\
\
<select id='chartSubType' style='width: 340px; margin: 10px;'>\
<option value='Normal' selected>Normal</option>\
<option value='stacked'>Stacked</option>\
<option value='stackedPer'>100Stacked</option>\
</select>\
\
<fieldset>\
<legend>Data</legend>\
<input type='text' style='margin-left: 10px; width: 80%;' id='chartRange' value=''><br>\
<input type='radio' name='dataRadio' id='dataRows' style='margin-left: 10px;'>Rows<br>\
<input type='radio' name='dataRadio' id='dataColumns' style='margin-left: 10px;'>Columns<br>\
</fieldset>\
\
<fieldset>\
<legend>Grid</legend>\
<input type='checkbox' id='xGridShow' checked style='margin-left: 10px;'>Vertical<br>\
<input type='checkbox' id='yGridShow' checked style='margin-left: 10px;'>Horizontal<br>\
</fieldset>\
\
<fieldset>\
<legend>Axis</legend>\
<input type='checkbox' id='xAxisShow' checked style='margin-left: 10px;'>Show X<br>\
<input type='checkbox' id='yAxisShow' checked style='margin-left: 10px;'>Show Y<br>\
</fieldset>\
\
<fieldset>\
<legend>Titles</legend>\
<input type='text' style='margin-left: 10px;' id='chartTitle' value='Diagramm'><br>\
<span style='margin-left: 10px;'>X axis title</span>\
<input type='text' style='margin-left: 10px;' id='xAxisTitle' value='X axis'><br>\
<span style='margin-left: 10px;'>Y axis title</span>\
<input type='text' style='margin-left: 10px;' id='yAxisTitle' value='Y axis'><br>\
<input type='checkbox' id='valueShow' style='margin-left: 10px;'>Show values<br>\
</fieldset>\
\
<fieldset>\
<legend>Legend</legend>\
<input type='checkbox' id='legendShow' checked style='margin-left: 10px;'>Show<br>\
<input type='radio' name='legendRadio' id='legendLeft' checked style='margin-left: 10px;'>Left<br>\
<input type='radio' name='legendRadio' id='legendRight' style='margin-left: 10px;'>Right<br>\
<input type='radio' name='legendRadio' id='legendTop' style='margin-left: 10px;'>Top<br>\
<input type='radio' name='legendRadio' id='legendBottom' style='margin-left: 10px;'>Bottom<br>\
</fieldset>\
</div>\
</div>");
$("body").append(menu);
}
function BuildDrawingObjectLayerMenu() {
var menu = $(
"<div id='drawingObjectsLayerMenu'>\
......@@ -2051,7 +1983,6 @@
var objectsExist = api.asc_drawingObjectsExist();
if (!chart) // selected image
return;
BuildDrawingObjectMenu();
$("#chartSelector").css("visibility", "visible");
$("#chartSelector").dialog({ autoOpen: false, closeOnEscape: false, height: 'auto', width: 400,
resizable: false, modal: true, title: "Chart properties", draggable: true,
......@@ -2062,6 +1993,7 @@
var interval = range.asc_getInterval();
chartForm.find("#chartRange").val(interval);
chartForm.find("#changeRange").addClass("ToolbarChangeRange").removeClass("ToolbarChangeRange2");
chartForm.find("#chartRange").bind("keyup", function() {
var result = range.asc_checkInterval(chartForm.find("#chartType").val(),chartForm.find("#chartSubType").val(),chartForm.find("#chartRange").val(),chartForm.find("#dataRows").is(":checked"));
if (result)
......@@ -2170,7 +2102,6 @@
}
],
close: function() {
$("#drawingObjectsMenu").remove();
},
create: function() {
}
......@@ -2180,7 +2111,6 @@
// Images
function showImageUrlDialog() {
BuildDrawingObjectMenu();
$("#imageSelector").css("visibility", "visible");
$("#imageSelector").dialog({ autoOpen: false, closeOnEscape: false, height: 160, width: 400,
resizable: false, modal: true, title: "Add image", draggable: true,
......@@ -2206,7 +2136,6 @@
}
],
close: function() {
$("#drawingObjectsMenu").remove();
},
create: function() {
$("#imageSelectorUrl").val("");
......@@ -2215,6 +2144,15 @@
$("#imageSelector").dialog("open");
}
$("#changeRange").click(function () {
var selector = $(this);
if (selector.hasClass("ToolbarChangeRange")) {
selector.removeClass("ToolbarChangeRange").addClass("ToolbarChangeRange2")
} else {
selector.removeClass("ToolbarChangeRange2").addClass("ToolbarChangeRange")
}
});
$("#autoFilterCancel").click(function() { $('#MenuAutoFilter').hide(); });
$("#autoFilterOk").click(function() {
var cellId = $('#MenuAutoFilter').attr('idcolumn')
......
Excel/menu/styles/MenuStyle.css
View file @ 19633769
......@@ -492,6 +492,20 @@
{
background-position: -1328px 50%;
}
.ToolbarChangeRange {
background: url(../img/selectRange.png) no-repeat scroll 0 0 transparent;
width: 21px;
height: 19px;
float: none;
margin-top: 1px;
}
.ToolbarChangeRange2 {
background: url(../img/selectRange2.png) no-repeat scroll 0 0 transparent;
width: 21px;
height: 19px;
float: none;
margin-top: 1px;
}
.MenuSeparator
{
border-top: 1px solid #CCCCCC;
......
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