@seafile/sdoc-editor 0.1.159-beta10 → 0.1.159-beta12

package/dist/api/seafile-api.js

@@ -84,13 +84,17 @@ var SeafileAPI = /*#__PURE__*/function () {
     key: "publishRevision",
     value: function publishRevision(docUuid) {
       var url = '/api/v2.1/seadoc/publish-revision/' + docUuid + '/';
-      return this._sendPostRequest(url);
+      return this.req.post(url);
     }
   }, {
     key: "updateSdocRevision",
-    value: function updateSdocRevision(docUuid) {
+    value: function updateSdocRevision(docUuid, docName) {
+      var docContent = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
       var url = 'api/v2.1/seadoc/revision/' + docUuid + '/';
-      return this.req.put(url);
+      var formData = new FormData();
+      var newFile = new File([JSON.stringify(docContent)], docName);
+      formData.append('file', newFile);
+      return this.req.put(url, formData);
     }
   }, {
     key: "getRevisionBasicVersionContent",

package/dist/basic-sdk/editor/index.js

@@ -93,15 +93,12 @@ var Editor = forwardRef(function (_ref, ref) {
           children: slateValue
         }));
       },
-      saveDocument: function saveDocument(callback) {
-        return editor.saveDocument(callback);
-      },
       // send message
       publishDocument: function publishDocument(originDocUuid, originDocName, callback) {
         editor.publishDocument(originDocUuid, originDocName, callback);
       },
