Skip to content

S
sdkjs
Commit 5da80eb8 authored by Sergey.Luzyanin's avatar Sergey.Luzyanin Committed by Alexander.Trofimov
Browse files
Options

Функция getChartTranslateManager. Не отрисовывались объекты после вставки,... 

Функция getChartTranslateManager. Не отрисовывались объекты после вставки, если был достаточно большой вертикальный или горизонтальный скролл.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@57232 954022d7-b5bf-4e40-9824-e11837661b57
parent 879b7035
Hide whitespace changes
Inline Side-by-side
Showing with 50 additions and 44 deletions
Excel/menu/menu.js
View file @ 5da80eb8
......@@ -2165,51 +2165,51 @@
return;
// chart font binding
chartForm.find("#chartTitleFont").bind("click", setTitleFont);
chartForm.find("#chartAxisXFont").bind("click", setAxisXFont);
chartForm.find("#chartAxisYFont").bind("click", setAxisYFont);
//chartForm.find("#chartTitleFont").bind("click", setTitleFont);
//chartForm.find("#chartAxisXFont").bind("click", setAxisXFont);
//chartForm.find("#chartAxisYFont").bind("click", setAxisYFont);
bIsUpdateChartProperties = false;
api.asc_enableKeyEvents(false);
var range = chart.asc_getRange();
var interval = range.asc_getInterval();
chartForm.find("#chartRange").val(interval);
chartForm.find("#chartRange").bind("keyup", function() {
var result = api.asc_checkChartInterval(chartForm.find("#chartType").val(), chartForm.find("#chartSubType").val(), chartForm.find("#chartRange").val(), chartForm.find("#dataRows").is(":checked"));
if (result)
chartForm.find("#chartRange").css("color", "black");
else
chartForm.find("#chartRange").css("color", "red");
});
//var range = chart.asc_getRange();
//var interval = range.asc_getInterval();
//
//chartForm.find("#chartRange").val(interval);
//
//chartForm.find("#chartRange").bind("keyup", function() {
// var result = api.asc_checkChartInterval(chartForm.find("#chartType").val(), chartForm.find("#chartSubType").val(), chartForm.find("#chartRange").val(), chartForm.find("#dataRows").is(":checked"));
// if (result)
// chartForm.find("#chartRange").css("color", "black");
// else
// chartForm.find("#chartRange").css("color", "red");
//});
// Check selected
if (chart.type) {
if (range.rows)
chartForm.find("#dataRows").attr("checked", range.asc_getRowsFlag());
else
chartForm.find("#dataColumns").attr("checked", range.asc_getColumnsFlag());
chartForm.find("#chartTitle").val(chart.asc_getHeader().asc_getTitle());
chartForm.find("#valueShow").attr("checked", chart.asc_getShowValueFlag());
chartForm.find("#borderShow").attr("checked", chart.asc_getShowBorderFlag());
var xAxis = chart.asc_getXAxis();
chartForm.find("#xAxisShow").attr("checked", xAxis.asc_getShowFlag());
chartForm.find("#xGridShow").attr("checked", xAxis.asc_getGridFlag());
chartForm.find("#xAxisTitle").val(xAxis.asc_getTitle() ? xAxis.asc_getTitle() : "");
var yAxis = chart.asc_getYAxis();
chartForm.find("#yAxisShow").attr("checked", yAxis.asc_getShowFlag());
chartForm.find("#yGridShow").attr("checked", yAxis.asc_getGridFlag());
chartForm.find("#yAxisTitle").val(yAxis.asc_getTitle() ? yAxis.asc_getTitle() : "");
}
else {
chartForm.find("#dataRows").attr("checked", true);
}
// if (chart.type) {
// if (range.rows)
// chartForm.find("#dataRows").attr("checked", range.asc_getRowsFlag());
// else
// chartForm.find("#dataColumns").attr("checked", range.asc_getColumnsFlag());
//
// chartForm.find("#chartTitle").val(chart.asc_getHeader().asc_getTitle());
// chartForm.find("#valueShow").attr("checked", chart.asc_getShowValueFlag());
// chartForm.find("#borderShow").attr("checked", chart.asc_getShowBorderFlag());
//
// var xAxis = chart.asc_getXAxis();
// chartForm.find("#xAxisShow").attr("checked", xAxis.asc_getShowFlag());
// chartForm.find("#xGridShow").attr("checked", xAxis.asc_getGridFlag());
// chartForm.find("#xAxisTitle").val(xAxis.asc_getTitle() ? xAxis.asc_getTitle() : "");
//
// var yAxis = chart.asc_getYAxis();
// chartForm.find("#yAxisShow").attr("checked", yAxis.asc_getShowFlag());
// chartForm.find("#yGridShow").attr("checked", yAxis.asc_getGridFlag());
// chartForm.find("#yAxisTitle").val(yAxis.asc_getTitle() ? yAxis.asc_getTitle() : "");
//}
//else {
// chartForm.find("#dataRows").attr("checked", true);
//}
},
buttons: [
{
......@@ -2232,9 +2232,9 @@
api.asc_enableKeyEvents(true);
// chart font unbinding
chartForm.find("#chartTitleFont").unbind("click", setTitleFont);
chartForm.find("#chartAxisXFont").unbind("click", setAxisXFont);
chartForm.find("#chartAxisYFont").unbind("click", setAxisYFont);
//chartForm.find("#chartTitleFont").unbind("click", setTitleFont);
//chartForm.find("#chartAxisXFont").unbind("click", setAxisXFont);
//chartForm.find("#chartAxisYFont").unbind("click", setAxisYFont);
},
create: function() {
}
......
Excel/model/DrawingObjects/Format/ChartSpacePrototype.js
View file @ 5da80eb8
"use strict";
function getChartTranslateManager()
{
return window["Asc"]["editor"].chartTranslate;
}
CChartSpace.prototype.addToDrawingObjects = CShape.prototype.addToDrawingObjects;
CChartSpace.prototype.setDrawingObjects = CShape.prototype.setDrawingObjects;
CChartSpace.prototype.setDrawingBase = CShape.prototype.setDrawingBase;
......
Excel/model/clipboard.js
View file @ 5da80eb8
......@@ -3175,9 +3175,9 @@
drawingObject.graphicObject.setWorksheet(ws.model);
//drawingObject.graphicObject.setDrawingDocument(ws.objectRender.drawingDocument);
drawingObject.graphicObject.recalculate();
drawingObject.graphicObject.addToDrawingObjects();
drawingObject.graphicObject.recalculate();
drawingObject.graphicObject.select(ws.objectRender.controller, 0);
tempArr = [];
......
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