@seafile/sdoc-editor 0.1.146-beta3 → 0.1.147

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

@@ -11,20 +11,14 @@ import './style.css';
 var DocOperations = function DocOperations(_ref) {
   var isShowChanges = _ref.isShowChanges,
     changes = _ref.changes,
-    toggleViewChanges = _ref.toggleViewChanges,
-    publishRevision = _ref.publishRevision,
-    mode = _ref.mode,
-    abortRebase = _ref.abortRebase;
+    toggleViewChanges = _ref.toggleViewChanges;
   var isSdocRevision = context.getSetting('isSdocRevision');
   return /*#__PURE__*/React.createElement("div", {
     className: "doc-ops"
   }, /*#__PURE__*/React.createElement(RevisionOperations, {
     isShowChanges: isShowChanges,
     changes: changes,
-    mode: mode,
-    toggleViewChanges: toggleViewChanges,
-    publishRevision: publishRevision,
-    abortRebase: abortRebase
+    toggleViewChanges: toggleViewChanges
   }), /*#__PURE__*/React.createElement(CommentsOperation, null), !isSdocRevision && /*#__PURE__*/React.createElement(ShareOperation, null), /*#__PURE__*/React.createElement(HistoryOperation, null), /*#__PURE__*/React.createElement(CollaboratorsOperation, null), !isSdocRevision && /*#__PURE__*/React.createElement(MoreOperations, null));
 };
 export default withTranslation('sdoc-editor')(DocOperations);

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

@@ -5,25 +5,17 @@ import ViewChanges from './view-changes';
 import MoreRevisionOperations from './more-revision-operations';
 import Revisions from './revisions';
 import ChangesCount from './changes-count';
-import { MODE } from '../../../constants';
 var RevisionOperations = function RevisionOperations(_ref) {
   var isShowChanges = _ref.isShowChanges,
     changes = _ref.changes,
-    toggleViewChanges = _ref.toggleViewChanges,
-    publishRevision = _ref.publishRevision,
-    mode = _ref.mode,
-    abortRebase = _ref.abortRebase;
+    toggleViewChanges = _ref.toggleViewChanges;
   var isSdocRevision = context.getSetting('isSdocRevision');
   var isPublished = context.getSetting('isPublished');
   return /*#__PURE__*/React.createElement(React.Fragment, null, !isSdocRevision && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(MoreRevisionOperations, null), /*#__PURE__*/React.createElement(Revisions, null)), isSdocRevision && isShowChanges && /*#__PURE__*/React.createElement(ChangesCount, {
     changes: changes
-  }), isSdocRevision && mode !== MODE.REBASE && /*#__PURE__*/React.createElement(ViewChanges, {
+  }), isSdocRevision && /*#__PURE__*/React.createElement(ViewChanges, {
     isShowChanges: isShowChanges,
     toggleViewChanges: toggleViewChanges
-  }), isSdocRevision && !isPublished && /*#__PURE__*/React.createElement(PublishRevision, {
-    publishRevision: publishRevision,
-    mode: mode,
-    abortRebase: abortRebase
-  }));
+  }), isSdocRevision && !isPublished && /*#__PURE__*/React.createElement(PublishRevision, null));
 };
 export default RevisionOperations;

package/dist/components/doc-operations/revision-operations/publish-button.js

@@ -1,31 +1,28 @@
 import React, { useCallback } from 'react';
-import { useTranslation } from 'react-i18next';
 import { Button } from 'reactstrap';
