pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-07-25 13:10:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2355 from ONLYOFFICE/feature/fix-bugs

Browse Source 
Feature/fix bugs
This commit is contained in:
maxkadushkin
2023-04-24 12:20:41 +03:00
committed by GitHub
parent 4ab8719a8e 95f001daac
commit 2f6520e890
6 changed files with 59 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/documenteditor/mobile/src/less/app.less
View File

@ -285,7 +285,7 @@
color: @text-normal;
font-size: 16px;
}
.calendar-day-selected .calendar-day-number {
.calendar-day-selected .calendar-day-number, .calendar-day-today.calendar-day-selected .calendar-day-number {
border: 1px solid transparent;
background-color: @brandColor;
color: @fill-white;

2
apps/documenteditor/mobile/src/view/Toolbar.jsx
View File

@ -76,7 +76,7 @@ const ToolbarView = props => {
})}
{/*props.displayCollaboration &&*/}
{Device.phone ? null : <Link className={(props.disabledControls || props.readerMode) && 'disabled'} icon='icon-search' searchbarEnable='.searchbar' href={false}></Link>}
{window.matchMedia("(min-width: 360px)").matches ? <Link className={props.disabledControls && 'disabled'} id='btn-coauth' href={false} icon='icon-collaboration' onClick={() => props.openOptions('coauth')}></Link> : null}
{window.matchMedia("(min-width: 360px)").matches && docExt !== 'oform' ? <Link className={props.disabledControls && 'disabled'} id='btn-coauth' href={false} icon='icon-collaboration' onClick={() => props.openOptions('coauth')}></Link> : null}
<Link className={(props.disabledSettings || props.disabledControls || isDisconnected) && 'disabled'} id='btn-settings' icon='icon-settings' href={false} onClick={() => props.openOptions('settings')}></Link>
</NavRight>
</Fragment>

49
apps/documenteditor/mobile/src/view/edit/EditText.jsx
View File

@ -306,29 +306,32 @@ const PageBulletsAndNumbers = props => {
</NavRight>
}
</Navbar>
<Swiper pagination>
<SwiperSlide>
<PageNumbers
storeTextSettings={storeTextSettings}
onNumber={props.onNumber}
getIconsBulletsAndNumbers={props.getIconsBulletsAndNumbers}
/>
</SwiperSlide>
<SwiperSlide>
<PageBullets
storeTextSettings={storeTextSettings}
onBullet={props.onBullet}
getIconsBulletsAndNumbers={props.getIconsBulletsAndNumbers}
/>
</SwiperSlide>
<SwiperSlide>
<PageMultiLevel
storeTextSettings={storeTextSettings}
onMultiLevelList={props.onMultiLevelList}
getIconsBulletsAndNumbers={props.getIconsBulletsAndNumbers}
/>
</SwiperSlide>
</Swiper>
<div className="swiper-container swiper-init" data-pagination='{"el": ".swiper-pagination"}'>
<div className="swiper-wrapper">
<div className="swiper-slide">
<PageNumbers
storeTextSettings={storeTextSettings}
onNumber={props.onNumber}
getIconsBulletsAndNumbers={props.getIconsBulletsAndNumbers}
/>
</div>
<div className="swiper-slide">
<PageBullets
storeTextSettings={storeTextSettings}
onBullet={props.onBullet}
getIconsBulletsAndNumbers={props.getIconsBulletsAndNumbers}
/>
</div>
<div className="swiper-slide">
<PageMultiLevel
storeTextSettings={storeTextSettings}
onMultiLevelList={props.onMultiLevelList}
getIconsBulletsAndNumbers={props.getIconsBulletsAndNumbers}
/>
</div>
</div>
<div className="swiper-pagination"></div>
</div>
</Page>
)
};

17
apps/documenteditor/mobile/src/view/settings/Settings.jsx
View File

@ -96,7 +96,7 @@ const routes = [
];
const SettingsList = inject("storeAppOptions", "storeReview")(observer(props => {
const SettingsList = inject("storeAppOptions", "storeReview", "storeDocumentInfo")(observer(props => {
const { t } = useTranslation();
const _t = t('Settings', {returnObjects: true});
const appOptions = props.storeAppOptions;
@ -106,6 +106,9 @@ const SettingsList = inject("storeAppOptions", "storeReview")(observer(props =>
const navbar = <Navbar title={_t.textSettings}>
{!props.inPopover && <NavRight><Link popupClose=".settings-popup">{_t.textDone}</Link></NavRight>}
</Navbar>;
const docInfo = props.storeDocumentInfo;
const docExt = docInfo.dataDoc ? docInfo.dataDoc.fileType : '';
const isNotForm = docExt && docExt !== 'oform';
const onoptionclick = page => {
if ( props.onOptionClick )
@ -211,10 +214,12 @@ const SettingsList = inject("storeAppOptions", "storeReview")(observer(props =>
<Icon slot="media" icon="icon-doc-setup"></Icon>
</ListItem>
}
<ListItem title={_t.textApplicationSettings} link="#"
onClick={onoptionclick.bind(this, "/application-settings/")}>
<Icon slot="media" icon="icon-app-settings"></Icon>
</ListItem>
{isNotForm &&
<ListItem title={_t.textApplicationSettings} link="#"
onClick={onoptionclick.bind(this, "/application-settings/")}>
<Icon slot="media" icon="icon-app-settings"></Icon>
</ListItem>
}
{_canDownload &&
<ListItem title={_t.textDownload} link="#" onClick={onoptionclick.bind(this, "/download/")}>
<Icon slot="media" icon="icon-download"></Icon>
@ -238,7 +243,7 @@ const SettingsList = inject("storeAppOptions", "storeReview")(observer(props =>
<Icon slot="media" icon="icon-help"></Icon>
</ListItem>
}
{_canAbout &&
{(_canAbout && isNotForm) &&
<ListItem title={_t.textAbout} link="#" onClick={onoptionclick.bind(this, "/about/")}>
<Icon slot="media" icon="icon-about"></Icon>
</ListItem>

9
apps/spreadsheeteditor/mobile/src/less/app.less
View File

@ -266,4 +266,11 @@
display: none;
}
}
}
}
// Marker color sheet
.marker-color-sheet {
width: 16px;
height: 16px;
border-radius: 50%;
}

21
apps/spreadsheeteditor/mobile/src/view/Statusbar.jsx
View File

@ -37,7 +37,7 @@ const PageListMove = props => {
)
};
const PageAllList = (props) => {
const PageAllList = observer((props) => {
const { t } = useTranslation();
const { sheets, onTabListClick } = props;
const allSheets = sheets.sheets;
@ -65,18 +65,21 @@ const PageAllList = (props) => {
<List>
{allSheets.map((model, sheetIndex) =>
<ListItem className='item-list' key={model.name} title={model.name} checkbox checked={model.active} onClick={() => onTabListClick(sheetIndex)}>
{model.hidden ?
<div slot='after'>
{t('Statusbar.textHidden')}
</div>
: null}
</ListItem>)
}
<div slot='after'>
{model.hidden ?
t('Statusbar.textHidden')
:
<div className='marker-color-sheet' style={{
background: model.color ? '#' + Common.Utils.ThemeColor.getHexColor(model.color.get_r(), model.color.get_g(), model.color.get_b()) : 'transparent'}}></div>
}
</div>
</ListItem>
)}
</List>
</Page>
</View>
)
};
});
const PageCustomTabColor = inject("storePalette")(observer (props => {
const { t } = useTranslation();