@seafile/sdoc-editor 2.0.79 → 2.0.80-test-0.0.1
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-context-menu/index.js +5 -0
- package/dist/basic-sdk/comment/components/comment-delete-popover.js +1 -1
- package/dist/basic-sdk/comment/components/comment-item-collapse-wrapper.js +5 -3
- package/dist/basic-sdk/comment/components/comment-item-content.js +32 -11
- package/dist/basic-sdk/comment/components/comment-item-reply.js +1 -1
- package/dist/basic-sdk/comment/components/comment-item-wrapper.js +8 -9
- package/dist/basic-sdk/comment/components/comment-list.js +14 -13
- package/dist/basic-sdk/comment/components/editor-comment.js +5 -8
- 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 +24 -50
- package/dist/basic-sdk/comment/reducer/notification-reducer.js +7 -9
- 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 +10 -8
- package/dist/basic-sdk/components/toast/toaster.js +10 -13
- package/dist/basic-sdk/context.js +2 -2
- package/dist/basic-sdk/cursor/helper.js +4 -11
- 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 +8 -9
- 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 +6 -7
- 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 +3 -3
- package/dist/basic-sdk/extension/commons/select-file-dialog/index.js +6 -8
- package/dist/basic-sdk/extension/commons/select-file-dialog/local-files/index.js +2 -2
- package/dist/basic-sdk/extension/commons/wiki-file-insert-dialog/index.js +5 -5
- 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 +10 -13
- package/dist/basic-sdk/extension/core/transforms/remove-node-children.js +4 -3
- package/dist/basic-sdk/extension/core/transforms/replace-node.js +9 -10
- package/dist/basic-sdk/extension/core/transforms/update-parent-node.js +3 -3
- package/dist/basic-sdk/extension/core/utils/index.js +5 -4
- 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 +5 -4
- 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 +5 -4
- package/dist/basic-sdk/extension/plugins/check-list/render-elem.js +1 -1
- package/dist/basic-sdk/extension/plugins/clear-format/menu/index.js +6 -4
- package/dist/basic-sdk/extension/plugins/code-block/hover-menu/index.js +4 -4
- package/dist/basic-sdk/extension/plugins/code-block/plugin.js +3 -6
- package/dist/basic-sdk/extension/plugins/code-block/render-elem.js +6 -6
- package/dist/basic-sdk/extension/plugins/file-link/hover-menu/index.js +1 -1
- package/dist/basic-sdk/extension/plugins/file-link/render-elem.js +4 -7
- 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 +16 -21
- package/dist/basic-sdk/extension/plugins/history/history-menu.js +9 -8
- package/dist/basic-sdk/extension/plugins/html/helper.js +2 -2
- package/dist/basic-sdk/extension/plugins/image/helpers.js +9 -11
- package/dist/basic-sdk/extension/plugins/image/hover-menu/index.js +5 -9
- 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 +11 -20
- 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 +6 -5
- package/dist/basic-sdk/extension/plugins/list/menu/index.js +5 -4
- package/dist/basic-sdk/extension/plugins/list/plugin/index.js +4 -3
- package/dist/basic-sdk/extension/plugins/list/plugin/on-tab-handle.js +3 -6
- package/dist/basic-sdk/extension/plugins/list/transforms/insert-list-item.js +3 -4
- package/dist/basic-sdk/extension/plugins/list/transforms/toggle-list.js +5 -6
- package/dist/basic-sdk/extension/plugins/markdown/plugin.js +7 -17
- package/dist/basic-sdk/extension/plugins/mention/plugin.js +5 -6
- 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 +10 -14
- 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 +8 -10
- 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 +3 -4
- 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 +5 -8
- 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 +21 -38
- 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 +16 -21
- 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 +8 -11
- package/dist/basic-sdk/extension/plugins/table/render/render-cell.js +9 -18
- 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 +4 -3
- package/dist/basic-sdk/extension/plugins/table/render/resize-mask/index.js +16 -20
- 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 +5 -6
- 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 +5 -6
- package/dist/basic-sdk/extension/plugins/text-style/render-elem.js +8 -6
- 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 +10 -15
- package/dist/basic-sdk/extension/render/render-comment-editor-element.js +10 -15
- 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 +12 -31
- package/dist/basic-sdk/extension/toolbar/side-toolbar/index.js +3 -3
- package/dist/basic-sdk/extension/toolbar/side-toolbar/insert-block-menu.js +11 -28
- package/dist/basic-sdk/extension/toolbar/side-toolbar/side-menu.js +5 -8
- package/dist/basic-sdk/highlight/setNodeToDecorations.js +5 -4
- package/dist/basic-sdk/hooks/use-selection-position.js +3 -3
- package/dist/basic-sdk/index.js +47 -0
- package/dist/basic-sdk/node-id/helpers.js +8 -12
- package/dist/basic-sdk/node-id/index.js +1 -1
- package/dist/basic-sdk/outline/outline-item.js +3 -4
- package/dist/basic-sdk/right-panel/index.js +6 -7
- 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 +24 -31
- package/dist/basic-sdk/slate-convert/slate-to-md/transform.js +5 -5
- package/dist/basic-sdk/socket/helpers.js +5 -6
- 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 +34 -48
- package/dist/basic-sdk/utils/document-utils.js +5 -7
- 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 +3 -5
- package/dist/basic-sdk/utils/rebase.js +21 -36
- package/dist/components/doc-info/index.js +2 -2
- 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 +3 -4
- package/dist/components/doc-operations/revision-operations/view-changes/index.js +5 -5
- package/dist/components/tip-dialog/index.js +1 -1
- package/dist/constants/index.js +7 -7
- package/dist/layout/content.js +8 -5
- package/dist/layout/header.js +8 -5
- package/dist/layout/layout.js +8 -7
- package/dist/pages/sdoc-wiki-editor.js +6 -11
- package/dist/pages/simple-editor.js +1 -2
- 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 +2 -4
- package/dist/plugin-module/plugins/chart/helpers.js +6 -6
- package/dist/plugin-module/plugins/seatable-column/helpers.js +3 -6
- package/dist/plugin-module/plugins/seatable-column/menu/column-list-item.js +1 -1
- package/dist/plugin-module/plugins/seatable-column/render-elem.js +25 -32
- 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 +2 -4
- 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 +2 -3
- package/dist/plugin-module/plugins/seatable-row/render-elem/index.js +6 -7
- 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 +2 -3
- 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 +6 -7
- 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 +4 -3
- 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 +3 -5
- 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
- package/dist/entry.js +0 -9
|
@@ -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: ".concat(this.state, " -> ").concat(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: ".concat(this.state, " -> ").concat(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: ".concat(this.state, " -> ").concat(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: ".concat(this.state, " -> ").concat(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: ".concat(this.state, " -> ").concat(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: ".concat(this.state, " -> ").concat(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: ".concat(this.state, " -> ").concat(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: ".concat(this.state, " -> ").concat(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: ".concat(this.state, " -> ").concat(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: ".concat(this.state, " -> ").concat(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: ".concat(this.state, " -> ").concat(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: ".concat(this.state, " -> ").concat(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: ".concat(this.state, " -> ").concat(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 => "".concat(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'] = "".concat(_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("[".concat(extendedWordChars, "]+|\\s+|[^").concat(extendedWordChars, "]"), 'ug');
|
|
12
12
|
const buildValues = (diff, components, newString, oldString, valueType, useLongestToken) => {
|
|
13
13
|
let componentPos = 0;
|
|
14
14
|
let componentLen = components.length;
|
|
@@ -5,6 +5,7 @@ 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"));
|
|
8
9
|
var _slugid = _interopRequireDefault(require("slugid"));
|
|
9
10
|
var _constants = require("../extension/constants");
|
|
10
11
|
var _diffText = _interopRequireDefault(require("./diff-text"));
|
|
@@ -17,18 +18,16 @@ const generatorDiffTextElement = function (textElement, diffType) {
|
|
|
17
18
|
if (!textElement) return null;
|
|
18
19
|
if (!diffType) return textElement;
|
|
19
20
|
const id = textElement.id;
|
|
20
|
-
return {
|
|
21
|
-
...textElement,
|
|
21
|
+
return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, textElement), {}, {
|
|
22
22
|
id: id || _slugid.default.nice(),
|
|
23
|
-
[diffType]: true
|
|
24
|
-
|
|
25
|
-
};
|
|
23
|
+
[diffType]: true
|
|
24
|
+
}, style);
|
|
26
25
|
};
|
|
27
26
|
const getTopLevelChanges = changes => {
|
|
28
27
|
const topLevelChanges = [];
|
|
29
28
|
const articleEl = document.getElementById('sdoc-editor');
|
|
30
29
|
changes.forEach(item => {
|
|
31
|
-
let dom = document.querySelectorAll(
|
|
30
|
+
let dom = document.querySelectorAll("[data-id=\"".concat(item, "\"]"))[0];
|
|
32
31
|
if (!dom) return [];
|
|
33
32
|
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) {
|
|
34
33
|
var _dom, _dom$dataset, _dom2, _dom3;
|
|
@@ -80,11 +79,10 @@ const generatorDiffElement = function (element, diffType) {
|
|
|
80
79
|
if (!Array.isArray(element.children) || element.children.length === 0) {
|
|
81
80
|
return generatorDiffTextElement(element, diffType, style);
|
|
82
81
|
}
|
|
83
|
-
return {
|
|
84
|
-
...element,
|
|
82
|
+
return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, element), {}, {
|
|
85
83
|
[diffType]: true,
|
|
86
84
|
children: element.children.map(item => generatorDiffElement(item, diffType, style))
|
|
87
|
-
};
|
|
85
|
+
});
|
|
88
86
|
};
|
|
89
87
|
const generateIdMapAndIds = elements => {
|
|
90
88
|
let map = {};
|
|
@@ -124,7 +122,7 @@ const getTextDiff = (element, oldElement, diff) => {
|
|
|
124
122
|
const textDiffs = textDiff.getDiffs();
|
|
125
123
|
let newChildren = [];
|
|
126
124
|
textDiffs.forEach((item, index) => {
|
|
127
|
-
const id =
|
|
125
|
+
const id = "".concat(element.id || _slugid.default.nice(), "-").concat(index);
|
|
128
126
|
let elementItem = {
|
|
129
127
|
id,
|
|
130
128
|
text: item.value
|
|
@@ -147,21 +145,18 @@ const getTextDiff = (element, oldElement, diff) => {
|
|
|
147
145
|
const getCommonDiff = (element, oldElement, diff) => {
|
|
148
146
|
if (!hasChildren(element) && !hasChildren(oldElement)) {
|
|
149
147
|
const newChildren = getTextDiff(element, oldElement, diff);
|
|
150
|
-
return [{
|
|
151
|
-
...element,
|
|
148
|
+
return [(0, _objectSpread2.default)((0, _objectSpread2.default)({}, element), {}, {
|
|
152
149
|
children: newChildren
|
|
153
|
-
}];
|
|
150
|
+
})];
|
|
154
151
|
}
|
|
155
152
|
if (!hasChildren(element) || !hasChildren(oldElement)) {
|
|
156
153
|
const elementId = element.id || _slugid.default.nice();
|
|
157
|
-
diff.changes.push(
|
|
158
|
-
return [generatorDiffElement({
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
id: `${elementId}_add`
|
|
164
|
-
}, _constants.TEXT_STYLE_MAP.ADD, _constants.ADDED_STYLE)];
|
|
154
|
+
diff.changes.push("".concat(elementId, "_delete"));
|
|
155
|
+
return [generatorDiffElement((0, _objectSpread2.default)((0, _objectSpread2.default)({}, oldElement), {}, {
|
|
156
|
+
id: "".concat(elementId, "_delete")
|
|
157
|
+
}), _constants.TEXT_STYLE_MAP.DELETE, _constants.DELETED_STYLE), generatorDiffElement((0, _objectSpread2.default)((0, _objectSpread2.default)({}, element), {}, {
|
|
158
|
+
id: "".concat(elementId, "_add")
|
|
159
|
+
}), _constants.TEXT_STYLE_MAP.ADD, _constants.ADDED_STYLE)];
|
|
165
160
|
}
|
|
166
161
|
|
|
167
162
|
// Content does not change
|
|
@@ -211,14 +206,12 @@ const getCommonDiff = (element, oldElement, diff) => {
|
|
|
211
206
|
if (newChildrenElement.data.src === oldChildrenElement.data.src) {
|
|
212
207
|
newChildren.push(newChildrenElement);
|
|
213
208
|
} else {
|
|
214
|
-
newChildren.push(generatorDiffTextElement({
|
|
215
|
-
...element,
|
|
209
|
+
newChildren.push(generatorDiffTextElement((0, _objectSpread2.default)((0, _objectSpread2.default)({}, element), {}, {
|
|
216
210
|
id: element.id + '_add'
|
|
217
|
-
}, _constants.TEXT_STYLE_MAP.ADD, _constants.ADDED_STYLE));
|
|
218
|
-
newChildren.push(generatorDiffTextElement({
|
|
219
|
-
...oldChildrenElement,
|
|
211
|
+
}), _constants.TEXT_STYLE_MAP.ADD, _constants.ADDED_STYLE));
|
|
212
|
+
newChildren.push(generatorDiffTextElement((0, _objectSpread2.default)((0, _objectSpread2.default)({}, oldChildrenElement), {}, {
|
|
220
213
|
id: element.id + '_delete'
|
|
221
|
-
}, _constants.TEXT_STYLE_MAP.DELETE, _constants.DELETED_STYLE));
|
|
214
|
+
}), _constants.TEXT_STYLE_MAP.DELETE, _constants.DELETED_STYLE));
|
|
222
215
|
}
|
|
223
216
|
} else if (newChildrenElement.type === _constants.ELEMENT_TYPE.LINK) {
|
|
224
217
|
if (newChildrenElement.title !== oldChildrenElement.title) {
|
|
@@ -226,14 +219,12 @@ const getCommonDiff = (element, oldElement, diff) => {
|
|
|
226
219
|
newChildren.push(...diffElements);
|
|
227
220
|
} else if (newChildrenElement.href !== oldChildrenElement.href) {
|
|
228
221
|
diff.changes.push(oldChildrenElement.id + '_delete');
|
|
229
|
-
newChildren.push(generatorDiffTextElement({
|
|
230
|
-
...oldChildrenElement,
|
|
222
|
+
newChildren.push(generatorDiffTextElement((0, _objectSpread2.default)((0, _objectSpread2.default)({}, oldChildrenElement), {}, {
|
|
231
223
|
id: oldChildrenElement.id + '_delete'
|
|
232
|
-
}, _constants.TEXT_STYLE_MAP.DELETE, _constants.DELETED_STYLE));
|
|
233
|
-
newChildren.push(generatorDiffTextElement({
|
|
234
|
-
...newChildrenElement,
|
|
224
|
+
}), _constants.TEXT_STYLE_MAP.DELETE, _constants.DELETED_STYLE));
|
|
225
|
+
newChildren.push(generatorDiffTextElement((0, _objectSpread2.default)((0, _objectSpread2.default)({}, newChildrenElement), {}, {
|
|
235
226
|
id: newChildrenElement.id + '_add'
|
|
236
|
-
}, _constants.TEXT_STYLE_MAP.ADD, _constants.ADDED_STYLE));
|
|
227
|
+
}), _constants.TEXT_STYLE_MAP.ADD, _constants.ADDED_STYLE));
|
|
237
228
|
} else {
|
|
238
229
|
newChildren.push(newChildrenElement);
|
|
239
230
|
}
|
|
@@ -246,23 +237,20 @@ const getCommonDiff = (element, oldElement, diff) => {
|
|
|
246
237
|
}
|
|
247
238
|
} else {
|
|
248
239
|
diff.changes.push(oldChildrenElement.id + '_delete');
|
|
249
|
-
newChildren.push(generatorDiffTextElement({
|
|
250
|
-
...oldChildrenElement,
|
|
240
|
+
newChildren.push(generatorDiffTextElement((0, _objectSpread2.default)((0, _objectSpread2.default)({}, oldChildrenElement), {}, {
|
|
251
241
|
id: oldChildrenElement.id + '_delete'
|
|
252
|
-
}, _constants.TEXT_STYLE_MAP.DELETE, _constants.DELETED_STYLE));
|
|
253
|
-
newChildren.push(generatorDiffTextElement({
|
|
254
|
-
...newChildrenElement,
|
|
242
|
+
}), _constants.TEXT_STYLE_MAP.DELETE, _constants.DELETED_STYLE));
|
|
243
|
+
newChildren.push(generatorDiffTextElement((0, _objectSpread2.default)((0, _objectSpread2.default)({}, newChildrenElement), {}, {
|
|
255
244
|
id: newChildrenElement.id + '_add'
|
|
256
|
-
}, _constants.TEXT_STYLE_MAP.ADD, _constants.ADDED_STYLE));
|
|
245
|
+
}), _constants.TEXT_STYLE_MAP.ADD, _constants.ADDED_STYLE));
|
|
257
246
|
}
|
|
258
247
|
}
|
|
259
248
|
}
|
|
260
249
|
});
|
|
261
250
|
});
|
|
262
|
-
return [{
|
|
263
|
-
...element,
|
|
251
|
+
return [(0, _objectSpread2.default)((0, _objectSpread2.default)({}, element), {}, {
|
|
264
252
|
children: newChildren
|
|
265
|
-
}];
|
|
253
|
+
})];
|
|
266
254
|
};
|
|
267
255
|
const updateDiffValue = (diff, element, oldElement) => {
|
|
268
256
|
if (!diff || !element || !oldElement) return;
|
|
@@ -355,17 +343,15 @@ const getDiff = function () {
|
|
|
355
343
|
const {
|
|
356
344
|
version: currentVersion,
|
|
357
345
|
elements: currentContent
|
|
358
|
-
} = {
|
|
359
|
-
...currentValue,
|
|
346
|
+
} = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, currentValue), {}, {
|
|
360
347
|
elements: (0, _documentUtils.normalizeChildren)(currentValue.elements)
|
|
361
|
-
};
|
|
348
|
+
});
|
|
362
349
|
const {
|
|
363
350
|
version: oldVersion,
|
|
364
351
|
elements: oldContent
|
|
365
|
-
} = {
|
|
366
|
-
...oldValue,
|
|
352
|
+
} = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, oldValue), {}, {
|
|
367
353
|
elements: (0, _documentUtils.normalizeChildren)(oldValue.elements)
|
|
368
|
-
};
|
|
354
|
+
});
|
|
369
355
|
if (currentVersion === oldVersion) return {
|
|
370
356
|
value: currentContent,
|
|
371
357
|
changes: []
|
|
@@ -5,6 +5,7 @@ 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"));
|
|
8
9
|
var _deepCopy = _interopRequireDefault(require("deep-copy"));
|
|
9
10
|
var _context = _interopRequireDefault(require("../context"));
|
|
10
11
|
var _constants = require("../extension/constants");
|
|
@@ -44,7 +45,7 @@ const normalizeCopyNodes = (editor, elements) => {
|
|
|
44
45
|
exports.normalizeCopyNodes = normalizeCopyNodes;
|
|
45
46
|
const setOriginSdocKey = event => {
|
|
46
47
|
const docUuid = _context.default.getSetting('docUuid');
|
|
47
|
-
event.clipboardData.setData(
|
|
48
|
+
event.clipboardData.setData("text/".concat(_constants.CLIPBOARD_ORIGIN_SDOC_KEY), docUuid);
|
|
48
49
|
};
|
|
49
50
|
exports.setOriginSdocKey = setOriginSdocKey;
|
|
50
51
|
const getSlateFragmentAttribute = dataTransfer => {
|
|
@@ -71,11 +72,8 @@ const generateDefaultDocContent = () => {
|
|
|
71
72
|
// patch: update children to elements
|
|
72
73
|
exports.generateDefaultDocContent = generateDefaultDocContent;
|
|
73
74
|
const formatSdocContent = content => {
|
|
74
|
-
return {
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
elements: content.children
|
|
78
|
-
})
|
|
79
|
-
};
|
|
75
|
+
return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, content), !content.elements && {
|
|
76
|
+
elements: content.children
|
|
77
|
+
});
|
|
80
78
|
};
|
|
81
79
|
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'] = "".concat(_constants.LEFT_OUTLINE_WIDTH, "px");
|
|
22
|
+
const adjustWidth = " - ".concat(_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': "".concat(Number(_constants.ARTICLE_FULL_MIN_WIDTH.slice(0, -2)), "px")
|
|
32
32
|
};
|
|
33
33
|
}
|
|
34
34
|
return {};
|
|
@@ -5,6 +5,7 @@ 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"));
|
|
8
9
|
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/esm/defineProperty"));
|
|
9
10
|
var _ObjectUtils;
|
|
10
11
|
class ObjectUtils {
|
|
@@ -20,16 +21,13 @@ class ObjectUtils {
|
|
|
20
21
|
}
|
|
21
22
|
static isObjectChanged(source, comparison, notIncludeKeys) {
|
|
22
23
|
if (!this.iterable(source)) {
|
|
23
|
-
throw new Error(
|
|
24
|
+
throw new Error("source should be a Object or Array , but got ".concat(this.getDataType(source)));
|
|
24
25
|
}
|
|
25
26
|
if (this.getDataType(source) !== this.getDataType(comparison)) {
|
|
26
27
|
return true;
|
|
27
28
|
}
|
|
28
29
|
const sourceKeys = Object.keys(source);
|
|
29
|
-
const comparisonKeys = Object.keys({
|
|
30
|
-
...source,
|
|
31
|
-
...comparison
|
|
32
|
-
}).filter(key => !notIncludeKeys.includes(key));
|
|
30
|
+
const comparisonKeys = Object.keys((0, _objectSpread2.default)((0, _objectSpread2.default)({}, source), comparison)).filter(key => !notIncludeKeys.includes(key));
|
|
33
31
|
if (sourceKeys.length !== comparisonKeys.length) {
|
|
34
32
|
return true;
|
|
35
33
|
}
|
|
@@ -5,6 +5,7 @@ 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"));
|
|
8
9
|
var _constants = require("../constants");
|
|
9
10
|
var _constants2 = require("../extension/constants");
|
|
10
11
|
var _helpers = require("../node-id/helpers");
|
|
@@ -34,15 +35,14 @@ const hasConflict = content => {
|
|
|
34
35
|
exports.hasConflict = hasConflict;
|
|
35
36
|
const expandGroup = content => {
|
|
36
37
|
if ([_constants2.ELEMENT_TYPE.UNORDERED_LIST, _constants2.ELEMENT_TYPE.ORDERED_LIST].includes(content.type)) {
|
|
37
|
-
return [{
|
|
38
|
-
...content,
|
|
38
|
+
return [(0, _objectSpread2.default)((0, _objectSpread2.default)({}, 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,11 +116,10 @@ const getChanges = function (masterContent, revisionContent) {
|
|
|
116
116
|
} else {
|
|
117
117
|
const oldElement = masterContentMap[elementId];
|
|
118
118
|
const currentElement = currentContentMap[elementId];
|
|
119
|
-
let newElement = {
|
|
120
|
-
...currentElement,
|
|
119
|
+
let newElement = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, currentElement), {}, {
|
|
121
120
|
[_constants.REBASE_MARK_KEY.MODIFY_TYPE]: _constants.MODIFY_TYPE.MODIFY,
|
|
122
121
|
[_constants.REBASE_MARK_KEY.OLD_ELEMENT]: oldElement
|
|
123
|
-
};
|
|
122
|
+
});
|
|
124
123
|
if (currentElement.type === oldElement.type) {
|
|
125
124
|
const elementType = currentElement.type;
|
|
126
125
|
if ([_constants2.ELEMENT_TYPE.UNORDERED_LIST, _constants2.ELEMENT_TYPE.ORDERED_LIST].includes(elementType)) {
|
|
@@ -138,9 +137,7 @@ const getChanges = function (masterContent, revisionContent) {
|
|
|
138
137
|
};
|
|
139
138
|
const getMergeElement = (diffElement, baseElement) => {
|
|
140
139
|
const modifyType = diffElement[_constants.REBASE_MARK_KEY.MODIFY_TYPE];
|
|
141
|
-
const newElement = {
|
|
142
|
-
...diffElement
|
|
143
|
-
};
|
|
140
|
+
const newElement = (0, _objectSpread2.default)({}, diffElement);
|
|
144
141
|
newElement[_constants.REBASE_MARK_KEY.MODIFY_TYPE] && delete newElement[_constants.REBASE_MARK_KEY.MODIFY_TYPE];
|
|
145
142
|
|
|
146
143
|
// revision does not have this element, master has this element
|
|
@@ -175,23 +172,19 @@ const getMergeElement = (diffElement, baseElement) => {
|
|
|
175
172
|
|
|
176
173
|
// Elements that differ between revision and master
|
|
177
174
|
if (modifyType === _constants.MODIFY_TYPE.MODIFY) {
|
|
178
|
-
const masterElement = {
|
|
179
|
-
...diffElement[_constants.REBASE_MARK_KEY.OLD_ELEMENT]
|
|
180
|
-
};
|
|
175
|
+
const masterElement = (0, _objectSpread2.default)({}, diffElement[_constants.REBASE_MARK_KEY.OLD_ELEMENT]);
|
|
181
176
|
delete newElement[_constants.REBASE_MARK_KEY.OLD_ELEMENT];
|
|
182
177
|
|
|
183
178
|
// 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.
|
|
184
179
|
if (!baseElement) {
|
|
185
|
-
return [{
|
|
186
|
-
...(0, _helpers.replaceNodeId)(masterElement),
|
|
180
|
+
return [(0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _helpers.replaceNodeId)(masterElement)), {}, {
|
|
187
181
|
[_constants.REBASE_MARK_KEY.REBASE_TYPE]: _constants.REBASE_TYPE.MODIFY_MODIFY,
|
|
188
182
|
[_constants.REBASE_MARK_KEY.OLD_ELEMENT]: masterElement,
|
|
189
183
|
[_constants.REBASE_MARK_KEY.ORIGIN]: _constants.REBASE_ORIGIN.OTHER
|
|
190
|
-
}, {
|
|
191
|
-
...newElement,
|
|
184
|
+
}), (0, _objectSpread2.default)((0, _objectSpread2.default)({}, newElement), {}, {
|
|
192
185
|
[_constants.REBASE_MARK_KEY.REBASE_TYPE]: _constants.REBASE_TYPE.MODIFY_MODIFY,
|
|
193
186
|
[_constants.REBASE_MARK_KEY.ORIGIN]: _constants.REBASE_ORIGIN.MY
|
|
194
|
-
}];
|
|
187
|
+
})];
|
|
195
188
|
}
|
|
196
189
|
|
|
197
190
|
// master is the same as base, indicating that revision has modified the content
|
|
@@ -201,35 +194,29 @@ const getMergeElement = (diffElement, baseElement) => {
|
|
|
201
194
|
if (_objectUtils.default.isSameObject(newElement, baseElement)) return [masterElement];
|
|
202
195
|
|
|
203
196
|
// 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.
|
|
204
|
-
return [{
|
|
205
|
-
...(0, _helpers.replaceNodeId)(masterElement),
|
|
197
|
+
return [(0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _helpers.replaceNodeId)(masterElement)), {}, {
|
|
206
198
|
[_constants.REBASE_MARK_KEY.REBASE_TYPE]: _constants.REBASE_TYPE.MODIFY_MODIFY,
|
|
207
199
|
[_constants.REBASE_MARK_KEY.OLD_ELEMENT]: masterElement,
|
|
208
200
|
[_constants.REBASE_MARK_KEY.ORIGIN]: _constants.REBASE_ORIGIN.OTHER
|
|
209
|
-
}, {
|
|
210
|
-
...newElement,
|
|
201
|
+
}), (0, _objectSpread2.default)((0, _objectSpread2.default)({}, newElement), {}, {
|
|
211
202
|
[_constants.REBASE_MARK_KEY.REBASE_TYPE]: _constants.REBASE_TYPE.MODIFY_MODIFY,
|
|
212
203
|
[_constants.REBASE_MARK_KEY.ORIGIN]: _constants.REBASE_ORIGIN.MY
|
|
213
|
-
}];
|
|
204
|
+
})];
|
|
214
205
|
}
|
|
215
206
|
if (modifyType === _constants.MODIFY_TYPE.CHILDREN_MODIFY) {
|
|
216
|
-
const masterElement = {
|
|
217
|
-
...diffElement[_constants.REBASE_MARK_KEY.OLD_ELEMENT]
|
|
218
|
-
};
|
|
207
|
+
const masterElement = (0, _objectSpread2.default)({}, diffElement[_constants.REBASE_MARK_KEY.OLD_ELEMENT]);
|
|
219
208
|
delete newElement[_constants.REBASE_MARK_KEY.OLD_ELEMENT];
|
|
220
209
|
|
|
221
210
|
// 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.
|
|
222
211
|
if (!baseElement) {
|
|
223
|
-
return [{
|
|
224
|
-
...(0, _helpers.replaceNodeId)(masterElement),
|
|
212
|
+
return [(0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _helpers.replaceNodeId)(masterElement)), {}, {
|
|
225
213
|
[_constants.REBASE_MARK_KEY.REBASE_TYPE]: _constants.REBASE_TYPE.MODIFY_MODIFY,
|
|
226
214
|
[_constants.REBASE_MARK_KEY.OLD_ELEMENT]: masterElement,
|
|
227
215
|
[_constants.REBASE_MARK_KEY.ORIGIN]: _constants.REBASE_ORIGIN.OTHER
|
|
228
|
-
}, {
|
|
229
|
-
...newElement,
|
|
216
|
+
}), (0, _objectSpread2.default)((0, _objectSpread2.default)({}, newElement), {}, {
|
|
230
217
|
[_constants.REBASE_MARK_KEY.REBASE_TYPE]: _constants.REBASE_TYPE.MODIFY_MODIFY,
|
|
231
218
|
[_constants.REBASE_MARK_KEY.ORIGIN]: _constants.REBASE_ORIGIN.MY
|
|
232
|
-
}];
|
|
219
|
+
})];
|
|
233
220
|
}
|
|
234
221
|
if (_objectUtils.default.isSameObject(masterElement, baseElement)) return expandGroup(newElement);
|
|
235
222
|
if (_objectUtils.default.isSameObject(newElement, baseElement)) return [masterElement];
|
|
@@ -240,10 +227,9 @@ const getMergeElement = (diffElement, baseElement) => {
|
|
|
240
227
|
|
|
241
228
|
// The content of the subnode has changed and needs to be solved manually.
|
|
242
229
|
const childrenContent = getMergeContent(baseElement, diffElement.children);
|
|
243
|
-
return [{
|
|
244
|
-
...newElement,
|
|
230
|
+
return [(0, _objectSpread2.default)((0, _objectSpread2.default)({}, newElement), {}, {
|
|
245
231
|
children: childrenContent
|
|
246
|
-
}];
|
|
232
|
+
})];
|
|
247
233
|
}
|
|
248
234
|
newElement[_constants.REBASE_MARK_KEY.OLD_ELEMENT] && delete newElement[_constants.REBASE_MARK_KEY.OLD_ELEMENT];
|
|
249
235
|
return expandGroup(newElement);
|
|
@@ -322,11 +308,10 @@ const getRebase = (masterContent, baseContent, revisionContent) => {
|
|
|
322
308
|
return {
|
|
323
309
|
canMerge: canMerge(content, revisionContent.elements),
|
|
324
310
|
isNeedReplaceMaster: true,
|
|
325
|
-
value: {
|
|
326
|
-
...revisionContent,
|
|
311
|
+
value: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, revisionContent), {}, {
|
|
327
312
|
elements: content,
|
|
328
313
|
version: Math.max(masterContent.version, revisionContent.version) + 1
|
|
329
|
-
}
|
|
314
|
+
})
|
|
330
315
|
};
|
|
331
316
|
};
|
|
332
317
|
exports.getRebase = getRebase;
|
|
@@ -8,9 +8,9 @@ Object.defineProperty(exports, "__esModule", {
|
|
|
8
8
|
exports.default = void 0;
|
|
9
9
|
var _react = _interopRequireWildcard(require("react"));
|
|
10
10
|
var _reactI18next = require("react-i18next");
|
|
11
|
+
var _basicSdk = require("../../basic-sdk");
|
|
11
12
|
var _revisionAvatar = _interopRequireDefault(require("../../assets/images/revision-avatar.png"));
|
|
12
13
|
var _sdocFreezed = _interopRequireDefault(require("../../assets/images/sdoc-freezed.png"));
|
|
13
|
-
var _basicSdk = require("../../basic-sdk");
|
|
14
14
|
var _constants = require("../../constants");
|
|
15
15
|
var _utils = require("../../utils");
|
|
16
16
|
var _draftDropdown = _interopRequireDefault(require("../draft-dropdown"));
|
|
@@ -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 ".concat(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 ? "".concat(item.name, " (").concat(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 ".concat(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=\"".concat(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
|
+
}, "".concat(t('Changes'), " ").concat(currentDiffIndex + 1, "/").concat(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 = "".concat(siteRoot, "lib/").concat(repoID, "/revisions/").concat(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-".concat(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, {
|