@seafile/sdoc-editor 2.0.78-test-0.0.1 → 2.0.79
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/basic-sdk/api/sdoc-server-api.js +24 -24
- package/dist/basic-sdk/api/seafile-api.js +3 -3
- package/dist/basic-sdk/comment/comment-decorate.js +1 -1
- package/dist/basic-sdk/comment/components/comment-all-participants/participant-avatar.js +1 -1
- package/dist/basic-sdk/comment/components/comment-delete-popover.js +1 -1
- package/dist/basic-sdk/comment/components/comment-item-collapse-wrapper.js +3 -3
- package/dist/basic-sdk/comment/components/comment-item-content.js +8 -8
- package/dist/basic-sdk/comment/components/comment-item-reply.js +1 -1
- package/dist/basic-sdk/comment/components/comment-item-wrapper.js +9 -8
- package/dist/basic-sdk/comment/components/comment-list.js +13 -12
- package/dist/basic-sdk/comment/components/editor-comment.js +8 -5
- package/dist/basic-sdk/comment/components/elements-comment-count/index.js +1 -1
- package/dist/basic-sdk/comment/components/global-comment/index.js +4 -4
- package/dist/basic-sdk/comment/helper.js +11 -11
- package/dist/basic-sdk/comment/hooks/notification-hooks/use-notification-mount.js +1 -1
- package/dist/basic-sdk/comment/provider/notification-context-provider.js +3 -3
- package/dist/basic-sdk/comment/reducer/comment-reducer.js +50 -24
- package/dist/basic-sdk/comment/reducer/notification-reducer.js +9 -7
- package/dist/basic-sdk/comment/utils/index.js +2 -2
- package/dist/basic-sdk/comment/utils/notification-utils.js +3 -3
- package/dist/basic-sdk/components/toast/alert.js +1 -1
- package/dist/basic-sdk/components/toast/toast.js +1 -1
- package/dist/basic-sdk/components/toast/toastManager.js +8 -10
- package/dist/basic-sdk/components/toast/toaster.js +13 -10
- package/dist/basic-sdk/context.js +2 -2
- package/dist/basic-sdk/cursor/helper.js +11 -4
- package/dist/basic-sdk/editor/comment-article.js +4 -4
- package/dist/basic-sdk/editor/sdoc-comment-editor.js +4 -4
- package/dist/basic-sdk/editor/sdoc-editor.js +4 -4
- package/dist/basic-sdk/editor/wiki-editor.js +4 -4
- package/dist/basic-sdk/extension/commons/color-menu/index.js +5 -5
- package/dist/basic-sdk/extension/commons/file-insert-dialog/index.js +9 -8
- package/dist/basic-sdk/extension/commons/insert-element-dialog/index.js +1 -1
- package/dist/basic-sdk/extension/commons/menu-shortcut-indicator/index.js +1 -1
- package/dist/basic-sdk/extension/commons/select/_option.js +2 -2
- package/dist/basic-sdk/extension/commons/select/field-setting.js +7 -6
- package/dist/basic-sdk/extension/commons/select/index.js +3 -3
- package/dist/basic-sdk/extension/commons/select/menu/item.js +2 -2
- package/dist/basic-sdk/extension/commons/select-file-dialog/helpers.js +25 -7
- package/dist/basic-sdk/extension/commons/select-file-dialog/index.js +8 -6
- package/dist/basic-sdk/extension/commons/select-file-dialog/local-files/index.js +7 -9
- package/dist/basic-sdk/extension/commons/wiki-file-insert-dialog/index.js +5 -5
- package/dist/basic-sdk/extension/constants/index.js +17 -1
- package/dist/basic-sdk/extension/constants/menus-config.js +13 -13
- package/dist/basic-sdk/extension/core/queries/index.js +35 -35
- package/dist/basic-sdk/extension/core/transforms/rebase.js +13 -10
- package/dist/basic-sdk/extension/core/transforms/remove-node-children.js +3 -4
- package/dist/basic-sdk/extension/core/transforms/replace-node.js +10 -9
- package/dist/basic-sdk/extension/core/transforms/update-parent-node.js +3 -3
- package/dist/basic-sdk/extension/core/utils/index.js +4 -5
- package/dist/basic-sdk/extension/plugins/ai/ai-module/index.js +10 -10
- package/dist/basic-sdk/extension/plugins/blockquote/helpers.js +3 -3
- package/dist/basic-sdk/extension/plugins/blockquote/menu/index.js +4 -5
- package/dist/basic-sdk/extension/plugins/callout/menu/index.js +1 -1
- package/dist/basic-sdk/extension/plugins/callout/render-elem/callout-color-selector/index.js +1 -1
- package/dist/basic-sdk/extension/plugins/callout/render-elem/index.js +1 -1
- package/dist/basic-sdk/extension/plugins/check-list/menu/index.js +4 -5
- package/dist/basic-sdk/extension/plugins/check-list/render-elem.js +1 -1
- package/dist/basic-sdk/extension/plugins/clear-format/menu/index.js +4 -6
- package/dist/basic-sdk/extension/plugins/code-block/hover-menu/index.js +4 -4
- package/dist/basic-sdk/extension/plugins/code-block/plugin.js +6 -3
- package/dist/basic-sdk/extension/plugins/code-block/render-elem.js +6 -6
- package/dist/basic-sdk/extension/plugins/file-link/helpers.js +1 -1
- package/dist/basic-sdk/extension/plugins/file-link/hover-menu/index.js +1 -1
- package/dist/basic-sdk/extension/plugins/file-link/render-elem.css +8 -0
- package/dist/basic-sdk/extension/plugins/file-link/render-elem.js +20 -9
- package/dist/basic-sdk/extension/plugins/font/helpers.js +5 -5
- package/dist/basic-sdk/extension/plugins/font/menu/font-family/index.js +3 -3
- package/dist/basic-sdk/extension/plugins/font/menu/font-size/index.js +1 -1
- package/dist/basic-sdk/extension/plugins/header/menu/index.js +3 -3
- package/dist/basic-sdk/extension/plugins/header/placeholder.js +1 -1
- package/dist/basic-sdk/extension/plugins/header/render-elem.js +21 -16
- package/dist/basic-sdk/extension/plugins/history/history-menu.js +8 -9
- package/dist/basic-sdk/extension/plugins/html/helper.js +2 -2
- package/dist/basic-sdk/extension/plugins/image/helpers.js +11 -9
- package/dist/basic-sdk/extension/plugins/image/hover-menu/index.js +9 -5
- package/dist/basic-sdk/extension/plugins/image/image-loader/index.js +1 -1
- package/dist/basic-sdk/extension/plugins/image/menu/index.js +8 -8
- package/dist/basic-sdk/extension/plugins/image/plugin.js +2 -2
- package/dist/basic-sdk/extension/plugins/image/render-elem.js +20 -11
- package/dist/basic-sdk/extension/plugins/image/use-copy-image.js +4 -4
- package/dist/basic-sdk/extension/plugins/link/helpers.js +3 -3
- package/dist/basic-sdk/extension/plugins/link/hover/index.js +1 -1
- package/dist/basic-sdk/extension/plugins/link/menu/index.js +5 -6
- package/dist/basic-sdk/extension/plugins/list/menu/index.js +4 -5
- package/dist/basic-sdk/extension/plugins/list/plugin/index.js +3 -4
- package/dist/basic-sdk/extension/plugins/list/plugin/on-tab-handle.js +6 -3
- package/dist/basic-sdk/extension/plugins/list/transforms/insert-list-item.js +4 -3
- package/dist/basic-sdk/extension/plugins/list/transforms/toggle-list.js +6 -5
- package/dist/basic-sdk/extension/plugins/markdown/plugin.js +17 -7
- package/dist/basic-sdk/extension/plugins/mention/plugin.js +6 -5
- package/dist/basic-sdk/extension/plugins/mention/render-elem/comment-participant-item.js +1 -1
- package/dist/basic-sdk/extension/plugins/mention/render-elem/participant-popover.js +2 -2
- package/dist/basic-sdk/extension/plugins/multi-column/helper.js +4 -4
- package/dist/basic-sdk/extension/plugins/multi-column/render/index.js +14 -10
- package/dist/basic-sdk/extension/plugins/multi-column/render/multi-column-root.js +3 -3
- package/dist/basic-sdk/extension/plugins/multi-column/render/render-column.js +1 -1
- package/dist/basic-sdk/extension/plugins/multi-column/resize-handlers/column-resize-handler.js +1 -1
- package/dist/basic-sdk/extension/plugins/multi-column/resize-handlers/index.js +10 -8
- package/dist/basic-sdk/extension/plugins/paragraph/render-elem.js +4 -4
- package/dist/basic-sdk/extension/plugins/quick-insert/render-elem.js +1 -1
- package/dist/basic-sdk/extension/plugins/sdoc-link/helpers.js +4 -3
- package/dist/basic-sdk/extension/plugins/sdoc-link/hover-menu/index.js +2 -2
- package/dist/basic-sdk/extension/plugins/sdoc-link/render/render-elem.js +8 -5
- package/dist/basic-sdk/extension/plugins/search-replace/helper.js +6 -6
- package/dist/basic-sdk/extension/plugins/search-replace/menu/index.js +3 -3
- package/dist/basic-sdk/extension/plugins/search-replace/popover/index.js +2 -2
- package/dist/basic-sdk/extension/plugins/search-replace/popover/replace-all-confirm-modal.js +1 -1
- package/dist/basic-sdk/extension/plugins/table/helpers.js +38 -21
- package/dist/basic-sdk/extension/plugins/table/menu/active-table-menu/common-menu.js +2 -2
- package/dist/basic-sdk/extension/plugins/table/menu/color-selector-popover/index.js +3 -3
- package/dist/basic-sdk/extension/plugins/table/model.js +2 -2
- package/dist/basic-sdk/extension/plugins/table/plugin.js +21 -16
- package/dist/basic-sdk/extension/plugins/table/popover/table-size-popover/index.js +4 -4
- package/dist/basic-sdk/extension/plugins/table/popover/table-template/sample-table.js +3 -3
- package/dist/basic-sdk/extension/plugins/table/render/index.js +11 -8
- package/dist/basic-sdk/extension/plugins/table/render/render-cell.js +18 -9
- package/dist/basic-sdk/extension/plugins/table/render/resize-handlers/column-resize-handler.js +6 -6
- package/dist/basic-sdk/extension/plugins/table/render/resize-handlers/first-column-left-resize-handler.js +3 -4
- package/dist/basic-sdk/extension/plugins/table/render/resize-mask/index.js +20 -16
- package/dist/basic-sdk/extension/plugins/table/render/table-root.js +4 -4
- package/dist/basic-sdk/extension/plugins/text-align/menu/index.js +1 -1
- package/dist/basic-sdk/extension/plugins/text-style/caret.js +6 -5
- package/dist/basic-sdk/extension/plugins/text-style/menu/comemnt-editor-menu.js +5 -5
- package/dist/basic-sdk/extension/plugins/text-style/menu/index.js +6 -5
- package/dist/basic-sdk/extension/plugins/text-style/render-elem.js +6 -8
- package/dist/basic-sdk/extension/plugins/video/helpers.js +8 -8
- package/dist/basic-sdk/extension/plugins/video/render-elem.js +4 -4
- package/dist/basic-sdk/extension/plugins/wiki-link/helpers.js +2 -2
- package/dist/basic-sdk/extension/render/custom-element.js +15 -10
- package/dist/basic-sdk/extension/render/render-comment-editor-element.js +15 -10
- package/dist/basic-sdk/extension/toolbar/context-toolbar/index.js +3 -3
- package/dist/basic-sdk/extension/toolbar/header-toolbar/index.js +2 -2
- package/dist/basic-sdk/extension/toolbar/header-toolbar/insert-toolbar/index.js +1 -1
- package/dist/basic-sdk/extension/toolbar/insert-element-toolbar/index.js +31 -12
- package/dist/basic-sdk/extension/toolbar/side-toolbar/index.js +3 -3
- package/dist/basic-sdk/extension/toolbar/side-toolbar/insert-block-menu.js +28 -11
- package/dist/basic-sdk/extension/toolbar/side-toolbar/side-menu.js +8 -5
- package/dist/basic-sdk/highlight/setNodeToDecorations.js +4 -5
- package/dist/basic-sdk/hooks/use-selection-position.js +3 -3
- package/dist/basic-sdk/node-id/helpers.js +12 -8
- package/dist/basic-sdk/node-id/index.js +1 -1
- package/dist/basic-sdk/outline/outline-item.js +4 -3
- package/dist/basic-sdk/right-panel/index.js +7 -6
- package/dist/basic-sdk/slate-convert/html-to-slate/constants.js +6 -6
- package/dist/basic-sdk/slate-convert/html-to-slate/index.js +2 -2
- package/dist/basic-sdk/slate-convert/md-to-slate/transform.js +31 -24
- package/dist/basic-sdk/slate-convert/slate-to-md/transform.js +5 -5
- package/dist/basic-sdk/socket/helpers.js +6 -5
- package/dist/basic-sdk/socket/socket-client.js +4 -4
- package/dist/basic-sdk/socket/socket-manager.js +13 -13
- package/dist/basic-sdk/utils/Kebab-to-camel.js +1 -1
- package/dist/basic-sdk/utils/default-mode.js +1 -1
- package/dist/basic-sdk/utils/diff-text.js +1 -1
- package/dist/basic-sdk/utils/diff.js +48 -34
- package/dist/basic-sdk/utils/document-utils.js +7 -5
- package/dist/basic-sdk/utils/full-width-mode.js +3 -3
- package/dist/basic-sdk/utils/local-storage-utils.js +1 -1
- package/dist/basic-sdk/utils/object-utils.js +5 -3
- package/dist/basic-sdk/utils/rebase.js +36 -21
- package/dist/components/doc-info/index.js +1 -1
- package/dist/components/doc-operations/collaborators-operation/collaborators-popover.js +1 -1
- package/dist/components/doc-operations/more-operations.js +1 -1
- package/dist/components/doc-operations/revision-operations/changes-count/index.js +2 -2
- package/dist/components/doc-operations/revision-operations/more-revision-operations/index.js +2 -2
- package/dist/components/doc-operations/revision-operations/revisions/revisions-dialog/index.js +2 -2
- package/dist/components/doc-operations/revision-operations/revisions/revisions-dialog/revision-operation/index.js +1 -1
- package/dist/components/doc-operations/revision-operations/view-changes/index.js +5 -5
- package/dist/layout/content.js +5 -8
- package/dist/layout/header.js +5 -8
- package/dist/layout/layout.js +4 -6
- package/dist/plugin-module/constants/index.js +3 -3
- package/dist/plugin-module/editor/plugin-editor.js +4 -4
- package/dist/plugin-module/gloable-ui/insert-element-dialog.js +1 -1
- package/dist/plugin-module/plugins/chart/chart-edit-dialog/index.js +4 -2
- package/dist/plugin-module/plugins/chart/helpers.js +6 -6
- package/dist/plugin-module/plugins/seatable-column/helpers.js +6 -3
- package/dist/plugin-module/plugins/seatable-column/menu/column-list-item.js +1 -1
- package/dist/plugin-module/plugins/seatable-column/render-elem.js +32 -25
- package/dist/plugin-module/plugins/seatable-row/dialog/add-seatable-row-dialog/record-content.js +2 -2
- package/dist/plugin-module/plugins/seatable-row/dialog/add-seatable-row-dialog/resize-handle/ResizeHandle.js +4 -2
- package/dist/plugin-module/plugins/seatable-row/dialog/add-seatable-row-dialog/row-card-header-cell.js +2 -2
- package/dist/plugin-module/plugins/seatable-row/dialog/add-seatable-row-dialog/row-card-header.js +2 -2
- package/dist/plugin-module/plugins/seatable-row/dialog/add-seatable-row-dialog/row-card-item.js +1 -1
- package/dist/plugin-module/plugins/seatable-row/helpers.js +3 -2
- package/dist/plugin-module/plugins/seatable-row/render-elem/index.js +7 -6
- package/dist/plugin-module/plugins/seatable-row/render-elem/record-header.js +4 -4
- package/dist/plugin-module/plugins/seatable-tables/formatter/index.js +1 -1
- package/dist/plugin-module/plugins/seatable-tables/formatter/link-formatter/index.js +18 -18
- package/dist/plugin-module/plugins/seatable-tables/helpers.js +3 -2
- package/dist/plugin-module/plugins/seatable-tables/op-menu/index.js +3 -3
- package/dist/plugin-module/plugins/seatable-tables/render-element/record-header.js +4 -4
- package/dist/plugin-module/plugins/seatable-tables/render-element/seatable-table.js +7 -6
- package/dist/plugin-module/plugins/seatable-tables/seatable-settings/common-add-tool/index.js +2 -2
- package/dist/plugin-module/plugins/seatable-tables/seatable-settings/dtable-search-input/index.js +1 -1
- package/dist/plugin-module/plugins/seatable-tables/seatable-settings/filter-setter/filter-popover-widgets/department-filter/_department-utils.js +3 -4
- package/dist/plugin-module/plugins/seatable-tables/seatable-settings/filter-setter/filter-popover-widgets/department-filter/department-multiple-select.js +3 -3
- package/dist/plugin-module/plugins/seatable-tables/seatable-settings/filter-setter/filter-popover-widgets/department-filter/department-single-select.js +5 -5
- package/dist/plugin-module/plugins/seatable-tables/seatable-settings/filter-setter/filter-popover-widgets/department-filter/selected-departments.js +3 -3
- package/dist/plugin-module/plugins/seatable-tables/seatable-settings/filter-setter/filter-popover-widgets/filter-item.js +2 -2
- package/dist/plugin-module/plugins/seatable-tables/seatable-settings/filter-setter/filter-popover-widgets/rate-item/index.js +5 -5
- package/dist/plugin-module/plugins/seatable-tables/seatable-settings/filter-setter/filter-popover.js +1 -1
- package/dist/plugin-module/plugins/seatable-tables/seatable-settings/hide-column-setter/hide-column-item.js +1 -1
- package/dist/plugin-module/plugins/seatable-tables/seatable-settings/hide-column-setter/hide-column-popover.js +1 -1
- package/dist/plugin-module/plugins/seatable-tables/seatable-settings/index.js +5 -3
- package/dist/plugin-module/plugins/seatable-tables/seatable-settings/sort-setter/sort-popover.js +1 -1
- package/dist/plugin-module/toolbar/header-toolbar/index.js +2 -2
- package/dist/plugin-module/toolbar/header-toolbar/insert-toolbar/index.js +1 -1
- package/dist/utils/date-utils.js +11 -11
- package/dist/utils/index.js +1 -1
- package/package.json +1 -1
|
@@ -71,14 +71,14 @@ class SocketManager {
|
|
|
71
71
|
(0, _defineProperty2.default)(this, "sendOperations", () => {
|
|
72
72
|
if (this.editor.readonly) return;
|
|
73
73
|
if (this.state !== STATE.IDLE) return;
|
|
74
|
-
(0, _debug.stateDebug)(
|
|
74
|
+
(0, _debug.stateDebug)(`State changed: ${this.state} -> ${STATE.SENDING}`);
|
|
75
75
|
this.state = STATE.SENDING;
|
|
76
76
|
this.sendNextOperations();
|
|
77
77
|
});
|
|
78
78
|
(0, _defineProperty2.default)(this, "sendNextOperations", () => {
|
|
79
79
|
if (this.state !== STATE.SENDING) return;
|
|
80
80
|
if (this.pendingOperationList.length === 0) {
|
|
81
|
-
(0, _debug.stateDebug)(
|
|
81
|
+
(0, _debug.stateDebug)(`State Changed: ${this.state} -> ${STATE.IDLE}`);
|
|
82
82
|
this.state = STATE.IDLE;
|
|
83
83
|
return;
|
|
84
84
|
}
|
|
@@ -115,13 +115,13 @@ class SocketManager {
|
|
|
115
115
|
this.dispatchConnectState(error_type);
|
|
116
116
|
|
|
117
117
|
// reset sending control
|
|
118
|
-
(0, _debug.stateDebug)(
|
|
118
|
+
(0, _debug.stateDebug)(`State Changed: ${this.state} -> ${STATE.NEED_RELOAD}`);
|
|
119
119
|
this.state = STATE.NEED_RELOAD;
|
|
120
120
|
this._sendingOperations = null;
|
|
121
121
|
} else if (error_type === 'version_behind_server') {
|
|
122
122
|
// Put the failed operation into the pending list and re-execute it
|
|
123
123
|
this.pendingOperationList.unshift([...this._sendingOperations]);
|
|
124
|
-
(0, _debug.stateDebug)(
|
|
124
|
+
(0, _debug.stateDebug)(`State Changed: ${this.state} -> ${STATE.CONFLICT}`);
|
|
125
125
|
this.state = STATE.CONFLICT;
|
|
126
126
|
const {
|
|
127
127
|
lose_operations
|
|
@@ -168,7 +168,7 @@ class SocketManager {
|
|
|
168
168
|
try {
|
|
169
169
|
(0, _helpers.syncRemoteOperations)(this.editor, operations);
|
|
170
170
|
} catch (error) {
|
|
171
|
-
(0, _debug.stateDebug)(
|
|
171
|
+
(0, _debug.stateDebug)(`State Changed: ${this.state} -> ${STATE.CONFLICT}`);
|
|
172
172
|
this.state = STATE.CONFLICT;
|
|
173
173
|
this.dispatchConnectState('sync_server_operations_error');
|
|
174
174
|
return;
|
|
@@ -198,17 +198,17 @@ class SocketManager {
|
|
|
198
198
|
}
|
|
199
199
|
|
|
200
200
|
// The version consistency indicates that there is no conflict and no processing is required
|
|
201
|
-
(0, _debug.stateDebug)(
|
|
201
|
+
(0, _debug.stateDebug)(`State Changed: ${this.state} -> ${STATE.IDLE}`);
|
|
202
202
|
this.state = STATE.IDLE;
|
|
203
203
|
if (this.pendingOperationList.length > 0) {
|
|
204
204
|
(0, _debug.clientDebug)('After reconnection, manually trigger the execution of ops.');
|
|
205
|
-
(0, _debug.stateDebug)(
|
|
205
|
+
(0, _debug.stateDebug)(`State Changed: ${this.state} -> ${STATE.SENDING}`);
|
|
206
206
|
this.state = STATE.SENDING;
|
|
207
207
|
this.sendNextOperations();
|
|
208
208
|
}
|
|
209
209
|
});
|
|
210
210
|
(0, _defineProperty2.default)(this, "onConflictHappen", () => {
|
|
211
|
-
(0, _debug.stateDebug)(
|
|
211
|
+
(0, _debug.stateDebug)(`State Changed: ${this.state} -> ${STATE.CONFLICT}`);
|
|
212
212
|
this.state = STATE.CONFLICT;
|
|
213
213
|
this.socketClient.getRecentOperations();
|
|
214
214
|
});
|
|
@@ -232,7 +232,7 @@ class SocketManager {
|
|
|
232
232
|
this.editor.children = children;
|
|
233
233
|
this.editor.isRemote = true;
|
|
234
234
|
this.editor.onChange();
|
|
235
|
-
(0, _debug.stateDebug)(
|
|
235
|
+
(0, _debug.stateDebug)(`State Changed: ${this.state} -> ${STATE.IDLE}`);
|
|
236
236
|
this.editor.isRemote = false;
|
|
237
237
|
this.state = STATE.IDLE;
|
|
238
238
|
this._sendingOperations = null;
|
|
@@ -280,7 +280,7 @@ class SocketManager {
|
|
|
280
280
|
try {
|
|
281
281
|
(0, _helpers.syncRemoteOperations)(this.editor, operations);
|
|
282
282
|
} catch (error) {
|
|
283
|
-
(0, _debug.stateDebug)(
|
|
283
|
+
(0, _debug.stateDebug)(`State Changed: ${this.state} -> ${STATE.CONFLICT}`);
|
|
284
284
|
this.state = STATE.CONFLICT;
|
|
285
285
|
this.dispatchConnectState('sync_server_operations_error');
|
|
286
286
|
return;
|
|
@@ -293,7 +293,7 @@ class SocketManager {
|
|
|
293
293
|
if (this.revertOperationList.length === 0) {
|
|
294
294
|
Promise.resolve().then(() => {
|
|
295
295
|
this.editor.isRemote = false;
|
|
296
|
-
(0, _debug.stateDebug)(
|
|
296
|
+
(0, _debug.stateDebug)(`State Changed: ${this.state} -> ${STATE.IDLE}`);
|
|
297
297
|
this.state = STATE.IDLE;
|
|
298
298
|
this._sendingOperations = null;
|
|
299
299
|
this.revertOperationList = [];
|
|
@@ -305,7 +305,7 @@ class SocketManager {
|
|
|
305
305
|
Promise.resolve().then(() => {
|
|
306
306
|
// reset execute remote operations flag
|
|
307
307
|
this.editor.isRemote = false;
|
|
308
|
-
(0, _debug.stateDebug)(
|
|
308
|
+
(0, _debug.stateDebug)(`State Changed: ${this.state} -> ${STATE.IDLE}`);
|
|
309
309
|
this.state = STATE.IDLE;
|
|
310
310
|
this._sendingOperations = null;
|
|
311
311
|
|
|
@@ -344,7 +344,7 @@ class SocketManager {
|
|
|
344
344
|
this.pendingOperationList.unshift(this._sendingOperations.slice());
|
|
345
345
|
this._sendingOperations = null;
|
|
346
346
|
}
|
|
347
|
-
(0, _debug.stateDebug)(
|
|
347
|
+
(0, _debug.stateDebug)(`State Changed: ${this.state} -> ${STATE.DISCONNECT}`);
|
|
348
348
|
this.state = STATE.DISCONNECT;
|
|
349
349
|
}
|
|
350
350
|
this.eventBus.dispatch(type, message);
|
|
@@ -5,6 +5,6 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
});
|
|
6
6
|
exports.default = void 0;
|
|
7
7
|
const KebabToCamel = str => {
|
|
8
|
-
return str.replace(/(_[a-z])/g, match =>
|
|
8
|
+
return str.replace(/(_[a-z])/g, match => `${match.slice(1).toUpperCase()}`);
|
|
9
9
|
};
|
|
10
10
|
var _default = exports.default = KebabToCamel;
|
|
@@ -20,7 +20,7 @@ const getStyleByDefaultMode = (scrollRef, editor) => {
|
|
|
20
20
|
if (isShowOutline && editor.editorType !== _constants.WIKI_EDITOR) {
|
|
21
21
|
const rect = scrollRef.current.getBoundingClientRect();
|
|
22
22
|
if ((rect.width - Number(_constants.ARTICLE_DEFAULT_WIDTH.slice(0, 3))) / 2 < 280) {
|
|
23
|
-
containerStyle['marginLeft'] =
|
|
23
|
+
containerStyle['marginLeft'] = `${_constants.LEFT_OUTLINE_WIDTH}px`;
|
|
24
24
|
}
|
|
25
25
|
}
|
|
26
26
|
return containerStyle;
|
|
@@ -8,7 +8,7 @@ exports.default = void 0;
|
|
|
8
8
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/defineProperty"));
|
|
9
9
|
var _objectUtils = _interopRequireDefault(require("./object-utils"));
|
|
10
10
|
const extendedWordChars = 'a-zA-Z\\u{C0}-\\u{FF}\\u{D8}-\\u{F6}\\u{F8}-\\u{2C6}\\u{2C8}-\\u{2D7}\\u{2DE}-\\u{2FF}\\u{1E00}-\\u{1EFF}\\u{4e00}-\\u{9fa5}';
|
|
11
|
-
const tokenizeIncludingWhitespace = new RegExp(
|
|
11
|
+
const tokenizeIncludingWhitespace = new RegExp(`[${extendedWordChars}]+|\\s+|[^${extendedWordChars}]`, 'ug');
|
|
12
12
|
const buildValues = (diff, components, newString, oldString, valueType, useLongestToken) => {
|
|
13
13
|
let componentPos = 0;
|
|
14
14
|
let componentLen = components.length;
|
|
@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
value: true
|
|
6
6
|
});
|
|
7
7
|
exports.getTopLevelChanges = exports.getMergedChanges = exports.getIdDiffs = exports.getDiff = exports.generateIdMapAndIds = void 0;
|
|
8
|
-
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
|
|
9
8
|
var _slugid = _interopRequireDefault(require("slugid"));
|
|
10
9
|
var _constants = require("../extension/constants");
|
|
11
10
|
var _diffText = _interopRequireDefault(require("./diff-text"));
|
|
@@ -18,16 +17,18 @@ const generatorDiffTextElement = function (textElement, diffType) {
|
|
|
18
17
|
if (!textElement) return null;
|
|
19
18
|
if (!diffType) return textElement;
|
|
20
19
|
const id = textElement.id;
|
|
21
|
-
return
|
|
20
|
+
return {
|
|
21
|
+
...textElement,
|
|
22
22
|
id: id || _slugid.default.nice(),
|
|
23
|
-
[diffType]: true
|
|
24
|
-
|
|
23
|
+
[diffType]: true,
|
|
24
|
+
...style
|
|
25
|
+
};
|
|
25
26
|
};
|
|
26
27
|
const getTopLevelChanges = changes => {
|
|
27
28
|
const topLevelChanges = [];
|
|
28
29
|
const articleEl = document.getElementById('sdoc-editor');
|
|
29
30
|
changes.forEach(item => {
|
|
30
|
-
let dom = document.querySelectorAll(
|
|
31
|
+
let dom = document.querySelectorAll(`[data-id="${item}"]`)[0];
|
|
31
32
|
if (!dom) return [];
|
|
32
33
|
while (((_dom = dom) === null || _dom === void 0 ? void 0 : (_dom$dataset = _dom.dataset) === null || _dom$dataset === void 0 ? void 0 : _dom$dataset.root) !== 'true' || ((_dom2 = dom) === null || _dom2 === void 0 ? void 0 : _dom2.parentNode) !== articleEl) {
|
|
33
34
|
var _dom, _dom$dataset, _dom2, _dom3;
|
|
@@ -79,10 +80,11 @@ const generatorDiffElement = function (element, diffType) {
|
|
|
79
80
|
if (!Array.isArray(element.children) || element.children.length === 0) {
|
|
80
81
|
return generatorDiffTextElement(element, diffType, style);
|
|
81
82
|
}
|
|
82
|
-
return
|
|
83
|
+
return {
|
|
84
|
+
...element,
|
|
83
85
|
[diffType]: true,
|
|
84
86
|
children: element.children.map(item => generatorDiffElement(item, diffType, style))
|
|
85
|
-
}
|
|
87
|
+
};
|
|
86
88
|
};
|
|
87
89
|
const generateIdMapAndIds = elements => {
|
|
88
90
|
let map = {};
|
|
@@ -122,7 +124,7 @@ const getTextDiff = (element, oldElement, diff) => {
|
|
|
122
124
|
const textDiffs = textDiff.getDiffs();
|
|
123
125
|
let newChildren = [];
|
|
124
126
|
textDiffs.forEach((item, index) => {
|
|
125
|
-
const id =
|
|
127
|
+
const id = `${element.id || _slugid.default.nice()}-${index}`;
|
|
126
128
|
let elementItem = {
|
|
127
129
|
id,
|
|
128
130
|
text: item.value
|
|
@@ -145,18 +147,21 @@ const getTextDiff = (element, oldElement, diff) => {
|
|
|
145
147
|
const getCommonDiff = (element, oldElement, diff) => {
|
|
146
148
|
if (!hasChildren(element) && !hasChildren(oldElement)) {
|
|
147
149
|
const newChildren = getTextDiff(element, oldElement, diff);
|
|
148
|
-
return [
|
|
150
|
+
return [{
|
|
151
|
+
...element,
|
|
149
152
|
children: newChildren
|
|
150
|
-
}
|
|
153
|
+
}];
|
|
151
154
|
}
|
|
152
155
|
if (!hasChildren(element) || !hasChildren(oldElement)) {
|
|
153
156
|
const elementId = element.id || _slugid.default.nice();
|
|
154
|
-
diff.changes.push(
|
|
155
|
-
return [generatorDiffElement(
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
157
|
+
diff.changes.push(`${elementId}_delete`);
|
|
158
|
+
return [generatorDiffElement({
|
|
159
|
+
...oldElement,
|
|
160
|
+
id: `${elementId}_delete`
|
|
161
|
+
}, _constants.TEXT_STYLE_MAP.DELETE, _constants.DELETED_STYLE), generatorDiffElement({
|
|
162
|
+
...element,
|
|
163
|
+
id: `${elementId}_add`
|
|
164
|
+
}, _constants.TEXT_STYLE_MAP.ADD, _constants.ADDED_STYLE)];
|
|
160
165
|
}
|
|
161
166
|
|
|
162
167
|
// Content does not change
|
|
@@ -206,12 +211,14 @@ const getCommonDiff = (element, oldElement, diff) => {
|
|
|
206
211
|
if (newChildrenElement.data.src === oldChildrenElement.data.src) {
|
|
207
212
|
newChildren.push(newChildrenElement);
|
|
208
213
|
} else {
|
|
209
|
-
newChildren.push(generatorDiffTextElement(
|
|
214
|
+
newChildren.push(generatorDiffTextElement({
|
|
215
|
+
...element,
|
|
210
216
|
id: element.id + '_add'
|
|
211
|
-
}
|
|
212
|
-
newChildren.push(generatorDiffTextElement(
|
|
217
|
+
}, _constants.TEXT_STYLE_MAP.ADD, _constants.ADDED_STYLE));
|
|
218
|
+
newChildren.push(generatorDiffTextElement({
|
|
219
|
+
...oldChildrenElement,
|
|
213
220
|
id: element.id + '_delete'
|
|
214
|
-
}
|
|
221
|
+
}, _constants.TEXT_STYLE_MAP.DELETE, _constants.DELETED_STYLE));
|
|
215
222
|
}
|
|
216
223
|
} else if (newChildrenElement.type === _constants.ELEMENT_TYPE.LINK) {
|
|
217
224
|
if (newChildrenElement.title !== oldChildrenElement.title) {
|
|
@@ -219,12 +226,14 @@ const getCommonDiff = (element, oldElement, diff) => {
|
|
|
219
226
|
newChildren.push(...diffElements);
|
|
220
227
|
} else if (newChildrenElement.href !== oldChildrenElement.href) {
|
|
221
228
|
diff.changes.push(oldChildrenElement.id + '_delete');
|
|
222
|
-
newChildren.push(generatorDiffTextElement(
|
|
229
|
+
newChildren.push(generatorDiffTextElement({
|
|
230
|
+
...oldChildrenElement,
|
|
223
231
|
id: oldChildrenElement.id + '_delete'
|
|
224
|
-
}
|
|
225
|
-
newChildren.push(generatorDiffTextElement(
|
|
232
|
+
}, _constants.TEXT_STYLE_MAP.DELETE, _constants.DELETED_STYLE));
|
|
233
|
+
newChildren.push(generatorDiffTextElement({
|
|
234
|
+
...newChildrenElement,
|
|
226
235
|
id: newChildrenElement.id + '_add'
|
|
227
|
-
}
|
|
236
|
+
}, _constants.TEXT_STYLE_MAP.ADD, _constants.ADDED_STYLE));
|
|
228
237
|
} else {
|
|
229
238
|
newChildren.push(newChildrenElement);
|
|
230
239
|
}
|
|
@@ -237,20 +246,23 @@ const getCommonDiff = (element, oldElement, diff) => {
|
|
|
237
246
|
}
|
|
238
247
|
} else {
|
|
239
248
|
diff.changes.push(oldChildrenElement.id + '_delete');
|
|
240
|
-
newChildren.push(generatorDiffTextElement(
|
|
249
|
+
newChildren.push(generatorDiffTextElement({
|
|
250
|
+
...oldChildrenElement,
|
|
241
251
|
id: oldChildrenElement.id + '_delete'
|
|
242
|
-
}
|
|
243
|
-
newChildren.push(generatorDiffTextElement(
|
|
252
|
+
}, _constants.TEXT_STYLE_MAP.DELETE, _constants.DELETED_STYLE));
|
|
253
|
+
newChildren.push(generatorDiffTextElement({
|
|
254
|
+
...newChildrenElement,
|
|
244
255
|
id: newChildrenElement.id + '_add'
|
|
245
|
-
}
|
|
256
|
+
}, _constants.TEXT_STYLE_MAP.ADD, _constants.ADDED_STYLE));
|
|
246
257
|
}
|
|
247
258
|
}
|
|
248
259
|
}
|
|
249
260
|
});
|
|
250
261
|
});
|
|
251
|
-
return [
|
|
262
|
+
return [{
|
|
263
|
+
...element,
|
|
252
264
|
children: newChildren
|
|
253
|
-
}
|
|
265
|
+
}];
|
|
254
266
|
};
|
|
255
267
|
const updateDiffValue = (diff, element, oldElement) => {
|
|
256
268
|
if (!diff || !element || !oldElement) return;
|
|
@@ -343,15 +355,17 @@ const getDiff = function () {
|
|
|
343
355
|
const {
|
|
344
356
|
version: currentVersion,
|
|
345
357
|
elements: currentContent
|
|
346
|
-
} =
|
|
358
|
+
} = {
|
|
359
|
+
...currentValue,
|
|
347
360
|
elements: (0, _documentUtils.normalizeChildren)(currentValue.elements)
|
|
348
|
-
}
|
|
361
|
+
};
|
|
349
362
|
const {
|
|
350
363
|
version: oldVersion,
|
|
351
364
|
elements: oldContent
|
|
352
|
-
} =
|
|
365
|
+
} = {
|
|
366
|
+
...oldValue,
|
|
353
367
|
elements: (0, _documentUtils.normalizeChildren)(oldValue.elements)
|
|
354
|
-
}
|
|
368
|
+
};
|
|
355
369
|
if (currentVersion === oldVersion) return {
|
|
356
370
|
value: currentContent,
|
|
357
371
|
changes: []
|
|
@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
value: true
|
|
6
6
|
});
|
|
7
7
|
exports.setOriginSdocKey = exports.normalizeCopyNodes = exports.normalizeChildren = exports.getSlateFragmentAttribute = exports.generateDefaultDocContent = exports.formatSdocContent = void 0;
|
|
8
|
-
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
|
|
9
8
|
var _deepCopy = _interopRequireDefault(require("deep-copy"));
|
|
10
9
|
var _context = _interopRequireDefault(require("../context"));
|
|
11
10
|
var _constants = require("../extension/constants");
|
|
@@ -45,7 +44,7 @@ const normalizeCopyNodes = (editor, elements) => {
|
|
|
45
44
|
exports.normalizeCopyNodes = normalizeCopyNodes;
|
|
46
45
|
const setOriginSdocKey = event => {
|
|
47
46
|
const docUuid = _context.default.getSetting('docUuid');
|
|
48
|
-
event.clipboardData.setData(
|
|
47
|
+
event.clipboardData.setData(`text/${_constants.CLIPBOARD_ORIGIN_SDOC_KEY}`, docUuid);
|
|
49
48
|
};
|
|
50
49
|
exports.setOriginSdocKey = setOriginSdocKey;
|
|
51
50
|
const getSlateFragmentAttribute = dataTransfer => {
|
|
@@ -72,8 +71,11 @@ const generateDefaultDocContent = () => {
|
|
|
72
71
|
// patch: update children to elements
|
|
73
72
|
exports.generateDefaultDocContent = generateDefaultDocContent;
|
|
74
73
|
const formatSdocContent = content => {
|
|
75
|
-
return
|
|
76
|
-
|
|
77
|
-
|
|
74
|
+
return {
|
|
75
|
+
...content,
|
|
76
|
+
...(!content.elements && {
|
|
77
|
+
elements: content.children
|
|
78
|
+
})
|
|
79
|
+
};
|
|
78
80
|
};
|
|
79
81
|
exports.formatSdocContent = formatSdocContent;
|
|
@@ -18,8 +18,8 @@ const getStyleByFullWidthMode = (scrollRef, editor) => {
|
|
|
18
18
|
|
|
19
19
|
// Has outline
|
|
20
20
|
if (isShowOutline && (editor === null || editor === void 0 ? void 0 : editor.editorType) !== _constants.WIKI_EDITOR) {
|
|
21
|
-
containerStyle['marginLeft'] =
|
|
22
|
-
const adjustWidth =
|
|
21
|
+
containerStyle['marginLeft'] = `${_constants.LEFT_OUTLINE_WIDTH}px`;
|
|
22
|
+
const adjustWidth = ` - ${_constants.LEFT_OUTLINE_WIDTH - 50}px`; // One side is 50
|
|
23
23
|
containerStyle['width'] = containerStyle['width'].slice(0, -1) + adjustWidth;
|
|
24
24
|
}
|
|
25
25
|
return containerStyle;
|
|
@@ -28,7 +28,7 @@ exports.getStyleByFullWidthMode = getStyleByFullWidthMode;
|
|
|
28
28
|
const getContentStyleByFullModeStyle = () => {
|
|
29
29
|
if (_localStorageUtils.default.getItem(_constants.FULL_WIDTH_MODE)) {
|
|
30
30
|
return {
|
|
31
|
-
'minWidth':
|
|
31
|
+
'minWidth': `${Number(_constants.ARTICLE_FULL_MIN_WIDTH.slice(0, -2))}px`
|
|
32
32
|
};
|
|
33
33
|
}
|
|
34
34
|
return {};
|
|
@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
value: true
|
|
6
6
|
});
|
|
7
7
|
exports.default = void 0;
|
|
8
|
-
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
|
|
9
8
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/defineProperty"));
|
|
10
9
|
var _ObjectUtils;
|
|
11
10
|
class ObjectUtils {
|
|
@@ -21,13 +20,16 @@ class ObjectUtils {
|
|
|
21
20
|
}
|
|
22
21
|
static isObjectChanged(source, comparison, notIncludeKeys) {
|
|
23
22
|
if (!this.iterable(source)) {
|
|
24
|
-
throw new Error(
|
|
23
|
+
throw new Error(`source should be a Object or Array , but got ${this.getDataType(source)}`);
|
|
25
24
|
}
|
|
26
25
|
if (this.getDataType(source) !== this.getDataType(comparison)) {
|
|
27
26
|
return true;
|
|
28
27
|
}
|
|
29
28
|
const sourceKeys = Object.keys(source);
|
|
30
|
-
const comparisonKeys = Object.keys(
|
|
29
|
+
const comparisonKeys = Object.keys({
|
|
30
|
+
...source,
|
|
31
|
+
...comparison
|
|
32
|
+
}).filter(key => !notIncludeKeys.includes(key));
|
|
31
33
|
if (sourceKeys.length !== comparisonKeys.length) {
|
|
32
34
|
return true;
|
|
33
35
|
}
|
|
@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
5
5
|
value: true
|
|
6
6
|
});
|
|
7
7
|
exports.hasConflict = exports.getRebase = exports.canMerge = void 0;
|
|
8
|
-
var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/objectSpread2"));
|
|
9
8
|
var _constants = require("../constants");
|
|
10
9
|
var _constants2 = require("../extension/constants");
|
|
11
10
|
var _helpers = require("../node-id/helpers");
|
|
@@ -35,14 +34,15 @@ const hasConflict = content => {
|
|
|
35
34
|
exports.hasConflict = hasConflict;
|
|
36
35
|
const expandGroup = content => {
|
|
37
36
|
if ([_constants2.ELEMENT_TYPE.UNORDERED_LIST, _constants2.ELEMENT_TYPE.ORDERED_LIST].includes(content.type)) {
|
|
38
|
-
return [
|
|
37
|
+
return [{
|
|
38
|
+
...content,
|
|
39
39
|
children: content.children.map(item => {
|
|
40
40
|
if (item.type === _constants2.ELEMENT_TYPE.GROUP) {
|
|
41
41
|
return expandGroup(item);
|
|
42
42
|
}
|
|
43
43
|
return item;
|
|
44
44
|
}).flat(1)
|
|
45
|
-
}
|
|
45
|
+
}];
|
|
46
46
|
}
|
|
47
47
|
return content.type === _constants2.ELEMENT_TYPE.GROUP ? content.children : [content];
|
|
48
48
|
};
|
|
@@ -116,10 +116,11 @@ const getChanges = function (masterContent, revisionContent) {
|
|
|
116
116
|
} else {
|
|
117
117
|
const oldElement = masterContentMap[elementId];
|
|
118
118
|
const currentElement = currentContentMap[elementId];
|
|
119
|
-
let newElement =
|
|
119
|
+
let newElement = {
|
|
120
|
+
...currentElement,
|
|
120
121
|
[_constants.REBASE_MARK_KEY.MODIFY_TYPE]: _constants.MODIFY_TYPE.MODIFY,
|
|
121
122
|
[_constants.REBASE_MARK_KEY.OLD_ELEMENT]: oldElement
|
|
122
|
-
}
|
|
123
|
+
};
|
|
123
124
|
if (currentElement.type === oldElement.type) {
|
|
124
125
|
const elementType = currentElement.type;
|
|
125
126
|
if ([_constants2.ELEMENT_TYPE.UNORDERED_LIST, _constants2.ELEMENT_TYPE.ORDERED_LIST].includes(elementType)) {
|
|
@@ -137,7 +138,9 @@ const getChanges = function (masterContent, revisionContent) {
|
|
|
137
138
|
};
|
|
138
139
|
const getMergeElement = (diffElement, baseElement) => {
|
|
139
140
|
const modifyType = diffElement[_constants.REBASE_MARK_KEY.MODIFY_TYPE];
|
|
140
|
-
const newElement =
|
|
141
|
+
const newElement = {
|
|
142
|
+
...diffElement
|
|
143
|
+
};
|
|
141
144
|
newElement[_constants.REBASE_MARK_KEY.MODIFY_TYPE] && delete newElement[_constants.REBASE_MARK_KEY.MODIFY_TYPE];
|
|
142
145
|
|
|
143
146
|
// revision does not have this element, master has this element
|
|
@@ -172,19 +175,23 @@ const getMergeElement = (diffElement, baseElement) => {
|
|
|
172
175
|
|
|
173
176
|
// Elements that differ between revision and master
|
|
174
177
|
if (modifyType === _constants.MODIFY_TYPE.MODIFY) {
|
|
175
|
-
const masterElement =
|
|
178
|
+
const masterElement = {
|
|
179
|
+
...diffElement[_constants.REBASE_MARK_KEY.OLD_ELEMENT]
|
|
180
|
+
};
|
|
176
181
|
delete newElement[_constants.REBASE_MARK_KEY.OLD_ELEMENT];
|
|
177
182
|
|
|
178
183
|
// 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.
|
|
179
184
|
if (!baseElement) {
|
|
180
|
-
return [
|
|
185
|
+
return [{
|
|
186
|
+
...(0, _helpers.replaceNodeId)(masterElement),
|
|
181
187
|
[_constants.REBASE_MARK_KEY.REBASE_TYPE]: _constants.REBASE_TYPE.MODIFY_MODIFY,
|
|
182
188
|
[_constants.REBASE_MARK_KEY.OLD_ELEMENT]: masterElement,
|
|
183
189
|
[_constants.REBASE_MARK_KEY.ORIGIN]: _constants.REBASE_ORIGIN.OTHER
|
|
184
|
-
}
|
|
190
|
+
}, {
|
|
191
|
+
...newElement,
|
|
185
192
|
[_constants.REBASE_MARK_KEY.REBASE_TYPE]: _constants.REBASE_TYPE.MODIFY_MODIFY,
|
|
186
193
|
[_constants.REBASE_MARK_KEY.ORIGIN]: _constants.REBASE_ORIGIN.MY
|
|
187
|
-
}
|
|
194
|
+
}];
|
|
188
195
|
}
|
|
189
196
|
|
|
190
197
|
// master is the same as base, indicating that revision has modified the content
|
|
@@ -194,29 +201,35 @@ const getMergeElement = (diffElement, baseElement) => {
|
|
|
194
201
|
if (_objectUtils.default.isSameObject(newElement, baseElement)) return [masterElement];
|
|
195
202
|
|
|
196
203
|
// 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.
|
|
197
|
-
return [
|
|
204
|
+
return [{
|
|
205
|
+
...(0, _helpers.replaceNodeId)(masterElement),
|
|
198
206
|
[_constants.REBASE_MARK_KEY.REBASE_TYPE]: _constants.REBASE_TYPE.MODIFY_MODIFY,
|
|
199
207
|
[_constants.REBASE_MARK_KEY.OLD_ELEMENT]: masterElement,
|
|
200
208
|
[_constants.REBASE_MARK_KEY.ORIGIN]: _constants.REBASE_ORIGIN.OTHER
|
|
201
|
-
}
|
|
209
|
+
}, {
|
|
210
|
+
...newElement,
|
|
202
211
|
[_constants.REBASE_MARK_KEY.REBASE_TYPE]: _constants.REBASE_TYPE.MODIFY_MODIFY,
|
|
203
212
|
[_constants.REBASE_MARK_KEY.ORIGIN]: _constants.REBASE_ORIGIN.MY
|
|
204
|
-
}
|
|
213
|
+
}];
|
|
205
214
|
}
|
|
206
215
|
if (modifyType === _constants.MODIFY_TYPE.CHILDREN_MODIFY) {
|
|
207
|
-
const masterElement =
|
|
216
|
+
const masterElement = {
|
|
217
|
+
...diffElement[_constants.REBASE_MARK_KEY.OLD_ELEMENT]
|
|
218
|
+
};
|
|
208
219
|
delete newElement[_constants.REBASE_MARK_KEY.OLD_ELEMENT];
|
|
209
220
|
|
|
210
221
|
// 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.
|
|
211
222
|
if (!baseElement) {
|
|
212
|
-
return [
|
|
223
|
+
return [{
|
|
224
|
+
...(0, _helpers.replaceNodeId)(masterElement),
|
|
213
225
|
[_constants.REBASE_MARK_KEY.REBASE_TYPE]: _constants.REBASE_TYPE.MODIFY_MODIFY,
|
|
214
226
|
[_constants.REBASE_MARK_KEY.OLD_ELEMENT]: masterElement,
|
|
215
227
|
[_constants.REBASE_MARK_KEY.ORIGIN]: _constants.REBASE_ORIGIN.OTHER
|
|
216
|
-
}
|
|
228
|
+
}, {
|
|
229
|
+
...newElement,
|
|
217
230
|
[_constants.REBASE_MARK_KEY.REBASE_TYPE]: _constants.REBASE_TYPE.MODIFY_MODIFY,
|
|
218
231
|
[_constants.REBASE_MARK_KEY.ORIGIN]: _constants.REBASE_ORIGIN.MY
|
|
219
|
-
}
|
|
232
|
+
}];
|
|
220
233
|
}
|
|
221
234
|
if (_objectUtils.default.isSameObject(masterElement, baseElement)) return expandGroup(newElement);
|
|
222
235
|
if (_objectUtils.default.isSameObject(newElement, baseElement)) return [masterElement];
|
|
@@ -227,9 +240,10 @@ const getMergeElement = (diffElement, baseElement) => {
|
|
|
227
240
|
|
|
228
241
|
// The content of the subnode has changed and needs to be solved manually.
|
|
229
242
|
const childrenContent = getMergeContent(baseElement, diffElement.children);
|
|
230
|
-
return [
|
|
243
|
+
return [{
|
|
244
|
+
...newElement,
|
|
231
245
|
children: childrenContent
|
|
232
|
-
}
|
|
246
|
+
}];
|
|
233
247
|
}
|
|
234
248
|
newElement[_constants.REBASE_MARK_KEY.OLD_ELEMENT] && delete newElement[_constants.REBASE_MARK_KEY.OLD_ELEMENT];
|
|
235
249
|
return expandGroup(newElement);
|
|
@@ -308,10 +322,11 @@ const getRebase = (masterContent, baseContent, revisionContent) => {
|
|
|
308
322
|
return {
|
|
309
323
|
canMerge: canMerge(content, revisionContent.elements),
|
|
310
324
|
isNeedReplaceMaster: true,
|
|
311
|
-
value:
|
|
325
|
+
value: {
|
|
326
|
+
...revisionContent,
|
|
312
327
|
elements: content,
|
|
313
328
|
version: Math.max(masterContent.version, revisionContent.version) + 1
|
|
314
|
-
}
|
|
329
|
+
}
|
|
315
330
|
};
|
|
316
331
|
};
|
|
317
332
|
exports.getRebase = getRebase;
|
|
@@ -53,7 +53,7 @@ const DocInfo = _ref => {
|
|
|
53
53
|
window.open(originFileURL, '_blank');
|
|
54
54
|
}, []);
|
|
55
55
|
const docInfo = /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, isDraft && /*#__PURE__*/_react.default.createElement(_draftDropdown.default, null), isStarIconShown && !mobileLogin && /*#__PURE__*/_react.default.createElement("button", {
|
|
56
|
-
className:
|
|
56
|
+
className: `doc-icon sdocfont ${isStarred ? 'sdoc-starred' : 'sdoc-unstarred'} border-0 p-0 bg-transparent`,
|
|
57
57
|
title: isStarred ? t('Starred') : t('Unstarred'),
|
|
58
58
|
"aria-label": isStarred ? t('Unstar') : t('Star'),
|
|
59
59
|
onClick: toggleStar
|
|
@@ -30,7 +30,7 @@ class CollaboratorsPopover extends _react.default.PureComponent {
|
|
|
30
30
|
}, /*#__PURE__*/_react.default.createElement("div", {
|
|
31
31
|
className: "content-list"
|
|
32
32
|
}, collaborators.map((item, index) => {
|
|
33
|
-
const name = index === 0 ?
|
|
33
|
+
const name = index === 0 ? `${item.name} (${t('Me')})` : item.name;
|
|
34
34
|
return /*#__PURE__*/_react.default.createElement("div", {
|
|
35
35
|
key: index,
|
|
36
36
|
className: "collaborator-details"
|
|
@@ -100,7 +100,7 @@ const MoreOperations = _ref => {
|
|
|
100
100
|
eventBus.dispatch(_constants.EXTERNAL_EVENT.INTERNAL_LINK_CLICK);
|
|
101
101
|
}, [isSdocRevision]);
|
|
102
102
|
return /*#__PURE__*/_react.default.createElement(_reactstrap.Dropdown, {
|
|
103
|
-
className:
|
|
103
|
+
className: `sdoc-operator-folder ${mobileLogin ? 'mobile-login' : ''}`,
|
|
104
104
|
isOpen: isDropdownOpen,
|
|
105
105
|
toggle: event => toggleDropdown(event, isDropdownOpen)
|
|
106
106
|
}, /*#__PURE__*/_react.default.createElement(_reactstrap.DropdownToggle, {
|
|
@@ -44,7 +44,7 @@ const ChangesCount = _ref => {
|
|
|
44
44
|
const jumpToElement = (0, _react.useCallback)(currentDiffIndex => {
|
|
45
45
|
setDiffIndex(currentDiffIndex);
|
|
46
46
|
const change = changes[currentDiffIndex];
|
|
47
|
-
const changeElement = document.querySelectorAll(
|
|
47
|
+
const changeElement = document.querySelectorAll(`[data-id="${change}"]`)[0];
|
|
48
48
|
if (changeElement) {
|
|
49
49
|
const scrollContainer = document.getElementById('sdoc-scroll-container');
|
|
50
50
|
if (scrollContainer) {
|
|
@@ -82,7 +82,7 @@ const ChangesCount = _ref => {
|
|
|
82
82
|
className: "sdoc-revision-changes-container d-flex align-items-center ml-4"
|
|
83
83
|
}, /*#__PURE__*/_react.default.createElement("div", {
|
|
84
84
|
className: "sdoc-revision-changes-tip d-flex align-items-center justify-content-center pl-2 pr-2"
|
|
85
|
-
},
|
|
85
|
+
}, `${t('Changes')} ${currentDiffIndex + 1}/${changesCount}`), /*#__PURE__*/_react.default.createElement("div", {
|
|
86
86
|
className: "sdoc-revision-changes-divider"
|
|
87
87
|
}), /*#__PURE__*/_react.default.createElement("div", {
|
|
88
88
|
className: "sdoc-revision-changes-last d-flex align-items-center justify-content-center",
|
package/dist/components/doc-operations/revision-operations/more-revision-operations/index.js
CHANGED
|
@@ -25,7 +25,7 @@ const MoreRevisionOperations = _ref => {
|
|
|
25
25
|
_basicSdk.context.startRevise().then(res => {
|
|
26
26
|
const repoID = _basicSdk.context.getSetting('repoID');
|
|
27
27
|
const siteRoot = _basicSdk.context.getSetting('siteRoot');
|
|
28
|
-
const revisionURL =
|
|
28
|
+
const revisionURL = `${siteRoot}lib/${repoID}/revisions/${res.data.revision_id}/`;
|
|
29
29
|
window.open(revisionURL, '_blank');
|
|
30
30
|
eventBus.dispatch(_constants.NEW_REVISION);
|
|
31
31
|
}).catch(error => {
|
|
@@ -44,7 +44,7 @@ const MoreRevisionOperations = _ref => {
|
|
|
44
44
|
}, /*#__PURE__*/_react.default.createElement("i", {
|
|
45
45
|
className: "sdocfont sdoc-revise"
|
|
46
46
|
}), /*#__PURE__*/_react.default.createElement("span", {
|
|
47
|
-
className:
|
|
47
|
+
className: `sdocfont sdoc-${isDropdownOpen ? 'caret-up' : 'drop-down'}`
|
|
48
48
|
})), /*#__PURE__*/_react.default.createElement(_basicSdk.Tooltip, {
|
|
49
49
|
target: id
|
|
50
50
|
}, t('Revise')), /*#__PURE__*/_react.default.createElement(_reactstrap.DropdownMenu, {
|
package/dist/components/doc-operations/revision-operations/revisions/revisions-dialog/index.js
CHANGED
|
@@ -74,7 +74,7 @@ const RevisionsDialog = _ref => {
|
|
|
74
74
|
event.stopPropagation();
|
|
75
75
|
event.nativeEvent && event.nativeEvent.stopImmediatePropagation && event.nativeEvent.stopImmediatePropagation();
|
|
76
76
|
if (event.target.className.includes('sdoc-revision-operation-toggle')) return;
|
|
77
|
-
const url =
|
|
77
|
+
const url = `${siteRoot}lib/${repoID}/revisions/${revisionId}/`;
|
|
78
78
|
window.open(url, '_blank');
|
|
79
79
|
|
|
80
80
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
@@ -228,7 +228,7 @@ const RevisionsDialog = _ref => {
|
|
|
228
228
|
onClose: closeDeleteTipDialog,
|
|
229
229
|
zIndex: 1071
|
|
230
230
|
}, t(_constants.TIP_CONTENT[_constants.TIP_TYPE.DELETE_REVISION], {
|
|
231
|
-
content:
|
|
231
|
+
content: `${t('revision')} ${operatingRevisionId}`
|
|
232
232
|
})));
|
|
233
233
|
};
|
|
234
234
|
var _default = exports.default = RevisionsDialog;
|