@seafile/sdoc-editor 0.1.149-beta5 → 0.1.149-beta6

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

@@ -16,6 +16,7 @@ export var MODIFY_TYPE = {
 export var REBASE_TYPE = {
   MODIFY_MODIFY: 'modify_modify',
   DELETE_MODIFY: 'delete_modify',
+  MODIFY_DELETE: 'modify_delete',
   CHILDREN_MODIFY: 'children_modify'
 };
 export var REBASE_MARK_KEY = {
@@ -24,4 +25,8 @@ export var REBASE_MARK_KEY = {
   MODIFY_TYPE: 'modify_type',
   OLD_ELEMENT: 'old_element'
 };
+export var REBASE_ORIGIN = {
+  OTHER: 'other',
+  MY: 'my'
+};
 export var REBASE_MARKS = [REBASE_MARK_KEY.ORIGIN, REBASE_MARK_KEY.REBASE_TYPE, REBASE_MARK_KEY.MODIFY_TYPE, REBASE_MARK_KEY.OLD_ELEMENT];

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

@@ -9,7 +9,7 @@ import { useTranslation } from 'react-i18next';
 import { BLOCKQUOTE, LINK, CHECK_LIST_ITEM, HEADER1, HEADER2, HEADER3, HEADER4, HEADER5, HEADER6, LIST_ITEM, LIST_LIC, ORDERED_LIST, PARAGRAPH, UNORDERED_LIST, CODE_BLOCK, CODE_LINE, IMAGE, ELEMENT_TYPE, SDOC_LINK, TITLE, SUBTITLE } from '../constants';
 import { BlockquotePlugin, LinkPlugin, CheckListPlugin, HeaderPlugin, ListPlugin, CodeBlockPlugin, ImagePlugin, TablePlugin, SdocLinkPlugin, ParagraphPlugin } from '../plugins';
 import EventBus from '../../utils/event-bus';
-import { INTERNAL_EVENT, REBASE_TYPE, REBASE_MARKS, REBASE_MARK_KEY } from '../../constants';
+import { INTERNAL_EVENT, REBASE_TYPE, REBASE_MARKS, REBASE_MARK_KEY, REBASE_ORIGIN } from '../../constants';
 import { findPath, getNode, replaceNode, generateEmptyElement, deleteNodeMark } from '../../extension/core';
 var CustomElement = function CustomElement(props) {
   var editor = useSlateStatic();
@@ -193,35 +193,32 @@ var RenderElement = function RenderElement(props) {
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [editor]);
-  var addDeletedElement = useCallback(function (element) {
-    var path = findPath(editor, element);
-    deleteNodeMark(editor, path, element, REBASE_MARKS);
-    if (element.type !== ELEMENT_TYPE.LIST_ITEM) {
-      var emptyNode = generateEmptyElement(ELEMENT_TYPE.PARAGRAPH);
-      Transforms.insertNodes(editor, emptyNode, {
-        at: [path[0]]
-      });
-    } else {
-      var _emptyNode = generateEmptyElement(ELEMENT_TYPE.LIST_ITEM);
-      _emptyNode.children[0] = generateEmptyElement(ELEMENT_TYPE.LIST_LIC);
-      var parentPath = path.slice(0, -1);
-      var parentNode = getNode(editor, parentPath);
-      var newChildren = _toConsumableArray(parentNode.children);
-      var index = path[path.length - 1];
-      newChildren.splice(index, 0, _emptyNode);
-      replaceNode(editor, {
-        at: parentPath,
-        nodes: _objectSpread(_objectSpread({}, parentNode), {}, {
-          children: newChildren
-        })
-      });
-    }
-    if (element.type === ELEMENT_TYPE.LIST_ITEM) {
-      updateParentNodeByPath(path);
-    }
 
-    // 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);
@@ -272,30 +269,53 @@ var RenderElement = function RenderElement(props) {
   if (!rebaseType) {
     return /*#__PURE__*/React.createElement(CustomElement, props);
   }
-  if (rebaseType === REBASE_TYPE.DELETE_MODIFY) {
+  if (rebaseType === REBASE_TYPE.MODIFY_DELETE) {
     return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
       className: "w-100 d-flex sdoc-rebase-btn-group",
       contentEditable: false
     }, /*#__PURE__*/React.createElement("div", {
       className: "sdoc-rebase-btn",
       onClick: function onClick() {
-        return deleteElement(element);
+        return deleteMark(element);
       }
     }, t('Keep_other_modification')), /*#__PURE__*/React.createElement("div", {
       className: "mr-2 ml-2"
     }, '|'), /*#__PURE__*/React.createElement("div", {
       className: "sdoc-rebase-btn",
       onClick: function onClick() {
-        return deleteMark(element);
+        return deleteElement(element);
       }
-    }, t('Keep_my_modification')), /*#__PURE__*/React.createElement("div", {
+    }, t('Keep_my_modification'))), /*#__PURE__*/React.createElement("div", {
+      className: "w-100 sdoc-rebase-current-changes-start",
+      contentEditable: false
+    }, '<<<<<<<'), /*#__PURE__*/React.createElement("div", {
+      className: "w-100 sdoc-rebase-incoming-changes",
+      contentEditable: false
+    }, /*#__PURE__*/React.createElement(CustomElement, props)), /*#__PURE__*/React.createElement("div", {
+      className: "w-100",
+      contentEditable: false
+    }, '======='), /*#__PURE__*/React.createElement("div", {
+      className: "w-100 sdoc-rebase-incoming-changes-end",
+      contentEditable: false
+    }, '>>>>>>>'));
+  }
+  if (rebaseType === REBASE_TYPE.DELETE_MODIFY) {
+    return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
+      className: "w-100 d-flex sdoc-rebase-btn-group",
+      contentEditable: false
+    }, /*#__PURE__*/React.createElement("div", {
+      className: "sdoc-rebase-btn",
+      onClick: function onClick() {
+        return deleteElement(element);
+      }
+    }, t('Keep_other_modification')), /*#__PURE__*/React.createElement("div", {
       className: "mr-2 ml-2"
     }, '|'), /*#__PURE__*/React.createElement("div", {
       className: "sdoc-rebase-btn",
       onClick: function onClick() {
-        return addDeletedElement(element);
+        return deleteMark(element);
       }
-    }, t('Keep_both_modification'))), /*#__PURE__*/React.createElement("div", {
+    }, t('Keep_my_modification'))), /*#__PURE__*/React.createElement("div", {
       className: "w-100 sdoc-rebase-current-changes-start",
       contentEditable: false
     }, '<<<<<<<'), /*#__PURE__*/React.createElement("div", {
@@ -310,7 +330,7 @@ var RenderElement = function RenderElement(props) {
     }, '>>>>>>>'));
   }
   if (rebaseType === REBASE_TYPE.MODIFY_MODIFY) {
-    if (element[REBASE_MARK_KEY.ORIGIN] === 'master') {
+    if (element[REBASE_MARK_KEY.ORIGIN] === REBASE_ORIGIN.OTHER) {
       return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", {
         className: "w-100 d-flex sdoc-rebase-btn-group",
         contentEditable: false

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

@@ -288,4 +288,5 @@ export var getDiff = function getDiff() {
     changes: []
   };
   return getElementDiffValue(currentContent, oldContent);
-};
+};
+window.getIdDiffs = getIdDiffs;

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

@@ -3,16 +3,22 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { generateIdMapAndIds, getIdDiffs } from './diff';
 import ObjectUtils from './object-utils';
-import { MODIFY_TYPE, REBASE_TYPE, REBASE_MARK_KEY } from '../constants';
+import { MODIFY_TYPE, REBASE_TYPE, REBASE_MARK_KEY, REBASE_ORIGIN } from '../constants';
 import { ELEMENT_TYPE } from '../extension/constants';
 import { replaceNodeId } from '../node-id/helpers';
-var getRevisionChanges = function getRevisionChanges(masterContent, currentContent) {
-  var _generateIdMapAndIds = generateIdMapAndIds(currentContent.children),
-    currentContentMap = _generateIdMapAndIds.map,
-    currentIds = _generateIdMapAndIds.ids;
-  var _generateIdMapAndIds2 = generateIdMapAndIds(masterContent.children),
-    masterContentMap = _generateIdMapAndIds2.map,
-    masterIds = _generateIdMapAndIds2.ids;
+export var hasConflict = function hasConflict(content) {
+  if (!Array.isArray(content) || content.length === 0) return false;
+  return content.filter(function (item) {
+    return item.rebase_type;
+  }).length !== 0;
+};
+var getChanges = function getChanges(masterContent, revisionContent) {
+  var _generateIdMapAndIds = generateIdMapAndIds(masterContent.children),
+    masterContentMap = _generateIdMapAndIds.map,
+    masterIds = _generateIdMapAndIds.ids;
+  var _generateIdMapAndIds2 = generateIdMapAndIds(revisionContent.children),
+    currentContentMap = _generateIdMapAndIds2.map,
+    currentIds = _generateIdMapAndIds2.ids;
   var idDiffs = getIdDiffs(masterIds, currentIds);
   var content = [];
   idDiffs.forEach(function (idDiff) {
@@ -41,7 +47,7 @@ var getRevisionChanges = function getRevisionChanges(masterContent, currentConte
           if (currentElement.type === oldElement.type) {
             var elementType = currentElement.type;
             if ([ELEMENT_TYPE.UNORDERED_LIST, ELEMENT_TYPE.ORDERED_LIST].includes(elementType)) {
-              var listContent = getRevisionChanges(oldElement, currentElement);
+              var listContent = getChanges(oldElement, currentElement);
               newElement[REBASE_MARK_KEY.MODIFY_TYPE] = MODIFY_TYPE.CHILDREN_MODIFY;
               newElement['children'] = listContent;
             }
@@ -53,129 +59,170 @@ var getRevisionChanges = function getRevisionChanges(masterContent, currentConte
   });
   return content;
 };
-var getMasterChanges = function getMasterChanges(masterContent, revisionChanges) {
-  var canMerge = true;
-  var _generateIdMapAndIds3 = generateIdMapAndIds(revisionChanges),
-    currentContentMap = _generateIdMapAndIds3.map,
-    currentIds = _generateIdMapAndIds3.ids;
-  var _generateIdMapAndIds4 = generateIdMapAndIds(masterContent.children),
-    masterContentMap = _generateIdMapAndIds4.map,
-    masterIds = _generateIdMapAndIds4.ids;
-  var idDiffs = getIdDiffs(masterIds, currentIds);
-  var content = [];
-  idDiffs.forEach(function (idDiff) {
-    var value = idDiff.value,
-      added = idDiff.added,
-      removed = idDiff.removed;
-    if (added) {
-      value.forEach(function (elementId) {
-        var element = currentContentMap[elementId];
-        var newElement = {
-          id: element.id,
-          children: element.children,
-          type: element.type
-        };
-        // The content has been deleted from the master, but this branch has been modified. At this time, rebase is required, and the user needs to confirm the selected content
-        // ==> delete ｜ use modification
-        if (element[REBASE_MARK_KEY.MODIFY_TYPE] === MODIFY_TYPE.MODIFY) {
-          newElement[REBASE_MARK_KEY.REBASE_TYPE] = REBASE_TYPE.DELETE_MODIFY;
-          content.push(newElement);
-          canMerge = false;
-        } else {
-          // new direct append
-          content.push(newElement);
-        }
-      });
-    } else if (removed) {
-      var deletedList = value.map(function (item) {
-        return _objectSpread({}, masterContentMap[item]);
-      });
-      content.push.apply(content, _toConsumableArray(deletedList));
-    } else {
-      value.forEach(function (elementId) {
-        var currentElement = currentContentMap[elementId];
-        var masterElement = masterContentMap[elementId];
-
-        // Unchanged
-        if (ObjectUtils.isSameObject(masterElement, currentElement)) {
-          content.push(currentElement);
-
-          // The content of the master branch is modified in the current branch, but the content of the master branch is the same as that of origin
-        } else if (ObjectUtils.isSameObject(masterElement, currentElement[REBASE_MARK_KEY.OLD_ELEMENT])) {
-          var newElement = _objectSpread({}, currentElement);
-          newElement[REBASE_MARK_KEY.OLD_ELEMENT] && delete newElement[REBASE_MARK_KEY.OLD_ELEMENT];
-          newElement[REBASE_MARK_KEY.MODIFY_TYPE] && delete newElement[REBASE_MARK_KEY.MODIFY_TYPE];
-          content.push(newElement);
+var getMergeElement = function getMergeElement(diffElement, baseElement) {
+  var modifyType = diffElement[REBASE_MARK_KEY.MODIFY_TYPE];
 
-          // Modify at the same time
-        } else if (currentElement[REBASE_MARK_KEY.MODIFY_TYPE] === MODIFY_TYPE.MODIFY) {
-          var _objectSpread5, _objectSpread6;
-          var oldMasterElement = replaceNodeId(_objectSpread(_objectSpread({}, masterElement), {}, (_objectSpread5 = {}, _defineProperty(_objectSpread5, REBASE_MARK_KEY.REBASE_TYPE, REBASE_TYPE.MODIFY_MODIFY), _defineProperty(_objectSpread5, REBASE_MARK_KEY.ORIGIN, 'master'), _defineProperty(_objectSpread5, REBASE_MARK_KEY.OLD_ELEMENT, masterElement), _objectSpread5)));
-          content.push(oldMasterElement);
-          var _newElement = _objectSpread(_objectSpread({}, currentElement), {}, (_objectSpread6 = {}, _defineProperty(_objectSpread6, REBASE_MARK_KEY.REBASE_TYPE, REBASE_TYPE.MODIFY_MODIFY), _defineProperty(_objectSpread6, REBASE_MARK_KEY.ORIGIN, 'current'), _objectSpread6));
-          _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];
-          content.push(_newElement);
-          canMerge = false;
-
-          // children modify
-        } else if (currentElement[REBASE_MARK_KEY.MODIFY_TYPE] === MODIFY_TYPE.CHILDREN_MODIFY) {
-          canMerge = false;
-          if (currentElement.type === masterElement.type) {
-            var _getMasterChanges = getMasterChanges(masterElement, currentElement.children),
-              childrenContent = _getMasterChanges.content;
-            content.push(_objectSpread(_objectSpread({}, masterElement), {}, _defineProperty({
-              children: childrenContent
-            }, REBASE_MARK_KEY.REBASE_TYPE, REBASE_TYPE.CHILDREN_MODIFY)));
-          } else {
-            var _objectSpread8, _objectSpread9;
-            var _oldMasterElement = replaceNodeId(_objectSpread(_objectSpread({}, masterElement), {}, (_objectSpread8 = {}, _defineProperty(_objectSpread8, REBASE_MARK_KEY.REBASE_TYPE, REBASE_TYPE.MODIFY_MODIFY), _defineProperty(_objectSpread8, REBASE_MARK_KEY.ORIGIN, 'master'), _defineProperty(_objectSpread8, REBASE_MARK_KEY.OLD_ELEMENT, masterElement), _objectSpread8)));
-            content.push(_oldMasterElement);
-            var _newElement2 = _objectSpread(_objectSpread({}, currentElement[REBASE_MARK_KEY.OLD_ELEMENT]), {}, (_objectSpread9 = {}, _defineProperty(_objectSpread9, REBASE_MARK_KEY.REBASE_TYPE, REBASE_TYPE.MODIFY_MODIFY), _defineProperty(_objectSpread9, REBASE_MARK_KEY.ORIGIN, 'current'), _objectSpread9));
-            content.push(_newElement2);
-          }
-        } else {
-          var _newElement3 = _objectSpread({}, currentElement);
-          _newElement3[REBASE_MARK_KEY.OLD_ELEMENT] && delete _newElement3[REBASE_MARK_KEY.OLD_ELEMENT];
-          _newElement3[REBASE_MARK_KEY.MODIFY_TYPE] && delete _newElement3[REBASE_MARK_KEY.MODIFY_TYPE];
-          content.push(_newElement3);
-        }
-      });
+  // revision 没有该元素，master 有该元素
+  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];
+    }
+
+    // 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];
+    }
+
+    // baseContent有该元素，master 没有对其进行了修改, 说明 revision 将其删除了，程序删除，不计入冲突
+    return [];
+  }
+
+  // revision 有该元素，master 没有该元素
+  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];
+    }
+
+    // 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 将其删除了， revision 没有对其进行了修改, 程序删除，不计入冲突
+    return [];
+  }
+
+  // revision 和 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];
+
+    // revision 和 master 同时新增了一个元素，但且内容不一样。 ===》 目前这种情况不存在，仅存在理论阶段
+    if (!baseElement) {
+      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))];
+    }
+
+    // master 和 base 一样，说明 revision 对内容进行了修改
+    if (ObjectUtils.isSameObject(masterElement, baseElement)) {
+      return [revisionElement];
+    }
+
+    // revision 和 base 一样，说明 master 对内容进行了修改
+    if (ObjectUtils.isSameObject(revisionElement, baseElement)) {
+      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))];
+  }
+  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];
+
+    // revision 和 master 同时新增了一个元素，但且内容不一样。 ===》 目前这种情况不存在，仅存在理论阶段
+    if (!baseElement) {
+      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))];
+    }
+
+    // master 和 base 一样，说明 revision 对内容进行了修改
+    if (ObjectUtils.isSameObject(_masterElement, baseElement)) {
+      return [_revisionElement];
+    }
+
+    // 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),
+      childrenContent = _getMergeContent.content;
+    return [_objectSpread(_objectSpread({}, _revisionElement), {}, _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 _generateIdMapAndIds3 = generateIdMapAndIds(diffChanges),
+    diffChangesContentMap = _generateIdMapAndIds3.map,
+    diffChangesContentIds = _generateIdMapAndIds3.ids;
+  var _generateIdMapAndIds4 = generateIdMapAndIds(baseContent.children),
+    baseContentMap = _generateIdMapAndIds4.map;
+  var content = [];
+  diffChangesContentIds.forEach(function (elementId) {
+    var diffElement = diffChangesContentMap[elementId];
+    var baseElement = baseContentMap[elementId];
+    var mergeElements = getMergeElement(diffElement, baseElement);
+    content.push.apply(content, _toConsumableArray(mergeElements));
   });
+  var canMerge = !hasConflict(content);
   return {
     content: content,
     canMerge: canMerge
   };
 };
-export var getRebase = function getRebase(masterContent, revisionMasterContent, revisionCurrentContent) {
+export var getRebase = function getRebase(masterContent, baseContent, revisionContent) {
   // master no changes, merged directly
-  if (masterContent.version === revisionMasterContent.version) {
+  if (masterContent.version === baseContent.version) {
     return {
       canMerge: true,
       isNeedReplaceMaster: true,
-      value: revisionCurrentContent
+      value: revisionContent
     };
   }
 
   // The revision content has not changed
-  if (revisionMasterContent.version === revisionCurrentContent.version) {
+  if (baseContent.version === revisionContent.version) {
     return {
       canMerge: true,
       isNeedReplaceMaster: false,
       value: masterContent
     };
   }
-  var revisionChanges = getRevisionChanges(revisionMasterContent, revisionCurrentContent);
-  var _getMasterChanges2 = getMasterChanges(masterContent, revisionChanges),
-    canMerge = _getMasterChanges2.canMerge,
-    content = _getMasterChanges2.content;
+  var diffChanges = getChanges(masterContent, revisionContent);
+  var _getMergeContent2 = getMergeContent(baseContent, diffChanges),
+    canMerge = _getMergeContent2.canMerge,
+    content = _getMergeContent2.content;
   return {
     canMerge: canMerge,
     isNeedReplaceMaster: true,
-    value: _objectSpread(_objectSpread({}, revisionCurrentContent), {}, {
+    value: _objectSpread(_objectSpread({}, revisionContent), {}, {
       children: content,
-      version: Math.max(masterContent.version, revisionCurrentContent.version) + 1
+      version: Math.max(masterContent.version, revisionContent.version) + 1
     })
   };
 };

package/dist/pages/simple-editor.js

@@ -12,7 +12,7 @@ import context from '../context';
 import ErrorBoundary from './error-boundary';
 import TipDialog from '../components/tip-dialog';
 import { EXTERNAL_EVENT, MODE, TIP_TYPE } from '../constants';
-import { getRebase } from '../basic-sdk/utils/rebase';
+import { getRebase, hasConflict } from '../basic-sdk/utils/rebase';
 import toaster from '../components/toast';
 import { EventBus, SDocEditor } from '../basic-sdk';
 import '../assets/css/simple-editor.css';
@@ -160,10 +160,8 @@ var SimpleEditor = function SimpleEditor(_ref) {
     });
   }, []);
   var toggleViewChanges = useCallback(function (isShowChanges) {
-    var revisionCurrentContent = editorRef.current.getSlateValue();
-    if (isShowChanges && revisionCurrentContent.children.filter(function (item) {
-      return item.rebase_type;
-    }).length !== 0) {
+    var revisionContent = editorRef.current.getSlateValue();
+    if (isShowChanges && hasConflict(revisionContent.children)) {
       setTipType(TIP_TYPE.HAS_CONFLICT_BEFORE_VIEW_CHANGES);
       setShowTip(true);
       return;
@@ -193,10 +191,8 @@ var SimpleEditor = function SimpleEditor(_ref) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           loadDocument(function (document) {
-            var revisionCurrentContent = document;
-            if (revisionCurrentContent.children.filter(function (item) {
-              return item.rebase_type;
-            }).length !== 0) {
+            var revisionContent = document;
+            if (hasConflict(revisionContent.children)) {
               setTipType(TIP_TYPE.HAS_CONFLICT_BEFORE_PUBLISH);
               setShowTip(true);
               return;
@@ -205,11 +201,11 @@ var SimpleEditor = function SimpleEditor(_ref) {
             var originFilePath = context.getSetting('originFilePath');
             var originDocName = context.getSetting('originFilename');
             var originDocUuid = context.getSetting('originDocUuid');
-            var revisionMasterContent;
+            var baseContent;
             var masterContent;
             context.getFileHistoryVersion(originFileVersion, originFilePath).then(function (res) {
               var fileHistoryRevisionContent = res.data.content; // commit content
-              revisionMasterContent = JSON.parse(fileHistoryRevisionContent);
+              baseContent = JSON.parse(fileHistoryRevisionContent);
               return context.getSeadocOriginFileDownloadLink();
             }).then(function (res) {
               var originFileDownloadLink = res.data.origin_file_download_link;
@@ -218,7 +214,7 @@ var SimpleEditor = function SimpleEditor(_ref) {
               return res.json();
             }).then(function (content) {
               masterContent = content;
-              var _getRebase = getRebase(masterContent, revisionMasterContent, revisionCurrentContent),
+              var _getRebase = getRebase(masterContent, baseContent, revisionContent),
                 canMerge = _getRebase.canMerge,
                 isNeedReplaceMaster = _getRebase.isNeedReplaceMaster,
                 value = _getRebase.value;

package/package.json

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