-      replaceDocument: function replaceDocument(value, originFileVersion) {
-        editor.replaceDocument(value, originFileVersion);
+      replaceDocument: function replaceDocument(value, callback) {
+        editor.replaceDocument(value, callback);
       }
 
       // eslint-disable-next-line react-hooks/exhaustive-deps

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

@@ -150,13 +150,6 @@ var SocketClient = /*#__PURE__*/_createClass(function SocketClient(config) {
     var socketManager = SocketManager.getInstance();
     socketManager.receiveDocumentReplacedError();
   };
-  this.sendSaveDocument = function (callback) {
-    _this.socket.emit('save-document', _this.getParams({
-      document: document
-    }), function (saveFlag) {
-      callback && callback(saveFlag);
-    });
-  };
   this.receiveRemoveDocument = function () {
     var socketManager = SocketManager.getInstance();
     socketManager.receiveRemoveDocument();

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

@@ -42,10 +42,14 @@ var SocketManager = /*#__PURE__*/_createClass(function SocketManager(editor, _do
   this.receiveRemoveDocumentError = function () {
     _this.eventBus.dispatch(EXTERNAL_EVENT.REMOVE_DOCUMENT_ERROR);
   };
-  this.sendReplaceDocument = function (document) {
+  this.sendReplaceDocument = function (document, callback) {
     _this.socketClient.sendReplaceDocument(document, function (result) {
-      var serverVersion = result.version;
-      _this.document['version'] = serverVersion;
+      var serverVersion = result.version,
+        success = result.success;
+      if (success) {
+        _this.document['version'] = serverVersion;
+      }
+      callback && callback(success);
     });
   };
   this.receiveDocumentReplaced = function () {
@@ -54,9 +58,6 @@ var SocketManager = /*#__PURE__*/_createClass(function SocketManager(editor, _do
   this.receiveDocumentReplacedError = function () {
     _this.eventBus.dispatch(EXTERNAL_EVENT.DOCUMENT_REPLACED_ERROR);
   };
-  this.sendSaveDocument = function (callback) {
-    _this.socketClient.sendSaveDocument(callback);
-  };
   this.onReceiveLocalOperations = function (operations) {
     _this.pendingOperationList.push(operations);
     if (_this.pendingOperationList.length > 5) {

package/dist/basic-sdk/socket/with-socket-io.js

@@ -59,15 +59,10 @@ var withSocketIO = function withSocketIO(editor, options) {
     var socketManager = SocketManager.getInstance(newEditor, document, config);
     socketManager.sendPublishDocument(originDocUuid, originDocName, callback);
   };
-  newEditor.replaceDocument = function (document) {
+  newEditor.replaceDocument = function (document, callback) {
     var config = options.config;
     var socketManager = SocketManager.getInstance(newEditor, document, config);
-    socketManager.sendReplaceDocument(document);
-  };
-  newEditor.saveDocument = function (callback) {
-    var config = options.config;
-    var socketManager = SocketManager.getInstance(newEditor, document, config);
-    socketManager.sendSaveDocument(callback);
+    socketManager.sendReplaceDocument(document, callback);
   };
   return newEditor;
 };

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

@@ -4,6 +4,7 @@ import { Modal, ModalHeader, ModalBody, ModalFooter, Button } from 'reactstrap';
 import classnames from 'classnames';
 import { TIP_TYPE, TIP_TITLE } from '../../constants';
 import TipContent from './tip-content';
+var NOT_CLOSE_DIALOG_TIP_TYPE = [TIP_TYPE.HAS_BEEN_REPLACED, TIP_TYPE.HAS_BEEN_PUBLISHED];
 var TipDialog = function TipDialog(_ref) {
   var className = _ref.className,
     tipType = _ref.tipType,
@@ -12,7 +13,8 @@ var TipDialog = function TipDialog(_ref) {
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
   var closeDialog = useCallback(function () {
-    toggle && toggle(false);
+    if (NOT_CLOSE_DIALOG_TIP_TYPE.includes(tipType)) return;
+    toggle && toggle();
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [tipType]);
@@ -30,12 +32,12 @@ var TipDialog = function TipDialog(_ref) {
     className: classnames('sdoc-tip-dialog', className),
     contentClassName: "sdoc-tip-modal"
   }, /*#__PURE__*/React.createElement(ModalHeader, {
-    toggle: [TIP_TYPE.HAS_BEEN_REPLACED, TIP_TYPE.HAS_BEEN_PUBLISHED].includes(tipType) ? undefined : closeDialog
+    toggle: NOT_CLOSE_DIALOG_TIP_TYPE.includes(tipType) ? undefined : closeDialog
   }, t(TIP_TITLE[tipType])), /*#__PURE__*/React.createElement(ModalBody, {
     className: "sdoc-tip-body"
   }, /*#__PURE__*/React.createElement(TipContent, {
     tipType: tipType
-  })), ![TIP_TYPE.HAS_BEEN_REPLACED, TIP_TYPE.HAS_BEEN_PUBLISHED].includes(tipType) && /*#__PURE__*/React.createElement(ModalFooter, null, /*#__PURE__*/React.createElement(Button, {
+  })), !NOT_CLOSE_DIALOG_TIP_TYPE.includes(tipType) && /*#__PURE__*/React.createElement(ModalFooter, null, /*#__PURE__*/React.createElement(Button, {
     color: "secondary",
     className: "mr-2",
     onClick: closeDialog

package/dist/context.js

@@ -193,9 +193,10 @@ var Context = /*#__PURE__*/function () {
     }
   }, {
     key: "updateSdocRevision",
-    value: function updateSdocRevision() {
+    value: function updateSdocRevision(sdocContent) {
       var docUuid = this.getSetting('docUuid');
-      return this.api.updateSdocRevision(docUuid);
+      var docName = this.getSetting('docName');
+      return this.api.updateSdocRevision(docUuid, docName, sdocContent);
     }
   }, {
     key: "deleteSdocRevision",

package/dist/pages/simple-editor.js

@@ -84,11 +84,12 @@ var SimpleEditor = function SimpleEditor(_ref) {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
   var onDocumentReplaced = useCallback(function () {
+    if (showTip) return;
     setTipType(TIP_TYPE.HAS_BEEN_REPLACED);
     setShowTip(true);
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [editorRef]);
+  }, [editorRef, showTip]);
   var hasPublishRevision = useCallback(function () {
     if (showTip) return;
     setTipType(TIP_TYPE.HAS_BEEN_PUBLISHED);
@@ -270,12 +271,20 @@ var SimpleEditor = function SimpleEditor(_ref) {
       return;
     }
     if (tipType === TIP_TYPE.MERGE) {
-      context.updateSdocRevision().then(function (res) {
+      var _context$getUserInfo = context.getUserInfo(),
+        username = _context$getUserInfo.username;
+      var doc = {
+        children: mergeValue.children,
+        version: mergeValue.version,
+        format_version: document.format_version,
+        docName: document.docName,
+        last_modify_user: username
+      };
+      context.updateSdocRevision(doc).then(function (res) {
         var origin_file_version = res.data.origin_file_version;
         context.updateSettings({
           'originFileVersion': origin_file_version
         });
-        editorRef.current.replaceDocument(mergeValue);
         editorRef.current.setLoading(true);
         editorRef.current.setSlateValue(mergeValue);
         setMode(MODE.EDITOR);
@@ -290,7 +299,7 @@ var SimpleEditor = function SimpleEditor(_ref) {
     setShowTip(false);
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [tipType, mergeValue, editorRef.current]);
+  }, [tipType, mergeValue, editorRef.current, document]);
   if (isLoadingSdoc) {
     return /*#__PURE__*/React.createElement(Loading, null);
   }

package/package.json

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