@seafile/sdoc-editor 1.0.105 → 1.0.106

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

@@ -32,15 +32,16 @@ const hasConflict = content => {
   return flag;
 };
 exports.hasConflict = hasConflict;
-const getChanges = (masterContent, revisionContent) => {
+const getChanges = function (masterContent, revisionContent) {
+  let childrenName = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'children';
   const {
     map: masterContentMap,
     ids: masterIds
-  } = (0, _diff.generateIdMapAndIds)(masterContent.children);
+  } = (0, _diff.generateIdMapAndIds)(masterContent[childrenName]);
   const {
     map: currentContentMap,
     ids: currentIds
-  } = (0, _diff.generateIdMapAndIds)(revisionContent.children);
+  } = (0, _diff.generateIdMapAndIds)(revisionContent[childrenName]);
   const idDiffs = (0, _diff.getIdDiffs)(masterIds, currentIds);
   let content = [];
   idDiffs.forEach(idDiff => {
@@ -200,14 +201,15 @@ const getMergeElement = (diffElement, baseElement) => {
   newElement[_constants.REBASE_MARK_KEY.OLD_ELEMENT] && delete newElement[_constants.REBASE_MARK_KEY.OLD_ELEMENT];
   return [newElement];
 };
-const getMergeContent = (baseContent, diffChanges) => {
+const getMergeContent = function (baseContent, diffChanges) {
+  let childrenName = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'children';
   const {
     map: diffChangesContentMap,
     ids: diffChangesContentIds
   } = (0, _diff.generateIdMapAndIds)(diffChanges);
   const {
     map: baseContentMap
-  } = (0, _diff.generateIdMapAndIds)(baseContent.children);
+  } = (0, _diff.generateIdMapAndIds)(baseContent[childrenName]);
   let content = [];
   diffChangesContentIds.forEach(elementId => {
     const diffElement = diffChangesContentMap[elementId];
@@ -239,7 +241,18 @@ const canMerge = (content, reference) => {
   return flag;
 };
 exports.canMerge = canMerge;
+const updateContentToFormatVersion4 = content => {
+  if (content.format_version === 4) return;
+  content.format_version = 4;
+  content.elements = content.children;
+  delete content['children'];
+};
+
+// Only the data in baseContent needs to be formatted.
+// The data in the other two does not need to be formatted. They are directly obtained from sdoc-server.
 const getRebase = (masterContent, baseContent, revisionContent) => {
+  updateContentToFormatVersion4(baseContent);
+
   // master no changes, merged directly
   if (masterContent.version === baseContent.version) {
     return {
@@ -257,14 +270,14 @@ const getRebase = (masterContent, baseContent, revisionContent) => {
       value: masterContent
     };
   }
-  const diffChanges = getChanges(masterContent, revisionContent);
-  const content = getMergeContent(baseContent, diffChanges);
+  const diffChanges = getChanges(masterContent, revisionContent, 'elements');
+  const content = getMergeContent(baseContent, diffChanges, 'elements');
   return {
-    canMerge: canMerge(content, revisionContent.children),
+    canMerge: canMerge(content, revisionContent.elements),
     isNeedReplaceMaster: true,
     value: {
       ...revisionContent,
-      children: content,
+      elements: content,
       version: Math.max(masterContent.version, revisionContent.version) + 1
     }
   };

package/dist/components/doc-operations/revision-operations/index.js

@@ -118,7 +118,7 @@ const RevisionOperations = _ref => {
       // The trick here is to send one more api request in order to use the same information box.
       loadDocument().then(revisionContent => {
         // Prevent users from switching if document contains conflicting content
-        if ((0, _rebase.hasConflict)(revisionContent.children)) {
+        if ((0, _rebase.hasConflict)(revisionContent.elements)) {
           setTipType(_constants.TIP_TYPE.HAS_CONFLICT_BEFORE_VIEW_CHANGES);
           setShowTip(true);
         } else {
@@ -146,7 +146,7 @@ const RevisionOperations = _ref => {
       const [revisionContent, baseRes, masterRes] = results;
       const baseContent = JSON.parse(baseRes.data.content);
       const masterContent = JSON.parse(masterRes.data.content);
-      if ((0, _rebase.hasConflict)(revisionContent.children)) {
+      if ((0, _rebase.hasConflict)(revisionContent.elements)) {
         setTipType(_constants.TIP_TYPE.HAS_CONFLICT_BEFORE_PUBLISH);
         return;
       }
@@ -206,7 +206,7 @@ const RevisionOperations = _ref => {
         username
       } = _context.default.getUserInfo();
       const doc = {
-        children: mergeValue.children,
+        elements: mergeValue.elements,
         version: mergeValue.version,
         format_version: mergeValue.format_version,
         last_modify_user: username

package/package.json

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