IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2

Browse Source
This commit is contained in:
Alexey Safronov 2022-07-06 17:47:15 +03:00
commit 771dffbcce
11 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/asc-web-components/drop-down-item/styled-drop-down-item.js
View File

@ -119,7 +119,7 @@ const StyledDropdownItem = styled.div`
props.isActive &&
css`
background-color: ${(props) =>
props.theme.dropDownItem.hoverBackgroundColor};
props.theme.dropDownItem.hoverBackgroundColor} !important;
`}
`;
StyledDropdownItem.defaultProps = { theme: Base };

2
packages/asc-web-components/drop-down/index.js
View File

@ -297,7 +297,7 @@ class DropDownContainer extends React.Component {
};
render() {
const { withBackdrop = true, withBlur = false, open } = this.props;
const eventTypesProp = isMobile ? { eventTypes: ["touchend"] } : {};
const eventTypesProp = isMobile ? { eventTypes: ["click"] } : {};
return (
<>

2
packages/asc-web-components/main-button-mobile/index.js
View File

@ -267,7 +267,7 @@ const MainButtonMobile = (props) => {
<StyledDropDownItem
key={item.key}
label={item.label}
className={item.className}
className={`${item.className} sublevel`}
onClick={subMenuOnClickAction}
icon={item.icon ? item.icon : ""}
action={item.action}

4
packages/asc-web-components/main-button-mobile/styled-main-button.js
View File

@ -167,6 +167,10 @@ StyledButtonOptions.defaultProps = { theme: Base };
const StyledContainerAction = styled.div`
padding: 16px 0px;
.sublevel {
padding-left: 48px;
}
`;
const StyledButtonWrapper = styled.div`

1
packages/asc-web-components/paging/index.js
View File

@ -51,6 +51,7 @@ const Paging = (props) => {
{pageItems && (
<StyledPage>
<ComboBox
isDisabled={disablePrevious && disableNext}
className="manualWidth"
directionY={openDirection}
options={pageItems}

3
products/ASC.Files/Client/public/images/form.blank.react.svg Normal file
View File

@ -0,0 +1,3 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M1 3C1 1.89543 1.89543 1 3 1H8H10C10.2652 1 10.5196 1.10536 10.7071 1.29289L14.7071 5.29289C14.8946 5.48043 15 5.73478 15 6V8V13C15 14.1046 14.1046 15 13 15H3C1.89543 15 1 14.1046 1 13V3ZM12.5858 6L10 3.41421V6L12.5858 6ZM8 6V3L3 3V13H13V8L8 8V7V6Z" fill="#333333"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 419 B

3
products/ASC.Files/Client/public/images/form.gallery.react.svg Normal file
View File

@ -0,0 +1,3 @@
<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M4.85714 0C3.83147 0 3 0.83147 3 1.85714V2H5H14V11V13H14.1429C15.1685 13 16 12.1685 16 11.1429V1.85714C16 0.831472 15.1685 0 14.1429 0H4.85714ZM0 4.85714C0 3.83147 0.831472 3 1.85714 3H11.1429C12.1685 3 13 3.83147 13 4.85714V14.1429C13 15.1685 12.1685 16 11.1429 16H1.85714C0.83147 16 0 15.1685 0 14.1429V4.85714ZM11 5H2V14H11V5ZM10 6H3V8H10V6ZM5 9H10V11H5V9Z" fill="#333333"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 530 B

6
products/ASC.Files/Client/public/locales/it/Translations.json
View File

@ -6,7 +6,7 @@
"ConnectingAccount": "Collegamento dell'account",
"Copy": "Copiare",
"CopyHere": "Copia qui",
"CreateMasterFormFromFile": "Crear plantilla de formulario desde archivo",
"CreateMasterFormFromFile": "Creare modello di modulo da file",
"DeleteFromTrash": "Gli elementi selezionati sono stati eliminati dal Cestino con successo",
"DeleteOperation": "Sta eliminando",
"DeleteSelectedElem": "Gli elementi selezionati sono stati eliminati con successo",
@ -39,12 +39,12 @@
"MoveHere": "Sposta qui",
"MoveToOperation": "Sta spostando",
"NewForm": "Modello di modulo",
"NewFormFile": "Formulario desde archivo de texto",
"NewFormFile": "Modulo da file di testo",
"OwnerChange": "Cambiare proprietario",
"Presentations": "Presentazioni",
"Spreadsheets": "Fogli di calcolo",
"SubNewForm": "En blanco",
"SubNewFormFile": "Desde archivo de texto",
"SubNewFormFile": "Da file di testo",
"ThirdPartyInfo": "Cambiare le informazioni di terze parti",
"TitleShowActions": "Mostra azioni con file",
"TitleShowFolderActions": "Mostra azioni con cartelle",

7
products/ASC.Files/Client/src/components/Article/MainButton/index.js
View File

@ -124,12 +124,11 @@ const ArticleMainButtonContent = (props) => {
items: [
{
className: "main-button_drop-down_sub",
icon: "images/form.react.svg",
icon: "images/form.blank.react.svg",
label: t("Translations:SubNewForm"),
onClick: onCreate,
action: "docxf",
key: "docxf",
withoutIcon: true,
},
{
className: "main-button_drop-down_sub",
@ -138,16 +137,14 @@ const ArticleMainButtonContent = (props) => {
onClick: onShowSelectFileDialog,
disabled: isPrivacy,
key: "form-file",
withoutIcon: true,
},
{
className: "main-button_drop-down_sub",
icon: "images/form.react.svg",
icon: "images/form.gallery.react.svg",
label: t("Common:OFORMsGallery"),
onClick: onShowGallery,
disabled: isPrivacy,
key: "form-gallery",
withoutIcon: true,
},
],
},

6
products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
View File

@ -114,22 +114,22 @@ class SectionHeaderContent extends React.Component {
{
key: "new-form",
label: t("Translations:SubNewForm"),
icon: "images/form.react.svg",
icon: "images/form.blank.react.svg",
onClick: this.createForm,
},
{
key: "new-form-file",
label: t("Translations:SubNewFormFile"),
icon: "images/form.file.react.svg",
onClick: this.createFormFromFile,
disabled: isPrivacyFolder,
icon: "images/form.file.react.svg",
},
{
key: "oforms-gallery",
label: t("Common:OFORMsGallery"),
icon: "images/form.gallery.react.svg",
onClick: this.onShowGallery,
disabled: isPrivacyFolder || (isMobile && isTablet),
icon: "images/form.react.svg",
},
],
},

11
products/ASC.Files/Client/src/store/FilesActionsStore.js
View File

@ -490,10 +490,13 @@ class FilesActionStore {
});
setIsLoading(false);
type === FileAction.Rename &&
this.onSelectItem({
id: selectedItem.id,
isFolder: selectedItem.isFolder,
});
this.onSelectItem(
{
id: selectedItem.id,
isFolder: selectedItem.isFolder,
},
false
);
}
};