@seafile/sdoc-editor 0.1.161 → 0.1.163

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

@@ -7,7 +7,7 @@ export { DEFAULT_COLORS, STANDARD_COLORS, DEFAULT_RECENT_USED_LIST, DEFAULT_FONT
 export { FONT_SIZE, DEFAULT_FONT, FONT, GOOGLE_FONT_CLASS, RECENT_USED_FONTS_KEY, SDOC_FONT_SIZE } from './font';
 export { DIFF_TYPE, ADDED_STYLE, DELETED_STYLE } from './diff-view';
 export { KEYBOARD, MAC_HOTKEYS, WIN_HOTKEYS } from './keyboard';
-export { UNDO, REDO, TEXT_STYLE, TEXT_STYLE_MAP, TEXT_STYLE_MORE, TEXT_ALIGN, REMOVE_TABLE, CLEAR_FORMAT, MENUS_CONFIG_MAP, SIDE_MENUS_CONFIG } from './menus-config';
+export { UNDO, REDO, TEXT_STYLE, TEXT_STYLE_MAP, TEXT_STYLE_MORE, TEXT_ALIGN, REMOVE_TABLE, CLEAR_FORMAT, MENUS_CONFIG_MAP, SIDE_TRANSFORM_MENUS_CONFIG, SIDE_INSERT_MENUS_CONFIG } from './menus-config';
 export var HEADERS = [HEADER1, HEADER2, HEADER3, HEADER4, HEADER5, HEADER6];
 export var HEADER_TITLE_MAP = (_HEADER_TITLE_MAP = {}, _defineProperty(_HEADER_TITLE_MAP, TITLE, 'Title'), _defineProperty(_HEADER_TITLE_MAP, SUBTITLE, 'Subtitle'), _defineProperty(_HEADER_TITLE_MAP, HEADER1, 'Header_one'), _defineProperty(_HEADER_TITLE_MAP, HEADER2, 'Header_two'), _defineProperty(_HEADER_TITLE_MAP, HEADER3, 'Header_three'), _defineProperty(_HEADER_TITLE_MAP, HEADER4, 'Header_four'), _defineProperty(_HEADER_TITLE_MAP, HEADER5, 'Header_five'), _defineProperty(_HEADER_TITLE_MAP, HEADER6, 'Header_six'), _defineProperty(_HEADER_TITLE_MAP, PARAGRAPH, 'Paragraph'), _HEADER_TITLE_MAP);
 export var TRANSPARENT = 'transparent';

package/dist/basic-sdk/extension/constants/menus-config.js

@@ -1,7 +1,7 @@
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-var _MENUS_CONFIG_MAP;
+var _MENUS_CONFIG_MAP, _SIDE_INSERT_MENUS_CO;
 import { RECENT_USED_HIGHLIGHT_COLORS_KEY, DEFAULT_LAST_USED_HIGHLIGHT_COLOR, RECENT_USED_FONT_COLORS_KEY, DEFAULT_FONT_COLOR, DEFAULT_LAST_USED_FONT_COLOR } from './color';
-import { BLOCKQUOTE, HEADER1, HEADER2, HEADER3, HEADER4, HEADER5, HEADER6, ORDERED_LIST, UNORDERED_LIST, CHECK_LIST_ITEM, CODE_BLOCK, LINK, IMAGE, TABLE, SDOC_LINK, FILE_LINK, PARAGRAPH } from './element-type';
+import { BLOCKQUOTE, HEADER, HEADER1, HEADER2, HEADER3, HEADER4, HEADER5, HEADER6, ORDERED_LIST, UNORDERED_LIST, CHECK_LIST_ITEM, CODE_BLOCK, LINK, IMAGE, TABLE, SDOC_LINK, FILE_LINK, PARAGRAPH } from './element-type';
 export var UNDO = 'undo';
 export var REDO = 'redo';
 export var CLEAR_FORMAT = 'clear_format';
@@ -166,8 +166,8 @@ export var MENUS_CONFIG_MAP = (_MENUS_CONFIG_MAP = {}, _defineProperty(_MENUS_CO
   text: 'Link_file'
 }), _MENUS_CONFIG_MAP);
 
