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

Merge branch 'bugfix/rc-2.5.0' of github.com:ONLYOFFICE/DocSpace-client into bugfix/rc-2.5.0

Browse Source
This commit is contained in:
Timofey Boyko 2024-03-04 10:51:25 +03:00
commit eacc122048
8 changed files with 76 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/client/src/store/FilesSettingsStore.js
View File

@ -516,6 +516,9 @@ class FilesSettingsStore {
case ".xlsx":
path = "xlsx.svg";
break;
case ".xlsb":
path = "xlsb.svg";
break;
case ".xps":
path = "xps.svg";
break;

14
packages/shared/components/table/TableHeader.tsx
View File

@ -1350,7 +1350,9 @@ class TableHeader extends React.Component<
getSubstring(tableInfoPanelContainer[0])
) {
const currentContentWidth =
contentWidth - +getSubstring(tableInfoPanelContainer[0]);
enabledColumnsCount > 0
? contentWidth - +getSubstring(tableInfoPanelContainer[0])
: contentWidth;
let overWidth = 0;
@ -1370,10 +1372,12 @@ class TableHeader extends React.Component<
gridTemplateColumns.push("0px");
} else if (item !== `${settingsSize}px`) {
const percent =
(getSubstring(item) /
(changedWidth -
+getSubstring(tableInfoPanelContainer[0]))) *
100;
enabledColumnsCount === 0
? 100
: (getSubstring(item) /
(changedWidth -
+getSubstring(tableInfoPanelContainer[0]))) *
100;
const newItemWidth = defaultColumnSize
? `${defaultColumnSize}px`

3
packages/shared/utils/axiosClient.ts
View File

@ -115,8 +115,9 @@ class AxiosClient {
const proto = headers["x-forwarded-proto"]?.split(",").shift();
const host = headers["x-forwarded-host"]?.split(",").shift();
const port = headers["x-forwarded-port"]?.split(",").shift();
const origin = apiOrigin || `${proto}://${host}`;
const origin = apiOrigin || `${proto}://${host}${port ? `:${port}` : ""}`;
const apiBaseURL = combineUrl(origin, proxyURL, apiPrefix);

1
packages/shared/utils/image-helpers.ts
View File

@ -75,6 +75,7 @@ const formatIcons = [
".wpt",
".xls",
".xlsm",
".xlsb",
".xlsx",
".xml",
".xps",

14
public/images/icons/24/xlsb.svg Normal file
View File

@ -0,0 +1,14 @@
<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M3 1H16L21 6V23H3V1Z" fill="white"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M3 15H10.5H21V6L16 1H3V15ZM16 0H2V16H22V6L16 0Z" fill="url(#paint0_linear_1_18033)"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M3 15H10.5H21V6L16 1H3V15ZM16 0H2V16H22V6L16 0Z" fill="#BFC0BF"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M3 15C2.44772 15 2 15.4477 2 16V23C2 23.5523 2.44772 24 3 24H21C21.5523 24 22 23.5523 22 23V16C22 15.4477 21.5523 15 21 15H3ZM9 17H8V22H11V21H9V17ZM3 20H4V22H3V20ZM4 19V20H6V22H7V20H6V19H7V17H6V19H4ZM4 19H3V17H4V19ZM15 19H13V18H15V17H13V18H12V19H13V20H15V21H12V22H15V21H16V20H15V19ZM20 17H17V22H20V21H21V20H20V19H21V18H20V17ZM20 18H18V19H20V18ZM20 20H18V21H20V20Z" fill="#6BAA1C"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M15 4H4V13H20V8H15V4ZM19 9H15V12H19V9ZM14 9V12H10V9H14ZM9 9V12H5V9H9ZM9 8H5V5H9V8ZM10 8V5H14V8H10Z" fill="#BFBFBF"/>
<path opacity="0.3" d="M14 9V1H15V8H21V9H14Z" fill="black"/>
<defs>
<linearGradient id="paint0_linear_1_18033" x1="10.5" y1="20.3" x2="10.5" y2="2.6126e-07" gradientUnits="userSpaceOnUse">
<stop stop-color="#A8A8A8"/>
<stop offset="1" stop-color="#DADADA"/>
</linearGradient>
</defs>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

7
public/images/icons/32/xlsb.svg Normal file
View File

@ -0,0 +1,7 @@
<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
<path fill-rule="evenodd" clip-rule="evenodd" d="M4 31H28V9.15393L18.6628 1H4V31ZM19 0H3V32H29V9L19 0Z" fill="#BFBFBE"/>
<path d="M4 1H18.5L28 9.23792V31H4V1Z" fill="white"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M18 5H6V18H26V10H25V13H20V10H19V13H13V10H18V9H13V6H18V5ZM12 10V13H7V10H12ZM12 14H7V17H12V14ZM20 17H25V14H20V17ZM19 17V14H13V17H19ZM12 9H7V6H12V9Z" fill="#BFBFBF"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M7 20C6.44772 20 6 20.4477 6 21V28C6 28.5523 6.44772 29 7 29H25C25.5523 29 26 28.5523 26 28V21C26 20.4477 25.5523 20 25 20H7ZM13 22H12V27H15V26H13V22ZM7 25H8V27H7V25ZM8 24V25H10V27H11V25H10V24H11V22H10V24H8ZM8 24H7V22H8V24ZM19 24H17V23H19V22H17V23H16V24H17V25H19V26H16V27H19V26H20V25H19V24ZM24 22H21V27H24V26H25V25H24V24H25V23H24V22ZM24 23H22V24H24V23ZM24 25H22V26H24V25Z" fill="#6BAA1C"/>
<path opacity="0.3" d="M17 11V1H18V10H28V11H17Z" fill="black"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 994 B

20
public/images/icons/64/xlsb.svg Normal file
View File

@ -0,0 +1,20 @@
<svg width="64" height="64" viewBox="0 0 64 64" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M38.5858 4L54 19.4142V60H10V4H38.5858Z" fill="white"/>
<path d="M30 32H46V30H30V32Z" fill="#BFBFBF"/>
<path d="M24 32H18V30H24V32Z" fill="#BFBFBF"/>
<path d="M18 24H24V22H18V24Z" fill="#BFBFBF"/>
<path d="M18 16H24V14H18V16Z" fill="#BFBFBF"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M38 10H14V36H50V20H48V26H28V20H38V18H28V12H38V10ZM48 28H28V34H48V28ZM26 34V28H16V34H26ZM26 26V20H16V26H26ZM16 18H26V12H16V18Z" fill="#BFBFBF"/>
<path d="M38 14H30V16H38V14Z" fill="#BFBFBF"/>
<path d="M30 24H46V22H30V24Z" fill="#BFBFBF"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M38 2H8V62H56V20L38 2ZM54 60V21L37 4H10V60H54Z" fill="url(#paint0_linear_4104_4868)"/>
<path opacity="0.25" d="M38 4H36V22H54V20H38V4Z" fill="black"/>
<path d="M14 40C14 38.8954 14.8954 38 16 38H48C49.1046 38 50 38.8954 50 40V54C50 55.1046 49.1046 56 48 56H16C14.8954 56 14 55.1046 14 54V40Z" fill="#6AAA1E"/>
<path d="M18.3162 51L21.0071 46.8911L18.5686 43.126H20.427L22.0061 45.6558L23.553 43.126H25.3953L22.9461 46.9502L25.637 51H23.7195L21.9739 48.2769L20.2229 51H18.3162ZM25.8363 51V43.1904H27.4262V49.6733H31.3793V51H25.8363ZM31.4552 48.438L33.002 48.2876C33.0951 48.8068 33.2831 49.1882 33.566 49.4316C33.8525 49.6751 34.2374 49.7969 34.7208 49.7969C35.2328 49.7969 35.6178 49.6895 35.8756 49.4746C36.137 49.2562 36.2677 49.002 36.2677 48.7119C36.2677 48.5257 36.2122 48.3682 36.1012 48.2393C35.9937 48.1068 35.804 47.9922 35.5318 47.8955C35.3456 47.8311 34.9213 47.7165 34.2589 47.5518C33.4067 47.3405 32.8087 47.0809 32.4649 46.7729C31.9815 46.3397 31.7398 45.8115 31.7398 45.1885C31.7398 44.7874 31.8526 44.4132 32.0782 44.0659C32.3074 43.715 32.635 43.4482 33.0611 43.2656C33.4908 43.083 34.0082 42.9917 34.6134 42.9917C35.6016 42.9917 36.3446 43.2083 36.8424 43.6416C37.3437 44.0749 37.6068 44.6532 37.6319 45.3765L36.0421 45.4463C35.974 45.0417 35.8272 44.7516 35.6016 44.5762C35.3796 44.3971 35.0448 44.3076 34.5972 44.3076C34.1353 44.3076 33.7737 44.4025 33.5123 44.5923C33.344 44.714 33.2598 44.877 33.2598 45.0811C33.2598 45.2673 33.3386 45.4266 33.4962 45.5591C33.6967 45.7274 34.1837 45.9028 34.9571 46.0854C35.7305 46.2681 36.3017 46.4578 36.6705 46.6548C37.0429 46.8481 37.3329 47.1149 37.5406 47.4551C37.7519 47.7917 37.8575 48.2088 37.8575 48.7065C37.8575 49.1577 37.7322 49.5802 37.4815 49.9741C37.2309 50.368 36.8764 50.6616 36.418 50.855C35.9597 51.0448 35.3886 51.1396 34.7047 51.1396C33.7092 51.1396 32.9447 50.9105 32.4112 50.4521C31.8777 49.9902 31.559 49.3188 31.4552 48.438ZM38.5403 43.126H41.6877C42.3108 43.126 42.7745 43.1528 43.0788 43.2065C43.3868 43.2567 43.6607 43.3641 43.9006 43.5288C44.1441 43.6935 44.3464 43.9137 44.5076 44.1895C44.6687 44.4616 44.7493 44.7677 44.7493 45.1079C44.7493 45.4767 44.649 45.8151 44.4485 46.123C44.2515 46.431 43.983 46.6619 43.6428 46.8159C44.1226 46.9556 44.4914 47.1937 44.7493 47.5303C45.0071 47.8669 45.136 48.2625 45.136 48.7173C45.136 49.0754 45.0518 49.4245 44.8835 49.7646C44.7188 50.1012 44.4914 50.3716 44.2014 50.5757C43.9149 50.7762 43.5605 50.8997 43.1379 50.9463C42.873 50.9749 42.2338 50.9928 41.2204 51H38.5403V43.126ZM40.1301 44.4365V46.2573H41.1721C41.7916 46.2573 42.1765 46.2484 42.3269 46.2305C42.599 46.1982 42.8121 46.1051 42.9661 45.9512C43.1236 45.7936 43.2024 45.5877 43.2024 45.3335C43.2024 45.09 43.1343 44.8931 42.9983 44.7427C42.8658 44.5887 42.6671 44.4956 42.4021 44.4634C42.2445 44.4455 41.7916 44.4365 41.0432 44.4365H40.1301ZM40.1301 47.5679V49.6733H41.6018C42.1747 49.6733 42.5382 49.6572 42.6921 49.625C42.9285 49.582 43.12 49.4782 43.2668 49.3135C43.4172 49.1452 43.4924 48.9214 43.4924 48.6421C43.4924 48.4058 43.4351 48.2052 43.3205 48.0405C43.206 47.8758 43.0395 47.7559 42.821 47.6807C42.6062 47.6055 42.1371 47.5679 41.4138 47.5679H40.1301Z" fill="white"/>
<defs>
<linearGradient id="paint0_linear_4104_4868" x1="29" y1="2" x2="29" y2="62" gradientUnits="userSpaceOnUse">
<stop stop-color="#DCDCDC"/>
<stop offset="1" stop-color="#ADADAD"/>
</linearGradient>
</defs>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 4.0 KiB

20
public/images/icons/96/xlsb.svg Normal file
View File

@ -0,0 +1,20 @@
<svg width="96" height="96" viewBox="0 0 96 96" fill="none" xmlns="http://www.w3.org/2000/svg">
<g clip-path="url(#clip0_1_17710)">
<path d="M10 1H57L86 30V95H10V1Z" fill="white"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M10 95H86V30L57 1H10V95ZM57 0H9V96H87V30L57 0Z" fill="url(#paint0_linear_1_17710)"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M57 11H20V50H76V29H57V11ZM73 41V47H58V41H73ZM73 32V38H58V32H73ZM55 14H41V20H55V14ZM55 23H41V29H55V23ZM55 32H41V38H55V32ZM55 41H41V47H55V41ZM23 14H38V20H23V14ZM23 23H38V29H23V23ZM23 32H38V38H23V32ZM23 41H38V47H23V41Z" fill="#BFBFBF"/>
<path opacity="0.3" d="M56 30V1H57V29H86L87 30H56Z" fill="black"/>
<path d="M65.9111 68.4697V71.9458H67.9004C69.083 71.9458 69.8179 71.9287 70.105 71.8945C70.6245 71.833 71.0312 71.6553 71.3252 71.3613C71.626 71.0605 71.7764 70.6675 71.7764 70.1821C71.7764 69.7173 71.6465 69.3413 71.3867 69.0542C71.1338 68.7603 70.7544 68.5825 70.2485 68.521C69.9478 68.4868 69.083 68.4697 67.6543 68.4697H65.9111Z" fill="#6AAA1E"/>
<path d="M65.9111 74.4478V78.4673H68.7207C69.8145 78.4673 70.5083 78.4365 70.8022 78.375C71.2534 78.293 71.6191 78.0947 71.8994 77.7803C72.1865 77.459 72.3301 77.0317 72.3301 76.4985C72.3301 76.0474 72.2207 75.6646 72.002 75.3501C71.7832 75.0356 71.4653 74.8066 71.0483 74.6631C70.6382 74.5195 69.7427 74.4478 68.3618 74.4478H65.9111Z" fill="#6AAA1E"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M20 61C20 59.3431 21.3431 58 23 58H73C74.6569 58 76 59.3431 76 61V86C76 87.6569 74.6569 89 73 89H23C21.3431 89 20 87.6569 20 86V61ZM48.0898 76.1089L51.043 75.8218C51.2207 76.813 51.5796 77.541 52.1196 78.0059C52.6665 78.4707 53.4014 78.7031 54.3242 78.7031C55.3018 78.7031 56.0366 78.498 56.5288 78.0879C57.0278 77.6709 57.2773 77.1855 57.2773 76.6318C57.2773 76.2764 57.1714 75.9756 56.9595 75.7295C56.7544 75.4766 56.3921 75.2578 55.8726 75.0732C55.5171 74.9502 54.707 74.7314 53.4424 74.417C51.8154 74.0137 50.6738 73.5181 50.0176 72.9302C49.0947 72.103 48.6333 71.0947 48.6333 69.9053C48.6333 69.1396 48.8486 68.4253 49.2793 67.7622C49.7168 67.0923 50.3423 66.583 51.1558 66.2344C51.9761 65.8857 52.9639 65.7114 54.1191 65.7114C56.0059 65.7114 57.4243 66.125 58.3745 66.9521C59.3315 67.7793 59.834 68.8833 59.8818 70.2642L56.8467 70.3975C56.7168 69.625 56.4365 69.0713 56.0059 68.7363C55.582 68.3945 54.9429 68.2236 54.0884 68.2236C53.2065 68.2236 52.5161 68.4048 52.0171 68.7671C51.6958 68.9995 51.5352 69.3105 51.5352 69.7002C51.5352 70.0557 51.6855 70.3599 51.9863 70.6128C52.3691 70.9341 53.2988 71.269 54.7754 71.6177C56.252 71.9663 57.3423 72.3286 58.0464 72.7046C58.7573 73.0737 59.311 73.583 59.7075 74.2324C60.1108 74.875 60.3125 75.6714 60.3125 76.6216C60.3125 77.4829 60.0732 78.2896 59.5947 79.0415C59.1162 79.7935 58.4395 80.354 57.5645 80.7231C56.6895 81.0854 55.5991 81.2666 54.2935 81.2666C52.3931 81.2666 50.9336 80.8291 49.915 79.9541C48.8965 79.0723 48.2881 77.7905 48.0898 76.1089ZM62.876 65.9678H68.8848C70.0742 65.9678 70.9595 66.019 71.5405 66.1216C72.1284 66.2173 72.6514 66.4224 73.1094 66.7368C73.5742 67.0513 73.9604 67.4717 74.2681 67.998C74.5757 68.5176 74.7295 69.1021 74.7295 69.7515C74.7295 70.4556 74.5381 71.1016 74.1553 71.6895C73.7793 72.2773 73.2666 72.7183 72.6172 73.0122C73.5332 73.2788 74.2373 73.7334 74.7295 74.376C75.2217 75.0186 75.4678 75.7739 75.4678 76.6421C75.4678 77.3257 75.3071 77.9922 74.9858 78.6416C74.6714 79.2842 74.2373 79.8003 73.6836 80.1899C73.1367 80.5728 72.46 80.8086 71.6533 80.8975C71.1475 80.9521 69.9272 80.9863 67.9927 81H62.876V65.9678ZM36.103 81V66.0908H39.1382V78.4673H46.6851V81H36.103ZM20.4863 81L25.6235 73.1558L20.9683 65.9678H24.5161L27.5308 70.7974L30.4839 65.9678H34.001L29.3252 73.2686L34.4624 81H30.8018L27.4692 75.8013L24.1265 81H20.4863Z" fill="#6AAA1E"/>
</g>
<defs>
<linearGradient id="paint0_linear_1_17710" x1="48" y1="94.25" x2="48" y2="1.21299e-06" gradientUnits="userSpaceOnUse">
<stop stop-color="#A8A8A8"/>
<stop offset="1" stop-color="#DADADA"/>
</linearGradient>
<clipPath id="clip0_1_17710">
<rect width="96" height="96" fill="white"/>
</clipPath>
</defs>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 4.0 KiB