Merge branch 'hotfix/v3.0.1' of git.onlyoffice.com:ONLYOFFICE/DocSpac…

…e-client into hotfix/v3.0.1

packages/client/public/locales/zh-CN/ArchiveDialog.json

@@ -1,7 +1,7 @@
 {
-  "ArchiveHeader": "移动至已归档？",
-  "ArchiveRoom": "您即将归档房间。",
-  "ArchiveRooms": "您即将归档房间。",
+  "ArchiveHeader": "移动至已存档？",
+  "ArchiveRoom": "您即将存档房间。",
+  "ArchiveRooms": "您即将存档房间。",
   "RestoreAllRooms": "确定要恢复所有房间吗？",
   "RestoreRoom": "确定要恢复房间吗？",
   "RestoreRooms": "确定要恢复房间吗？"

packages/client/public/locales/zh-CN/EmptyTrashDialog.json

@@ -1,8 +1,8 @@
 {
   "DeleteForeverButton": "永久删除",
   "DeleteForeverNote": "垃圾箱中的所有项目都将被永久性删除。您将无法使其恢复。",
-  "DeleteForeverNoteArchive": "归档中的所有项目都将被永久性删除。您将无法使其恢复。",
+  "DeleteForeverNoteArchive": "存档中的所有项目都将被永久性删除。您将无法使其恢复。",
   "DeleteForeverTitle": "永久删除？",
-  "SuccessEmptyArchived": "归档已清空",
+  "SuccessEmptyArchived": "存档已清空",
   "SuccessEmptyTrash": "回收站已清空"
 }

packages/client/public/locales/zh-CN/Files.json

@@ -8,12 +8,12 @@
   "All": "全部",
   "AllLinksAreDisabled": "所有链接都已被禁用",
   "AppointNewOwner": "您已指定一个新的所有者。",
-  "ArchiveAction": "清空归档",
-  "ArchivedRoomsAction": "房间已归档",
+  "ArchiveAction": "清空存档",
+  "ArchivedRoomsAction": "房间已存档",
   "ArchiveEmptyScreen": " 您可以随时存档不使用的房间并在{{productName}}中恢复它们，也可以永久删除它们。这些房间将显示在此处。",
-  "ArchiveEmptyScreenHeader": "暂无已归档房间 —> 暂无已存档房间",
-  "ArchiveEmptyScreenUser": "已归档房间将出现在此处。",
-  "Archives": "归档",
+  "ArchiveEmptyScreenHeader": "暂无已存档房间",
+  "ArchiveEmptyScreenUser": "已存档房间将出现在此处。",
+  "Archives": "存档",
   "AssignOwner": "分配所有者",
   "BackToParentFolderButton": "返回父文件夹",
   "BadgeAlertDescription": "这个表单中含有几个填写人角色。此类型房间不支持设置多个角色填写表单",
@@ -121,7 +121,7 @@
   "MoveItem": "<strong>{{title}}</strong>已移动",
   "MoveItems": "<strong>{{qty}}</strong>元素已移动",
   "MoveOrCopy": "移动或复制",
-  "MoveToArchive": "移动至归档",
+  "MoveToArchive": "移动至存档",
   "MoveToPublicRoom": "任何人都可以通过此链接访问此房间及房间中的所有内容。您要继续吗？",
   "MoveToPublicRoomTitle": "移至公共房间",
   "New": "新建",
@@ -194,8 +194,8 @@
   "TooltipElementsMoveMessage": "移动{{element}}元素",
   "TrashEmptyDescription": "“回收站”存放的是被删除的文档。您可以选择“还原”或“永久删除”回收站中的文件。“回收站”中的文件将在 30 天后自动删除。请注意：被永久删除的文档将无法再恢复。",
   "TrashErasureWarning": "回收站中的文件在30天后会自动删除。",
-  "UnarchivedRoomAction": "房间 '{{name}}' 已取消归档。",
-  "UnarchivedRoomsAction": "房间已取消归档。",
+  "UnarchivedRoomAction": "房间 '{{name}}' 已取消存档。",
+  "UnarchivedRoomsAction": "房间已取消存档。",
   "UnblockVersion": "锁定/解锁",
   "Unpin": "取消标记",
   "VersionBadge": "V.{{version}}",

packages/client/public/locales/zh-CN/MainBar.json

@@ -1,5 +1,5 @@
 {
-  "ArchivedRoomsOrContact": "您可以归档不需要的房间或联系{{productName}}管理员升级费用版本。",
+  "ArchivedRoomsOrContact": "您可以存档不需要的房间或联系{{productName}}管理员升级费用版本。",
   "ClickToUpgradeTariff": "<1>点击此处</1>升级您的费用版本。",
   "ConfirmEmailDescription": "使用激活邮件中提供的链接。没有收到包含激活链接的邮件？",
   "ConfirmEmailHeader": "请激活您的电子邮件 ({{ email }}) 以访问{{productName}}功能。",

packages/client/public/locales/zh-CN/Payments.json

@@ -35,7 +35,7 @@
   "PayerDescription": "此用户可以访问付款详情，并且是唯一可以调整配额和付款的用户。{{productName}}所有者以及付款经理本人可以使用 Stripe 客户门户重新分配付款经理角色。",
   "PriceCalculation": "计算价格",
   "RenewSubscription": "将订阅更新至{{planName}}版本",
-  "RoomManagerDescription": "房间管理和归档，用户邀请和管理可为房间指派多名管理员。",
+  "RoomManagerDescription": "房间管理和存档，用户邀请和管理可为房间指派多名管理员。",
   "RoomsQuotaAlmostExhausted": "房间配额已几乎用完。",
   "StartupSuggestion": "升级为{{planName}}版获得更多权限",
   "StartupTitle": "您正在使用免费{{planName}}版本",

packages/client/public/locales/zh-CN/Translations.json

@@ -1,5 +1,5 @@
 {
-  "ArchivingData": "归档数据",
+  "ArchivingData": "存档数据",
   "ChooseFromList": "从列表中选择",
   "ConnectingAccount": "连接账户",
   "DeleteFromTrash": "选择的元素已成功从回收站中删除",

packages/client/src/pages/Sdk/index.js

@@ -126,7 +126,10 @@ const Sdk = ({
     getFilesSettings();
   }, []);
 
-  const { mode, selectorType } = useParams();
+  const { mode } = useParams();
+  const selectorType = new URLSearchParams(window.location.search).get(
+    "selectorType",
+  );
 
   const handleMessage = async (e) => {
     const eventData = typeof e.data === "string" ? JSON.parse(e.data) : e.data;

packages/doceditor/src/components/Editor.tsx

@@ -166,7 +166,12 @@ const Editor = ({
       }
     )?.["FileLocation"]; // t("FileLocation");
 
-    if (editorGoBack === "false" || user?.isVisitor || !user) {
+    if (
+      editorGoBack === "false" ||
+      editorGoBack === false ||
+      user?.isVisitor ||
+      !user
+    ) {
     } else if (editorGoBack === "event") {
       goBack = {
         requestClose: true,

public/locales/zh-CN/Common.json

@@ -18,7 +18,7 @@
   "AnyoneWithLink": "任何拥有此链接的人",
   "ApplyButton": "应用",
   "Archive": "存档",
-  "ArchivedRoomAction": "房间'{{name}}'已归档",
+  "ArchivedRoomAction": "房间'{{name}}'已存档",
   "Attention": "注意",
   "Audio": "音频",
   "Authentication": "身份验证",

public/scripts/sdk/1.0.1/api.js

@@ -809,13 +809,15 @@
       const loader = document.getElementById(this.config.frameId + "-loader");
 
       if (targetFrame) {
-        targetFrame.style.opacity = 1;
         targetFrame.style.position = "relative";
+        targetFrame.style.opacity = 1;
         targetFrame.style.width = this.config.width;
         targetFrame.style.height = this.config.height;
         targetFrame.parentNode.style.height = "inherit";
 
         if (loader) {
+          loader.style.opacity = 0;
+          targetFrame.style.transition = "opacity 350ms";
           loader.remove();
           this.config.events?.onContentReady &&
             this.config.events.onContentReady();