@ones-editor/editor 2.3.0-beta.11 → 2.3.0-beta.13

package/dist/error-handler/error-info-bar.d.ts

@@ -7,7 +7,6 @@ export default class ErrorInfoBar {
     private message;
     private _hideTimer;
     private _adjustParentInterval;
-    private _messageText;
     private _type;
     constructor(editor: OnesEditor);
     show(message: string, type: BarType): void;
@@ -16,5 +15,4 @@ export default class ErrorInfoBar {
     destroy(): void;
     private findParent;
     private autoAdjustParent;
-    private getErrorMessage;
 }

package/dist/error-handler/index.d.ts

@@ -1,7 +1,8 @@
-import { OnesEditor } from '../../@ones-editor/core';
+import { ErrorHandler, OnesEditor, UploadResourceErrorDialogOptions } from '../../@ones-editor/core';
 import { AuthMessage } from '../../@ones-editor/sharedb-doc';
+import { AlertDialog } from '../../@ones-editor/ui-base';
 import ErrorInfoBar from './error-info-bar';
-export default class DefaultErrorHandler {
+export default class DefaultErrorHandler implements ErrorHandler {
     private _editor;
     private _errorInfoBar;
     private _dirtyFlag;
@@ -20,10 +21,13 @@ export default class DefaultErrorHandler {
     onConnectionError: (error: Error) => void;
     onDisconnected: (reason: string) => void;
     onUploadResourceError: (error: Error) => void;
+    onUploadResourceSuccess: () => void;
     onReady: () => void;
     setEditor(editor: OnesEditor): void;
     private handleError;
     private autoHide;
     get bar(): ErrorInfoBar;
+    showUploadResourceErrorDialog(options?: UploadResourceErrorDialogOptions): AlertDialog | null;
+    private hasPopup;
     destroy(): void;
 }

package/dist/index.js

@@ -39136,7 +39136,7 @@ ${codeText}
       return ret;
     }
     async uploadResource(file2, options) {
-      var _a, _b, _c, _d;
+      var _a, _b, _c, _d, _e, _f;
       try {
         if ((_a = this.options) == null ? void 0 : _a.uploadResource) {
           try {
@@ -39147,11 +39147,12 @@ ${codeText}
         }
         const ret = await this.client.uploadResource(file2, (_b = options == null ? void 0 : options.onProgress) != null ? _b : () => {
         });
+        (_d = (_c = this.options) == null ? void 0 : _c.onUploadResourceSuccess) == null ? void 0 : _d.call(_c);
         return {
           resourceId: ret
         };
       } catch (err) {
-        (_d = (_c = this.options) == null ? void 0 : _c.onUploadResourceError) == null ? void 0 : _d.call(_c, err);
+        (_f = (_e = this.options) == null ? void 0 : _e.onUploadResourceError) == null ? void 0 : _f.call(_e, err);
         throw err;
       }
     }
@@ -40083,7 +40084,7 @@ ${codeText}
   const AlignCenterIcon = '<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">\n<path d="M2 1.5H14" stroke="currentColor" stroke-linejoin="round"/>\n<path d="M2 9.5H8.5H14" stroke="currentColor" stroke-linejoin="round"/>\n<path d="M4 5.5H12" stroke="currentColor" stroke-linejoin="round"/>\n<path d="M4 13.5H12" stroke="currentColor" stroke-linejoin="round"/>\n</svg>  \n';
   const ImageIcon = '<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">\n<g clip-path="url(#clip0_1214_10264)">\n<path d="M2 14L9.5 7L15 12" stroke="currentColor"/>\n<path d="M5 6C5 6.27614 4.77614 6.5 4.5 6.5C4.22386 6.5 4 6.27614 4 6C4 5.72386 4.22386 5.5 4.5 5.5C4.77614 5.5 5 5.72386 5 6Z" fill="#606060" stroke="currentColor"/>\n<path d="M1 13V3C1 2.44772 1.44772 2 2 2H14C14.5523 2 15 2.44772 15 3V13C15 13.5523 14.5523 14 14 14H2C1.44772 14 1 13.5523 1 13Z" stroke="currentColor"/>\n</g>\n<defs>\n<clipPath id="clip0_1214_10264">\n<rect width="16" height="16" fill="white"/>\n</clipPath>\n</defs>\n</svg>';
   const ImageMenuIcon = '<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">\n<path d="M2 14L9.5 7L15 12" stroke="currentColor"/>\n<path d="M5 6C5 6.27614 4.77614 6.5 4.5 6.5C4.22386 6.5 4 6.27614 4 6C4 5.72386 4.22386 5.5 4.5 5.5C4.77614 5.5 5 5.72386 5 6Z" fill="currentColor" stroke="currentColor"/>\n<path d="M1 13V3C1 2.44772 1.44772 2 2 2H14C14.5523 2 15 2.44772 15 3V13C15 13.5523 14.5523 14 14 14H2C1.44772 14 1 13.5523 1 13Z" stroke="currentColor"/>\n</svg>\n';
-  const WarningIcon = '<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">\n<path fill-rule="evenodd" clip-rule="evenodd" d="M8 1.49902C4.41023 1.49902 1.5 4.40925 1.5 7.99902C1.5 11.5888 4.41023 14.499 8 14.499C11.5898 14.499 14.5 11.5888 14.5 7.99902C14.5 4.40925 11.5898 1.49902 8 1.49902ZM0.5 7.99902C0.5 3.85696 3.85794 0.499023 8 0.499023C12.1421 0.499023 15.5 3.85696 15.5 7.99902C15.5 12.1411 12.1421 15.499 8 15.499C3.85794 15.499 0.5 12.1411 0.5 7.99902ZM8.5 6.99902V11.999H7.5V6.99902H8.5ZM8.5 5.99902V3.99902H7.5V5.99902H8.5Z" fill="currentColor"/>\n</svg>\n';
+  const WarningIcon = '<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">\n<path fill-rule="evenodd" clip-rule="evenodd" d="M12 4.98464L3.24099 20H20.7589L17.8862 15.0753L12 4.98464ZM11.0066 2.71825C11.4504 1.95752 12.5495 1.95753 12.9933 2.71825L19.6137 14.0676L23.2321 20.2706C23.6794 21.0372 23.1263 22 22.2388 22H1.76111C0.873539 22 0.320549 21.0372 0.767761 20.2706L11.0066 2.71825ZM13 9.00001V15H11V9.00001H13ZM13 19.5V16.5H11V19.5H13Z" fill="currentColor"/>\n</svg>\n';
   const PasteSpecialIcon = '<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">\n<path d="M7.5 6.5C7.5 5.94772 7.94772 5.5 8.5 5.5H13.5C14.0523 5.5 14.5 5.94772 14.5 6.5V11.2273V13.5C14.5 14.0523 14.0523 14.5 13.5 14.5H8.5C7.94772 14.5 7.5 14.0523 7.5 13.5V6.5Z" stroke="currentColor"/>\n<path d="M11.5 6V3C11.5 2.44772 11.0523 2 10.5 2H8.5M4.27778 2L2.5 2C1.94772 2 1.5 2.44772 1.5 3V11.5C1.5 12.0523 1.94772 12.5 2.5 12.5H7.05556" stroke="currentColor"/>\n<rect x="4.5" y="1" width="4" height="2" stroke="currentColor"/>\n</svg>\n';
   const ImageErrorIcon = '<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">\n<path d="M6 42L28.5 21L33.32 25.3818" stroke="currentColor" stroke-width="3"/>\n<path d="M15 18C15 18.8284 14.3284 19.5 13.5 19.5C12.6716 19.5 12 18.8284 12 18C12 17.1716 12.6716 16.5 13.5 16.5C14.3284 16.5 15 17.1716 15 18Z" fill="currentColor" stroke="currentColor" stroke-width="3"/>\n<path d="M45 27V9C45 7.34315 43.6569 6 42 6H6C4.34315 6 3 7.34315 3 9V39C3 40.6569 4.34315 42 6 42H27" stroke="currentColor" stroke-width="3"/>\n<path d="M44.916 44.915L33.0007 32.9997" stroke="currentColor" stroke-width="3"/>\n<path d="M33 44.915L44.9153 32.9997" stroke="currentColor" stroke-width="3"/>\n</svg>\n';
   const ImageEmptyIcon = '<svg width="48" height="48" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">\n<path d="M6 42L28.5 21L45 36" stroke="currentColor" stroke-width="6"/>\n<path d="M15 18C15 18.8284 14.3284 19.5 13.5 19.5C12.6716 19.5 12 18.8284 12 18C12 17.1716 12.6716 16.5 13.5 16.5C14.3284 16.5 15 17.1716 15 18Z" fill="currentColor" stroke="currentColor" stroke-width="6"/>\n<path d="M3 39V9C3 7.34315 4.34315 6 6 6H42C43.6569 6 45 7.34315 45 9V39C45 40.6569 43.6569 42 42 42H6C4.34315 42 3 40.6569 3 39Z" stroke="currentColor" stroke-width="6"/>\n</svg>\n';
@@ -85460,6 +85461,7 @@ ${docStr}
   const SAVE_DELAY_TIME = 30 * 1e3;
   const DRAWIO_EMPTY_CLASS = "editor-empty-drawio";
   const SHOW_FULL_SCREEN_IFRAME = "show-full-screen-iframe";
+  const ERROR_DIALOG_ID = "draw-io-error-alert";
   const logger$f = getLogger("embed-block-drawio");
   let currentAlertDialog = null;
   let isDirty = false;
@@ -85520,8 +85522,7 @@ ${docStr}
       drawioContainer.setAttribute("data-placeholder", i18n$1.t("drawio.loading"));
       const clientId = editor.clientId;
       const popupClass = ["editor-popup-info-container", `editor-popup-info-container-${clientId}`];
-      const errorInfoContainer = createElement("div", popupClass, drawioContainer);
-      errorInfoContainer.setAttribute("data-custom-error-message", i18n$1.t("drawio.error.network"));
+      createElement("div", popupClass, drawioContainer);
       drawioIframe = createElement("iframe", ["drawio-iframe-element"], drawioContainer);
       drawioIframe.setAttribute("frameborder", "0");
       addClass(drawioContainer, SHOW_FULL_SCREEN_IFRAME);
@@ -85580,11 +85581,6 @@ ${docStr}
     constructor() {
       __publicField(this, "loadingContainer");
       __publicField(this, "setLoading", (iframe, placeholder2 = i18n$1.t("drawio.save")) => {
-        const parent = iframe.parentElement;
-        if (parent) {
-          addClass(parent, "loading");
-          parent.setAttribute("data-placeholder", placeholder2);
-        }
       });
       __publicField(this, "removeLoading", () => {
         const containers = document.querySelectorAll(".editor-drawio-iframe-container");
@@ -85654,28 +85650,27 @@ ${docStr}
             } catch (error2) {
               isDirty = true;
               const drawioIframeWindow = iframe.contentWindow;
-              if (!currentAlertDialog) {
-                currentAlertDialog = AlertDialog.showAlert({
-                  id: "draw-io-error-alert",
-                  title: i18n$1.t("drawio.error.networkDisconnected"),
-                  content: i18n$1.t("drawio.error.networkDisconnectedMessage"),
-                  buttons: ["cancel", "ok"],
-                  okButtonTitle: i18n$1.t("drawio.retry"),
-                  onOk: () => {
-                    setTimeout(() => {
-                      drawioIframeWindow.postMessage(JSON.stringify({
-                        action: "export",
-                        format: "xmlsvg",
-                        spin: i18n$1.t("drawio.save"),
-                        autoSave: exportFlag
-                      }), "*");
-                    }, 1e3);
-                  },
-                  onClose: () => {
-                    currentAlertDialog = null;
-                  },
-                  type: "warning"
-                });
+              if (!currentAlertDialog && exportFlag !== "auto") {
+                const errorHandler = editor.findCustom("error-handler");
+                if (errorHandler) {
+                  currentAlertDialog = errorHandler.showUploadResourceErrorDialog({
+                    id: ERROR_DIALOG_ID,
+                    allowRetry: true,
+                    onOk: () => {
+                      setTimeout(() => {
+                        drawioIframeWindow.postMessage(JSON.stringify({
+                          action: "export",
+                          format: "xmlsvg",
+                          spin: i18n$1.t("drawio.save"),
+                          autoSave: exportFlag
+                        }), "*");
+                      }, 1e3);
+                    },
+                    onClose: () => {
+                      currentAlertDialog = null;
+                    }
+                  });
+                }
               }
             }
             loadingHandler.removeLoading();
@@ -85684,7 +85679,7 @@ ${docStr}
           case "exit":
             if (isDirty) {
               AlertDialog.showAlert({
-                id: "draw-io-error-alert",
+                id: ERROR_DIALOG_ID,
                 title: i18n$1.t("drawio.error.exitConfirm"),
                 content: i18n$1.t("drawio.error.exitMessage"),
                 okButtonTitle: i18n$1.t("drawio.exit"),
@@ -85973,9 +85968,6 @@ ${docStr}
       save: "Saving",
       exit: "\u9000\u51FA",
       error: {
-        network: "\u7F51\u7EDC\u8FDE\u63A5\u5DF2\u65AD\u5F00\uFF0C\u6B63\u5728\u5C1D\u8BD5\u91CD\u8FDE...",
-        networkDisconnected: "\u7F51\u7EDC\u8FDE\u63A5\u5DF2\u65AD\u5F00",
-        networkDisconnectedMessage: "\u7F51\u7EDC\u8FDE\u63A5\u5DF2\u65AD\u5F00\uFF0C\u6B63\u5728\u5C1D\u8BD5\u91CD\u8FDE\u3002\u8BF7\u5728\u8FDE\u63A5\u6210\u529F\u540E\u5C1D\u8BD5\u4FDD\u5B58\u3002",
         exitConfirm: "\u9000\u51FA\u7F16\u8F91",
         exitMessage: "\u9000\u51FA\u7F16\u8F91\u540E\uFF0C\u6240\u6709\u66F4\u6539\u65E0\u6CD5\u4FDD\u5B58\u3002\u662F\u5426\u786E\u5B9A\u9000\u51FA\uFF1F"
       }
@@ -85993,9 +85985,6 @@ ${docStr}
       save: "\u4FDD\u5B58\u4E2D",
       exit: "\u9000\u51FA",
       error: {
-        network: "\u7F51\u7EDC\u8FDE\u63A5\u5DF2\u65AD\u5F00\uFF0C\u6B63\u5728\u5C1D\u8BD5\u91CD\u8FDE...",
-        networkDisconnected: "\u7F51\u7EDC\u8FDE\u63A5\u5DF2\u65AD\u5F00",
-        networkDisconnectedMessage: "\u7F51\u7EDC\u8FDE\u63A5\u5DF2\u65AD\u5F00\uFF0C\u6B63\u5728\u5C1D\u8BD5\u91CD\u8FDE\u3002\u8BF7\u5728\u8FDE\u63A5\u6210\u529F\u540E\u5C1D\u8BD5\u4FDD\u5B58\u3002",
         exitConfirm: "\u9000\u51FA\u7F16\u8F91",
         exitMessage: "\u9000\u51FA\u7F16\u8F91\u540E\uFF0C\u6240\u6709\u66F4\u6539\u65E0\u6CD5\u4FDD\u5B58\u3002\u662F\u5426\u786E\u5B9A\u9000\u51FA\uFF1F"
       }
@@ -86013,9 +86002,6 @@ ${docStr}
       save: "\u4FDD\u5B58\u4E2D",
       exit: "\u9000\u51FA",
       error: {
-        network: "\u7F51\u7EDC\u8FDE\u63A5\u5DF2\u65AD\u5F00\uFF0C\u6B63\u5728\u5C1D\u8BD5\u91CD\u8FDE...",
-        networkDisconnected: "\u7F51\u7EDC\u8FDE\u63A5\u5DF2\u65AD\u5F00",
-        networkDisconnectedMessage: "\u7F51\u7EDC\u8FDE\u63A5\u5DF2\u65AD\u5F00\uFF0C\u6B63\u5728\u5C1D\u8BD5\u91CD\u8FDE\u3002\u8BF7\u5728\u8FDE\u63A5\u6210\u529F\u540E\u5C1D\u8BD5\u4FDD\u5B58\u3002",
         exitConfirm: "\u9000\u51FA\u7F16\u8F91",
         exitMessage: "\u9000\u51FA\u7F16\u8F91\u540E\uFF0C\u6240\u6709\u66F4\u6539\u65E0\u6CD5\u4FDD\u5B58\u3002\u662F\u5426\u786E\u5B9A\u9000\u51FA\uFF1F"
       }
@@ -88116,7 +88102,13 @@ ${data2.flowchartText}
       limitedEnvTips: "\u7531\u4E8E\u6D4F\u89C8\u5668\u9650\u5236\uFF0C\u8BF7\u4F7F\u7528 {shortCut} \u7C98\u8D34"
     },
     error: {
-      network: "\u7F51\u7EDC\u8FDE\u63A5\u5DF2\u65AD\u5F00\uFF0C\u6B63\u5728\u5C1D\u8BD5\u91CD\u8FDE\u3002\u4E3A\u907F\u514D\u5185\u5BB9\u65E0\u6CD5\u540C\u6B65\uFF0C\u5DF2\u6682\u65F6\u7981\u7528\u7F16\u8F91\u3002\u8BF7\u5728\u7F51\u7EDC\u91CD\u8FDE\u6210\u529F\u540E\u7EE7\u7EED\u3002"
+      retry: "\u91CD\u8BD5",
+      network: "\u7F51\u7EDC\u8FDE\u63A5\u5DF2\u65AD\u5F00\uFF0C\u6B63\u5728\u5C1D\u8BD5\u91CD\u8FDE\u3002\u4E3A\u907F\u514D\u5185\u5BB9\u65E0\u6CD5\u540C\u6B65\uFF0C\u5DF2\u6682\u65F6\u7981\u7528\u7F16\u8F91\u3002\u8BF7\u5728\u7F51\u7EDC\u91CD\u8FDE\u6210\u529F\u540E\u7EE7\u7EED\u3002",
+      networkPopup: "\u670D\u52A1\u8FDE\u63A5\u5F02\u5E38\uFF0C\u6B63\u5728\u5C1D\u8BD5\u91CD\u8FDE...",
+      uploadResourceError: "\u6570\u636E\u4FDD\u5B58\u5F02\u5E38",
+      uploadResourceErrorMessage: "\u8D44\u6E90\u4FDD\u5B58\u5931\u8D25\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5\u3002",
+      uploadResourcePopup: "\u8D44\u6E90\u4E0A\u4F20\u5F02\u5E38\uFF0C\u65E0\u6CD5\u4FDD\u5B58\u6570\u636E\u3002\u8BF7\u590D\u5236\u8FD8\u672A\u4FDD\u5B58\u7684\u4FEE\u6539\uFF0C\u5237\u65B0\u9875\u9762\u540E\u91CD\u8BD5\u3002",
+      uploadResourceNoPopup: "\u6587\u4EF6\u8D44\u6E90\u4E0A\u4F20\u5F02\u5E38\uFF0C\u4E3A\u907F\u514D\u6570\u636E\u4E22\u5931\uFF0C\u5DF2\u6682\u65F6\u7981\u7528\u7F16\u8F91\u3002\u8BF7\u590D\u5236\u8FD8\u672A\u4FDD\u5B58\u7684\u4FEE\u6539\uFF0C\u5237\u65B0\u9875\u9762\u540E\u91CD\u8BD5\u3002"
     }
   };
   const enUS$1 = {
@@ -88139,7 +88131,13 @@ ${data2.flowchartText}
       limitedEnvTips: "Press {shortCut} to paste due to browser restrictions"
     },
     error: {
-      network: "\u7F51\u7EDC\u8FDE\u63A5\u5DF2\u65AD\u5F00\uFF0C\u6B63\u5728\u5C1D\u8BD5\u91CD\u8FDE\u3002\u4E3A\u907F\u514D\u5185\u5BB9\u65E0\u6CD5\u540C\u6B65\uFF0C\u5DF2\u6682\u65F6\u7981\u7528\u7F16\u8F91\u3002\u8BF7\u5728\u7F51\u7EDC\u91CD\u8FDE\u6210\u529F\u540E\u7EE7\u7EED\u3002"
+      retry: "Try again",
+      network: "\u7F51\u7EDC\u8FDE\u63A5\u5DF2\u65AD\u5F00\uFF0C\u6B63\u5728\u5C1D\u8BD5\u91CD\u8FDE\u3002\u4E3A\u907F\u514D\u5185\u5BB9\u65E0\u6CD5\u540C\u6B65\uFF0C\u5DF2\u6682\u65F6\u7981\u7528\u7F16\u8F91\u3002\u8BF7\u5728\u7F51\u7EDC\u91CD\u8FDE\u6210\u529F\u540E\u7EE7\u7EED\u3002",
+      networkPopup: "\u670D\u52A1\u8FDE\u63A5\u5F02\u5E38\uFF0C\u6B63\u5728\u5C1D\u8BD5\u91CD\u8FDE...",
+      uploadResourceError: "\u6570\u636E\u4FDD\u5B58\u5F02\u5E38",
+      uploadResourceErrorMessage: "\u8D44\u6E90\u4FDD\u5B58\u5931\u8D25\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5\u3002",
+      uploadResourcePopup: "\u8D44\u6E90\u4E0A\u4F20\u5F02\u5E38\uFF0C\u65E0\u6CD5\u4FDD\u5B58\u6570\u636E\u3002\u8BF7\u590D\u5236\u8FD8\u672A\u4FDD\u5B58\u7684\u4FEE\u6539\uFF0C\u5237\u65B0\u9875\u9762\u540E\u91CD\u8BD5\u3002",
+      uploadResourceNoPopup: "\u6587\u4EF6\u8D44\u6E90\u4E0A\u4F20\u5F02\u5E38\uFF0C\u4E3A\u907F\u514D\u6570\u636E\u4E22\u5931\uFF0C\u5DF2\u6682\u65F6\u7981\u7528\u7F16\u8F91\u3002\u8BF7\u590D\u5236\u8FD8\u672A\u4FDD\u5B58\u7684\u4FEE\u6539\uFF0C\u5237\u65B0\u9875\u9762\u540E\u91CD\u8BD5\u3002"
     }
   };
   const jaJP$1 = {
@@ -88162,7 +88160,13 @@ ${data2.flowchartText}
       limitedEnvTips: "\u30D6\u30E9\u30A6\u30B6\u30FC\u306E\u5236\u9650\u306B\u3088\u308A\u3001\u300C{shortCut}\u300D\u3092\u4F7F\u7528\u3057\u3066\u8CBC\u308A\u4ED8\u3051\u3066\u304F\u3060\u3055\u3044"
     },
     error: {
-      network: "\u7F51\u7EDC\u8FDE\u63A5\u5DF2\u65AD\u5F00\uFF0C\u6B63\u5728\u5C1D\u8BD5\u91CD\u8FDE\u3002\u4E3A\u907F\u514D\u5185\u5BB9\u65E0\u6CD5\u540C\u6B65\uFF0C\u5DF2\u6682\u65F6\u7981\u7528\u7F16\u8F91\u3002\u8BF7\u5728\u7F51\u7EDC\u91CD\u8FDE\u6210\u529F\u540E\u7EE7\u7EED\u3002"
+      retry: "\u518D\u8A66\u884C",
+      network: "\u7F51\u7EDC\u8FDE\u63A5\u5DF2\u65AD\u5F00\uFF0C\u6B63\u5728\u5C1D\u8BD5\u91CD\u8FDE\u3002\u4E3A\u907F\u514D\u5185\u5BB9\u65E0\u6CD5\u540C\u6B65\uFF0C\u5DF2\u6682\u65F6\u7981\u7528\u7F16\u8F91\u3002\u8BF7\u5728\u7F51\u7EDC\u91CD\u8FDE\u6210\u529F\u540E\u7EE7\u7EED\u3002",
+      networkPopup: "\u670D\u52A1\u8FDE\u63A5\u5F02\u5E38\uFF0C\u6B63\u5728\u5C1D\u8BD5\u91CD\u8FDE...",
+      uploadResourceError: "\u6570\u636E\u4FDD\u5B58\u5F02\u5E38",
+      uploadResourceErrorMessage: "\u8D44\u6E90\u4FDD\u5B58\u5931\u8D25\uFF0C\u8BF7\u7A0D\u540E\u91CD\u8BD5\u3002",
+      uploadResourcePopup: "\u8D44\u6E90\u4E0A\u4F20\u5F02\u5E38\uFF0C\u65E0\u6CD5\u4FDD\u5B58\u6570\u636E\u3002\u8BF7\u590D\u5236\u8FD8\u672A\u4FDD\u5B58\u7684\u4FEE\u6539\uFF0C\u5237\u65B0\u9875\u9762\u540E\u91CD\u8BD5\u3002",
+      uploadResourceNoPopup: "\u6587\u4EF6\u8D44\u6E90\u4E0A\u4F20\u5F02\u5E38\uFF0C\u4E3A\u907F\u514D\u6570\u636E\u4E22\u5931\uFF0C\u5DF2\u6682\u65F6\u7981\u7528\u7F16\u8F91\u3002\u8BF7\u590D\u5236\u8FD8\u672A\u4FDD\u5B58\u7684\u4FEE\u6539\uFF0C\u5237\u65B0\u9875\u9762\u540E\u91CD\u8BD5\u3002"
     }
   };
   i18n$1.mergeLang({
@@ -88210,7 +88214,6 @@ ${data2.flowchartText}
       __publicField(this, "message");
       __publicField(this, "_hideTimer", null);
       __publicField(this, "_adjustParentInterval", null);
-      __publicField(this, "_messageText", "");
       __publicField(this, "_type", "error");
       this.editor = editor;
       const root2 = createElement("div", ["error-info-bar"], null);
@@ -88220,15 +88223,14 @@ ${data2.flowchartText}
       this.message = message;
     }
     show(message, type) {
-      this._messageText = message;
       this._type = type;
       const parent = this.findParent();
       if (this.root.parentElement !== parent) {
         parent.insertAdjacentElement("afterbegin", this.root);
       }
-      this.message.innerText = this.getErrorMessage(parent);
+      this.message.innerText = message;
       removeClass(this.root, "hidden");
-      this.root.setAttribute("data-type", type);
+      this.root.setAttribute("data-type", this._type);
       if (this._hideTimer) {
         clearTimeout(this._hideTimer);
         this._hideTimer = null;
@@ -88294,13 +88296,6 @@ ${data2.flowchartText}
         currentParent.insertAdjacentElement("afterbegin", this.root);
       }, 1e3);
     }
-    getErrorMessage(parent) {
-      const customErrorMessage = parent.getAttribute("data-custom-error-message");
-      if (customErrorMessage && this._type === "error") {
-        return customErrorMessage;
-      }
-      return this._messageText;
-    }
   }
   const logger$6 = getLogger("error-handler");
   class DefaultErrorHandler {
@@ -88363,7 +88358,17 @@ ${data2.flowchartText}
       __publicField(this, "onUploadResourceError", (error2) => {
         assert(logger$6, this._editor, "no editor");
         logger$6.error(`Upload resource error${JSON.stringify(error2)}`);
-        this.handleError(error2);
+        if (!this._connectionFlag) {
+          if (this.hasPopup()) {
+            this.handleError(error2, i18n$1.t("error.uploadResourcePopup"));
+          } else {
+            this.handleError(error2, i18n$1.t("error.uploadResourceNoPopup"));
+          }
+        }
+      });
+      __publicField(this, "onUploadResourceSuccess", () => {
+        assert(logger$6, this._editor, "no editor");
+        this.autoHide();
       });
       __publicField(this, "onReady", () => {
         var _a;
@@ -88382,15 +88387,21 @@ ${data2.flowchartText}
     setEditor(editor) {
       this._editor = editor;
     }
-    handleError(error2) {
+    handleError(error2, customMessage) {
       if (this._editor) {
         this._editor.readonly = true;
       }
-      this.bar.show(this._errorMessage, "error");
+      const defaultMessage = this.hasPopup() ? i18n$1.t("error.networkPopup") : i18n$1.t("error.network");
+      const errorMessage = customMessage || defaultMessage;
+      this.bar.show(errorMessage, "error");
     }
     autoHide() {
+      var _a;
       if (!this._dirtyFlag && !this._connectionFlag) {
         this.bar.hide();
+        if ((_a = this._editor) == null ? void 0 : _a.readonly) {
+          this._editor.readonly = false;
+        }
       }
     }
     get bar() {
@@ -88400,6 +88411,26 @@ ${data2.flowchartText}
       }
       return this._errorInfoBar;
     }
+    showUploadResourceErrorDialog(options) {
+      const buttons = (options == null ? void 0 : options.allowRetry) ? ["cancel", "ok"] : ["ok"];
+      return AlertDialog.showAlert({
+        id: (options == null ? void 0 : options.id) || "error-handler-upload-resource-alert",
+        title: i18n$1.t("error.uploadResourceError"),
+        content: i18n$1.t("error.uploadResourceErrorMessage"),
+        buttons,
+        okButtonTitle: i18n$1.t("error.retry"),
+        onOk: (dialog) => {
+          options == null ? void 0 : options.onOk(dialog);
+        },
+        onClose: () => {
+          options == null ? void 0 : options.onClose();
+        },
+        type: "warning"
+      });
+    }
+    hasPopup() {
+      return !!document.querySelector(".editor-popup-info-container");
+    }
     destroy() {
       var _a;
       (_a = this._errorInfoBar) == null ? void 0 : _a.destroy();
@@ -90602,6 +90633,7 @@ ${data2.flowchartText}
       onDisconnected: options.onDisconnected || errorHandler.onDisconnected,
       onUnknownError: options.onUnknownError || errorHandler.onUnknownError,
       onUploadResourceError: options.onUploadResourceError || errorHandler.onUploadResourceError,
+      onUploadResourceSuccess: options.onUploadResourceSuccess || errorHandler.onUploadResourceSuccess,
       onReady: options.onReady || errorHandler.onReady
     };
     const doc2 = await ShareDBDoc.load(docOptions);
@@ -90733,7 +90765,7 @@ ${data2.flowchartText}
         }
       }
     });
-    editor.version = "2.3.0-beta.11";
+    editor.version = "2.3.0-beta.13";
     return editor;
   }
   function isDoc(doc2) {
@@ -90840,7 +90872,7 @@ ${data2.flowchartText}
       }
     });
     OnesEditorToolbar.register(editor);
