@seafile/sdoc-editor 0.1.159-beta14 → 0.1.159-beta15

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

@@ -59,7 +59,7 @@ var getChanges = function getChanges(masterContent, revisionContent) {
   });
   return content;
 };
-var getMergeElement = function getMergeElement(diffElement, basicElement) {
+var getMergeElement = function getMergeElement(diffElement, baseElement) {
   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];
@@ -67,10 +67,10 @@ var getMergeElement = function getMergeElement(diffElement, basicElement) {
   // revision does not have this element, master has this element
   if (modifyType === MODIFY_TYPE.DELETE) {
     // 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];
+    if (!baseElement) return [newElement];
 
     // 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])) {
+    if (!ObjectUtils.isSameObject(baseElement, diffElement, [REBASE_MARK_KEY.MODIFY_TYPE])) {
       newElement[REBASE_MARK_KEY.REBASE_TYPE] = REBASE_TYPE.MODIFY_DELETE;
       return [newElement];
     }
@@ -82,10 +82,10 @@ var getMergeElement = function getMergeElement(diffElement, basicElement) {
   // revision has this element, master does not have this element
   if (modifyType === MODIFY_TYPE.ADD) {
     // 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];
+    if (!baseElement) return [newElement];
 
     // master deleted it, revision modified it, and the user manually selected the conflict
-    if (!ObjectUtils.isSameObject(basicElement, diffElement, [REBASE_MARK_KEY.MODIFY_TYPE])) {
+    if (!ObjectUtils.isSameObject(baseElement, diffElement, [REBASE_MARK_KEY.MODIFY_TYPE])) {
       newElement[REBASE_MARK_KEY.REBASE_TYPE] = REBASE_TYPE.DELETE_MODIFY;
       return [newElement];
     }
@@ -101,16 +101,16 @@ var getMergeElement = function getMergeElement(diffElement, basicElement) {
     delete newElement[REBASE_MARK_KEY.OLD_ELEMENT];
 
     // 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) {
+    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({}, newElement), {}, (_objectSpread6 = {}, _defineProperty(_objectSpread6, REBASE_MARK_KEY.REBASE_TYPE, REBASE_TYPE.MODIFY_MODIFY), _defineProperty(_objectSpread6, REBASE_MARK_KEY.ORIGIN, REBASE_ORIGIN.MY), _objectSpread6))];
     }
 
     // master is the same as base, indicating that revision has modified the content
-    if (ObjectUtils.isSameObject(masterElement, basicElement)) return [newElement];
+    if (ObjectUtils.isSameObject(masterElement, baseElement)) return [newElement];
 
     // revision is the same as base, indicating that master has modified the content
-    if (ObjectUtils.isSameObject(newElement, basicElement)) return [masterElement];
+    if (ObjectUtils.isSameObject(newElement, baseElement)) return [masterElement];
 
     // 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))];
@@ -120,19 +120,19 @@ var getMergeElement = function getMergeElement(diffElement, basicElement) {
     delete newElement[REBASE_MARK_KEY.OLD_ELEMENT];
 
     // 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) {
+    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({}, newElement), {}, (_objectSpread10 = {}, _defineProperty(_objectSpread10, REBASE_MARK_KEY.REBASE_TYPE, REBASE_TYPE.MODIFY_MODIFY), _defineProperty(_objectSpread10, REBASE_MARK_KEY.ORIGIN, REBASE_ORIGIN.MY), _objectSpread10))];
     }
-    if (ObjectUtils.isSameObject(_masterElement, basicElement)) return [newElement];
-    if (ObjectUtils.isSameObject(newElement, basicElement)) return [_masterElement];
+    if (ObjectUtils.isSameObject(_masterElement, baseElement)) return [newElement];
+    if (ObjectUtils.isSameObject(newElement, baseElement)) return [_masterElement];
     if (ObjectUtils.isSameObject(_masterElement, newElement, ['type'])) {
-      if (ObjectUtils.isSameObject(_masterElement, basicElement, ['type'])) return [newElement];
-      if (ObjectUtils.isSameObject(newElement, basicElement, ['type'])) return [_masterElement];
+      if (ObjectUtils.isSameObject(_masterElement, baseElement, ['type'])) return [newElement];
+      if (ObjectUtils.isSameObject(newElement, baseElement, ['type'])) return [_masterElement];
     }
 
     // The content of the subnode has changed and needs to be solved manually.
-    var _getMergeContent = getMergeContent(basicElement, diffElement.children),
+    var _getMergeContent = getMergeContent(baseElement, diffElement.children),
       childrenContent = _getMergeContent.content;
     return [_objectSpread(_objectSpread({}, newElement), {}, _defineProperty({
       children: childrenContent
@@ -141,17 +141,17 @@ var getMergeElement = function getMergeElement(diffElement, basicElement) {
   newElement[REBASE_MARK_KEY.OLD_ELEMENT] && delete newElement[REBASE_MARK_KEY.OLD_ELEMENT];
   return [newElement];
 };
-var getMergeContent = function getMergeContent(basicContent, diffChanges) {
+var getMergeContent = function getMergeContent(baseContent, diffChanges) {
   var _generateIdMapAndIds3 = generateIdMapAndIds(diffChanges),
     diffChangesContentMap = _generateIdMapAndIds3.map,
     diffChangesContentIds = _generateIdMapAndIds3.ids;
-  var _generateIdMapAndIds4 = generateIdMapAndIds(basicContent.children),
+  var _generateIdMapAndIds4 = generateIdMapAndIds(baseContent.children),
     baseContentMap = _generateIdMapAndIds4.map;
   var content = [];
   diffChangesContentIds.forEach(function (elementId) {
     var diffElement = diffChangesContentMap[elementId];
-    var basicElement = baseContentMap[elementId];
-    var mergeElements = getMergeElement(diffElement, basicElement);
+    var baseElement = baseContentMap[elementId];
+    var mergeElements = getMergeElement(diffElement, baseElement);
     content.push.apply(content, _toConsumableArray(mergeElements));
   });
   var canMerge = !hasConflict(content);
@@ -160,9 +160,9 @@ var getMergeContent = function getMergeContent(basicContent, diffChanges) {
     canMerge: canMerge
   };
 };
-export var getRebase = function getRebase(masterContent, basicContent, revisionContent) {
+export var getRebase = function getRebase(masterContent, baseContent, revisionContent) {
   // master no changes, merged directly
-  if (masterContent.version === basicContent.version) {
+  if (masterContent.version === baseContent.version) {
     return {
       canMerge: true,
       isNeedReplaceMaster: true,
@@ -171,7 +171,7 @@ export var getRebase = function getRebase(masterContent, basicContent, revisionC
   }
 
   // The revision content has not changed
-  if (basicContent.version === revisionContent.version) {
+  if (baseContent.version === revisionContent.version) {
     return {
       canMerge: true,
       isNeedReplaceMaster: false,
@@ -179,7 +179,7 @@ export var getRebase = function getRebase(masterContent, basicContent, revisionC
     };
   }
   var diffChanges = getChanges(masterContent, revisionContent);
-  var _getMergeContent2 = getMergeContent(basicContent, diffChanges),
+  var _getMergeContent2 = getMergeContent(baseContent, diffChanges),
     canMerge = _getMergeContent2.canMerge,
     content = _getMergeContent2.content;
   return {

package/dist/pages/simple-editor.js

@@ -202,16 +202,16 @@ var SimpleEditor = function SimpleEditor(_ref) {
               setShowTip(true);
               return;
             }
-            var basicContent;
+            var baseContent;
             var masterContent;
             context.getRevisionBasicVersionContent().then(function (res) {
-              var basicVersionContentString = res.data.content; // commit content
-              basicContent = JSON.parse(basicVersionContentString);
+              var baseVersionContentString = res.data.content; // commit content
+              baseContent = JSON.parse(baseVersionContentString);
               return context.getSeadocOriginFileContent();
             }).then(function (res) {
               var masterContentString = res.data.content;
               masterContent = JSON.parse(masterContentString);
-              var _getRebase = getRebase(masterContent, basicContent, revisionContent),
+              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.159beta14",
+  "version": "0.1.159beta15",
   "private": false,
   "description": "This is a sdoc editor",
   "main": "dist/index.js",