🎨 Rows in the database without bound blocks should not show created a…

…nd updated Fix #9391
siyuan-note · Oct 10, 2023 · 7e9243d · 7e9243d
1 parent 7aa4aac
commit 7e9243d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/app/src/protyle/render/av/blockAttr.ts b/app/src/protyle/render/av/blockAttr.ts
@@ -32,7 +32,7 @@ export const genAVValueHTML = (value: IAVCellValue) => {
         case "date":
         case "created":
         case "updated":
-            if (value[value.type].isNotEmpty || "date" !== value.type) {
+            if (value[value.type].isNotEmpty) {
                 html = `<span data-content="${value[value.type].content}">${dayjs(value[value.type].content).format("YYYY-MM-DD HH:mm")}</span>`;
             }
             if (value[value.type].hasEndDate && value[value.type].isNotEmpty2 && value[value.type].isNotEmpty) {

diff --git a/app/src/protyle/render/av/render.ts b/app/src/protyle/render/av/render.ts
@@ -107,7 +107,7 @@ style="width: ${column.width || "200px"}">${getCalcValue(column) || '<svg><use x
                         } else if (["created", "updated"].includes(cell.valueType)) {
                             text = '<span class="av__celltext av__celltext--date">';
                             const dataValue = cell.value ? cell.value[cell.valueType as "date"] : null;
-                            if (dataValue && dataValue.content) {
+                            if (dataValue && dataValue.isNotEmpty) {
                                 text += dayjs(dataValue.content).format("YYYY-MM-DD HH:mm");
                             }
                             text += "</span>";

diff --git a/kernel/model/attribute_view.go b/kernel/model/attribute_view.go
@@ -154,6 +154,7 @@ func GetBlockAttributeViewKeys(blockID string) (ret []*BlockAttributeViewKeys) {
 				created, parseErr := time.ParseInLocation("20060102150405", createdStr, time.Local)
 				if nil == parseErr {
 					kv.Values[0].Created = av.NewFormattedValueCreated(created.UnixMilli(), 0, av.CreatedFormatNone)
+					kv.Values[0].Created.IsNotEmpty = true
 				} else {
 					logging.LogWarnf("parse created [%s] failed: %s", createdStr, parseErr)
 					kv.Values[0].Created = av.NewFormattedValueCreated(time.Now().UnixMilli(), 0, av.CreatedFormatNone)
@@ -164,6 +165,7 @@ func GetBlockAttributeViewKeys(blockID string) (ret []*BlockAttributeViewKeys) {
 				updated, parseErr := time.ParseInLocation("20060102150405", updatedStr, time.Local)
 				if nil == parseErr {
 					kv.Values[0].Updated = av.NewFormattedValueUpdated(updated.UnixMilli(), 0, av.UpdatedFormatNone)
+					kv.Values[0].Updated.IsNotEmpty = true
 				} else {
 					logging.LogWarnf("parse updated [%s] failed: %s", updatedStr, parseErr)
 					kv.Values[0].Updated = av.NewFormattedValueUpdated(time.Now().UnixMilli(), 0, av.UpdatedFormatNone)
@@ -384,8 +386,8 @@ func renderAttributeViewTable(attrView *av.AttributeView, view *av.View) (ret *a
 				created, parseErr := time.ParseInLocation("20060102150405", createdStr, time.Local)
 				if nil == parseErr {
 					cell.Value.Created = av.NewFormattedValueCreated(created.UnixMilli(), 0, av.CreatedFormatNone)
+					cell.Value.Created.IsNotEmpty = true
 				} else {
-					logging.LogWarnf("parse created [%s] failed: %s", createdStr, parseErr)
 					cell.Value.Created = av.NewFormattedValueCreated(time.Now().UnixMilli(), 0, av.CreatedFormatNone)
 				}
 			case av.KeyTypeUpdated: // 渲染更新时间
@@ -394,8 +396,8 @@ func renderAttributeViewTable(attrView *av.AttributeView, view *av.View) (ret *a
 				updated, parseErr := time.ParseInLocation("20060102150405", updatedStr, time.Local)
 				if nil == parseErr {
 					cell.Value.Updated = av.NewFormattedValueUpdated(updated.UnixMilli(), 0, av.UpdatedFormatNone)
+					cell.Value.Updated.IsNotEmpty = true
 				} else {
-					logging.LogWarnf("parse updated [%s] failed: %s", updatedStr, parseErr)
 					cell.Value.Updated = av.NewFormattedValueUpdated(time.Now().UnixMilli(), 0, av.UpdatedFormatNone)
 				}
 			}