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

fix locks

Browse Source
This commit is contained in:
nikita_bartoshuk
2025-12-30 02:26:53 +03:00
parent 3f97fc5923
commit 465eb3e13b
2 changed files with 21 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
apps/common/main/lib/controller/ChartTab.js
View File

@ -221,13 +221,9 @@ define([
}, },
onStartUpdateExternalReference: function(status) { onStartUpdateExternalReference: function(status) {
this._state.isUpdatingReference = status; this.view.btnEditDataExt.menu.items[0].setDisabled(status);
// if (this._initSettings) return; this.view.btnEditDataExt.menu.items[2].setDisabled(status);
this.view.btnUpdateData.setDisabled(status);
// var externalRef = this.chartProps.getExternalReference();
// this.btnEditData.setDisabled(this._locked || externalRef && this._state.isUpdatingReference);
// this.btnUpdateData.setDisabled(this._locked || this._state.isUpdatingReference);
// this.linkExternalSrc.toggleClass('disabled', this._locked || !!this._state.isUpdatingReference);
}, },
onAddChartStylesPreview: function(styles){ onAddChartStylesPreview: function(styles){
@ -283,17 +279,13 @@ define([
this._originalProps = new Asc.asc_CImgProperty(props); this._originalProps = new Asc.asc_CImgProperty(props);
this._noApply = true; this._noApply = true;
var value = props.get_WrappingStyle();
if (this._state.WrappingStyle!==value) {
this._state.WrappingStyle=value;
}
this.chartProps = props.get_ChartProperties(); this.chartProps = props.get_ChartProperties();
var externalRef = this.chartProps.getExternalReference(); var externalRef = this.chartProps.getExternalReference();
var text = externalRef ? (externalRef.asc_getSource() || '').replace(new RegExp("%20",'g')," ") : ''; var text = externalRef ? (externalRef.asc_getSource() || '').replace(new RegExp("%20",'g')," ") : '';
value = props.get_SeveralCharts(); var value = props.get_SeveralCharts();
this._state.SeveralCharts=value; this._state.SeveralCharts=value;
this.view.btnUpdateData.setVisible(externalRef); this.view.btnUpdateData.setVisible(externalRef);

51
apps/common/main/lib/view/ChartTab.js
View File

@ -546,8 +546,8 @@ define([
cls: 'btn-toolbar x-huge icon-top', cls: 'btn-toolbar x-huge icon-top',
iconCls: 'toolbar__icon btn-ic-reviewview', iconCls: 'toolbar__icon btn-ic-reviewview',
caption: me.capChartElements, caption: me.capChartElements,
lock: [_set.paragraphLock, _set.imageLock, _set.headerLock, _set.viewFormMode, _set.sheetLock, _set.lostConnect, lock: [_set.paragraphLock, _set.imageLock, _set.headerLock, _set.viewFormMode, _set.lostConnect,
_set.coAuth, _set.editCell, _set.docLockView, _set.docLockForms, _set.docLockCommentsIns, _set.previewReviewMode, _set.coAuthText, _set.wsLock, _set.viewMode, _set.slideDeleted, _set.pageDeleted], _set.coAuth, _set.docLockView, _set.docLockForms, _set.docLockCommentsIns, _set.previewReviewMode, _set.coAuthText, _set.viewMode, _set.slideDeleted, _set.pageDeleted],
dataHint: '1', dataHint: '1',
dataHintDirection: 'bottom', dataHintDirection: 'bottom',
dataHintOffset: 'small', dataHintOffset: 'small',
@ -559,37 +559,20 @@ define([
cls: 'btn-toolbar x-huge icon-top', cls: 'btn-toolbar x-huge icon-top',
iconCls: 'toolbar__icon btn-pagemargins', iconCls: 'toolbar__icon btn-pagemargins',
caption: me.capEditData, caption: me.capEditData,
lock: [_set.paragraphLock, _set.imageLock, _set.headerLock, _set.viewFormMode, _set.sheetLock, _set.lostConnect, lock: [_set.paragraphLock, _set.imageLock, _set.headerLock, _set.viewFormMode, _set.lostConnect,
_set.coAuth, _set.docLockView, _set.docLockForms, _set.docLockCommentsIns, _set.previewReviewMode, _set.editCell, _set.coAuthText, _set.wsLock, _set.viewMode, _set.slideDeleted, _set.pageDeleted], _set.coAuth, _set.docLockView, _set.docLockForms, _set.docLockCommentsIns, _set.previewReviewMode, _set.coAuthText, _set.viewMode, _set.slideDeleted, _set.pageDeleted],
dataHint: '1', dataHint: '1',
dataHintDirection: 'bottom', dataHintDirection: 'bottom',
dataHintOffset: 'small', dataHintOffset: 'small',
}); });
this.lockedControls.push(this.btnEditData); this.lockedControls.push(this.btnEditData);
this.menuEditDataExt = new Common.UI.Menu({
items: [
{
caption: me.menuCapEditData,
value: 'data'
},
{
caption: me.menuCapEditLinks,
value: 'links'
},
{
caption: me.menuCapOpen,
value: 'file'
}
]
})
this.btnEditDataExt = new Common.UI.Button({ this.btnEditDataExt = new Common.UI.Button({
cls: 'btn-toolbar x-huge icon-top', cls: 'btn-toolbar x-huge icon-top',
iconCls: 'toolbar__icon btn-pagemargins', iconCls: 'toolbar__icon btn-pagemargins',
caption: me.capEditData, caption: me.capEditData,
lock: [_set.paragraphLock, _set.imageLock, _set.headerLock, _set.viewFormMode, _set.sheetLock, _set.lostConnect, lock: [_set.paragraphLock, _set.imageLock, _set.headerLock, _set.viewFormMode, _set.lostConnect,
_set.coAuth, _set.docLockView, _set.docLockForms, _set.docLockCommentsIns, _set.previewReviewMode, _set.editCell, _set.coAuthText, _set.wsLock, _set.viewMode, _set.slideDeleted, _set.pageDeleted], _set.coAuth, _set.docLockView, _set.docLockForms, _set.docLockCommentsIns, _set.previewReviewMode, _set.coAuthText, _set.viewMode, _set.slideDeleted, _set.pageDeleted],
dataHint: '1', dataHint: '1',
menu: new Common.UI.Menu({ menu: new Common.UI.Menu({
items: [ items: [
@ -616,8 +599,8 @@ define([
cls: 'btn-toolbar x-huge icon-top', cls: 'btn-toolbar x-huge icon-top',
iconCls: 'toolbar__icon btn-pagemargins', iconCls: 'toolbar__icon btn-pagemargins',
caption: me.capUpdateData, caption: me.capUpdateData,
lock: [_set.paragraphLock, _set.imageLock, _set.headerLock, _set.viewFormMode, _set.sheetLock, _set.lostConnect, lock: [_set.paragraphLock, _set.imageLock, _set.headerLock, _set.viewFormMode, _set.lostConnect,
_set.coAuth, _set.docLockView, _set.docLockForms, _set.docLockCommentsIns, _set.previewReviewMode, _set.editCell, _set.coAuthText, _set.wsLock, _set.viewMode, _set.slideDeleted, _set.pageDeleted], _set.coAuth, _set.docLockView, _set.docLockForms, _set.docLockCommentsIns, _set.previewReviewMode,_set.coAuthText, _set.viewMode, _set.slideDeleted, _set.pageDeleted],
dataHint: '1', dataHint: '1',
dataHintDirection: 'bottom', dataHintDirection: 'bottom',
dataHintOffset: 'small', dataHintOffset: 'small',
@ -636,8 +619,8 @@ define([
menuMaxHeight : 300, menuMaxHeight : 300,
groups : new Common.UI.DataViewGroupStore(), groups : new Common.UI.DataViewGroupStore(),
autoWidth : true, autoWidth : true,
lock: [_set.paragraphLock, _set.imageLock, _set.headerLock, _set.viewFormMode, _set.editCell, _set.lostConnect, lock: [_set.paragraphLock, _set.imageLock, _set.headerLock, _set.viewFormMode, _set.lostConnect,
_set.coAuth, _set.docLockView, _set.docLockForms, _set.docLockCommentsIns, _set.previewReviewMode, _set.wsLock, _set.noStyles, _set.coAuthText, _set.viewMode, _set.slideDeleted, _set.pageDeleted], _set.coAuth, _set.docLockView, _set.docLockForms, _set.docLockCommentsIns, _set.previewReviewMode, _set.noStyles, _set.coAuthText, _set.viewMode, _set.slideDeleted, _set.pageDeleted],
beforeOpenHandler: function(e) { beforeOpenHandler: function(e) {
var cmp = this, var cmp = this,
menu = cmp.openButton.menu, menu = cmp.openButton.menu,
@ -699,7 +682,7 @@ define([
iconCls: 'toolbar__icon btn-settings', iconCls: 'toolbar__icon btn-settings',
caption: me.capAdvancedSettings, caption: me.capAdvancedSettings,
lock : [_set.paragraphLock, _set.imageLock, _set.headerLock, _set.viewFormMode, _set.lostConnect, lock : [_set.paragraphLock, _set.imageLock, _set.headerLock, _set.viewFormMode, _set.lostConnect,
_set.coAuth, _set.editCell, _set.SeveralCharts, _set.docLockView, _set.docLockForms, _set.docLockCommentsIns, _set.previewReviewMode, _set.coAuthText, _set.wsLock, _set.viewMode, _set.slideDeleted, _set.pageDeleted], _set.coAuth, _set.SeveralCharts, _set.docLockView, _set.docLockForms, _set.docLockCommentsIns, _set.previewReviewMode, _set.coAuthText, _set.viewMode, _set.slideDeleted, _set.pageDeleted],
dataHint : '1', dataHint : '1',
dataHintDirection: 'bottom', dataHintDirection: 'bottom',
dataHintOffset: 'small' dataHintOffset: 'small'
@ -709,14 +692,14 @@ define([
this.lblWidth = new Common.UI.Label({ this.lblWidth = new Common.UI.Label({
caption: me.textWidth, caption: me.textWidth,
lock: [_set.paragraphLock, _set.imageLock, _set.headerLock, _set.viewFormMode, _set.lostConnect, lock: [_set.paragraphLock, _set.imageLock, _set.headerLock, _set.viewFormMode, _set.lostConnect,
_set.coAuth, _set.docLockView, _set.docLockForms, _set.docLockCommentsIns, _set.previewReviewMode, _set.editCell, _set.coAuthText, _set.wsLock, _set.viewMode, _set.slideDeleted, _set.pageDeleted], _set.coAuth, _set.docLockView, _set.docLockForms, _set.docLockCommentsIns, _set.previewReviewMode, _set.coAuthText, _set.viewMode, _set.slideDeleted, _set.pageDeleted],
}); });
this.lockedControls.push(this.lblWidth); this.lockedControls.push(this.lblWidth);
this.lblHeight = new Common.UI.Label({ this.lblHeight = new Common.UI.Label({
caption: me.textHeight, caption: me.textHeight,
lock: [_set.paragraphLock, _set.imageLock, _set.headerLock, _set.viewFormMode, _set.lostConnect, lock: [_set.paragraphLock, _set.imageLock, _set.headerLock, _set.viewFormMode, _set.lostConnect,
_set.coAuth, _set.docLockView, _set.docLockForms, _set.docLockCommentsIns, _set.previewReviewMode, _set.editCell, _set.coAuthText, _set.wsLock, _set.viewMode, _set.slideDeleted, _set.pageDeleted], _set.coAuth, _set.docLockView, _set.docLockForms, _set.docLockCommentsIns, _set.previewReviewMode, _set.coAuthText, _set.viewMode, _set.slideDeleted, _set.pageDeleted],
}); });
this.lockedControls.push(this.lblHeight); this.lockedControls.push(this.lblHeight);
@ -725,7 +708,7 @@ define([
width: 78, width: 78,
defaultUnit : "cm", defaultUnit : "cm",
lock: [_set.paragraphLock, _set.imageLock, _set.headerLock, _set.viewFormMode, _set.lostConnect, lock: [_set.paragraphLock, _set.imageLock, _set.headerLock, _set.viewFormMode, _set.lostConnect,
_set.coAuth, _set.docLockView, _set.docLockForms, _set.docLockCommentsIns, _set.previewReviewMode, _set.editCell, _set.coAuthText, _set.wsLock, _set.viewMode, _set.slideDeleted, _set.pageDeleted], _set.coAuth, _set.docLockView, _set.docLockForms, _set.docLockCommentsIns, _set.previewReviewMode, _set.coAuthText, _set.viewMode, _set.slideDeleted, _set.pageDeleted],
value: '3 cm', value: '3 cm',
maxValue: 55.88, maxValue: 55.88,
minValue: 0, minValue: 0,
@ -741,7 +724,7 @@ define([
width: 78, width: 78,
defaultUnit : "cm", defaultUnit : "cm",
lock: [_set.paragraphLock, _set.imageLock, _set.headerLock, _set.viewFormMode, _set.lostConnect, lock: [_set.paragraphLock, _set.imageLock, _set.headerLock, _set.viewFormMode, _set.lostConnect,
_set.coAuth, _set.docLockView, _set.docLockForms, _set.docLockCommentsIns, _set.previewReviewMode, _set.editCell, _set.coAuthText, _set.wsLock, _set.viewMode, _set.slideDeleted, _set.pageDeleted], _set.coAuth, _set.docLockView, _set.docLockForms, _set.docLockCommentsIns, _set.previewReviewMode, _set.coAuthText, _set.viewMode, _set.slideDeleted, _set.pageDeleted],
value: '3 cm', value: '3 cm',
maxValue: 55.88, maxValue: 55.88,
minValue: 0, minValue: 0,
@ -756,7 +739,7 @@ define([
labelText: me.textLockRation, labelText: me.textLockRation,
value: true, value: true,
lock : [_set.paragraphLock, _set.imageLock, _set.headerLock, _set.viewFormMode, _set.lostConnect, lock : [_set.paragraphLock, _set.imageLock, _set.headerLock, _set.viewFormMode, _set.lostConnect,
_set.editCell, _set.docLockView, _set.docLockForms, _set.docLockCommentsIns, _set.previewReviewMode, _set.coAuthText, _set.wsLock, _set.viewMode, _set.slideDeleted, _set.pageDeleted], _set.docLockView, _set.docLockForms, _set.docLockCommentsIns, _set.previewReviewMode, _set.coAuthText, _set.viewMode, _set.slideDeleted, _set.pageDeleted],
dataHint : '1', dataHint : '1',
dataHintDirection: 'left', dataHintDirection: 'left',
dataHintOffset: 'small' dataHintOffset: 'small'
@ -768,7 +751,7 @@ define([
iconCls: 'toolbar__icon btn-day', iconCls: 'toolbar__icon btn-day',
caption: me.cap3DRotation, caption: me.cap3DRotation,
lock : [_set.paragraphLock, _set.imageLock, _set.headerLock, _set.viewFormMode, _set.lostConnect, lock : [_set.paragraphLock, _set.imageLock, _set.headerLock, _set.viewFormMode, _set.lostConnect,
_set.coAuth, _set.editCell, _set.docLockView, _set.docLockForms, _set.docLockCommentsIns, _set.previewReviewMode, _set.coAuthText, _set.wsLock, _set.viewMode, _set.slideDeleted, _set.pageDeleted], _set.coAuth, _set.docLockView, _set.docLockForms, _set.docLockCommentsIns, _set.previewReviewMode, _set.coAuthText, _set.viewMode, _set.slideDeleted, _set.pageDeleted],
dataHint : '1', dataHint : '1',
dataHintDirection: 'bottom', dataHintDirection: 'bottom',
dataHintOffset: 'small' dataHintOffset: 'small'