From 5c2f06d8fe2616a50d2d17b270668b50d0304a71 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Mon, 9 Oct 2023 11:39:13 +0800 Subject: [PATCH 1/4] :art: Add created and updated type column to database https://github.com/siyuan-note/siyuan/issues/9371 --- kernel/model/attribute_view.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/kernel/model/attribute_view.go b/kernel/model/attribute_view.go index ecc752f26..2d715b212 100644 --- a/kernel/model/attribute_view.go +++ b/kernel/model/attribute_view.go @@ -341,20 +341,20 @@ func renderAttributeViewTable(attrView *av.AttributeView, view *av.View) (ret *a createdStr := row.ID[:len("20060102150405")] created, parseErr := time.Parse("20060102150405", createdStr) if nil == parseErr { - cell.Value.Created = av.NewFormattedValueCreated(created.Unix(), 0, av.CreatedFormatNone) + cell.Value.Created = av.NewFormattedValueCreated(created.UnixMilli(), 0, av.CreatedFormatNone) } else { logging.LogWarnf("parse created [%s] failed: %s", createdStr, parseErr) - cell.Value.Created = av.NewFormattedValueCreated(time.Now().Unix(), 0, av.CreatedFormatNone) + cell.Value.Created = av.NewFormattedValueCreated(time.Now().UnixMilli(), 0, av.CreatedFormatNone) } case av.KeyTypeUpdated: // 渲染更新时间 ial := GetBlockAttrs(row.ID) updatedStr := ial["updated"] updated, parseErr := time.Parse("20060102150405", updatedStr) if nil == parseErr { - cell.Value.Created = av.NewFormattedValueCreated(updated.Unix(), 0, av.CreatedFormatNone) + cell.Value.Created = av.NewFormattedValueCreated(updated.UnixMilli(), 0, av.CreatedFormatNone) } else { logging.LogWarnf("parse updated [%s] failed: %s", updatedStr, parseErr) - cell.Value.Created = av.NewFormattedValueCreated(time.Now().Unix(), 0, av.CreatedFormatNone) + cell.Value.Created = av.NewFormattedValueCreated(time.Now().UnixMilli(), 0, av.CreatedFormatNone) } } } From 184579965d794a986aba523cb046809eea3efeb6 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Mon, 9 Oct 2023 11:40:33 +0800 Subject: [PATCH 2/4] :art: Add created and updated type column to database https://github.com/siyuan-note/siyuan/issues/9371 --- kernel/model/attribute_view.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/model/attribute_view.go b/kernel/model/attribute_view.go index 2d715b212..ef69687d2 100644 --- a/kernel/model/attribute_view.go +++ b/kernel/model/attribute_view.go @@ -351,10 +351,10 @@ func renderAttributeViewTable(attrView *av.AttributeView, view *av.View) (ret *a updatedStr := ial["updated"] updated, parseErr := time.Parse("20060102150405", updatedStr) if nil == parseErr { - cell.Value.Created = av.NewFormattedValueCreated(updated.UnixMilli(), 0, av.CreatedFormatNone) + cell.Value.Updated = av.NewFormattedValueUpdated(updated.UnixMilli(), 0, av.CreatedFormatNone) } else { logging.LogWarnf("parse updated [%s] failed: %s", updatedStr, parseErr) - cell.Value.Created = av.NewFormattedValueCreated(time.Now().UnixMilli(), 0, av.CreatedFormatNone) + cell.Value.Updated = av.NewFormattedValueUpdated(time.Now().UnixMilli(), 0, av.CreatedFormatNone) } } } From 74110cda68e8f8f6499d71a61170debc8b905b34 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Mon, 9 Oct 2023 11:40:49 +0800 Subject: [PATCH 3/4] :art: Add created and updated type column to database https://github.com/siyuan-note/siyuan/issues/9371 --- kernel/model/attribute_view.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/model/attribute_view.go b/kernel/model/attribute_view.go index ef69687d2..5f62f9f5f 100644 --- a/kernel/model/attribute_view.go +++ b/kernel/model/attribute_view.go @@ -351,10 +351,10 @@ func renderAttributeViewTable(attrView *av.AttributeView, view *av.View) (ret *a updatedStr := ial["updated"] updated, parseErr := time.Parse("20060102150405", updatedStr) if nil == parseErr { - cell.Value.Updated = av.NewFormattedValueUpdated(updated.UnixMilli(), 0, av.CreatedFormatNone) + cell.Value.Updated = av.NewFormattedValueUpdated(updated.UnixMilli(), 0, av.UpdatedFormatNone) } else { logging.LogWarnf("parse updated [%s] failed: %s", updatedStr, parseErr) - cell.Value.Updated = av.NewFormattedValueUpdated(time.Now().UnixMilli(), 0, av.CreatedFormatNone) + cell.Value.Updated = av.NewFormattedValueUpdated(time.Now().UnixMilli(), 0, av.UpdatedFormatNone) } } } From f0e1dcc6a7c3491c66d65411ab58296228ec68ee Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Mon, 9 Oct 2023 11:48:02 +0800 Subject: [PATCH 4/4] :art: Add created and updated type column to database https://github.com/siyuan-note/siyuan/issues/9371 --- app/appearance/langs/en_US.json | 2 ++ app/appearance/langs/es_ES.json | 2 ++ app/appearance/langs/fr_FR.json | 2 ++ app/appearance/langs/zh_CHT.json | 2 ++ app/appearance/langs/zh_CN.json | 2 ++ app/src/protyle/render/av/addCol.ts | 12 ++++++------ 6 files changed, 16 insertions(+), 6 deletions(-) diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index 930fbaaa6..5c8d308a2 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -1,4 +1,6 @@ { + "createdTime": "Created time", + "updatedTime": "Updated time", "removeBookmark": "Remove bookmark from ${x}?", "defaultMargin": "Default", "noneMargin": "None", diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index fbbedc9c3..e7cb6bb63 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -1,4 +1,6 @@ { + "createdTime": "Hora de creación", + "updatedTime": "Hora actualizada", "removeBookmark": "¿Eliminar marcador de ${x}?", "lockEdit": "Hacer que el documento sea de sólo lectura", "unlockEdit": "Hacer que el documento sea escribible", diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index 99b1e538f..f09001865 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -1,4 +1,6 @@ { + "createdTime": "Heure de création", + "updatedTime": "Heure mise à jour", "removeBookmark": "Supprimer le signet de ${x} ?", "lockEdit": "Rendre le document en lecture seule", "unlockEdit": "Rendre le document accessible en écriture", diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index d3fd0a0d4..0221972de 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -1,4 +1,6 @@ { + "createdTime": "建立時間", + "updatedTime": "更新時間", "removeBookmark": "移除 ${x} 中的書籤？", "lockEdit": "鎖定編輯", "unlockEdit": "解除鎖定", diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index a30d8b6af..e03987f0e 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -1,4 +1,6 @@ { + "createdTime": "创建时间", + "updatedTime": "更新时间", "removeBookmark": "移除 ${x} 中的书签？", "lockEdit": "锁定编辑", "unlockEdit": "解除锁定", diff --git a/app/src/protyle/render/av/addCol.ts b/app/src/protyle/render/av/addCol.ts index 43c2ed083..9a9d7de64 100644 --- a/app/src/protyle/render/av/addCol.ts +++ b/app/src/protyle/render/av/addCol.ts @@ -257,12 +257,12 @@ export const addCol = (protyle: IProtyle, blockElement: Element) => { }); menu.addItem({ icon: "iconClock", - label: window.siyuan.languages.creationDate, + label: window.siyuan.languages.createdTime, click() { const id = Lute.NewNodeID(); transaction(protyle, [{ action: "addAttrViewCol", - name: window.siyuan.languages.creationDate, + name: window.siyuan.languages.createdTime, avID, type: "created", id @@ -275,19 +275,19 @@ export const addCol = (protyle: IProtyle, blockElement: Element) => { blockElement: blockElement, protyle: protyle, type: "created", - name: window.siyuan.languages.creationDate, + name: window.siyuan.languages.createdTime, id }); } }); menu.addItem({ icon: "iconClock", - label: window.siyuan.languages.modificationDate, + label: window.siyuan.languages.updatedTime, click() { const id = Lute.NewNodeID(); transaction(protyle, [{ action: "addAttrViewCol", - name: window.siyuan.languages.modificationDate, + name: window.siyuan.languages.updatedTime, avID, type: "updated", id @@ -300,7 +300,7 @@ export const addCol = (protyle: IProtyle, blockElement: Element) => { blockElement: blockElement, protyle: protyle, type: "updated", - name: window.siyuan.languages.modificationDate, + name: window.siyuan.languages.updatedTime, id }); }