@seafile/sdoc-editor 0.1.109 → 0.1.111

package/dist/basic-sdk/socket/socket-manager.js

@@ -10,6 +10,9 @@ var SocketManager = /*#__PURE__*/_createClass(function SocketManager(editor, doc
   _classCallCheck(this, SocketManager);
   this.addOperations = function (operations) {
     _this.pendingOperationList.push(operations);
+    if (_this.pendingOperationList.length > 5) {
+      _this.dispatchConnectState('pending_operations_exceed_limit');
+    }
     _this.sendOperations();
   };
   this.getDocumentVersion = function () {
@@ -36,7 +39,8 @@ var SocketManager = /*#__PURE__*/_createClass(function SocketManager(editor, doc
     if (result && result.success) {
       var serverVersion = result.version;
       _this.document['version'] = serverVersion;
-      _this.dispatchConnectState('saved');
+      var lastSavedAt = new Date().getTime();
+      _this.dispatchConnectState('saved', lastSavedAt);
       _this.sendNextOperations();
       return;
     }
@@ -48,6 +52,9 @@ var SocketManager = /*#__PURE__*/_createClass(function SocketManager(editor, doc
       // Put the failed operation into the pending list and re-execute it
       _this.pendingOperationList.unshift(operations);
       _this.sendNextOperations();
+    } else if (error_type === 'document_content_load_failed') {
+      // After a short-term reconnection, the content of the document fails to load
+      _this.dispatchConnectState(error_type);
     } else if (error_type === 'operation_exec_error') {
       _this.editor.isRemote = true;
       revertOperationList(_this.editor, [operations]);

package/dist/components/tip-message/index.js

@@ -4,6 +4,7 @@ import _inherits from "@babel/runtime/helpers/esm/inherits";
 import _createSuper from "@babel/runtime/helpers/esm/createSuper";
 import React from 'react';
 import { withTranslation } from 'react-i18next';
+import dayjs from 'dayjs';
 import { EventBus } from '../../basic-sdk';
 import toaster from '../toast';
 import './style.css';
@@ -22,6 +23,22 @@ var TipMessage = /*#__PURE__*/function (_React$Component) {
         duration: null
       });
     };
+    _this.onPendingOpExceedLimit = function () {
+      var t = _this.props.t;
+      toaster.closeAll();
+      var message = t('Pending_operations_exceed_limit');
+      toaster.warning(message, {
+        duration: 5
+      });
+    };
+    _this.onDocumentLoadError = function () {
+      var t = _this.props.t;
+      var message = t('Document_content_load_failed');
+      toaster.danger(message, {
+        hasCloseButton: true,
+        duration: null
+      });
+    };
     _this.onDisconnect = function () {
       var _this$props = _this.props,
         t = _this$props.t,
@@ -58,11 +75,12 @@ var TipMessage = /*#__PURE__*/function (_React$Component) {
         isSaved: false
       });
     };
-    _this.onDocumentSaved = function () {
+    _this.onDocumentSaved = function (lastSavedAt) {
       if (_this.saveTimer) clearTimeout(_this.saveTimer);
       if (_this.resetTimer) clearTimeout(_this.resetTimer);
       _this.saveTimer = setTimeout(function () {
         _this.setState({
+          lastSavedAt: lastSavedAt,
           isSaving: false,
           isSaved: true
         });
@@ -78,7 +96,8 @@ var TipMessage = /*#__PURE__*/function (_React$Component) {
       var t = _this.props.t;
       var _this$state = _this.state,
         isSaved = _this$state.isSaved,
-        isSaving = _this$state.isSaving;
+        isSaving = _this$state.isSaving,
+        lastSavedAt = _this$state.lastSavedAt;
       if (isSaving && !isSaved) {
         return /*#__PURE__*/React.createElement("span", {
           className: "tip-message"
@@ -89,11 +108,17 @@ var TipMessage = /*#__PURE__*/function (_React$Component) {
           className: "tip-message"
         }, t('All_changes_saved'));
       }
+      if (lastSavedAt) {
+        return /*#__PURE__*/React.createElement("span", {
+          className: "tip-message"
+        }, /*#__PURE__*/React.createElement("span", null, t('Recently_saved'), ' '), /*#__PURE__*/React.createElement("span", null, dayjs(lastSavedAt).format('HH:mm')));
+      }
       return null;
     };
     _this.state = {
       isSaved: false,
-      isSaving: false
+      isSaving: false,
+      lastSavedAt: ''
     };
     _this.saveTimer = null;
     return _this;
@@ -111,12 +136,15 @@ var TipMessage = /*#__PURE__*/function (_React$Component) {
 
       // op execute error
       this.unsubscribeOpExecError = eventBus.subscribe('operation_exec_error', this.onOperationExecuteError);
+      this.unsubscribePendingOpExceedLimit = eventBus.subscribe('pending_operations_exceed_limit', this.onPendingOpExceedLimit);
+      this.unsubscribeDocumentLoadError = eventBus.subscribe('document_content_load_failed', this.onDocumentLoadError);
     }
   }, {
     key: "componentWillUnmount",
     value: function componentWillUnmount() {
       this.unsubscribeSavingEvent();
       this.unsubscribeSavedEvent();
+      this.unsubscribeDocumentLoadError();
       clearTimeout(this.saveTimer);
     }
   }]);

package/dist/components/toast/toastManager.js

@@ -17,7 +17,7 @@ var wrapperClass = css({
   left: 0,
   right: 0,
   position: 'fixed',
-  zIndex: 30
+  zIndex: 120
 });
 var hasCustomId = function hasCustomId(settings) {
   return Object.hasOwnProperty.call(settings, 'id');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@seafile/sdoc-editor",
-  "version": "0.1.109",
+  "version": "0.1.111",
   "private": false,
   "description": "This is a sdoc editor",
   "main": "dist/index.js",

package/public/locales/en/sdoc-editor.json

@@ -339,5 +339,8 @@
   "Reduce_font_size": "Reduce font size",
   "Font": "Font",
   "All_fonts": "All fonts",
-  "Default_font": "Default font"
+  "Default_font": "Default font",
+  "Document_content_load_failed": "Document content failed to load, please refresh the page to try again",
+  "Pending_operations_exceed_limit": "There are multiple operations not synced to the server. Please check your network.",
+  "Recently_saved": "Recently saved"
 }

package/public/locales/zh-CN/sdoc-editor.json

@@ -341,5 +341,8 @@
   "Reduce_font_size": "减小字号",
   "Font": "字体",
   "All_fonts": "所有字体",
-  "Default_font": "默认字体"
+  "Default_font": "默认字体",
+  "Document_content_load_failed": "文档内容加载失败, 请刷新页面重新访问",
+  "Pending_operations_exceed_limit": "有多个操作未同步到服务器。请检查你的网络。",
+  "Recently_saved": "最近保存"
 }