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

package/dist/api/seafile-api.js

@@ -88,9 +88,13 @@ var SeafileAPI = /*#__PURE__*/function () {
     }
   }, {
     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

@@ -97,8 +97,8 @@ var Editor = forwardRef(function (_ref, ref) {
       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-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 () {

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

@@ -59,10 +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);
+    socketManager.sendReplaceDocument(document, callback);
   };
   return newEditor;
 };

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.159beta11",
+  "version": "0.1.159beta12",
   "private": false,
   "description": "This is a sdoc editor",
   "main": "dist/index.js",