@seafile/sdoc-editor 0.5.50 → 0.5.51
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.
|
@@ -33,38 +33,48 @@ const RevisionOperations = _ref => {
|
|
|
33
33
|
loadDocument
|
|
34
34
|
} = useDocument();
|
|
35
35
|
useEffect(() => {
|
|
36
|
+
if (!isSdocRevision) return;
|
|
36
37
|
if (isShowChanges) return;
|
|
37
38
|
setShowTip(true);
|
|
38
39
|
setTipType(TIP_TYPE.CHECKING);
|
|
39
|
-
const revisionPromise = loadDocument();
|
|
40
|
-
const baseVersionPromise = context.getRevisionBaseVersionContent();
|
|
41
|
-
const originVersionPromise = context.getSeadocOriginFileContent();
|
|
42
|
-
Promise.all([revisionPromise, baseVersionPromise, originVersionPromise]).then(results => {
|
|
43
|
-
const [revisionContent, baseRes, masterRes] = results;
|
|
44
|
-
const baseContent = JSON.parse(baseRes.data.content);
|
|
45
|
-
const masterContent = JSON.parse(masterRes.data.content);
|
|
46
40
|
|
|
47
|
-
|
|
48
|
-
|
|
41
|
+
// Let users perceive the processing process
|
|
42
|
+
let timer = null;
|
|
43
|
+
timer = setTimeout(() => {
|
|
44
|
+
const revisionPromise = loadDocument();
|
|
45
|
+
const baseVersionPromise = context.getRevisionBaseVersionContent();
|
|
46
|
+
const originVersionPromise = context.getSeadocOriginFileContent();
|
|
47
|
+
Promise.all([revisionPromise, baseVersionPromise, originVersionPromise]).then(results => {
|
|
48
|
+
const [revisionContent, baseRes, masterRes] = results;
|
|
49
|
+
const baseContent = JSON.parse(baseRes.data.content);
|
|
50
|
+
const masterContent = JSON.parse(masterRes.data.content);
|
|
51
|
+
timer = null;
|
|
52
|
+
|
|
53
|
+
// no changes
|
|
54
|
+
if (masterContent.version === baseContent.version) {
|
|
55
|
+
setShowTip(false);
|
|
56
|
+
setTipType('');
|
|
57
|
+
return;
|
|
58
|
+
}
|
|
59
|
+
const {
|
|
60
|
+
value
|
|
61
|
+
} = getRebase(masterContent, baseContent, revisionContent);
|
|
62
|
+
setMergeValue(value);
|
|
63
|
+
setTipType(TIP_TYPE.SOURCE_DOCUMENT_CHANGED);
|
|
64
|
+
}).catch(error => {
|
|
65
|
+
timer = null;
|
|
66
|
+
if (typeof error === 'string') {
|
|
67
|
+
toaster.danger(t(error));
|
|
68
|
+
return;
|
|
69
|
+
}
|
|
70
|
+
toaster.danger(t('Error'));
|
|
49
71
|
setShowTip(false);
|
|
50
72
|
setTipType('');
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
setMergeValue(value);
|
|
57
|
-
setTipType(TIP_TYPE.SOURCE_DOCUMENT_CHANGED);
|
|
58
|
-
}).catch(error => {
|
|
59
|
-
if (typeof error === 'string') {
|
|
60
|
-
toaster.danger(t(error));
|
|
61
|
-
return;
|
|
62
|
-
}
|
|
63
|
-
toaster.danger(t('Error'));
|
|
64
|
-
setShowTip(false);
|
|
65
|
-
setTipType('');
|
|
66
|
-
});
|
|
67
|
-
|
|
73
|
+
});
|
|
74
|
+
}, 600);
|
|
75
|
+
return () => {
|
|
76
|
+
timer && clearTimeout(timer);
|
|
77
|
+
};
|
|
68
78
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
69
79
|
}, []);
|
|
70
80
|
const onDocumentReplaced = useCallback(() => {
|