-    editor.version = "2.3.0-beta.11";
+    editor.version = "2.3.0-beta.13";
     return editor;
   }
   async function showDocVersions(editor, options, serverUrl) {

package/dist/lang/en-us.d.ts

@@ -18,7 +18,13 @@ declare const _default: {
         limitedEnvTips: string;
     };
     error: {
+        retry: string;
         network: string;
+        networkPopup: string;
+        uploadResourceError: string;
+        uploadResourceErrorMessage: string;
+        uploadResourcePopup: string;
+        uploadResourceNoPopup: string;
     };
 };
 export default _default;

package/dist/lang/ja-jp.d.ts

@@ -18,7 +18,13 @@ declare const _default: {
         limitedEnvTips: string;
     };
     error: {
+        retry: string;
         network: string;
+        networkPopup: string;
+        uploadResourceError: string;
+        uploadResourceErrorMessage: string;
+        uploadResourcePopup: string;
+        uploadResourceNoPopup: string;
     };
 };
 export default _default;

package/dist/lang/zh-cn.d.ts

@@ -18,7 +18,13 @@ declare const _default: {
         limitedEnvTips: string;
     };
     error: {
+        retry: string;
         network: string;
+        networkPopup: string;
+        uploadResourceError: string;
+        uploadResourceErrorMessage: string;
+        uploadResourcePopup: string;
+        uploadResourceNoPopup: string;
     };
 };
 export default _default;

package/dist/types.d.ts

@@ -104,6 +104,7 @@ export interface CreateOnesEditorOptions {
     onDisconnected?: (reason: string) => void;
     onUnknownError?: (error: Error) => void;
     onUploadResourceError?: (error: Error) => void;
+    onUploadResourceSuccess?: () => void;
     onReady?: () => void;
 }
 export interface CreateLocalEditorOptions {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ones-editor/editor",
-  "version": "2.3.0-beta.11",
+  "version": "2.3.0-beta.13",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "dependencies": {