-// side menu config
-export var SIDE_MENUS_CONFIG = [{
+// Side transform menu config
+export var SIDE_TRANSFORM_MENUS_CONFIG = [{
   id: PARAGRAPH,
   iconClass: 'sdocfont sdoc-text',
   type: PARAGRAPH,
@@ -217,24 +217,72 @@ export var SIDE_MENUS_CONFIG = [{
   iconClass: 'sdocfont sdoc-check-square',
   type: CHECK_LIST_ITEM,
   text: 'Check_list_item'
-}, {
-  id: ALIGN_LEFT,
-  iconClass: 'sdocfont sdoc-align-left',
-  type: 'left',
-  text: 'Left'
-}, {
-  id: ALIGN_CENTER,
-  iconClass: 'sdocfont sdoc-align-center',
-  type: 'center',
-  text: 'Center'
-}, {
-  id: ALIGN_RIGHT,
-  iconClass: 'sdocfont sdoc-align-right',
-  type: 'right',
-  text: 'Right'
 }, {
   id: BLOCKQUOTE,
   iconClass: 'sdocfont sdoc-quote1',
   type: BLOCKQUOTE,
   text: 'Quote'
-}];
+}];
+
+// Side insert menu config
+export var SIDE_INSERT_MENUS_CONFIG = (_SIDE_INSERT_MENUS_CO = {}, _defineProperty(_SIDE_INSERT_MENUS_CO, IMAGE, {
+  id: '',
+  iconClass: 'sdocfont sdoc-image',
+  type: IMAGE,
+  text: 'Insert_image'
+}), _defineProperty(_SIDE_INSERT_MENUS_CO, TABLE, {
+  id: 'sdoc-side-menu-item-table',
+  iconClass: 'sdocfont sdoc-table',
+  type: TABLE,
+  text: 'Insert_table'
+}), _defineProperty(_SIDE_INSERT_MENUS_CO, LINK, {
+  id: '',
+  iconClass: 'sdocfont sdoc-link',
+  type: LINK,
+  text: 'Insert_link'
+}), _defineProperty(_SIDE_INSERT_MENUS_CO, CODE_BLOCK, {
+  id: '',
+  iconClass: 'sdocfont sdoc-code-block',
+  type: CODE_BLOCK,
+  text: 'Code_block'
+}), _defineProperty(_SIDE_INSERT_MENUS_CO, ORDERED_LIST, {
+  id: '',
+  iconClass: 'sdocfont sdoc-list-ol',
+  type: ORDERED_LIST,
+  text: 'Ordered_list'
+}), _defineProperty(_SIDE_INSERT_MENUS_CO, UNORDERED_LIST, {
+  id: '',
+  iconClass: 'sdocfont sdoc-list-ul',
+  type: UNORDERED_LIST,
+  text: 'Unordered_list'
+}), _defineProperty(_SIDE_INSERT_MENUS_CO, CHECK_LIST_ITEM, {
+  id: '',
+  iconClass: 'sdocfont sdoc-check-square',
+  type: CHECK_LIST_ITEM,
+  text: 'Check_list_item'
+}), _defineProperty(_SIDE_INSERT_MENUS_CO, PARAGRAPH, {
+  id: PARAGRAPH,
+  iconClass: 'sdocfont sdoc-text',
+  type: PARAGRAPH,
+  text: 'Paragraph'
+}), _defineProperty(_SIDE_INSERT_MENUS_CO, HEADER, [{
+  id: HEADER1,
+  iconClass: 'sdocfont sdoc-header1',
+  type: HEADER1,
+  text: 'Header_one'
+}, {
+  id: HEADER2,
+  iconClass: 'sdocfont sdoc-header2',
+  type: HEADER2,
+  text: 'Header_two'
+}, {
+  id: HEADER3,
+  iconClass: 'sdocfont sdoc-header3',
+  type: HEADER3,
+  text: 'Header_three'
+}, {
+  id: HEADER4,
+  iconClass: 'sdocfont sdoc-header4',
+  type: HEADER4,
+  text: 'Header_four'
+}]), _SIDE_INSERT_MENUS_CO);

package/dist/basic-sdk/extension/plugins/check-list/helpers.js

@@ -1,8 +1,8 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
 import { Transforms, Editor, Element } from '@seafile/slate';
-import { CHECK_LIST_ITEM, PARAGRAPH, ELEMENT_TYPE } from '../../constants';
-import { getSelectedNodeByType } from '../../core';
+import { CHECK_LIST_ITEM, PARAGRAPH, ELEMENT_TYPE, INSERT_POSITION } from '../../constants';
+import { getSelectedNodeByType, generateEmptyElement } from '../../core';
 export var isMenuDisabled = function isMenuDisabled(editor, readonly) {
   if (readonly) return true;
   if (editor.selection == null) return true;
@@ -43,7 +43,15 @@ export var getCheckListItemType = function getCheckListItemType(editor) {
   if (!node) return PARAGRAPH;
   return node.type;
 };
-export var setCheckListItemType = function setCheckListItemType(editor, newType) {
+export var setCheckListItemType = function setCheckListItemType(editor, newType, insertPosition) {
+  if (insertPosition === INSERT_POSITION.AFTER) {
+    var p = generateEmptyElement(PARAGRAPH);
+    var path = Editor.path(editor, editor.selection);
+    Transforms.insertNodes(editor, p, {
+      at: [path[0] + 1]
+    });
+    Transforms.select(editor, [path[0] + 1]);
+  }
   Transforms.setNodes(editor, {
     type: newType
   });

package/dist/basic-sdk/extension/plugins/list/transforms/toggle-list.js

@@ -1,8 +1,8 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { Node, Range, Transforms, Element, Editor } from '@seafile/slate';
-import { LIST_ITEM, LIST_LIC, PARAGRAPH } from '../../../constants';
-import { findNode, getNodeEntries, getNodeType, getSelectedNodeEntryByType, isRangeAcrossBlocks } from '../../../core';
+import { LIST_ITEM, LIST_LIC, PARAGRAPH, INSERT_POSITION } from '../../../constants';
+import { findNode, getNodeEntries, getNodeType, getSelectedNodeEntryByType, isRangeAcrossBlocks, generateEmptyElement } from '../../../core';
 import { getListItemEntry, getListTypes } from '../queries';
 import { unwrapList } from './unwrap-list';
 import { generateEmptyList, generateEmptyListItem } from '../model';
@@ -110,7 +110,18 @@ var wrapRangeList = function wrapRangeList(editor, type) {
     });
   });
 };
-var toggleList = function toggleList(editor, type) {
+var toggleList = function toggleList(editor, type, insertPosition) {
+  if (insertPosition === INSERT_POSITION.AFTER) {
+    var list = generateEmptyList(type);
+    var p = generateEmptyElement(PARAGRAPH);
+    var path = Editor.path(editor, editor.selection);
+    Transforms.insertNodes(editor, p, {
+      at: [path[0] + 1]
+    });
+    Transforms.select(editor, [path[0] + 1]);
+    Transforms.wrapNodes(editor, list);
+    return;
+  }
   Editor.withoutNormalizing(editor, function () {
     var selection = editor.selection;
     if (!selection) return false;
@@ -120,9 +131,9 @@ var toggleList = function toggleList(editor, type) {
     if (Range.isCollapsed(selection) || !isRangeAcrossBlocks(editor)) {
       var res = getListItemEntry(editor);
       if (res) {
-        var list = res.list;
+        var _list = res.list;
         // 选中内容的类型是另一个类型, 如： select_type: ordered_list, 将被切换为 unordered_list
-        if (list[0].type !== type) {
+        if (_list[0].type !== type) {
           var match = function match(n) {
             return getListTypes().includes(getNodeType(n));
           };

package/dist/basic-sdk/extension/toolbar/side-toolbar/helpers.js

@@ -3,7 +3,8 @@ import slugid from 'slugid';
 import { ReactEditor } from '@seafile/slate-react';
 import copy from 'copy-to-clipboard';
 import { toggleList } from '../../plugins/list/transforms';
-import { ORDERED_LIST, UNORDERED_LIST, PARAGRAPH, CHECK_LIST_ITEM, IMAGE, TABLE, CODE_BLOCK, LIST_ITEM, BLOCKQUOTE, LIST_ITEM_CORRELATION_TYPE, ADD_POSITION_OFFSET_TYPE } from '../../constants';
+import { generateEmptyElement } from '../../core';
+import { ORDERED_LIST, UNORDERED_LIST, PARAGRAPH, CHECK_LIST_ITEM, IMAGE, TABLE, CODE_BLOCK, BLOCKQUOTE, LIST_ITEM_CORRELATION_TYPE, ADD_POSITION_OFFSET_TYPE, INSERT_POSITION } from '../../constants';
 export var onSetNodeType = function onSetNodeType(editor, element, type) {
   if (!type) return;
   if ([ORDERED_LIST, UNORDERED_LIST].includes(type)) {
@@ -17,12 +18,6 @@ export var onSetNodeType = function onSetNodeType(editor, element, type) {
     });
     return;
   }
-  if (['left', 'center', 'right'].includes(type)) {
-    Transforms.setNodes(editor, {
-      'align': type
-    });
-    return;
-  }
   if (type === BLOCKQUOTE && LIST_ITEM_CORRELATION_TYPE.includes(element.type)) {
     Transforms.wrapNodes(editor, {
       id: slugid.nice(),
@@ -88,4 +83,19 @@ export var isNotSupportTransform = function isNotSupportTransform(node) {
     return true;
   }
   return false;
+};
+export var insertElement = function insertElement(editor, type, insertPosition) {
+  if (insertPosition === INSERT_POSITION.AFTER) {
+    var p = generateEmptyElement(PARAGRAPH);
+    var path = Editor.path(editor, editor.selection);
+    Transforms.insertNodes(editor, p, {
+      at: [path[0] + 1]
+    });
+    Transforms.select(editor, [path[0] + 1]);
+  }
+  if (type !== PARAGRAPH) {
+    Transforms.setNodes(editor, {
+      type: type
+    });
+  }
 };

package/dist/basic-sdk/extension/toolbar/side-toolbar/insert-block-menu.js

@@ -1,11 +1,15 @@
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import React, { useCallback } from 'react';
 import { useSlateStatic } from '@seafile/slate-react';
 import { Transforms } from '@seafile/slate';
+import { insertElement } from './helpers';
 import { insertTable } from '../../plugins/table/helpers';
 import TableSizePopover from '../../plugins/table/popover/table-size-popover';
 import { changeToCodeBlock } from '../../plugins/code-block/helpers';
-import { ELEMENT_TYPE, INSERT_POSITION, LOCAL_IMAGE, MENUS_CONFIG_MAP, LIST_ITEM } from '../../constants';
+import { toggleList } from '../../plugins/list/transforms';
+import { setCheckListItemType } from '../../plugins/check-list/helpers';
+import { ELEMENT_TYPE, INSERT_POSITION, LOCAL_IMAGE, SIDE_INSERT_MENUS_CONFIG } from '../../constants';
 import EventBus from '../../../utils/event-bus';
 import { INTERNAL_EVENT } from '../../../constants';
 import DropdownMenuItem from '../../commons/dropdown-menu-item';
@@ -27,7 +31,7 @@ var InsertBlockMenu = function InsertBlockMenu(_ref) {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [editor, insertPosition]);
   var createTable = useCallback(function (size) {
-    var newInsertPosition = slateNode.type === LIST_ITEM ? INSERT_POSITION.AFTER : insertPosition;
+    var newInsertPosition = slateNode.type === ELEMENT_TYPE.LIST_ITEM ? INSERT_POSITION.AFTER : insertPosition;
     insertTable(editor, size, editor.selection, newInsertPosition);
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -43,7 +47,7 @@ var InsertBlockMenu = function InsertBlockMenu(_ref) {
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [insertPosition]);
   var onInsertCodeBlock = useCallback(function () {
-    var newInsertPosition = slateNode.type === LIST_ITEM ? INSERT_POSITION.AFTER : insertPosition;
+    var newInsertPosition = slateNode.type === ELEMENT_TYPE.LIST_ITEM ? INSERT_POSITION.AFTER : insertPosition;
     changeToCodeBlock(editor, 'plaintext', newInsertPosition);
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -57,15 +61,23 @@ var InsertBlockMenu = function InsertBlockMenu(_ref) {
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [insertPosition]);
+  var onInsertList = useCallback(function (type) {
+    toggleList(editor, type, insertPosition);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [editor, insertPosition, slateNode]);
+  var onInsertCheckList = useCallback(function () {
+    setCheckListItemType(editor, ELEMENT_TYPE.CHECK_LIST_ITEM, insertPosition);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [editor, insertPosition, slateNode]);
+  var onInsert = useCallback(function (type) {
+    insertElement(editor, type, insertPosition);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [editor, insertPosition, slateNode]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(DropdownMenuItem, {
-    menuConfig: _objectSpread(_objectSpread({}, MENUS_CONFIG_MAP[ELEMENT_TYPE.IMAGE]), {}, {
-      id: ''
-    }),
+    menuConfig: _objectSpread({}, SIDE_INSERT_MENUS_CONFIG[ELEMENT_TYPE.IMAGE]),
     onClick: onInsertImageToggle
   }), /*#__PURE__*/React.createElement(DropdownMenuItem, {
-    menuConfig: _objectSpread(_objectSpread({}, MENUS_CONFIG_MAP[ELEMENT_TYPE.TABLE]), {}, {
-      id: 'sdoc-side-menu-item-table'
-    }),
+    menuConfig: _objectSpread({}, SIDE_INSERT_MENUS_CONFIG[ELEMENT_TYPE.TABLE]),
     className: "pr-2"
   }, /*#__PURE__*/React.createElement("i", {
     className: "sdocfont sdoc-right-slide sdoc-dropdown-item-right-icon"
@@ -77,15 +89,32 @@ var InsertBlockMenu = function InsertBlockMenu(_ref) {
     createTable: createTable,
     openDialog: openTableDialog
   })), /*#__PURE__*/React.createElement(DropdownMenuItem, {
-    menuConfig: _objectSpread(_objectSpread({}, MENUS_CONFIG_MAP[ELEMENT_TYPE.LINK]), {}, {
-      id: ''
-    }),
+    menuConfig: _objectSpread({}, SIDE_INSERT_MENUS_CONFIG[ELEMENT_TYPE.LINK]),
     onClick: openLinkDialog
   }), /*#__PURE__*/React.createElement(DropdownMenuItem, {
-    menuConfig: _objectSpread(_objectSpread({}, MENUS_CONFIG_MAP[ELEMENT_TYPE.CODE_BLOCK]), {}, {
-      id: ''
-    }),
+    menuConfig: _objectSpread({}, SIDE_INSERT_MENUS_CONFIG[ELEMENT_TYPE.CODE_BLOCK]),
     onClick: onInsertCodeBlock
+  }), /*#__PURE__*/React.createElement(DropdownMenuItem, {
+    menuConfig: _objectSpread({}, SIDE_INSERT_MENUS_CONFIG[ELEMENT_TYPE.UNORDERED_LIST]),
+    onClick: function onClick() {
+      onInsertList(ELEMENT_TYPE.UNORDERED_LIST);
+    }
+  }), /*#__PURE__*/React.createElement(DropdownMenuItem, {
+    menuConfig: _objectSpread({}, SIDE_INSERT_MENUS_CONFIG[ELEMENT_TYPE.ORDERED_LIST]),
+    onClick: function onClick() {
+      onInsertList(ELEMENT_TYPE.ORDERED_LIST);
+    }
+  }), /*#__PURE__*/React.createElement(DropdownMenuItem, {
+    menuConfig: _objectSpread({}, SIDE_INSERT_MENUS_CONFIG[ELEMENT_TYPE.CHECK_LIST_ITEM]),
+    onClick: onInsertCheckList
+  }), [SIDE_INSERT_MENUS_CONFIG[ELEMENT_TYPE.PARAGRAPH]].concat(_toConsumableArray(SIDE_INSERT_MENUS_CONFIG[ELEMENT_TYPE.HEADER])).map(function (item) {
+    return /*#__PURE__*/React.createElement(DropdownMenuItem, {
+      key: item.id,
+      menuConfig: item,
+      onClick: function onClick() {
+        return onInsert(item.type);
+      }
+    });
   }));
 };
 InsertBlockMenu.defaultProps = {

package/dist/basic-sdk/extension/toolbar/side-toolbar/side-menu.js

@@ -58,7 +58,7 @@ var SideMenu = function SideMenu(_ref) {
   }, /*#__PURE__*/React.createElement("div", {
     className: "sdoc-side-menu sdoc-dropdown-menu",
     ref: sideMenuRef
-  }, /*#__PURE__*/React.createElement(React.Fragment, null, !isNotSupportTransform(slateNode) && /*#__PURE__*/React.createElement(DropdownMenuItem, {
+  }, /*#__PURE__*/React.createElement(React.Fragment, null, !isNodeEmpty && !isNotSupportTransform(slateNode) && /*#__PURE__*/React.createElement(DropdownMenuItem, {
     menuConfig: {
       id: 'sdoc-side-menu-item-transform',
       text: 'Transform_to',

package/dist/basic-sdk/extension/toolbar/side-toolbar/transform-menus.js

@@ -3,7 +3,7 @@ import { UncontrolledPopover } from 'reactstrap';
 import { withTranslation } from 'react-i18next';
 import { useSlateStatic } from '@seafile/slate-react';
 import { onSetNodeType } from './helpers';
-import { SIDE_MENUS_CONFIG, LIST_ITEM_SUPPORTED_TRANSFORMATION, LIST_ITEM_CORRELATION_TYPE } from '../../constants';
+import { SIDE_TRANSFORM_MENUS_CONFIG, LIST_ITEM_SUPPORTED_TRANSFORMATION, LIST_ITEM_CORRELATION_TYPE } from '../../constants';
 import DropdownMenuItem from '../../commons/dropdown-menu-item';
 var TransformMenus = function TransformMenus(_ref) {
   var target = _ref.target,
@@ -16,10 +16,10 @@ var TransformMenus = function TransformMenus(_ref) {
     onReset();
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
-  var getSideMenusConfig = useCallback(function (SIDE_MENUS_CONFIG) {
-    var newSideMenusConfig = SIDE_MENUS_CONFIG;
+  var getSideMenusConfig = useCallback(function (SIDE_TRANSFORM_MENUS_CONFIG) {
+    var newSideMenusConfig = SIDE_TRANSFORM_MENUS_CONFIG;
     if (LIST_ITEM_CORRELATION_TYPE.includes(slateNode.type)) {
-      newSideMenusConfig = SIDE_MENUS_CONFIG.filter(function (item) {
+      newSideMenusConfig = SIDE_TRANSFORM_MENUS_CONFIG.filter(function (item) {
         return LIST_ITEM_SUPPORTED_TRANSFORMATION.includes(item.type);
       });
     }
@@ -36,7 +36,7 @@ var TransformMenus = function TransformMenus(_ref) {
     fade: false
   }, /*#__PURE__*/React.createElement("div", {
     className: "sdoc-dropdown-menu-container"
-  }, getSideMenusConfig(SIDE_MENUS_CONFIG).map(function (item) {
+  }, getSideMenusConfig(SIDE_TRANSFORM_MENUS_CONFIG).map(function (item) {
     return /*#__PURE__*/React.createElement(DropdownMenuItem, {
       key: item.id,
       menuConfig: item,

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

@@ -4,6 +4,7 @@ import { withTranslation } from 'react-i18next';
 import { Dropdown, DropdownToggle, DropdownMenu, DropdownItem } from 'reactstrap';
 import context from '../../../../context';
 import toaster from '../../../toast';
+import { REVISION_FIRST_LOAD_KEY, REVISION_FIRST_LOAD_VALUE } from '../../../../constants';
 import './index.css';
 var MoreRevisionOperations = function MoreRevisionOperations(_ref) {
   var t = _ref.t;
@@ -18,7 +19,7 @@ var MoreRevisionOperations = function MoreRevisionOperations(_ref) {
   }, []);
   var startRevise = useCallback(function () {
     context.startRevise().then(function (res) {
-      window.location.href = "".concat(siteRoot, "lib/").concat(repoID, "/revisions/").concat(res.data.revision_id, "/");
+      window.location.href = "".concat(siteRoot, "lib/").concat(repoID, "/revisions/").concat(res.data.revision_id, "/?").concat(REVISION_FIRST_LOAD_KEY, "=").concat(REVISION_FIRST_LOAD_VALUE);
     }).catch(function (error) {
       toaster.danger(t('Error'));
     });

package/dist/components/tip-dialog/index.css

@@ -0,0 +1,4 @@
+.sdoc-tip-dialog .highlight-bg-color {
+  background-color: #FF8000;
+  border-color: #FF8000;
+}

package/dist/components/tip-dialog/index.js

@@ -1,10 +1,13 @@
-import React, { useCallback } from 'react';
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import React, { useCallback, useState } from 'react';
 import { useTranslation } from 'react-i18next';
 import { Modal, ModalHeader, ModalBody, ModalFooter, Button } from 'reactstrap';
 import classnames from 'classnames';
 import { TIP_TYPE, TIP_TITLE } from '../../constants';
 import TipContent from './tip-content';
-var NOT_CLOSE_DIALOG_TIP_TYPE = [TIP_TYPE.HAS_BEEN_REPLACED, TIP_TYPE.HAS_BEEN_PUBLISHED];
+import CommonLoading from '../common-loading';
+import './index.css';
+var NOT_CLOSE_DIALOG_TIP_TYPE = [TIP_TYPE.HAS_BEEN_REPLACED, TIP_TYPE.HAS_BEEN_PUBLISHED, TIP_TYPE.CHECKING, TIP_TYPE.PUBLISHING];
 var TipDialog = function TipDialog(_ref) {
   var className = _ref.className,
     tipType = _ref.tipType,
@@ -12,17 +15,24 @@ var TipDialog = function TipDialog(_ref) {
     submit = _ref.submit;
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    isSubmitting = _useState2[0],
+    setSubmitting = _useState2[1];
   var closeDialog = useCallback(function () {
     if (NOT_CLOSE_DIALOG_TIP_TYPE.includes(tipType)) return;
+    if (isSubmitting) return;
     toggle && toggle();
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [tipType]);
+  }, [tipType, isSubmitting]);
   var confirmTip = useCallback(function () {
-    submit && submit();
+    submit && submit(function (submitting) {
+      setSubmitting(submitting);
+    });
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
+  }, [tipType]);
   return /*#__PURE__*/React.createElement(Modal, {
     isOpen: true,
     autoFocus: false,
@@ -43,8 +53,13 @@ var TipDialog = function TipDialog(_ref) {
     onClick: closeDialog
   }, t('Cancel')), /*#__PURE__*/React.createElement(Button, {
     color: "primary",
-    className: "highlight-bg-color",
-    onClick: confirmTip
-  }, t('Confirm'))));
+    className: classnames('highlight-bg-color', {
+      'd-flex align-items-center': isSubmitting
+    }),
+    onClick: confirmTip,
+    disabled: isSubmitting
+  }, isSubmitting && /*#__PURE__*/React.createElement("span", {
+    className: "submit-loading-container mr-2"
+  }, /*#__PURE__*/React.createElement(CommonLoading, null)), t('Confirm'))));
 };
 export default TipDialog;

package/dist/constants/index.js

@@ -1,5 +1,7 @@
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 var _TIP_TITLE, _TIP_CONTENT;
+export var REVISION_FIRST_LOAD_KEY = 'first-load';
+export var REVISION_FIRST_LOAD_VALUE = '1';
 export var EXTERNAL_EVENT = {
   INTERNAL_LINK_CLICK: 'internal_link_click',
   TOGGLE_STAR: 'toggle_star',
@@ -24,7 +26,9 @@ export var TIP_TYPE = {
   HAS_BEEN_PUBLISHED: 'has_been_published',
   HAS_BEEN_REPLACED: 'has_been_merge',
   HAS_CONFLICT_BEFORE_VIEW_CHANGES: 'has_conflict_before_view_changes',
-  HAS_BEEN_REMOVED: 'has_been_removed'
+  HAS_BEEN_REMOVED: 'has_been_removed',
+  CHECKING: 'checking',
+  PUBLISHING: 'publishing'
 };
-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);
+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'), _defineProperty(_TIP_TITLE, TIP_TYPE.CHECKING, 'Tip'), _defineProperty(_TIP_TITLE, TIP_TYPE.PUBLISHING, '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'), _defineProperty(_TIP_CONTENT, TIP_TYPE.CHECKING, 'Checking'), _defineProperty(_TIP_CONTENT, TIP_TYPE.PUBLISHING, 'Publishing'), _TIP_CONTENT);

package/dist/pages/simple-editor.js

@@ -11,7 +11,7 @@ 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 { EXTERNAL_EVENT, MODE, TIP_TYPE, REVISION_FIRST_LOAD_KEY, REVISION_FIRST_LOAD_VALUE } from '../constants';
 import { getRebase, hasConflict } from '../basic-sdk/utils/rebase';
 import toaster from '../components/toast';
 import { EventBus, SDocEditor } from '../basic-sdk';
@@ -79,6 +79,18 @@ var SimpleEditor = function SimpleEditor(_ref) {
     var originFilename = context.getSetting('originFilename');
     if (isSdocRevision) {
       window.document.getElementsByTagName('title')[0].innerText = "".concat(t('Revision'), " - ").concat(originFilename);
+
+      // show revision created success info
+      var url = new URL(window.location.href);
+      var searchParams = new URLSearchParams(url.search);
+      if (!searchParams.has(REVISION_FIRST_LOAD_KEY)) return;
+      var firstLoadValue = searchParams.get(REVISION_FIRST_LOAD_KEY);
+      if (firstLoadValue === REVISION_FIRST_LOAD_VALUE) {
+        var revisionId = context.getSetting('revisionId');
+        toaster.success(t('Revision_created', {
+          id: revisionId
+        }));
+      }
     }
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
@@ -195,6 +207,8 @@ var SimpleEditor = function SimpleEditor(_ref) {
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
+          setTipType(TIP_TYPE.CHECKING);
+          setShowTip(true);
           loadDocument(function (document) {
             var revisionContent = document;
             if (hasConflict(revisionContent.children)) {
@@ -216,6 +230,7 @@ var SimpleEditor = function SimpleEditor(_ref) {
                 isNeedReplaceMaster = _getRebase.isNeedReplaceMaster,
                 value = _getRebase.value;
               if (canMerge && isNeedReplaceMaster) {
+                setTipType(TIP_TYPE.PUBLISHING);
                 context.publishRevision().then(function (res) {
                   setTipType(TIP_TYPE.HAS_BEEN_PUBLISHED);
                   setShowTip(true);
@@ -240,7 +255,7 @@ var SimpleEditor = function SimpleEditor(_ref) {
           });
 
           // eslint-disable-next-line react-hooks/exhaustive-deps
-        case 1:
+        case 3:
         case "end":
           return _context.stop();
       }
@@ -259,18 +274,22 @@ var SimpleEditor = function SimpleEditor(_ref) {
 
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [tipType]);
-  var tipSubmit = useCallback(function () {
+  var tipSubmit = useCallback(function (callback) {
     if (tipType === TIP_TYPE.DELETE_NO_CHANGES_REVISION) {
+      callback && callback(true);
       context.deleteSdocRevision().then(function (res) {
+        callback && callback(false);
         setShowTip(false);
         var originFileURL = context.getSetting('originFileURL');
         jumpToURL(originFileURL);
       }).catch(function (error) {
+        callback && callback(false);
         toaster.danger(t('Error'));
       });
       return;
     }
     if (tipType === TIP_TYPE.MERGE) {
+      callback && callback(true);
       var _context$getUserInfo = context.getUserInfo(),
         username = _context$getUserInfo.username;
       var doc = {
@@ -281,6 +300,7 @@ var SimpleEditor = function SimpleEditor(_ref) {
         last_modify_user: username
       };
       context.updateSdocRevision(doc).then(function (res) {
+        callback && callback(false);
         var origin_file_version = res.data.origin_file_version;
         context.updateSettings({
           'originFileVersion': origin_file_version
@@ -293,6 +313,7 @@ var SimpleEditor = function SimpleEditor(_ref) {
         editorRef.current.setLoading(false);
         setShowTip(false);
       }).catch(function (error) {
+        callback && callback(false);
         toaster.danger(t('Error'));
       });
       return;

package/package.json

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

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

@@ -347,6 +347,7 @@
   "Icon_and_text_Link": "Icon and text Link",
   "Card": "Card",
   "Select_sdoc_document": "Select sdoc document",
+  "Select_file": "Select file",
   "Local_file": "Local file",
   "Internal_server_exec_operations_error": "An exception occurred on the server, please refresh the page and try again",
   "Failed_to_sync_with_server_operations": "Synchronization with the server failed, please refresh the page",
@@ -362,5 +363,20 @@
   "No_changes": "No changes",
   "Title": "Název",
   "Subtitle": "Subtitle",
-  "Link_sdoc": "Link sdoc"
+  "Link_sdoc": "Link sdoc",
+  "Link_file": "Link file",
+  "Keep_my_modification": "Keep my modification",
+  "Keep_other_modification": "Keep other's modification",
+  "Keep_both_modification": "Keep my modification",
+  "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_replaced_tip": "Document content has been replaced. Please refresh the page.",
+  "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!",
+  "Has_been_removed_tip": "Document has been removed, please view other documents.",
+  "Revision_created": "Revision {{id}} created",
+  "Checking": "Checking...",
+  "Publishing": "Publishing..."
 }

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

@@ -347,6 +347,7 @@
   "Icon_and_text_Link": "Icon and text Link",
   "Card": "Card",
   "Select_sdoc_document": "Select sdoc document",
+  "Select_file": "Select file",
   "Local_file": "Local file",
   "Internal_server_exec_operations_error": "An exception occurred on the server, please refresh the page and try again",
   "Failed_to_sync_with_server_operations": "Synchronization with the server failed, please refresh the page",
@@ -362,5 +363,20 @@
   "No_changes": "No changes",
   "Title": "Titel",
   "Subtitle": "Subtitle",
-  "Link_sdoc": "Link sdoc"
+  "Link_sdoc": "Link sdoc",
+  "Link_file": "Link file",
+  "Keep_my_modification": "Keep my modification",
+  "Keep_other_modification": "Keep other's modification",
+  "Keep_both_modification": "Keep my modification",
+  "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_replaced_tip": "Document content has been replaced. Please refresh the page.",
+  "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!",
+  "Has_been_removed_tip": "Document has been removed, please view other documents.",
+  "Revision_created": "Revision {{id}} created",
+  "Checking": "Checking...",
+  "Publishing": "Publishing..."
 }

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

@@ -375,5 +375,8 @@
   "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!",
-  "Has_been_removed_tip": "Document has been removed, please view other documents."
+  "Has_been_removed_tip": "Document has been removed, please view other documents.",
+  "Revision_created": "Revision {{id}} created",
+  "Checking": "Checking...",
+  "Publishing": "Publishing..."
 }

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

@@ -347,6 +347,7 @@
   "Icon_and_text_Link": "Icon and text Link",
   "Card": "Card",
   "Select_sdoc_document": "Select sdoc document",
+  "Select_file": "Select file",
   "Local_file": "Local file",
   "Internal_server_exec_operations_error": "An exception occurred on the server, please refresh the page and try again",
   "Failed_to_sync_with_server_operations": "Synchronization with the server failed, please refresh the page",
@@ -362,5 +363,20 @@
   "No_changes": "No changes",
   "Title": "Título",
   "Subtitle": "Subtitle",
-  "Link_sdoc": "Link sdoc"
+  "Link_sdoc": "Link sdoc",
+  "Link_file": "Link file",
+  "Keep_my_modification": "Keep my modification",
+  "Keep_other_modification": "Keep other's modification",
+  "Keep_both_modification": "Keep my modification",
+  "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_replaced_tip": "Document content has been replaced. Please refresh the page.",
+  "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!",
+  "Has_been_removed_tip": "Document has been removed, please view other documents.",
+  "Revision_created": "Revision {{id}} created",
+  "Checking": "Checking...",
+  "Publishing": "Publishing..."
 }

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

@@ -364,5 +364,19 @@
   "Title": "Titre",
   "Subtitle": "Sous-titre",
   "Link_sdoc": "Lien sdoc",
-  "Link_file": "Link file"
+  "Link_file": "Link file",
+  "Keep_my_modification": "Keep my modification",
+  "Keep_other_modification": "Keep other's modification",
+  "Keep_both_modification": "Keep my modification",
+  "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_replaced_tip": "Document content has been replaced. Please refresh the page.",
+  "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!",
+  "Has_been_removed_tip": "Document has been removed, please view other documents.",
+  "Revision_created": "Revision {{id}} created",
+  "Checking": "Checking...",
+  "Publishing": "Publishing..."
 }

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

@@ -343,11 +343,11 @@
   "Default_font": "Default font",
   "Pending_operations_exceed_limit": "There are multiple operations not synced to the server. Please check your network.",
   "Recently_saved": "Recently saved",
-  "Sdoc_document" : "Sdoc document",
   "Text_Link": "Text Link",
   "Icon_and_text_Link": "Icon and text Link",
   "Card": "Card",
   "Select_sdoc_document": "Select sdoc document",
+  "Select_file": "Select file",
   "Local_file": "Local file",
   "Internal_server_exec_operations_error": "An exception occurred on the server, please refresh the page and try again",
   "Failed_to_sync_with_server_operations": "Synchronization with the server failed, please refresh the page",
@@ -362,5 +362,21 @@
   "Changes": "Modifiche",
   "No_changes": "No changes",
   "Title": "Titolo",
-  "SubTitle": "Subtitle"
+  "Subtitle": "Subtitle",
+  "Link_sdoc": "Link sdoc",
+  "Link_file": "Link file",
+  "Keep_my_modification": "Keep my modification",
+  "Keep_other_modification": "Keep other's modification",
+  "Keep_both_modification": "Keep my modification",
+  "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_replaced_tip": "Document content has been replaced. Please refresh the page.",
+  "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!",
+  "Has_been_removed_tip": "Document has been removed, please view other documents.",
+  "Revision_created": "Revision {{id}} created",
+  "Checking": "Checking...",
+  "Publishing": "Publishing..."
 }

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

@@ -347,7 +347,7 @@
   "Icon_and_text_Link": "Значок и текстовая ссылка",
   "Card": "Карта",
   "Select_sdoc_document": "Выбрать документ sdoc",
-  "Select_file": "Select file",
+  "Select_file": "Выбрать файл",
   "Local_file": "Заблокировать файл",
   "Internal_server_exec_operations_error": "На сервере произошло исключение. Обновите страницу и повторите попытку",
   "Failed_to_sync_with_server_operations": "Не удалось синхронизироваться с сервером, обновите страницу.",
@@ -364,5 +364,19 @@
   "Title": "Название",
   "Subtitle": "Подзаголовок",
   "Link_sdoc": "Ссылка на sdoc",
-  "Link_file": "Link file"
+  "Link_file": "Ссылка на файл",
+  "Keep_my_modification": "Сохранить мою модификацию",
+  "Keep_other_modification": "Сохранить чужую модификацию",
+  "Keep_both_modification": "Сохранить мою модификацию",
+  "Tip": "Совет",
+  "Rebase_delete_no_change_revision_tip": "Редакция не внесла никаких изменений по сравнению с исходным документом. Вы хотите удалить эту редакцию?",
+  "Has_been_replaced_tip": "Содержимое документа было заменено. Обновите страницу.",
+  "Has_been_published_tip": "Версия опубликована. Автоматический переход к исходному контенту через {{ time }} секунд.",
+  "Has_conflict_before_publish_tip": "В документе есть конфликты, разрешите их перед публикацией!",
+  "Merge_tip": "В документах есть конфликты. Вы хотите объединить их?",
+  "Has_conflict_before_view_changes_tip": "В документе есть конфликты. Разрешите конфликт перед просмотром изменений!",
+  "Has_been_removed_tip": "Документ удален, посмотрите другие документы.",
+  "Revision_created": "Revision {{id}} created",
+  "Checking": "Checking...",
+  "Publishing": "Publishing..."
 }

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

@@ -367,11 +367,16 @@
   "Link_file": "文件链接",
   "Keep_my_modification": "保留我的更改",
   "Keep_other_modification": "保留其他的更改",
-  "Keep_both_modification": "保留两个更改",
+  "Keep_both_modification": "保留我的更改",
+  "Tip": "提示",
   "Rebase_delete_no_change_revision_tip": "修订改没有更改，是否删除修订稿？",
   "Has_been_replaced_tip": "文档内容已经被替换，请刷新页面。",
   "Has_been_published_tip": "修订稿已经发布了，{{ time }} 秒后自动跳转到源文件。",
   "Has_conflict_before_publish_tip": "文档有冲突，请解决冲突后再发布！",
   "Merge_tip": "文档有冲突，是否合并？",
-  "Has_conflict_before_view_changes_tip": "文档有冲突，请解决冲突后再查看更改！"
+  "Has_conflict_before_view_changes_tip": "文档有冲突，请解决冲突后再查看更改！",
+  "Has_been_removed_tip": "文档已经被删除，请查看其他文档",
+  "Revision_created": "已创建修订稿 {{id}}",
+  "Checking": "检查中...",
+  "Publishing": "发布中..."
 }