-import { MODE } from '../../../constants';
+import { withTranslation } from 'react-i18next';
+import context from '../../../context';
+import toaster from '../../../components/toast';
 var PublishRevision = function PublishRevision(_ref) {
-  var mode = _ref.mode,
-    publishRevision = _ref.publishRevision,
-    abortRebase = _ref.abortRebase;
-  var _useTranslation = useTranslation(),
-    t = _useTranslation.t;
+  var t = _ref.t;
+  var repoID = context.getSetting('repoID');
+  var siteRoot = context.getSetting('siteRoot');
   var publish = useCallback(function (event) {
     event.stopPropagation();
     event.nativeEvent.stopImmediatePropagation();
-    publishRevision();
+    context.publishSdocRevision().then(function (res) {
+      var origin_file_path = res.data.origin_file_path;
+      window.location.href = "".concat(siteRoot, "lib/").concat(repoID, "/file/").concat(origin_file_path);
+    }).catch(function (error) {
+      toaster.danger(t('Error'));
+    });
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
-  if (mode === MODE.REBASE) {
-    return /*#__PURE__*/React.createElement(Button, {
-      color: "success",
-      onClick: abortRebase,
-      className: "ml-4"
-    }, t('Abort'));
-  }
   return /*#__PURE__*/React.createElement(Button, {
     color: "success",
     onClick: publish,
     className: "ml-4"
   }, t('Publish'));
 };
-export default PublishRevision;
+export default withTranslation('sdoc-editor')(PublishRevision);

package/dist/constants/index.js

@@ -1,27 +1,6 @@
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-var _TIP_TITLE, _TIP_CONTENT;
 export var EXTERNAL_EVENT = {
   INTERNAL_LINK_CLICK: 'internal_link_click',
   TOGGLE_STAR: 'toggle_star',
   UNMARK_AS_DRAFT: 'unmark_as_draft',
-  SHARE_SDOC: 'share_sdoc',
-  // REBASE_DOCUMENT: 'rebase_document',
-  PUBLISH_DOCUMENT: 'publish_document',
-  MERGE_DOCUMENT: 'merge_document'
-};
-export var MODE = {
-  DIFF_VIEWER: 'diff-viewer',
-  VIEWER: 'viewer',
-  EDITOR: 'editor',
-  REBASE: 'rebase'
-};
-export var TIP_TYPE = {
-  DELETE_NO_CHANGES_REVISION: 'delete_no_changes_revision',
-  MERGE: 'merge',
-  HAS_CONFLICT_BEFORE_PUBLISH: 'has_conflict_before_publish',
-  HAS_BEEN_PUBLISHED: 'has_been_published',
-  HAS_BEEN_MERGE: 'has_been_merge',
-  HAS_CONFLICT_BEFORE_VIEW_CHANGES: 'has_conflict_before_view_changes'
-};
-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_MERGE, '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_MERGE, 'Has_been_merge_tip'), _defineProperty(_TIP_CONTENT, TIP_TYPE.HAS_CONFLICT_BEFORE_VIEW_CHANGES, 'Has_conflict_before_view_changes_tip'), _TIP_CONTENT);
+  SHARE_SDOC: 'share_sdoc'
+};

package/dist/context.js

@@ -10,9 +10,6 @@ var Context = /*#__PURE__*/function () {
     this.initSettings = function () {
       _this.settings = window.seafile ? window.seafile : window.seafileConfig;
     };
-    // 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) {
@@ -48,13 +45,6 @@ var Context = /*#__PURE__*/function () {
       if (this.settings[key] === false) return this.settings[key];
       return this.settings[key] || '';
     }
-  }, {
-    key: "updateSettings",
-    value: function updateSettings(update) {
-      for (var key in update) {
-        this.settings[key] = update[key];
-      }
-    }
   }, {
     key: "getViewConfig",
     value: function getViewConfig() {
@@ -166,15 +156,14 @@ var Context = /*#__PURE__*/function () {
   }, {
     key: "publishSdocRevision",
     value: function publishSdocRevision() {
-      var replace = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 1;
       var docUuid = this.getSetting('docUuid');
-      return this.api.sdocPublishRevision(docUuid, replace);
+      return this.api.sdocPublishRevision(docUuid);
     }
   }, {
-    key: "getSeadocOriginFileDownloadLink",
-    value: function getSeadocOriginFileDownloadLink() {
+    key: "getSeadocRevisionDownloadLinks",
+    value: function getSeadocRevisionDownloadLinks() {
       var docUuid = this.getSetting('docUuid');
-      return this.api.getSeadocOriginFileDownloadLink(docUuid);
+      return this.api.getSeadocRevisionDownloadLinks(docUuid);
     }
   }, {
     key: "getSdocRevisionsCount",
@@ -188,26 +177,6 @@ var Context = /*#__PURE__*/function () {
       var docUuid = this.getSetting('docUuid');
       return this.api.getSdocRevisions(docUuid, page, perPage);
     }
-  }, {
-    key: "deleteSdocRevision",
-    value: function deleteSdocRevision() {
-      var docUuid = this.getSetting('docUuid');
-      return this.api.deleteSdocRevision(docUuid);
-    }
-  }, {
-    key: "mergeSdocRevision",
-    value: function mergeSdocRevision() {
-      var docUuid = this.getSetting('docUuid');
-      return this.api.mergeSdocRevision(docUuid);
-    }
-  }, {
-    key: "getFileHistoryVersion",
-    value: function getFileHistoryVersion(fileVersion, filePath) {
-      var docUuid = this.getSetting('docUuid');
-      return this.api.getFileHistoryVersion(docUuid, fileVersion, filePath);
-    }
-
-    // local files
   }, {
     key: "getSdocLocalFiles",
     value: function getSdocLocalFiles(p) {

package/dist/pages/simple-editor.js

@@ -1,6 +1,9 @@
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React, { useCallback, useEffect, useRef, useState } from 'react';
 import { withTranslation } from 'react-i18next';
+import deepCopy from 'deep-copy';
+import { SDocEditor, DiffViewer } from '../basic-sdk';
 import Loading from '../components/loading';
 import DocInfo from '../components/doc-info';
 import DocOperations from '../components/doc-operations';
@@ -8,103 +11,47 @@ import Layout, { Header, Content } from '../layout';
 import { generateDefaultDocContent } from '../utils';
 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 toaster from '../components/toast';
-import { EventBus, SDocEditor } from '../basic-sdk';
 import '../assets/css/simple-editor.css';
 var SimpleEditor = function SimpleEditor(_ref) {
   var isStarred = _ref.isStarred,
     isDraft = _ref.isDraft,
     t = _ref.t;
-  context.initApi();
-  var repoID = context.getSetting('repoID');
-  var siteRoot = context.getSetting('siteRoot');
-  var originFilePath = context.getSetting('originFilePath');
-  var isRevision = context.getSetting('isSdocRevision');
-  var originFileURL = isRevision ? "".concat(siteRoot, "lib/").concat(repoID, "/file").concat(originFilePath) : '';
   var editorRef = useRef(null);
   var _useState = useState(true),
     _useState2 = _slicedToArray(_useState, 2),
-    isLoadingSdoc = _useState2[0],
-    setLoadingSdoc = _useState2[1];
-  var _useState3 = useState(''),
+    isFirstLoad = _useState2[0],
+    setFirstLoad = _useState2[1];
+  var _useState3 = useState(true),
     _useState4 = _slicedToArray(_useState3, 2),
-    errorMessage = _useState4[0],
-    setErrorMessage = _useState4[1];
-  var _useState5 = useState(false),
+    isLoadingSdoc = _useState4[0],
+    setLoadingSdoc = _useState4[1];
+  var _useState5 = useState(''),
     _useState6 = _slicedToArray(_useState5, 2),
-    isShowChanges = _useState6[0],
-    setShowChanges = _useState6[1];
-  var _useState7 = useState(null),
+    errorMessage = _useState6[0],
+    setErrorMessage = _useState6[1];
+  var _useState7 = useState(false),
     _useState8 = _slicedToArray(_useState7, 2),
-    document = _useState8[0],
-    setDocument = _useState8[1];
-  var _useState9 = useState(MODE.EDITOR),
+    isShowChanges = _useState8[0],
+    setShowChanges = _useState8[1];
+  var _useState9 = useState(null),
     _useState10 = _slicedToArray(_useState9, 2),
-    mode = _useState10[0],
-    setMode = _useState10[1];
-  var _useState11 = useState([]),
+    document = _useState10[0],
+    setDocument = _useState10[1];
+  var _useState11 = useState(null),
     _useState12 = _slicedToArray(_useState11, 2),
-    changes = _useState12[0],
-    setChanges = _useState12[1];
-  var _useState13 = useState(false),
+    currentContent = _useState12[0],
+    setCurrentContent = _useState12[1];
+  var _useState13 = useState(null),
     _useState14 = _slicedToArray(_useState13, 2),
-    showTip = _useState14[0],
-    setShowTip = _useState14[1];
-  var _useState15 = useState(''),
-    _useState16 = _slicedToArray(_useState15, 2),
-    tipType = _useState16[0],
-    setTipType = _useState16[1];
-  var _useState17 = useState([]),
-    _useState18 = _slicedToArray(_useState17, 2),
-    mergeValue = _useState18[0],
-    setMergeValue = _useState18[1];
-  useEffect(function () {
-    initDocumentData();
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-
-  // 提示刷新界面: 主动刷新
-  var mergeDocument = useCallback(function (document, originFileVersion) {
-    setTipType(TIP_TYPE.HAS_BEEN_MERGE);
-    setShowTip(true);
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [editorRef]);
-
-  // 提示刷新界面: 被动跳转
-  var hasPublishRevision = useCallback(function () {
-    setTipType(TIP_TYPE.HAS_BEEN_PUBLISHED);
-    setShowTip(true);
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [editorRef]);
+    lastContent = _useState14[0],
+    setLastContent = _useState14[1];
   useEffect(function () {
-    var eventBus = EventBus.getInstance();
-    var mergeDocumentSubscribe = eventBus.subscribe(EXTERNAL_EVENT.MERGE_DOCUMENT, mergeDocument);
-    var publishDocumentSubscribe = eventBus.subscribe(EXTERNAL_EVENT.PUBLISH_DOCUMENT, hasPublishRevision);
-    return function () {
-      mergeDocumentSubscribe();
-      publishDocumentSubscribe();
-    };
+    context.initApi();
+    initDocumentData(true);
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
-
-  // useMount: reset title
-  useEffect(function () {
-    var isSdocRevision = context.getSetting('isSdocRevision');
-    var originFilename = context.getSetting('originFilename');
-    if (isSdocRevision) {
-      window.document.getElementsByTagName('title')[0].innerText = "".concat(t('Revision'), " - ").concat(originFilename);
-    }
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-  var initDocumentData = useCallback(function () {
+  var initDocumentData = useCallback(function (isFirstLoad) {
     setShowChanges(false);
     setLoadingSdoc(true);
     context.getFileContent().then(function (res) {
@@ -118,6 +65,7 @@ var SimpleEditor = function SimpleEditor(_ref) {
       }
       setDocument(result);
       setLoadingSdoc(false);
+      isFirstLoad && setFirstLoad(false);
     }).catch(function (error) {
       // eslint-disable-next-line
       console.log(error);
@@ -135,202 +83,54 @@ var SimpleEditor = function SimpleEditor(_ref) {
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
-  var setFileContent = useCallback(function () {
-    context.getFileContent().then(function (res) {
-      var result = res.data || generateDefaultDocContent();
-      if (result && !result.children) {
-        result = {
-          version: 0,
-          children: result.content,
-          cursors: result.cursors || {}
-        };
-      }
-      setDocument(result);
-      editorRef.current.setSlateValue(result);
-      editorRef.current.setLoading(false);
-    }).catch(function (error) {
-      // eslint-disable-next-line
-      console.log(error);
-      setErrorMessage('Load_doc_content_error');
-      editorRef.current.setLoading(false);
-    });
-
-    // eslint-disable-next-line no-trailing-spaces
-  }, []);
-  var setDiffContent = useCallback(function () {
-    context.getSeadocOriginFileDownloadLink().then(function (res) {
+  var initChangesData = useCallback(function () {
+    setShowChanges(true);
+    setLoadingSdoc(true);
+    context.getSeadocRevisionDownloadLinks().then(function (res) {
       var originFileDownloadLink = res.data.origin_file_download_link;
       return fetch(originFileDownloadLink);
     }).then(function (res) {
       return res.json();
     }).then(function (originContent) {
-      editorRef.current.setDiffContent(originContent);
-      editorRef.current.setLoading(false);
-    }).catch(function (error) {
-      console.log('error');
-    });
-  }, []);
-  var toggleViewChanges = useCallback(function (isShowChanges) {
-    var needFetchNewContent = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
-    var revisionCurrentContent = editorRef.current.getSlateValue();
-    if (revisionCurrentContent.children.filter(function (item) {
-      return item.rebaseType;
-    }).length !== 0) {
-      setTipType(TIP_TYPE.HAS_CONFLICT_BEFORE_VIEW_CHANGES);
-      setShowTip(true);
-      return;
-    }
-    editorRef.current.setLoading(true);
-    setShowChanges(isShowChanges);
-    var mode = isShowChanges ? MODE.DIFF_VIEWER : MODE.EDITOR;
-    setMode(mode);
-    editorRef.current.setEditorMode(mode);
-    if (!isShowChanges) {
-      setFileContent();
-      return;
-    }
-    if (!needFetchNewContent) {
-      setDiffContent();
-      return;
-    }
-    context.getFileContent().then(function (res) {
-      var result = res.data || generateDefaultDocContent();
-      if (result && !result.children) {
-        result = {
-          version: 0,
-          children: result.content,
-          cursors: result.cursors || {}
-        };
-      }
-      setDocument(result);
-      editorRef.current.setSlateValue(result);
-    }).then(function () {
-      setDiffContent();
+      setLastContent(originContent);
+      setErrorMessage(null);
+      setLoadingSdoc(false);
     }).catch(function (error) {
-      // eslint-disable-next-line
-      console.log(error);
       setErrorMessage('Load_doc_content_error');
-      editorRef.current.setLoading(false);
+      setLoadingSdoc(false);
     });
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [document, editorRef.current]);
-  var publishRevision = useCallback(function () {
-    var revisionCurrentContent = editorRef.current.getSlateValue();
-    if (revisionCurrentContent.children.filter(function (item) {
-      return item.rebaseType;
-    }).length !== 0) {
-      setTipType(TIP_TYPE.HAS_CONFLICT_BEFORE_PUBLISH);
-      setShowTip(true);
+  }, [document]);
+  var toggleViewChanges = useCallback(function (isShowChanges) {
+    if (isShowChanges) {
+      var newestValue = editorRef.current.getValue();
+      setCurrentContent(deepCopy(_objectSpread(_objectSpread({}, document), {}, {
+        children: newestValue
+      })));
+    }
+    if (isShowChanges) {
+      initChangesData();
       return;
     }
-    var originFileVersion = context.getSetting('originFileVersion');
-    var originFilePath = context.getSetting('originFilePath');
-    var revisionMasterContent;
-    var masterContent;
-    context.getFileHistoryVersion(originFileVersion, originFilePath).then(function (res) {
-      var fileHistoryRevisionContent = res.data.content; // commit content
-      revisionMasterContent = JSON.parse(fileHistoryRevisionContent);
-      return context.getSeadocOriginFileDownloadLink();
-    }).then(function (res) {
-      var originFileDownloadLink = res.data.origin_file_download_link;
-      return fetch(originFileDownloadLink);
-    }).then(function (res) {
-      return res.json();
-    }).then(function (content) {
-      masterContent = content;
-      var _getRebase = getRebase(masterContent, revisionMasterContent, revisionCurrentContent),
-        canMerge = _getRebase.canMerge,
-        isNeedReplaceMaster = _getRebase.isNeedReplaceMaster,
-        value = _getRebase.value;
-      if (canMerge && isNeedReplaceMaster) {
-        context.publishSdocRevision().then(function (res) {
-          editorRef.current.publishDocument(originFileURL);
-          setTipType(TIP_TYPE.HAS_BEEN_PUBLISHED);
-          setShowTip(true);
-        }).catch(function (error) {
-          toaster.danger(t('Error'));
-        });
-        return;
-      }
-      if (canMerge && !isNeedReplaceMaster) {
-        setTipType(TIP_TYPE.DELETE_NO_CHANGES_REVISION);
-        setShowTip(true);
-        return;
-      }
-      setMergeValue(value);
-      setTipType(TIP_TYPE.MERGE);
-      setShowTip(true);
-    }).catch(function (error) {
-      toaster.danger(t('Error'));
-    });
+    setChanges([]);
+    initDocumentData(false);
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [document, isShowChanges, mode]);
-  var abortRebase = useCallback(function () {
-    toggleViewChanges(isShowChanges, true);
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [isShowChanges, document]);
+  }, [document]);
+  var _useState15 = useState([]),
+    _useState16 = _slicedToArray(_useState15, 2),
+    changes = _useState16[0],
+    setChanges = _useState16[1];
   var setDiffChanges = useCallback(function (diff) {
     setChanges(diff.changes);
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [isShowChanges]);
-  var jumpToURL = useCallback(function (url) {
-    window.location.href = url;
-  }, []);
-  var closeTip = useCallback(function () {
-    setShowTip(false);
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [tipType]);
-  var tipSubmit = useCallback(function () {
-    if (tipType === TIP_TYPE.DELETE_NO_CHANGES_REVISION) {
-      context.deleteSdocRevision().then(function (res) {
-        if (res.data.success) {
-          // 通知其他用户文档已经发布
-          var targetURL = "".concat(siteRoot, "lib/").concat(repoID, "/file").concat(originFilePath);
-          editorRef.current.publishDocument(targetURL);
-          // 跳转页面
-          jumpToURL(targetURL);
-          setShowTip(false);
-        }
-      }).catch(function (error) {
-        toaster.danger(t('Error'));
-      });
-      return;
-    }
-    if (tipType === TIP_TYPE.MERGE) {
-      context.mergeSdocRevision().then(function (res) {
-        var origin_file_version = res.data.origin_file_version;
-        context.updateSettings({
-          'originFileVersion': origin_file_version
-        });
-
-        // 通知其他用户合并文档 并更新
-        editorRef.current.mergeDocument(mergeValue, origin_file_version);
-
-        // 当前用户更新内容
-        editorRef.current.setLoading(true);
-        editorRef.current.setSlateValue(mergeValue);
-        setMode(MODE.EDITOR);
-        editorRef.current.setEditorMode(MODE.EDITOR);
-        editorRef.current.setLoading(false);
-        setShowTip(false);
-      }).catch(function (error) {
-        toaster.danger(t('Error'));
-      });
-      return;
-    }
-    setShowTip(false);
-
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [tipType, originFileURL, mergeValue, editorRef.current]);
-  if (isLoadingSdoc) {
+  if (isFirstLoad && !errorMessage) {
     return /*#__PURE__*/React.createElement(Loading, null);
   }
-  if (errorMessage) {
+  if (isFirstLoad && errorMessage) {
     return /*#__PURE__*/React.createElement("div", {
       className: "error-page"
     }, /*#__PURE__*/React.createElement("div", {
@@ -343,21 +143,25 @@ var SimpleEditor = function SimpleEditor(_ref) {
     isEditMode: !isShowChanges
   }), /*#__PURE__*/React.createElement(DocOperations, {
     isShowChanges: isShowChanges,
-    mode: mode,
     changes: changes,
-    toggleViewChanges: toggleViewChanges,
-    publishRevision: publishRevision,
-    abortRebase: abortRebase
-  })), /*#__PURE__*/React.createElement(Content, null, /*#__PURE__*/React.createElement(SDocEditor, {
-    ref: editorRef,
-    document: document,
-    mode: mode,
-    setDiffChanges: setDiffChanges,
     toggleViewChanges: toggleViewChanges
-  }))), showTip && /*#__PURE__*/React.createElement(TipDialog, {
-    toggle: closeTip,
-    submit: tipSubmit,
-    tipType: tipType
-  }));
+  })), /*#__PURE__*/React.createElement(Content, null, isLoadingSdoc && /*#__PURE__*/React.createElement("div", {
+    className: "w-100 h-100 d-flex align-items-center justify-content-center"
+  }, /*#__PURE__*/React.createElement(Loading, null)), !isLoadingSdoc && errorMessage && /*#__PURE__*/React.createElement("div", {
+    className: "error-page"
+  }, /*#__PURE__*/React.createElement("div", {
+    className: "error-tip"
+  }, t(errorMessage))), !isLoadingSdoc && !errorMessage && /*#__PURE__*/React.createElement(React.Fragment, null, isShowChanges ? /*#__PURE__*/React.createElement(DiffViewer, {
+    showToolbar: true,
+    showOutline: true,
+    currentContent: currentContent,
+    lastContent: lastContent,
+    didMountCallback: setDiffChanges
+  }) : /*#__PURE__*/React.createElement(SDocEditor, {
+    config: context.getEditorConfig(),
+    document: document,
+    ref: editorRef,
+    isOpenSocket: context.getSetting('isOpenSocket')
+  })))));
 };
 export default withTranslation('sdoc-editor')(SimpleEditor);

package/package.json

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

package/public/locales/en/sdoc-editor.json

@@ -362,17 +362,5 @@
   "No_changes": "No changes",
   "Title": "Title",
   "Subtitle": "Subtitle",
-  "Link_sdoc": "Link sdoc",
-  "Keep_my_modification": "Keep my modification",
-  "Keep_other_modification": "Keep other's modification",
-  "Keep_both_modification": "Keep my modification",
-  "Need_rebase": "Need rebase",
-  "Abort": "Abort",
-  "Tip": "Tip",
-  "Rebase_delete_no_change_revision_tip": "Revision has not made any change compared to original document. Do you want to delete this revision?",
-  "Has_been_merge_tip": "Revision has been merged, please refresh the page to see the latest content.",
-  "Has_been_published_tip": "Revision has been published, Automatically jump to source content after {{ time }} seconds.",
-  "Has_conflict_before_publish_tip": "There are conflicts in the document, please resolve it before publishing!",
-  "Merge_tip": "There are conflicts in the documents. Do you want to merge them?",
-  "Has_conflict_before_view_changes_tip": "There are conflicts in the document. Please resolve the conflict before viewing the changes!"
+  "Link_sdoc": "Link sdoc"
 }

package/public/locales/zh_CN/sdoc-editor.json

@@ -362,16 +362,5 @@
   "No_changes": "没有变化",
   "Title": "标题",
   "Subtitle": "副标题",
-  "Link_sdoc": "链接 sdoc",
-  "Keep_my_modification": "保留我的更改",
-  "Keep_other_modification": "保留其他的更改",
-  "Keep_both_modification": "保留两个更改",
-  "Need_rebase": "需要变基",
-  "Abort": "中止",
-  "Rebase_delete_no_change_revision_tip": "修订改没有更改，是否删除修订稿？",
-  "Has_been_merge_tip": "修订稿被合并了，请刷新页面查看最新内容。",
-  "Has_been_published_tip": "修订稿已经发布了，{{ time }} 秒后自动跳转到源文件.",
-  "Has_conflict_before_publish_tip": "文档有冲突，请解决冲突后再发布!",
-  "Merge_tip": "文档有冲突，是否合并？",
-  "Has_conflict_before_view_changes_tip": "文档有冲突，请解决冲突后再查看更改!"
+  "Link_sdoc": "链接 sdoc"
 }