Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[SSE] Отладка настройки форматированных таблиц.

Browse source
This commit is contained in:
Julia Radzhabova 2016-03-29 17:35:28 +03:00
parent a6fff90b12
commit 7ad63bcae1
4 changed files with 88 additions and 126 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
View file

@ -1156,7 +1156,8 @@ define([
documentHolder.pmiClear.menu.items[3].setVisible(!this.permissions.isEditDiagram); documentHolder.pmiClear.menu.items[3].setVisible(!this.permissions.isEditDiagram);
documentHolder.pmiClear.menu.items[4].setVisible(!this.permissions.isEditDiagram); documentHolder.pmiClear.menu.items[4].setVisible(!this.permissions.isEditDiagram);
var filterInfo = cellinfo.asc_getAutoFilterInfo() && cellinfo.asc_getAutoFilterInfo().asc_getIsApplyAutoFilter(); var filterInfo = cellinfo.asc_getAutoFilterInfo();
filterInfo = (filterInfo) ? filterInfo.asc_getIsApplyAutoFilter() : false;
documentHolder.pmiInsertCells.menu.items[0].setDisabled(filterInfo); documentHolder.pmiInsertCells.menu.items[0].setDisabled(filterInfo);
documentHolder.pmiDeleteCells.menu.items[0].setDisabled(filterInfo); documentHolder.pmiDeleteCells.menu.items[0].setDisabled(filterInfo);
documentHolder.pmiInsertCells.menu.items[1].setDisabled(filterInfo); documentHolder.pmiInsertCells.menu.items[1].setDisabled(filterInfo);

12
apps/spreadsheeteditor/main/app/controller/RightMenu.js
View file

@ -73,18 +73,18 @@ define([
onSelectionChanged: function(info) { onSelectionChanged: function(info) {
var SelectedObjects = [], var SelectedObjects = [],
selectType = info.asc_getFlags().asc_getSelectionType(), selectType = info.asc_getFlags().asc_getSelectionType(),
filterInfo = info.asc_getAutoFilterInfo(); formatTableInfo = info.asc_getFormatTableInfo();
if (selectType == c_oAscSelectionType.RangeImage || selectType == c_oAscSelectionType.RangeShape || if (selectType == c_oAscSelectionType.RangeImage || selectType == c_oAscSelectionType.RangeShape ||
selectType == c_oAscSelectionType.RangeChart || selectType == c_oAscSelectionType.RangeChartText || selectType == c_oAscSelectionType.RangeShapeText) { selectType == c_oAscSelectionType.RangeChart || selectType == c_oAscSelectionType.RangeChartText || selectType == c_oAscSelectionType.RangeShapeText) {
SelectedObjects = this.api.asc_getGraphicObjectProps(); SelectedObjects = this.api.asc_getGraphicObjectProps();
} }
if (SelectedObjects.length<=0 && !(filterInfo && filterInfo.asc_getTableName()!==null) && !this.rightmenu.minimizedMode) { if (SelectedObjects.length<=0 && !formatTableInfo && !this.rightmenu.minimizedMode) {
this.rightmenu.clearSelection(); this.rightmenu.clearSelection();
} }
this.onFocusObject(SelectedObjects, filterInfo); this.onFocusObject(SelectedObjects, formatTableInfo);
var need_disable = info.asc_getLocked(), var need_disable = info.asc_getLocked(),
me = this; me = this;
@ -97,7 +97,7 @@ define([
} }
}, },
onFocusObject: function(SelectedObjects, filterInfo) { onFocusObject: function(SelectedObjects, formatTableInfo) {
if (!this.editMode) if (!this.editMode)
return; return;
@ -135,9 +135,9 @@ define([
this._settings[settingsType].locked = value.asc_getLocked(); this._settings[settingsType].locked = value.asc_getLocked();
} }
if (filterInfo && filterInfo.asc_getTableName()!==null) { if (formatTableInfo) {
settingsType = Common.Utils.documentSettingsType.Table; settingsType = Common.Utils.documentSettingsType.Table;
this._settings[settingsType].props = filterInfo; this._settings[settingsType].props = formatTableInfo;
this._settings[settingsType].hidden = 0; this._settings[settingsType].hidden = 0;
} }

13
apps/spreadsheeteditor/main/app/controller/Toolbar.js
View file

@ -1169,9 +1169,7 @@ define([
shortcuts: { shortcuts: {
'command+l,ctrl+l': function(e) { 'command+l,ctrl+l': function(e) {
if (me.editMode) { if (me.editMode) {
var cellinfo = me.api.asc_getCellInfo(), if (!me.api.asc_getCellInfo().asc_getFormatTableInfo())
filterinfo = cellinfo.asc_getAutoFilterInfo();
if (!filterinfo || filterinfo.asc_getTableName()===null)
me._setTableFormat(me.toolbar.mnuTableTemplatePicker.store.at(23).get('name')); me._setTableFormat(me.toolbar.mnuTableTemplatePicker.store.at(23).get('name'));
} }
@ -1674,7 +1672,8 @@ define([
// (coauth_disable !== toolbar.btnClearStyle.isDisabled()) && toolbar.btnClearStyle.setDisabled(coauth_disable); // (coauth_disable !== toolbar.btnClearStyle.isDisabled()) && toolbar.btnClearStyle.setDisabled(coauth_disable);
// (coauth_disable !== toolbar.btnCopyStyle.isDisabled()) && toolbar.btnCopyStyle.setDisabled(coauth_disable); // (coauth_disable !== toolbar.btnCopyStyle.isDisabled()) && toolbar.btnCopyStyle.setDisabled(coauth_disable);
var filterInfo = info.asc_getAutoFilterInfo(); var filterInfo = info.asc_getAutoFilterInfo(),
formatTableInfo = info.asc_getFormatTableInfo();
if (!toolbar.mode.isEditMailMerge) { if (!toolbar.mode.isEditMailMerge) {
/* read cell horizontal align */ /* read cell horizontal align */
fontparam = info.asc_getHorAlign(); fontparam = info.asc_getHorAlign();
@ -1751,7 +1750,7 @@ define([
} }
} }
need_disable = this._state.controlsdisabled.filters || filterInfo && (filterInfo.asc_getTableName()!==null || filterInfo.asc_getIsAutoFilter()===null); need_disable = this._state.controlsdisabled.filters || formatTableInfo!==null || filterInfo && filterInfo.asc_getIsAutoFilter()===null;
// (need_disable !== toolbar.btnMerge.isDisabled()) && toolbar.btnMerge.setDisabled(need_disable); // (need_disable !== toolbar.btnMerge.isDisabled()) && toolbar.btnMerge.setDisabled(need_disable);
toolbar.lockToolbar(SSE.enumLock.ruleMerge, need_disable, {array:[toolbar.btnMerge]}); toolbar.lockToolbar(SSE.enumLock.ruleMerge, need_disable, {array:[toolbar.btnMerge]});
@ -1782,7 +1781,7 @@ define([
{ array: [toolbar.btnSortDown, toolbar.btnSortUp, toolbar.mnuitemSortAZ, toolbar.mnuitemSortZA, { array: [toolbar.btnSortDown, toolbar.btnSortUp, toolbar.mnuitemSortAZ, toolbar.mnuitemSortZA,
toolbar.btnTableTemplate,toolbar.btnSetAutofilter,toolbar.mnuitemAutoFilter,toolbar.btnAutofilter] }); toolbar.btnTableTemplate,toolbar.btnSetAutofilter,toolbar.mnuitemAutoFilter,toolbar.btnAutofilter] });
val = (filterInfo) ? filterInfo.asc_getTableStyleName() : null; val = (formatTableInfo) ? formatTableInfo.asc_getTableStyleName() : null;
if (this._state.tablestylename !== val && this.toolbar.mnuTableTemplatePicker) { if (this._state.tablestylename !== val && this.toolbar.mnuTableTemplatePicker) {
val = this.toolbar.mnuTableTemplatePicker.store.findWhere({name: val}); val = this.toolbar.mnuTableTemplatePicker.store.findWhere({name: val});
if (val) { if (val) {
@ -1794,7 +1793,7 @@ define([
} }
} }
this._state.tablename = (filterInfo) ? filterInfo.asc_getTableName() : undefined; this._state.tablename = (formatTableInfo) ? formatTableInfo.asc_getTableName() : undefined;
need_disable = this._state.controlsdisabled.filters || !filterInfo || (filterInfo.asc_getIsApplyAutoFilter()!==true); need_disable = this._state.controlsdisabled.filters || !filterInfo || (filterInfo.asc_getIsApplyAutoFilter()!==true);
toolbar.lockToolbar(SSE.enumLock.ruleDelFilter, need_disable, {array:[toolbar.btnClearAutofilter,toolbar.mnuitemClearFilter]}); toolbar.lockToolbar(SSE.enumLock.ruleDelFilter, need_disable, {array:[toolbar.btnClearAutofilter,toolbar.mnuitemClearFilter]});

186
apps/spreadsheeteditor/main/app/view/TableSettings.js
View file

@ -36,6 +36,7 @@ define([
var me = this; var me = this;
this._state = { this._state = {
TableName: '',
TemplateName: '', TemplateName: '',
CheckHeader: false, CheckHeader: false,
CheckTotal: false, CheckTotal: false,
@ -48,7 +49,6 @@ define([
}; };
this.lockedControls = []; this.lockedControls = [];
this._locked = false; this._locked = false;
// this._originalLook = new CTablePropLook();
this._originalProps = null; this._originalProps = null;
this._noApply = false; this._noApply = false;
@ -97,13 +97,13 @@ define([
}); });
this.lockedControls.push(this.chFilter); this.lockedControls.push(this.chFilter);
this.chHeader.on('change', _.bind(this.onCheckTemplateChange, this, 0)); this.chHeader.on('change', _.bind(this.onCheckTemplateChange, this, c_oAscChangeTableStyleInfo.rowHeader));
this.chTotal.on('change', _.bind(this.onCheckTemplateChange, this, 1)); this.chTotal.on('change', _.bind(this.onCheckTemplateChange, this, c_oAscChangeTableStyleInfo.rowTotal));
this.chBanded.on('change', _.bind(this.onCheckTemplateChange, this, 2)); this.chBanded.on('change', _.bind(this.onCheckTemplateChange, this, c_oAscChangeTableStyleInfo.rowBanded));
this.chFirst.on('change', _.bind(this.onCheckTemplateChange, this, 3)); this.chFirst.on('change', _.bind(this.onCheckTemplateChange, this, c_oAscChangeTableStyleInfo.columnFirst));
this.chLast.on('change', _.bind(this.onCheckTemplateChange, this, 4)); this.chLast.on('change', _.bind(this.onCheckTemplateChange, this, c_oAscChangeTableStyleInfo.columnLast));
this.chColBanded.on('change', _.bind(this.onCheckTemplateChange, this, 5)); this.chColBanded.on('change', _.bind(this.onCheckTemplateChange, this, c_oAscChangeTableStyleInfo.columnBanded));
this.chFilter.on('change', _.bind(this.onCheckFilterChange, this)); this.chFilter.on('change', _.bind(this.onCheckTemplateChange, this, c_oAscChangeTableStyleInfo.filterButton));
this.cmbTableTemplate = new Common.UI.ComboDataView({ this.cmbTableTemplate = new Common.UI.ComboDataView({
itemWidth: 61, itemWidth: 61,
@ -142,19 +142,19 @@ define([
menu : new Common.UI.Menu({ menu : new Common.UI.Menu({
menuAlign: 'tr-br', menuAlign: 'tr-br',
items: [ items: [
{ caption: this.selectRowText, value: 0 }, { caption: this.selectRowText, value: c_oAscChangeSelectionFormatTable.row, idx: 0 },
{ caption: this.selectColumnText, value: 1 }, { caption: this.selectColumnText, value: c_oAscChangeSelectionFormatTable.column, idx: 1 },
{ caption: this.selectCellText, value: 2 }, { caption: this.selectDataText, value: c_oAscChangeSelectionFormatTable.data, idx: 2 },
{ caption: this.selectTableText, value: 3 }, { caption: this.selectTableText, value: c_oAscChangeSelectionFormatTable.all, idx: 3 },
{ caption: '--' }, { caption: '--' },
{ caption: this.insertRowAboveText, value: 4 }, { caption: this.insertRowAboveText, value: 4 },
{ caption: this.insertRowBelowText, value: 5 }, { caption: this.insertRowBelowText, value: 5 },
{ caption: this.insertColumnLeftText, value: 6 }, { caption: this.insertColumnLeftText, value: 6 },
{ caption: this.insertColumnRightText, value: 7 }, { caption: this.insertColumnRightText, value: 7 },
{ caption: '--' }, { caption: '--' },
{ caption: this.deleteRowText, value: 8 }, { caption: this.deleteRowText, value: 8 },
{ caption: this.deleteColumnText, value: 9 }, { caption: this.deleteColumnText, value: 9 },
{ caption: this.deleteTableText, value: 10 } { caption: this.deleteTableText, value: 10 }
] ]
}) })
}); });
@ -170,62 +170,23 @@ define([
}, },
onCheckTemplateChange: function(type, field, newValue, oldValue, eOpts) { onCheckTemplateChange: function(type, field, newValue, oldValue, eOpts) {
if (this.api) { if (this.api)
var properties = new CTableProp(); this.api.asc_changeFormatTableInfo(this._state.TableName, type);
var look = (this._originalLook) ? this._originalLook : new CTablePropLook();
switch (type) {
case 0:
look.put_FirstRow(field.getValue()=='checked');
break;
case 1:
look.put_LastRow(field.getValue()=='checked');
break;
case 2:
look.put_BandHor(field.getValue()=='checked');
break;
case 3:
look.put_FirstCol(field.getValue()=='checked');
break;
case 4:
look.put_LastCol(field.getValue()=='checked');
break;
case 5:
look.put_BandVer(field.getValue()=='checked');
break;
}
properties.put_TableLook(look);
this.api.tblApply(properties);
}
Common.NotificationCenter.trigger('edit:complete', this);
},
onCheckFilterChange: function(field, newValue, oldValue, eOpts) {
Common.NotificationCenter.trigger('edit:complete', this); Common.NotificationCenter.trigger('edit:complete', this);
}, },
onTableTemplateSelect: function(combo, record){ onTableTemplateSelect: function(combo, record){
if (this.api && !this._noApply) { if (this.api && !this._noApply) {
if (this._state.TemplateName) if (this._state.TemplateName)
this.api.asc_changeAutoFilter(this._state.TemplateName, c_oAscChangeFilterOptions.style, record.get('name')); this.api.asc_changeAutoFilter(this._state.TableName, c_oAscChangeFilterOptions.style, record.get('name'));
} }
Common.NotificationCenter.trigger('edit:complete', this); Common.NotificationCenter.trigger('edit:complete', this);
}, },
onEditClick: function(menu, item, e) { onEditClick: function(menu, item, e) {
if (this.api) { if (this.api) {
switch (item.value) { if (item.idx>=0 && item.idx<4)
case 0: this.api.selectRow(); break; this.api.asc_changeSelectionFormatTable(this._state.TableName, item.value);
case 1: this.api.selectColumn(); break;
case 2: this.api.selectCell(); break;
case 3: this.api.selectTable(); break;
case 4: this.api.addRowAbove(); break;
case 5: this.api.addRowBelow(); break;
case 6: this.api.addColumnLeft(); break;
case 7: this.api.addColumnRight(); break;
case 8: this.api.remRow(); break;
case 9: this.api.remColumn(); break;
case 10: this.api.remTable(); break;
}
} }
Common.NotificationCenter.trigger('edit:complete', this); Common.NotificationCenter.trigger('edit:complete', this);
}, },
@ -248,12 +209,18 @@ define([
ChangeSettings: function(props) { ChangeSettings: function(props) {
this.disableControls(this._locked); this.disableControls(this._locked);
if (props )//filterInfo if (props )//formatTableInfo
{ {
this._originalProps = props; this._originalProps = props;
var value = props.asc_getTableName();
if (this._state.TableName!==value) {
this.txtTableName.setValue(value);
this._state.TableName=value;
}
//for table-template //for table-template
var value = props.asc_getTableStyleName(); value = props.asc_getTableStyleName();
if (this._state.TemplateName!==value || this._isTemplatesChanged) { if (this._state.TemplateName!==value || this._isTemplatesChanged) {
this.cmbTableTemplate.suspendEvents(); this.cmbTableTemplate.suspendEvents();
var rec = this.cmbTableTemplate.menuPicker.store.findWhere({ var rec = this.cmbTableTemplate.menuPicker.store.findWhere({
@ -272,52 +239,47 @@ define([
} }
this._isTemplatesChanged = false; this._isTemplatesChanged = false;
/* value = props.asc_getFirstRow();
var look = props.get_TableLook(); if (this._state.CheckHeader!==value) {
if (look) { this.chHeader.setValue(value, true);
value = look.get_FirstRow(); this._state.CheckHeader=value;
if (this._state.CheckHeader!==value) { }
this.chHeader.setValue(value, true);
this._state.CheckHeader=value; value = props.asc_getLastRow();
this._originalLook.put_FirstRow(value); if (this._state.CheckTotal!==value) {
} this.chTotal.setValue(value, true);
this._state.CheckTotal=value;
value = look.get_LastRow(); }
if (this._state.CheckTotal!==value) {
this.chTotal.setValue(value, true); value = props.asc_getBandHor();
this._state.CheckTotal=value; if (this._state.CheckBanded!==value) {
this._originalLook.put_LastRow(value); this.chBanded.setValue(value, true);
} this._state.CheckBanded=value;
}
value = look.get_BandHor();
if (this._state.CheckBanded!==value) { value = props.asc_getFirstCol();
this.chBanded.setValue(value, true); if (this._state.CheckFirst!==value) {
this._state.CheckBanded=value; this.chFirst.setValue(value, true);
this._originalLook.put_BandHor(value); this._state.CheckFirst=value;
} }
value = look.get_FirstCol(); value = props.asc_getLastCol();
if (this._state.CheckFirst!==value) { if (this._state.CheckLast!==value) {
this.chFirst.setValue(value, true); this.chLast.setValue(value, true);
this._state.CheckFirst=value; this._state.CheckLast=value;
this._originalLook.put_FirstCol(value); }
}
value = props.asc_getBandVer();
value = look.get_LastCol(); if (this._state.CheckColBanded!==value) {
if (this._state.CheckLast!==value) { this.chColBanded.setValue(value, true);
this.chLast.setValue(value, true); this._state.CheckColBanded=value;
this._state.CheckLast=value; }
this._originalLook.put_LastCol(value);
} value = props.asc_getFilterButton();
if (this._state.CheckFilter!==value) {
value = look.get_BandVer(); this.chFilter.setValue(value, true);
if (this._state.CheckColBanded!==value) { this._state.CheckFilter=value;
this.chColBanded.setValue(value, true);
this._state.CheckColBanded=value;
this._originalLook.put_BandVer(value);
}
} }
*/
} }
}, },
@ -356,8 +318,8 @@ define([
var handlerDlg = function(dlg, result) { var handlerDlg = function(dlg, result) {
if (result == 'ok') { if (result == 'ok') {
me.api.asc_setSelectionDialogMode(c_oAscSelectionDialogType.None); me.api.asc_setSelectionDialogMode(c_oAscSelectionDialogType.None);
if (me._state.tablename) if (me._state.Tablename)
me.api.asc_changeAutoFilter(me._state.tablename, c_oAscChangeFilterOptions.style, fmtname); me.api.asc_changeAutoFilter(me._state.Tablename, c_oAscChangeFilterOptions.style, fmtname);
} }
Common.NotificationCenter.trigger('edit:complete', me.toolbar); Common.NotificationCenter.trigger('edit:complete', me.toolbar);
@ -388,8 +350,8 @@ define([
textEdit: 'Rows & Columns', textEdit: 'Rows & Columns',
selectRowText : 'Select Row', selectRowText : 'Select Row',
selectColumnText : 'Select Column', selectColumnText : 'Select Entire Column',
selectCellText : 'Select Cell', selectDataText : 'Select Column Data',
selectTableText : 'Select Table', selectTableText : 'Select Table',
insertRowAboveText : 'Insert Row Above', insertRowAboveText : 'Insert Row Above',
insertRowBelowText : 'Insert Row Below', insertRowBelowText : 'Insert Row Below',