mirror of
https://github.com/leanote/desktop-app.git
synced 2026-01-22 01:01:27 +08:00
笔记本数量问题 , APP端的笔记不能自动保存, APP端的笔记不能自动保存. [ok] 同步删除笔记问题
笔记本数量问题 [ok]
两次粘贴问题 [ok]
APP端的笔记不能自动保存. [ok]
同步删除笔记问题 [ok]
执行以下操作:APP内添加两篇笔记,手动同步到网页,网页可见.此时在网页中删掉其中一篇笔记后保存,网页可
达到预期效果.回到APP后手动同步, APP内的笔记仍然是2条,未作任何删改.已反复尝试证实. [ok]
This commit is contained in:
16
node_modules/api.js
generated
vendored
16
node_modules/api.js
generated
vendored
@@ -611,23 +611,27 @@ var Api = {
|
||||
return callback(false);
|
||||
}
|
||||
var ret = resp.body;
|
||||
log('delete note ret');
|
||||
log(ret);
|
||||
console.error('delete note ret');
|
||||
console.log('delete note ret');
|
||||
console.log(ret);
|
||||
if(Common.isOk(ret)) {
|
||||
// 以后不要再发了
|
||||
Note.setNotDirty(note.NoteId);
|
||||
Note.removeNote(note.NoteId);
|
||||
callback(ret);
|
||||
} else {
|
||||
callback(false);
|
||||
try {
|
||||
log('delete note conflict');
|
||||
console.log('delete note conflict');
|
||||
// 代表冲突了, 那么本地的删除无效, 设为IsDirty为false, 不删除
|
||||
// 待以后同步
|
||||
if(ret.Msg == 'conflict') {
|
||||
log('delete note conflict: setNotDirtyNotDelete');
|
||||
console.log('delete note conflict: setNotDirtyNotDelete');
|
||||
Note.setNotDirtyNotDelete(note.NoteId);
|
||||
} else if(ret.Msg == 'notExists') {
|
||||
console.log('delete note conflict: remove not exists');
|
||||
Note.removeNote(note.NoteId);
|
||||
} else {
|
||||
log('delete note conflict: setNotDirty');
|
||||
console.log('delete note conflict: setNotDirty');
|
||||
Note.setNotDirty(note.NoteId);
|
||||
}
|
||||
} catch(e) {}
|
||||
|
||||
Reference in New Issue
Block a user