@seafile/sdoc-editor 0.1.154-beta → 0.1.154-beta2

package/dist/api/sdoc-server-api.js

@@ -58,16 +58,6 @@ var SDocServerApi = /*#__PURE__*/function () {
         }
       });
     }
-
-    // saveDocContentByRebase(content) {
-    //   const { server, docUuid, accessToken } = this;
-    //   const url = `${server}/api/v1/docs/${docUuid}/rebase/`;
-
-    //   const formData = new FormData();
-    //   formData.append('doc_content', JSON.stringify(content));
-
-    //   return axios.post(url, formData, {headers: {Authorization: `Token ${accessToken}`}});
-    // }
   }, {
     key: "getCollaborators",
     value: function getCollaborators() {

package/dist/api/seafile-api.js

@@ -3,7 +3,12 @@ import _createClass from "@babel/runtime/helpers/esm/createClass";
 import axios from 'axios';
 var SeafileAPI = /*#__PURE__*/function () {
   function SeafileAPI(server, token) {
+    var _this = this;
     _classCallCheck(this, SeafileAPI);
+    this.deleteSdocRevision = function (docUuid) {
+      var url = 'api/v2.1/seadoc/revision/' + docUuid + '/';
+      return _this.req.delete(url);
+    };
     this.req = axios.create({
       baseURL: server,
       headers: {
@@ -57,9 +62,9 @@ var SeafileAPI = /*#__PURE__*/function () {
       return this._sendPostRequest(url, form);
     }
   }, {
-    key: "getSeadocOriginFileDownloadLink",
-    value: function getSeadocOriginFileDownloadLink(docUuid) {
-      var url = '/api/v2.1/seadoc/origin-file-download-link/' + docUuid + '/';
+    key: "getSeadocOriginFileContentDownloadLink",
+    value: function getSeadocOriginFileContentDownloadLink(docUuid) {
+      var url = '/api/v2.1/seadoc/revision/origin-file-download-link/' + docUuid + '/';
       return this.req.get(url);
     }
   }, {
@@ -82,16 +87,16 @@ var SeafileAPI = /*#__PURE__*/function () {
       return this.req.put(url);
     }
   }, {
-    key: "getFileHistoryVersion",
-    value: function getFileHistoryVersion(docUuid, fileVersion, docPath) {
-      var url = 'api/v2.1/seadoc/history-content/' + docUuid + '/?p=' + encodeURIComponent(docPath) + '&file_version=' + fileVersion;
+    key: "getRevisionBasicVersionContent",
+    value: function getRevisionBasicVersionContent(docUuid) {
+      var url = 'api/v2.1/seadoc/revision/basic-version-content/' + docUuid + '/';
       return this.req.get(url);
     }
-
-    // local files
   }, {
     key: "getSdocFiles",
-    value: function getSdocFiles(docUuid, p, type) {
+    value:
+    // local files
+    function getSdocFiles(docUuid, p, type) {
       var url = 'api/v2.1/seadoc/dir/' + docUuid + '/?p=' + p + '&type=' + type + '&doc_uuid=' + docUuid;
       return this.req.get(url);
     }

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

@@ -94,8 +94,8 @@ var Editor = forwardRef(function (_ref, ref) {
         }));
       },
       // send message
-      publishDocument: function publishDocument(originDocUuid, originDocName, isNeedUpdateOriginDoc, callback) {
-        editor.publishDocument(originDocUuid, originDocName, isNeedUpdateOriginDoc, callback);
+      publishDocument: function publishDocument(originDocUuid, originDocName, callback) {
+        editor.publishDocument(originDocUuid, originDocName, callback);
       },
       replaceDocument: function replaceDocument(value, originFileVersion) {
         editor.replaceDocument(value, originFileVersion);

package/dist/basic-sdk/extension/render/render-element.js

@@ -10,7 +10,7 @@ import { BLOCKQUOTE, LINK, CHECK_LIST_ITEM, HEADER1, HEADER2, HEADER3, HEADER4,
 import { BlockquotePlugin, LinkPlugin, CheckListPlugin, HeaderPlugin, ListPlugin, CodeBlockPlugin, ImagePlugin, TablePlugin, SdocLinkPlugin, ParagraphPlugin, FileLinkPlugin } from '../plugins';
 import EventBus from '../../utils/event-bus';
 import { INTERNAL_EVENT, REBASE_TYPE, REBASE_MARKS, REBASE_MARK_KEY, REBASE_ORIGIN } from '../../constants';
-import { findPath, getNode, replaceNode, generateEmptyElement, deleteNodeMark } from '../../extension/core';
+import { findPath, getNode, replaceNode, deleteNodeMark } from '../../extension/core';
 var CustomElement = function CustomElement(props) {
   var editor = useSlateStatic();
   var element = props.element,
@@ -199,32 +199,6 @@ var RenderElement = function RenderElement(props) {
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [editor]);
-
-  // const addDeletedElement = useCallback((element) => {
-  //   const path = findPath(editor, element);
-  //   deleteNodeMark(editor, path, element, REBASE_MARKS);
-
-  //   if (element.type !== ELEMENT_TYPE.LIST_ITEM) {
-  //     const emptyNode = generateEmptyElement(ELEMENT_TYPE.PARAGRAPH);
-  //     Transforms.insertNodes(editor, emptyNode, { at: [ path[0] ] });
-  //   } else {
-  //     const emptyNode = generateEmptyElement(ELEMENT_TYPE.LIST_ITEM);
-  //     emptyNode.children[0] = generateEmptyElement(ELEMENT_TYPE.LIST_LIC);
-  //     const parentPath = path.slice(0, -1);
-  //     const parentNode = getNode(editor, parentPath);
-  //     const newChildren = [ ...parentNode.children ];
-  //     const index = path[path.length - 1];
-  //     newChildren.splice(index, 0, emptyNode);
-  //     replaceNode(editor, { at: parentPath, nodes: { ...parentNode, children: newChildren} });
-  //   }
-
-  //   if (element.type === ELEMENT_TYPE.LIST_ITEM) {
-  //     updateParentNodeByPath(path);
-  //   }
-
-  // // eslint-disable-next-line react-hooks/exhaustive-deps
-  // }, [ editor]);
-
   var useMasterChanges = useCallback(function (element) {
     var path = findPath(editor, element);
     deleteNodeMark(editor, path, element[REBASE_MARK_KEY.OLD_ELEMENT], REBASE_MARKS);

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

@@ -119,11 +119,10 @@ var SocketClient = /*#__PURE__*/_createClass(function SocketClient(config) {
   this.disconnectWithServer = function () {
     _this.socket.disconnect();
   };
-  this.sendPublishDocument = function (originDocUuid, originDocName, isNeedUpdateOriginDoc, callback) {
+  this.sendPublishDocument = function (originDocUuid, originDocName, callback) {
     _this.socket.emit('publish-document', _this.getParams({
       origin_doc_uuid: originDocUuid,
-      origin_doc_name: originDocName,
-      update_origin_doc: isNeedUpdateOriginDoc
+      origin_doc_name: originDocName
     }), function (success) {
       callback && callback(success);
     });
@@ -158,6 +157,14 @@ var SocketClient = /*#__PURE__*/_createClass(function SocketClient(config) {
       callback && callback(saveFlag);
     });
   };
+  this.receiveRemoveDocument = function () {
+    var socketManager = SocketManager.getInstance();
+    socketManager.receiveRemoveDocument();
+  };
+  this.receiveRemoveDocumentError = function () {
+    var socketManager = SocketManager.getInstance();
+    socketManager.receiveRemoveDocumentError();
+  };
   this.config = config;
   this.isReconnect = false;
   this.socket = io(config.sdocServer, {
@@ -173,11 +180,17 @@ var SocketClient = /*#__PURE__*/_createClass(function SocketClient(config) {
   this.socket.on('leave-room', this.onLeaveRoom);
   this.socket.on('update-document', this.onReceiveRemoteOperations);
 
-  // doc-replaced
+  // doc replaced
   this.socket.on('doc-replaced', this.receiveDocumentReplaced);
   this.socket.on('doc-replaced-error', this.receiveDocumentReplacedError);
-  this.socket.on('publish-document', this.receivePublishDocument);
-  this.socket.on('publish-document-error', this.receivePublishDocumentError);
+
+  // doc published
+  this.socket.on('doc-published', this.receivePublishDocument);
+  this.socket.on('doc-published-error', this.receivePublishDocumentError);
+
+  // doc removed
+  this.socket.on('doc-removed', this.receiveRemoveDocument);
+  this.socket.on('doc-removed-error', this.receiveRemoveDocumentError);
   this.socket.on('update-cursor', this.receiveCursorLocation);
   this.socket.io.on('reconnect', this.onReconnect);
   this.socket.io.on('reconnect_attempt', this.onReconnectAttempt);

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

@@ -27,8 +27,8 @@ var SocketManager = /*#__PURE__*/_createClass(function SocketManager(editor, _do
     var version = _this.document.version;
     return version;
   };
-  this.sendPublishDocument = function (originDocUuid, originDocName, isNeedUpdateOriginDoc, callback) {
-    _this.socketClient.sendPublishDocument(originDocUuid, originDocName, isNeedUpdateOriginDoc, callback);
+  this.sendPublishDocument = function (originDocUuid, originDocName, callback) {
+    _this.socketClient.sendPublishDocument(originDocUuid, originDocName, callback);
   };
   this.receivePublishDocument = function () {
     _this.eventBus.dispatch(EXTERNAL_EVENT.PUBLISH_DOCUMENT);
@@ -36,6 +36,12 @@ var SocketManager = /*#__PURE__*/_createClass(function SocketManager(editor, _do
   this.receivePublishDocumentError = function () {
     _this.eventBus.dispatch(EXTERNAL_EVENT.PUBLISH_DOCUMENT_ERROR);
   };
+  this.receiveRemoveDocument = function () {
+    _this.eventBus.dispatch(EXTERNAL_EVENT.REMOVE_DOCUMENT);
+  };
+  this.receiveRemoveDocumentError = function () {
+    _this.eventBus.dispatch(EXTERNAL_EVENT.REMOVE_DOCUMENT_ERROR);
+  };
   this.sendReplaceDocument = function (document) {
     _this.socketClient.sendReplaceDocument(document, function (result) {
       var serverVersion = result.version;

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

@@ -54,10 +54,10 @@ var withSocketIO = function withSocketIO(editor, options) {
     var socketManager = SocketManager.getInstance(newEditor, document, config);
     socketManager.sendRebaseContent(document, originFileVersion);
   };
-  newEditor.publishDocument = function (originDocUuid, originDocName, isNeedUpdateOriginDoc, callback) {
+  newEditor.publishDocument = function (originDocUuid, originDocName, callback) {
     var config = options.config;
     var socketManager = SocketManager.getInstance(newEditor, document, config);
-    socketManager.sendPublishDocument(originDocUuid, originDocName, isNeedUpdateOriginDoc, callback);
+    socketManager.sendPublishDocument(originDocUuid, originDocName, callback);
   };
   newEditor.replaceDocument = function (document) {
     var config = options.config;

package/dist/basic-sdk/utils/rebase.js

@@ -59,134 +59,99 @@ var getChanges = function getChanges(masterContent, revisionContent) {
   });
   return content;
 };
-var getMergeElement = function getMergeElement(diffElement, baseElement) {
+var getMergeElement = function getMergeElement(diffElement, basicElement) {
   var modifyType = diffElement[REBASE_MARK_KEY.MODIFY_TYPE];
+  var newElement = _objectSpread({}, diffElement);
+  newElement[REBASE_MARK_KEY.MODIFY_TYPE] && delete newElement[REBASE_MARK_KEY.MODIFY_TYPE];
 
-  // revision 没有该元素，master 有该元素
+  // revision does not have this element, master has this element
   if (modifyType === MODIFY_TYPE.DELETE) {
-    // baseContent没有该元素，说明是 master 新增的，需要保留，不计入冲突
-    if (!baseElement) {
-      var _newElement = _objectSpread({}, diffElement);
-      _newElement[REBASE_MARK_KEY.MODIFY_TYPE] && delete _newElement[REBASE_MARK_KEY.MODIFY_TYPE];
-      return [_newElement];
-    }
+    // basic content does not have this element, indicating that it is newly added by master and needs to be retained, and will not be counted as a conflict.
+    if (!basicElement) return [newElement];
 
-    // baseContent有该元素, master 对其进行了修改，说明 revision 将其删除了, 用户手动选择冲突
-    if (!ObjectUtils.isSameObject(baseElement, diffElement, [REBASE_MARK_KEY.MODIFY_TYPE])) {
-      var _newElement2 = _objectSpread({}, diffElement);
-      _newElement2[REBASE_MARK_KEY.MODIFY_TYPE] && delete _newElement2[REBASE_MARK_KEY.MODIFY_TYPE];
-      _newElement2[REBASE_MARK_KEY.REBASE_TYPE] = REBASE_TYPE.MODIFY_DELETE;
-      return [_newElement2];
+    // basic content has this element, master modified it, indicating that revision deleted it, and the user manually selected the conflict
+    if (!ObjectUtils.isSameObject(basicElement, diffElement, [REBASE_MARK_KEY.MODIFY_TYPE])) {
+      newElement[REBASE_MARK_KEY.REBASE_TYPE] = REBASE_TYPE.MODIFY_DELETE;
+      return [newElement];
     }
 
-    // baseContent有该元素，master 没有对其进行了修改, 说明 revision 将其删除了，程序删除，不计入冲突
+    // basic content has this element, but master has not modified it. It means that revision has deleted it and the program has deleted it. The conflict will not be counted.
     return [];
   }
 
-  // revision 有该元素，master 没有该元素
+  // revision has this element, master does not have this element
   if (modifyType === MODIFY_TYPE.ADD) {
-    // baseContent没有该元素，说明是 revision 新增的，需要保留，不计入冲突
-    if (!baseElement) {
-      var _newElement3 = _objectSpread({}, diffElement);
-      _newElement3[REBASE_MARK_KEY.MODIFY_TYPE] && delete _newElement3[REBASE_MARK_KEY.MODIFY_TYPE];
-      return [_newElement3];
-    }
+    // basic content does not have this element, indicating that it is newly added by revision and needs to be retained, and will not be counted as a conflict.
+    if (!basicElement) return [newElement];
 
-    // master 将其删除了， revision 对其进行了修改, 用户手动选择冲突
-    if (!ObjectUtils.isSameObject(baseElement, diffElement, [REBASE_MARK_KEY.MODIFY_TYPE])) {
-      var _newElement4 = _objectSpread({}, diffElement);
-      _newElement4[REBASE_MARK_KEY.MODIFY_TYPE] && delete _newElement4[REBASE_MARK_KEY.MODIFY_TYPE];
-      _newElement4[REBASE_MARK_KEY.REBASE_TYPE] = REBASE_TYPE.DELETE_MODIFY;
-      return [_newElement4];
+    // master deleted it, revision modified it, and the user manually selected the conflict
+    if (!ObjectUtils.isSameObject(basicElement, diffElement, [REBASE_MARK_KEY.MODIFY_TYPE])) {
+      newElement[REBASE_MARK_KEY.REBASE_TYPE] = REBASE_TYPE.DELETE_MODIFY;
+      return [newElement];
     }
 
-    // master 将其删除了， revision 没有对其进行了修改, 程序删除，不计入冲突
+    // master deleted it, revision did not modify it, the program deleted it, and the conflict is not counted.
     return [];
   }
 
-  // revision 和 master 有差异的元素
+  // Elements that differ between revision and master
   if (modifyType === MODIFY_TYPE.MODIFY) {
     var _objectSpread7, _objectSpread8;
-    var revisionElement = _objectSpread({}, diffElement);
     var masterElement = _objectSpread({}, diffElement[REBASE_MARK_KEY.OLD_ELEMENT]);
-    delete revisionElement[REBASE_MARK_KEY.MODIFY_TYPE];
-    delete revisionElement[REBASE_MARK_KEY.OLD_ELEMENT];
+    delete newElement[REBASE_MARK_KEY.OLD_ELEMENT];
 
-    // revision 和 master 同时新增了一个元素，但且内容不一样。 ===》 目前这种情况不存在，仅存在理论阶段
-    if (!baseElement) {
+    // revision and master both add a new element, but the content is different. ===》 At present, this situation does not exist, it only exists in the theoretical stage.
+    if (!basicElement) {
       var _objectSpread5, _objectSpread6;
-      return [_objectSpread(_objectSpread({}, replaceNodeId(masterElement)), {}, (_objectSpread5 = {}, _defineProperty(_objectSpread5, REBASE_MARK_KEY.REBASE_TYPE, REBASE_TYPE.MODIFY_MODIFY), _defineProperty(_objectSpread5, REBASE_MARK_KEY.OLD_ELEMENT, masterElement), _defineProperty(_objectSpread5, REBASE_MARK_KEY.ORIGIN, REBASE_ORIGIN.OTHER), _objectSpread5)), _objectSpread(_objectSpread({}, revisionElement), {}, (_objectSpread6 = {}, _defineProperty(_objectSpread6, REBASE_MARK_KEY.REBASE_TYPE, REBASE_TYPE.MODIFY_MODIFY), _defineProperty(_objectSpread6, REBASE_MARK_KEY.ORIGIN, REBASE_ORIGIN.MY), _objectSpread6))];
+      return [_objectSpread(_objectSpread({}, replaceNodeId(masterElement)), {}, (_objectSpread5 = {}, _defineProperty(_objectSpread5, REBASE_MARK_KEY.REBASE_TYPE, REBASE_TYPE.MODIFY_MODIFY), _defineProperty(_objectSpread5, REBASE_MARK_KEY.OLD_ELEMENT, masterElement), _defineProperty(_objectSpread5, REBASE_MARK_KEY.ORIGIN, REBASE_ORIGIN.OTHER), _objectSpread5)), _objectSpread(_objectSpread({}, newElement), {}, (_objectSpread6 = {}, _defineProperty(_objectSpread6, REBASE_MARK_KEY.REBASE_TYPE, REBASE_TYPE.MODIFY_MODIFY), _defineProperty(_objectSpread6, REBASE_MARK_KEY.ORIGIN, REBASE_ORIGIN.MY), _objectSpread6))];
     }
 
-    // master 和 base 一样，说明 revision 对内容进行了修改
-    if (ObjectUtils.isSameObject(masterElement, baseElement)) {
-      return [revisionElement];
-    }
+    // master is the same as base, indicating that revision has modified the content
+    if (ObjectUtils.isSameObject(masterElement, basicElement)) return [newElement];
 
-    // revision 和 base 一样，说明 master 对内容进行了修改
-    if (ObjectUtils.isSameObject(revisionElement, baseElement)) {
-      return [masterElement];
-    }
+    // revision is the same as base, indicating that master has modified the content
+    if (ObjectUtils.isSameObject(newElement, basicElement)) return [masterElement];
 
-    // 都不一样，revision 和 master 同时修改了，有冲突，需要手动解决冲突
-    return [_objectSpread(_objectSpread({}, replaceNodeId(masterElement)), {}, (_objectSpread7 = {}, _defineProperty(_objectSpread7, REBASE_MARK_KEY.REBASE_TYPE, REBASE_TYPE.MODIFY_MODIFY), _defineProperty(_objectSpread7, REBASE_MARK_KEY.OLD_ELEMENT, masterElement), _defineProperty(_objectSpread7, REBASE_MARK_KEY.ORIGIN, REBASE_ORIGIN.OTHER), _objectSpread7)), _objectSpread(_objectSpread({}, revisionElement), {}, (_objectSpread8 = {}, _defineProperty(_objectSpread8, REBASE_MARK_KEY.REBASE_TYPE, REBASE_TYPE.MODIFY_MODIFY), _defineProperty(_objectSpread8, REBASE_MARK_KEY.ORIGIN, REBASE_ORIGIN.MY), _objectSpread8))];
+    // They are all different. Revision and master were modified at the same time. If there is a conflict, the conflict needs to be resolved manually.
+    return [_objectSpread(_objectSpread({}, replaceNodeId(masterElement)), {}, (_objectSpread7 = {}, _defineProperty(_objectSpread7, REBASE_MARK_KEY.REBASE_TYPE, REBASE_TYPE.MODIFY_MODIFY), _defineProperty(_objectSpread7, REBASE_MARK_KEY.OLD_ELEMENT, masterElement), _defineProperty(_objectSpread7, REBASE_MARK_KEY.ORIGIN, REBASE_ORIGIN.OTHER), _objectSpread7)), _objectSpread(_objectSpread({}, newElement), {}, (_objectSpread8 = {}, _defineProperty(_objectSpread8, REBASE_MARK_KEY.REBASE_TYPE, REBASE_TYPE.MODIFY_MODIFY), _defineProperty(_objectSpread8, REBASE_MARK_KEY.ORIGIN, REBASE_ORIGIN.MY), _objectSpread8))];
   }
   if (modifyType === MODIFY_TYPE.CHILDREN_MODIFY) {
-    var _revisionElement = _objectSpread({}, diffElement);
     var _masterElement = _objectSpread({}, diffElement[REBASE_MARK_KEY.OLD_ELEMENT]);
-    delete _revisionElement[REBASE_MARK_KEY.MODIFY_TYPE];
-    delete _revisionElement[REBASE_MARK_KEY.OLD_ELEMENT];
+    delete newElement[REBASE_MARK_KEY.OLD_ELEMENT];
 
-    // revision 和 master 同时新增了一个元素，但且内容不一样。 ===》 目前这种情况不存在，仅存在理论阶段
-    if (!baseElement) {
+    // revision and master both add a new element, but the content is different. ===》 At present, this situation does not exist, it only exists in the theoretical stage.
+    if (!basicElement) {
       var _objectSpread9, _objectSpread10;
-      return [_objectSpread(_objectSpread({}, replaceNodeId(_masterElement)), {}, (_objectSpread9 = {}, _defineProperty(_objectSpread9, REBASE_MARK_KEY.REBASE_TYPE, REBASE_TYPE.MODIFY_MODIFY), _defineProperty(_objectSpread9, REBASE_MARK_KEY.OLD_ELEMENT, _masterElement), _defineProperty(_objectSpread9, REBASE_MARK_KEY.ORIGIN, REBASE_ORIGIN.OTHER), _objectSpread9)), _objectSpread(_objectSpread({}, _revisionElement), {}, (_objectSpread10 = {}, _defineProperty(_objectSpread10, REBASE_MARK_KEY.REBASE_TYPE, REBASE_TYPE.MODIFY_MODIFY), _defineProperty(_objectSpread10, REBASE_MARK_KEY.ORIGIN, REBASE_ORIGIN.MY), _objectSpread10))];
+      return [_objectSpread(_objectSpread({}, replaceNodeId(_masterElement)), {}, (_objectSpread9 = {}, _defineProperty(_objectSpread9, REBASE_MARK_KEY.REBASE_TYPE, REBASE_TYPE.MODIFY_MODIFY), _defineProperty(_objectSpread9, REBASE_MARK_KEY.OLD_ELEMENT, _masterElement), _defineProperty(_objectSpread9, REBASE_MARK_KEY.ORIGIN, REBASE_ORIGIN.OTHER), _objectSpread9)), _objectSpread(_objectSpread({}, newElement), {}, (_objectSpread10 = {}, _defineProperty(_objectSpread10, REBASE_MARK_KEY.REBASE_TYPE, REBASE_TYPE.MODIFY_MODIFY), _defineProperty(_objectSpread10, REBASE_MARK_KEY.ORIGIN, REBASE_ORIGIN.MY), _objectSpread10))];
     }
-
-    // master 和 base 一样，说明 revision 对内容进行了修改
-    if (ObjectUtils.isSameObject(_masterElement, baseElement)) {
-      return [_revisionElement];
+    if (ObjectUtils.isSameObject(_masterElement, basicElement)) return [newElement];
+    if (ObjectUtils.isSameObject(newElement, basicElement)) return [_masterElement];
+    if (ObjectUtils.isSameObject(_masterElement, newElement, ['type'])) {
+      if (ObjectUtils.isSameObject(_masterElement, basicElement, ['type'])) return [newElement];
+      if (ObjectUtils.isSameObject(newElement, basicElement, ['type'])) return [_masterElement];
     }
 
-    // revision 和 base 一样，说明 master 对内容进行了修改
-    if (ObjectUtils.isSameObject(_revisionElement, baseElement)) {
-      return [_masterElement];
-    }
-    if (ObjectUtils.isSameObject(_masterElement, _revisionElement, ['type'])) {
-      // master 和 base 一样，说明 revision 对内容进行了修改
-      if (ObjectUtils.isSameObject(_masterElement, baseElement, ['type'])) {
-        return [_revisionElement];
-      }
-
-      // revision 和 base 一样，说明 master 对内容进行了修改
-      if (ObjectUtils.isSameObject(_revisionElement, baseElement, ['type'])) {
-        return [_masterElement];
-      }
-    }
-
-    // 子节点内容更改了，需要 手动解决
-    var _getMergeContent = getMergeContent(baseElement, diffElement.children),
+    // The content of the subnode has changed and needs to be solved manually.
+    var _getMergeContent = getMergeContent(basicElement, diffElement.children),
       childrenContent = _getMergeContent.content;
-    return [_objectSpread(_objectSpread({}, _revisionElement), {}, _defineProperty({
+    return [_objectSpread(_objectSpread({}, newElement), {}, _defineProperty({
       children: childrenContent
     }, REBASE_MARK_KEY.REBASE_TYPE, REBASE_TYPE.CHILDREN_MODIFY))];
   }
-  var newElement = _objectSpread({}, diffElement);
-  newElement[REBASE_MARK_KEY.MODIFY_TYPE] && delete newElement[REBASE_MARK_KEY.MODIFY_TYPE];
   newElement[REBASE_MARK_KEY.OLD_ELEMENT] && delete newElement[REBASE_MARK_KEY.OLD_ELEMENT];
   return [newElement];
 };
-var getMergeContent = function getMergeContent(baseContent, diffChanges) {
+var getMergeContent = function getMergeContent(basicContent, diffChanges) {
   var _generateIdMapAndIds3 = generateIdMapAndIds(diffChanges),
     diffChangesContentMap = _generateIdMapAndIds3.map,
     diffChangesContentIds = _generateIdMapAndIds3.ids;
-  var _generateIdMapAndIds4 = generateIdMapAndIds(baseContent.children),
+  var _generateIdMapAndIds4 = generateIdMapAndIds(basicContent.children),
     baseContentMap = _generateIdMapAndIds4.map;
   var content = [];
   diffChangesContentIds.forEach(function (elementId) {
     var diffElement = diffChangesContentMap[elementId];
-    var baseElement = baseContentMap[elementId];
-    var mergeElements = getMergeElement(diffElement, baseElement);
+    var basicElement = baseContentMap[elementId];
+    var mergeElements = getMergeElement(diffElement, basicElement);
     content.push.apply(content, _toConsumableArray(mergeElements));
   });
   var canMerge = !hasConflict(content);
@@ -195,9 +160,9 @@ var getMergeContent = function getMergeContent(baseContent, diffChanges) {
     canMerge: canMerge
   };
 };
-export var getRebase = function getRebase(masterContent, baseContent, revisionContent) {
+export var getRebase = function getRebase(masterContent, basicContent, revisionContent) {
   // master no changes, merged directly
-  if (masterContent.version === baseContent.version) {
+  if (masterContent.version === basicContent.version) {
     return {
       canMerge: true,
       isNeedReplaceMaster: true,
@@ -206,7 +171,7 @@ export var getRebase = function getRebase(masterContent, baseContent, revisionCo
   }
 
   // The revision content has not changed
-  if (baseContent.version === revisionContent.version) {
+  if (basicContent.version === revisionContent.version) {
     return {
       canMerge: true,
       isNeedReplaceMaster: false,
@@ -214,7 +179,7 @@ export var getRebase = function getRebase(masterContent, baseContent, revisionCo
     };
   }
   var diffChanges = getChanges(masterContent, revisionContent);
-  var _getMergeContent2 = getMergeContent(baseContent, diffChanges),
+  var _getMergeContent2 = getMergeContent(basicContent, diffChanges),
     canMerge = _getMergeContent2.canMerge,
     content = _getMergeContent2.content;
   return {

package/dist/constants/index.js

@@ -8,7 +8,9 @@ export var EXTERNAL_EVENT = {
   PUBLISH_DOCUMENT: 'publish_document',
   PUBLISH_DOCUMENT_ERROR: 'publish_document_error',
   DOCUMENT_REPLACED: 'document_replaced',
-  DOCUMENT_REPLACED_ERROR: 'document_replaced_error'
+  DOCUMENT_REPLACED_ERROR: 'document_replaced_error',
+  REMOVE_DOCUMENT: 'remove_document',
+  REMOVE_DOCUMENT_ERROR: 'remove_document_error'
 };
 export var MODE = {
   DIFF_VIEWER: 'diff_viewer',
@@ -21,7 +23,8 @@ export var TIP_TYPE = {
   HAS_CONFLICT_BEFORE_PUBLISH: 'has_conflict_before_publish',
   HAS_BEEN_PUBLISHED: 'has_been_published',
   HAS_BEEN_REPLACED: 'has_been_merge',
-  HAS_CONFLICT_BEFORE_VIEW_CHANGES: 'has_conflict_before_view_changes'
+  HAS_CONFLICT_BEFORE_VIEW_CHANGES: 'has_conflict_before_view_changes',
+  HAS_BEEN_REMOVED: 'has_been_removed'
 };
-export var TIP_TITLE = (_TIP_TITLE = {}, _defineProperty(_TIP_TITLE, TIP_TYPE.DELETE_NO_CHANGES_REVISION, 'Tip'), _defineProperty(_TIP_TITLE, TIP_TYPE.MERGE, 'Tip'), _defineProperty(_TIP_TITLE, TIP_TYPE.HAS_CONFLICT_BEFORE_PUBLISH, 'Tip'), _defineProperty(_TIP_TITLE, TIP_TYPE.HAS_BEEN_PUBLISHED, 'Tip'), _defineProperty(_TIP_TITLE, TIP_TYPE.HAS_BEEN_REPLACED, 'Tip'), _defineProperty(_TIP_TITLE, TIP_TYPE.HAS_CONFLICT_BEFORE_VIEW_CHANGES, 'Tip'), _TIP_TITLE);
-export var TIP_CONTENT = (_TIP_CONTENT = {}, _defineProperty(_TIP_CONTENT, TIP_TYPE.DELETE_NO_CHANGES_REVISION, 'Rebase_delete_no_change_revision_tip'), _defineProperty(_TIP_CONTENT, TIP_TYPE.MERGE, 'Merge_tip'), _defineProperty(_TIP_CONTENT, TIP_TYPE.HAS_CONFLICT_BEFORE_PUBLISH, 'Has_conflict_before_publish_tip'), _defineProperty(_TIP_CONTENT, TIP_TYPE.HAS_BEEN_PUBLISHED, 'Has_been_published_tip'), _defineProperty(_TIP_CONTENT, TIP_TYPE.HAS_BEEN_REPLACED, 'Has_been_replaced_tip'), _defineProperty(_TIP_CONTENT, TIP_TYPE.HAS_CONFLICT_BEFORE_VIEW_CHANGES, 'Has_conflict_before_view_changes_tip'), _TIP_CONTENT);
+export var TIP_TITLE = (_TIP_TITLE = {}, _defineProperty(_TIP_TITLE, TIP_TYPE.DELETE_NO_CHANGES_REVISION, 'Tip'), _defineProperty(_TIP_TITLE, TIP_TYPE.MERGE, 'Tip'), _defineProperty(_TIP_TITLE, TIP_TYPE.HAS_CONFLICT_BEFORE_PUBLISH, 'Tip'), _defineProperty(_TIP_TITLE, TIP_TYPE.HAS_BEEN_PUBLISHED, 'Tip'), _defineProperty(_TIP_TITLE, TIP_TYPE.HAS_BEEN_REPLACED, 'Tip'), _defineProperty(_TIP_TITLE, TIP_TYPE.HAS_CONFLICT_BEFORE_VIEW_CHANGES, 'Tip'), _defineProperty(_TIP_TITLE, TIP_TYPE.HAS_BEEN_REMOVED, 'Tip'), _TIP_TITLE);
+export var TIP_CONTENT = (_TIP_CONTENT = {}, _defineProperty(_TIP_CONTENT, TIP_TYPE.DELETE_NO_CHANGES_REVISION, 'Rebase_delete_no_change_revision_tip'), _defineProperty(_TIP_CONTENT, TIP_TYPE.MERGE, 'Merge_tip'), _defineProperty(_TIP_CONTENT, TIP_TYPE.HAS_CONFLICT_BEFORE_PUBLISH, 'Has_conflict_before_publish_tip'), _defineProperty(_TIP_CONTENT, TIP_TYPE.HAS_BEEN_PUBLISHED, 'Has_been_published_tip'), _defineProperty(_TIP_CONTENT, TIP_TYPE.HAS_BEEN_REPLACED, 'Has_been_replaced_tip'), _defineProperty(_TIP_CONTENT, TIP_TYPE.HAS_CONFLICT_BEFORE_VIEW_CHANGES, 'Has_conflict_before_view_changes_tip'), _defineProperty(_TIP_CONTENT, TIP_TYPE.HAS_BEEN_REMOVED, 'Has_been_removed_tip'), _TIP_CONTENT);

package/dist/context.js

@@ -17,9 +17,6 @@ var Context = /*#__PURE__*/function () {
         _this.settings['originFileURL'] = originFileURL;
       }
     };
-    // saveDocContentByRebase(content) {
-    //   return this.sdocServerApi.saveDocContentByRebase(content);
-    // }
     this.uploadLocalImage = function (imageFile) {
       var docUuid = _this.getSetting('docUuid');
       return _this.api.uploadSdocImage(docUuid, imageFile).then(function (res) {
@@ -171,10 +168,10 @@ var Context = /*#__PURE__*/function () {
       return this.api.startRevise(repoID, fileUuid, filePath);
     }
   }, {
-    key: "getSeadocOriginFileDownloadLink",
-    value: function getSeadocOriginFileDownloadLink() {
+    key: "getSeadocOriginFileContentDownloadLink",
+    value: function getSeadocOriginFileContentDownloadLink() {
       var docUuid = this.getSetting('docUuid');
-      return this.api.getSeadocOriginFileDownloadLink(docUuid);
+      return this.api.getSeadocOriginFileContentDownloadLink(docUuid);
     }
   }, {
     key: "getSdocRevisionsCount",
@@ -195,10 +192,16 @@ var Context = /*#__PURE__*/function () {
       return this.api.updateSdocRevision(docUuid);
     }
   }, {
-    key: "getFileHistoryVersion",
-    value: function getFileHistoryVersion(fileVersion, filePath) {
+    key: "deleteSdocRevision",
+    value: function deleteSdocRevision() {
       var docUuid = this.getSetting('docUuid');
-      return this.api.getFileHistoryVersion(docUuid, fileVersion, filePath);
+      return this.api.deleteSdocRevision(docUuid);
+    }
+  }, {
+    key: "getRevisionBasicVersionContent",
+    value: function getRevisionBasicVersionContent() {
+      var docUuid = this.getSetting('docUuid');
+      return this.api.getRevisionBasicVersionContent(docUuid);
     }
 
     // local files

package/dist/pages/simple-editor.js

@@ -105,17 +105,25 @@ var SimpleEditor = function SimpleEditor(_ref) {
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
+  var onDocumentRemoved = useCallback(function () {
+    setTipType(TIP_TYPE.HAS_BEEN_REMOVED);
+    setShowTip(true);
+
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
   useEffect(function () {
     var eventBus = EventBus.getInstance();
     var unsubscribeMergeDocument = eventBus.subscribe(EXTERNAL_EVENT.DOCUMENT_REPLACED, onDocumentReplaced);
     var unsubscribePublishDocument = eventBus.subscribe(EXTERNAL_EVENT.PUBLISH_DOCUMENT, hasPublishRevision);
     var unsubscribeMergeDocumentError = eventBus.subscribe(EXTERNAL_EVENT.DOCUMENT_REPLACED_ERROR, onDocumentReplacedError);
     var unsubscribePublishDocumentError = eventBus.subscribe(EXTERNAL_EVENT.PUBLISH_DOCUMENT_ERROR, publishDocumentError);
+    var unsubscribeRemoveDocument = eventBus.subscribe(EXTERNAL_EVENT.REMOVE_DOCUMENT, onDocumentRemoved);
     return function () {
       unsubscribeMergeDocument();
       unsubscribePublishDocument();
       unsubscribeMergeDocumentError();
       unsubscribePublishDocumentError();
+      unsubscribeRemoveDocument();
     };
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -147,8 +155,8 @@ var SimpleEditor = function SimpleEditor(_ref) {
     });
   }, []);
   var setDiffContent = useCallback(function () {
-    context.getSeadocOriginFileDownloadLink().then(function (res) {
-      var originFileDownloadLink = res.data.origin_file_download_link;
+    context.getSeadocOriginFileContentDownloadLink().then(function (res) {
+      var originFileDownloadLink = res.data.download_link;
       return fetch(originFileDownloadLink);
     }).then(function (res) {
       return res.json();
@@ -197,29 +205,27 @@ var SimpleEditor = function SimpleEditor(_ref) {
               setShowTip(true);
               return;
             }
-            var originFileVersion = context.getSetting('originFileVersion'); // changing
-            var originFilePath = context.getSetting('originFilePath');
             var originDocName = context.getSetting('originFilename');
             var originDocUuid = context.getSetting('originDocUuid');
-            var baseContent;
+            var basicContent;
             var masterContent;
-            context.getFileHistoryVersion(originFileVersion, originFilePath).then(function (res) {
-              var fileHistoryRevisionContent = res.data.content; // commit content
-              baseContent = JSON.parse(fileHistoryRevisionContent);
-              return context.getSeadocOriginFileDownloadLink();
+            context.getRevisionBasicVersionContent().then(function (res) {
+              var basicVersionContentString = res.data.content; // commit content
+              basicContent = JSON.parse(basicVersionContentString);
+              return context.getSeadocOriginFileContentDownloadLink();
             }).then(function (res) {
-              var originFileDownloadLink = res.data.origin_file_download_link;
+              var originFileDownloadLink = res.data.download_link;
               return fetch(originFileDownloadLink);
             }).then(function (res) {
               return res.json();
             }).then(function (content) {
               masterContent = content;
-              var _getRebase = getRebase(masterContent, baseContent, revisionContent),
+              var _getRebase = getRebase(masterContent, basicContent, revisionContent),
                 canMerge = _getRebase.canMerge,
                 isNeedReplaceMaster = _getRebase.isNeedReplaceMaster,
                 value = _getRebase.value;
               if (canMerge && isNeedReplaceMaster) {
-                editorRef.current.publishDocument(originDocUuid, originDocName, true, function (success) {
+                editorRef.current.publishDocument(originDocUuid, originDocName, function (success) {
                   if (success) {
                     setTipType(TIP_TYPE.HAS_BEEN_PUBLISHED);
                     setShowTip(true);
@@ -266,16 +272,12 @@ var SimpleEditor = function SimpleEditor(_ref) {
   }, [tipType]);
   var tipSubmit = useCallback(function () {
     if (tipType === TIP_TYPE.DELETE_NO_CHANGES_REVISION) {
-      var originFileURL = context.getSetting('originFileURL');
-      var originDocName = context.getSetting('originFilename');
-      var originDocUuid = context.getSetting('originDocUuid');
-      editorRef.current.publishDocument(originDocUuid, originDocName, false, function (success) {
-        if (success) {
-          setShowTip(false);
-          jumpToURL(originFileURL);
-        } else {
-          toaster.danger(t('Error'));
-        }
+      context.deleteSdocRevision().then(function (res) {
+        setShowTip(false);
+        var originFileURL = context.getSetting('originFileURL');
+        jumpToURL(originFileURL);
+      }).catch(function (error) {
+        toaster.danger(t('Error'));
       });
       return;
     }

package/package.json

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