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

[DE mobile] Bug 48388

Browse source
This commit is contained in:
SergeyEzhin 2021-07-07 15:17:55 +03:00
parent 5d8bc1e6df
commit 2034377187
5 changed files with 101 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
apps/documenteditor/mobile/src/controller/Main.jsx
View file

@ -26,7 +26,8 @@ import PluginsController from '../../../../common/mobile/lib/controller/Plugins.
"storeTableSettings", "storeTableSettings",
"storeDocumentInfo", "storeDocumentInfo",
"storeChartSettings", "storeChartSettings",
"storeApplicationSettings" "storeApplicationSettings",
"storeLinkSettings"
) )
class MainController extends Component { class MainController extends Component {
constructor(props) { constructor(props) {
@ -572,6 +573,12 @@ class MainController extends Component {
storeTextSettings.resetBackgroundColor(color); storeTextSettings.resetBackgroundColor(color);
}); });
// link settings
const storeLinkSettings = this.props.storeLinkSettings;
this.api.asc_registerCallback('asc_onCanAddHyperlink', (value) => {
storeLinkSettings.canAddHyperlink(value);
});
//paragraph settings //paragraph settings
EditorUIController.initEditorStyles && EditorUIController.initEditorStyles(this.props.storeParagraphSettings); EditorUIController.initEditorStyles && EditorUIController.initEditorStyles(this.props.storeParagraphSettings);

11
apps/documenteditor/mobile/src/controller/add/AddOther.jsx
View file

@ -242,7 +242,8 @@ class AddOtherController extends Component {
render () { render () {
return ( return (
<AddOther closeModal={this.closeModal} <AddOther
closeModal={this.closeModal}
onInsertPageNumber={this.onInsertPageNumber} onInsertPageNumber={this.onInsertPageNumber}
onPageBreak={this.onPageBreak} onPageBreak={this.onPageBreak}
onColumnBreak={this.onColumnBreak} onColumnBreak={this.onColumnBreak}
@ -252,6 +253,14 @@ class AddOtherController extends Component {
onFootnoteStartAt={this.onFootnoteStartAt} onFootnoteStartAt={this.onFootnoteStartAt}
onInsertFootnote={this.onInsertFootnote} onInsertFootnote={this.onInsertFootnote}
initFootnoteStartAt={this.initFootnoteStartAt} initFootnoteStartAt={this.initFootnoteStartAt}
inFootnote={this.props.inFootnote}
inControl={this.props.inControl}
paragraphLocked={this.props.paragraphLocked}
controlPlain={this.props.controlPlain}
richDelLock={this.props.richDelLock}
richEditLock={this.props.richEditLock}
plainDelLock={this.props.plainDelLock}
plainEditLock={this.props.plainEditLock}
/> />
) )
} }

2
apps/documenteditor/mobile/src/store/mainStore.js
View file

@ -9,6 +9,7 @@ import {storeImageSettings} from "./imageSettings";
import {storeTableSettings} from "./tableSettings"; import {storeTableSettings} from "./tableSettings";
import {storeChartSettings} from "./chartSettings"; import {storeChartSettings} from "./chartSettings";
import {storeDocumentInfo} from "./documentInfo"; import {storeDocumentInfo} from "./documentInfo";
import {storeLinkSettings} from './linkSettings';
import {storeApplicationSettings} from './applicationSettings'; import {storeApplicationSettings} from './applicationSettings';
import {storeAppOptions} from "./appOptions"; import {storeAppOptions} from "./appOptions";
import {storePalette} from "./palette"; import {storePalette} from "./palette";
@ -21,6 +22,7 @@ export const stores = {
storeDocumentSettings: new storeDocumentSettings(), storeDocumentSettings: new storeDocumentSettings(),
users: new storeUsers(), users: new storeUsers(),
storeTextSettings: new storeTextSettings(), storeTextSettings: new storeTextSettings(),
storeLinkSettings: new storeLinkSettings(),
storeParagraphSettings: new storeParagraphSettings(), storeParagraphSettings: new storeParagraphSettings(),
storeShapeSettings: new storeShapeSettings(), storeShapeSettings: new storeShapeSettings(),
storeChartSettings: new storeChartSettings(), storeChartSettings: new storeChartSettings(),

81
apps/documenteditor/mobile/src/view/add/Add.jsx
View file

@ -84,45 +84,44 @@ const AddTabs = inject("storeFocusObjects")(observer(({storeFocusObjects, showPa
const options = storeFocusObjects.settings; const options = storeFocusObjects.settings;
const paragraphObj = storeFocusObjects.paragraphObject; const paragraphObj = storeFocusObjects.paragraphObject;
let need_disable = false, let needDisable = false,
can_add_table = true, canAddTable = true,
can_add_image = true, canAddImage = true,
paragraph_locked = false, paragraphLocked = false,
in_footnote = false, inFootnote = false,
in_control = false, inControl = false,
control_props = false, controlProps = false,
lock_type = false, lockType = false,
control_plain = false, controlPlain = false,
content_locked = false, contentLocked = false,
rich_del_lock = false, richDelLock = false,
rich_edit_lock = false, richEditLock = false,
plain_del_lock = false, plainDelLock = false,
plain_edit_lock = false; plainEditLock = false;
if(paragraphObj) { if(paragraphObj) {
can_add_table = paragraphObj.get_CanAddTable(); canAddTable = paragraphObj.get_CanAddTable();
can_add_image = paragraphObj.get_CanAddImage(); canAddImage = paragraphObj.get_CanAddImage();
paragraph_locked = paragraphObj.get_Locked(); paragraphLocked = paragraphObj.get_Locked();
in_footnote = api.asc_IsCursorInFootnote() || api.asc_IsCursorInEndnote(); inFootnote = api.asc_IsCursorInFootnote() || api.asc_IsCursorInEndnote();
in_control = api.asc_IsContentControl(); inControl = api.asc_IsContentControl();
control_props = in_control ? api.asc_GetContentControlProperties() : null; controlProps = inControl ? api.asc_GetContentControlProperties() : null;
lock_type = (in_control && control_props) ? control_props.get_Lock() : Asc.c_oAscSdtLockType.Unlocked; lockType = (inControl && controlProps) ? controlProps.get_Lock() : Asc.c_oAscSdtLockType.Unlocked;
control_plain = (in_control && control_props) ? (control_props.get_ContentControlType() == Asc.c_oAscSdtLevelType.Inline) : false; controlPlain = (inControl && controlProps) ? (controlProps.get_ContentControlType() == Asc.c_oAscSdtLevelType.Inline) : false;
content_locked = lock_type == Asc.c_oAscSdtLockType.SdtContentLocked || lock_type == Asc.c_oAscSdtLockType.ContentLocked; contentLocked = lockType == Asc.c_oAscSdtLockType.SdtContentLocked || lockType == Asc.c_oAscSdtLockType.ContentLocked;
rich_del_lock = paragraphObj ? !paragraphObj.can_DeleteBlockContentControl() : false; richDelLock = paragraphObj ? !paragraphObj.can_DeleteBlockContentControl() : false;
rich_edit_lock = paragraphObj ? !paragraphObj.can_EditBlockContentControl() : false; richEditLock = paragraphObj ? !paragraphObj.can_EditBlockContentControl() : false;
plain_del_lock = paragraphObj ? !paragraphObj.can_DeleteInlineContentControl() : false; plainDelLock = paragraphObj ? !paragraphObj.can_DeleteInlineContentControl() : false;
plain_edit_lock = paragraphObj ? !paragraphObj.can_EditInlineContentControl() : false; plainEditLock = paragraphObj ? !paragraphObj.can_EditInlineContentControl() : false;
} }
if (!showPanels && options.indexOf('text') > -1) { if (!showPanels && options.indexOf('text') > -1) {
need_disable = !can_add_table || control_plain || rich_edit_lock || plain_edit_lock || rich_del_lock || plain_del_lock; needDisable = !canAddTable || controlPlain || richEditLock || plainEditLock || richDelLock || plainDelLock;
// console.log(need_disable);
if(!need_disable) { if(!needDisable) {
tabs.push({ tabs.push({
caption: _t.textTable, caption: _t.textTable,
id: 'add-table', id: 'add-table',
@ -132,10 +131,9 @@ const AddTabs = inject("storeFocusObjects")(observer(({storeFocusObjects, showPa
} }
} }
if(!showPanels) { if(!showPanels) {
need_disable = paragraph_locked || control_plain || content_locked || in_footnote; needDisable = paragraphLocked || controlPlain || contentLocked || inFootnote;
// console.log(need_disable);
if(!need_disable) { if(!needDisable) {
tabs.push({ tabs.push({
caption: _t.textShape, caption: _t.textShape,
id: 'add-shape', id: 'add-shape',
@ -145,10 +143,9 @@ const AddTabs = inject("storeFocusObjects")(observer(({storeFocusObjects, showPa
} }
} }
if(!showPanels) { if(!showPanels) {
need_disable = paragraph_locked || paragraphObj && !can_add_image || control_plain || rich_del_lock || plain_del_lock || content_locked; needDisable = paragraphLocked || paragraphObj && !canAddImage || controlPlain || richDelLock || plainDelLock || contentLocked;
// console.log(need_disable);
if(!need_disable) { if(!needDisable) {
tabs.push({ tabs.push({
caption: _t.textImage, caption: _t.textImage,
id: 'add-image', id: 'add-image',
@ -162,7 +159,17 @@ const AddTabs = inject("storeFocusObjects")(observer(({storeFocusObjects, showPa
caption: _t.textOther, caption: _t.textOther,
id: 'add-other', id: 'add-other',
icon: 'icon-add-other', icon: 'icon-add-other',
component: <AddOtherController/> component:
<AddOtherController
inFootnote={inFootnote}
inControl={inControl}
paragraphLocked={paragraphLocked}
controlPlain={controlPlain}
richDelLock={richDelLock}
richEditLock={richEditLock}
plainDelLock={plainDelLock}
plainEditLock={plainEditLock}
/>
}); });
} }
if (showPanels && showPanels === 'link') { if (showPanels && showPanels === 'link') {

35
apps/documenteditor/mobile/src/view/add/AddOther.jsx
View file

@ -153,12 +153,30 @@ const PageFootnote = props => {
const AddOther = props => { const AddOther = props => {
const { t } = useTranslation(); const { t } = useTranslation();
const _t = t('Add', {returnObjects: true}); const _t = t('Add', {returnObjects: true});
const storeFocusObjects = props.storeFocusObjects; const storeFocusObjects = props.storeFocusObjects;
const storeLinkSettings = props.storeLinkSettings;
const canAddLink = storeLinkSettings.canAddLink;
let isShape = storeFocusObjects.settings.indexOf('shape') > -1, let isShape = storeFocusObjects.settings.indexOf('shape') > -1,
isText = storeFocusObjects.settings.indexOf('text') > -1, isText = storeFocusObjects.settings.indexOf('text') > -1,
isChart = storeFocusObjects.settings.indexOf('chart') > -1; isChart = storeFocusObjects.settings.indexOf('chart') > -1;
let disabledAddLink = false,
disabledAddBreak = false,
disabledAddFootnote = false,
inFootnote = props.inFootnote,
inControl = props.inControl,
paragraphLocked = props.paragraphLocked,
controlPlain = props.controlPlain,
richDelLock = props.richDelLock,
richEditLock = props.richEditLock,
plainDelLock = props.plainDelLock,
plainEditLock = props.plainEditLock;
disabledAddBreak = paragraphLocked || inFootnote || inControl || richEditLock || plainEditLock || richDelLock || plainDelLock;
disabledAddFootnote = paragraphLocked || controlPlain || richEditLock || plainEditLock;
disabledAddLink = paragraphLocked || !canAddLink;
return ( return (
<List> <List>
{isText && <ListItem title={_t.textComment} onClick={() => { {isText && <ListItem title={_t.textComment} onClick={() => {
@ -167,7 +185,7 @@ const AddOther = props => {
}}> }}>
<Icon slot="media" icon="icon-insert-comment"></Icon> <Icon slot="media" icon="icon-insert-comment"></Icon>
</ListItem>} </ListItem>}
{isText && <ListItem title={_t.textLink} link={'/add-link/'} routeProps={{ {(isText && !disabledAddLink) && <ListItem title={_t.textLink} link={'/add-link/'} routeProps={{
onInsertLink: props.onInsertLink, onInsertLink: props.onInsertLink,
getDisplayLinkText: props.getDisplayLinkText getDisplayLinkText: props.getDisplayLinkText
}}> }}>
@ -178,15 +196,16 @@ const AddOther = props => {
}}> }}>
<Icon slot="media" icon="icon-pagenumber"></Icon> <Icon slot="media" icon="icon-pagenumber"></Icon>
</ListItem> </ListItem>
{(isShape || isChart) ? null : {(isShape || isChart) || (isText && disabledAddBreak) ? null :
[ <ListItem key='break' title={_t.textBreak} link={'/add-break/'} routeProps={{ <ListItem key='break' title={_t.textBreak} link={'/add-break/'} routeProps={{
onPageBreak: props.onPageBreak, onPageBreak: props.onPageBreak,
onColumnBreak: props.onColumnBreak, onColumnBreak: props.onColumnBreak,
onInsertSectionBreak: props.onInsertSectionBreak onInsertSectionBreak: props.onInsertSectionBreak
}}> }}>
<Icon slot="media" icon="icon-sectionbreak"></Icon> <Icon slot="media" icon="icon-sectionbreak"></Icon>
</ListItem>, </ListItem>
}
{(isShape || isChart) || (isText && disabledAddFootnote) ? null :
<ListItem key='footnote' title={_t.textFootnote} link={'/add-footnote/'} routeProps={{ <ListItem key='footnote' title={_t.textFootnote} link={'/add-footnote/'} routeProps={{
getFootnoteProps: props.getFootnoteProps, getFootnoteProps: props.getFootnoteProps,
getFootnoteStartAt: props.getFootnoteStartAt, getFootnoteStartAt: props.getFootnoteStartAt,
@ -195,13 +214,13 @@ const AddOther = props => {
initFootnoteStartAt: props.initFootnoteStartAt initFootnoteStartAt: props.initFootnoteStartAt
}}> }}>
<Icon slot="media" icon="icon-footnote"></Icon> <Icon slot="media" icon="icon-footnote"></Icon>
</ListItem> ] </ListItem>
} }
</List> </List>
) )
}; };
const AddOtherContainer = inject("storeComments","storeFocusObjects")(observer(AddOther)); const AddOtherContainer = inject("storeComments","storeFocusObjects", "storeLinkSettings")(observer(AddOther));
export {AddOtherContainer as AddOther, export {AddOtherContainer as AddOther,
PageNumber as PageAddNumber, PageNumber as PageAddNumber,