fix: import

canwdev · Jun 6, 2023 · a23e869 · a23e869
1 parent b1a58d2
commit a23e869
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 6 deletions.
diff --git a/electron/src/common/keepass/kdbx.ts b/electron/src/common/keepass/kdbx.ts
@@ -211,16 +211,23 @@ export class KdbxHelper {
     }
     console.log(`[db] updateEntry ${uuid}`)
     const entry = this.getEntry(uuid)
+    let isAutoUpdateTime = true
     updates.forEach((obj) => {
       // eslint-disable-next-line prefer-const
       let {path, value} = obj
-      if (path.indexOf('creationTime') > 0) {
+      if (path === 'times.creationTime') {
         // need convert time format to Date!
         value = new Date(value)
       }
+      if (path === 'times.lastModTime') {
+        value = new Date(value)
+        isAutoUpdateTime = false
+      }
       setValDot(entry, path, value)
     })
-    entry.times.update()
+    if (isAutoUpdateTime) {
+      entry.times.update()
+    }
     this.isChanged = true
     return new EntryItem(entry, true)
   }

diff --git a/nest/src/common/keepass/kdbx.ts b/nest/src/common/keepass/kdbx.ts
@@ -211,16 +211,23 @@ export class KdbxHelper {
     }
     console.log(`[db] updateEntry ${uuid}`)
     const entry = this.getEntry(uuid)
+    let isAutoUpdateTime = true
     updates.forEach((obj) => {
       // eslint-disable-next-line prefer-const
       let {path, value} = obj
-      if (path.indexOf('creationTime') > 0) {
+      if (path === 'times.creationTime') {
         // need convert time format to Date!
         value = new Date(value)
       }
+      if (path === 'times.lastModTime') {
+        value = new Date(value)
+        isAutoUpdateTime = false
+      }
       setValDot(entry, path, value)
     })
-    entry.times.update()
+    if (isAutoUpdateTime) {
+      entry.times.update()
+    }
     this.isChanged = true
     return new EntryItem(entry, true)
   }

diff --git a/vue/src/components/NoteViews/use-common-actions.ts b/vue/src/components/NoteViews/use-common-actions.ts
@@ -66,7 +66,7 @@ export const useCommonActions = (options) => {
         },
       },
       isMultiple && {
-        label: '📃 Export JSON (Unencrypted)',
+        label: '📃 Export JSON (no attachments)',
         props: {
           onClick: () => {
             handleExportJson()

diff --git a/vue/src/utils/export-import.ts b/vue/src/utils/export-import.ts
@@ -102,6 +102,8 @@ export const importEntryListJson = async (groupUuid) => {
 
   const entryItems: EntryItem[] = (await handleReadSelectedFile(file, true)) as EntryItem[]
 
+  entryItems.reverse()
+
   console.log('[entryItems]', entryItems)
   for (let i = 0; i < entryItems.length; i++) {
     const entryDetail = entryItems[i]

diff --git a/vue/src/views/Note/DetailView.vue b/vue/src/views/Note/DetailView.vue
@@ -110,7 +110,7 @@ export default defineComponent({
       const params = getEntryItemUpdateParams({
         uuid: entryDetail.value.uuid,
         entryDetail: entryDetail.value,
-        isSetModTime: true,
+        isSetModTime: false,
       })
 
       await kService.updateEntry(params)