From b53a224f9cc8ff445243d435ab78195826ed064b Mon Sep 17 00:00:00 2001
From: Daniel <845765@qq.com>
Date: Thu, 7 Mar 2024 10:05:55 +0800
Subject: [PATCH] :art: Improve av

---
 kernel/av/av.go                | 9 ++++++++-
 kernel/model/attribute_view.go | 9 ++++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/kernel/av/av.go b/kernel/av/av.go
index b1e88263c..a695a9736 100644
--- a/kernel/av/av.go
+++ b/kernel/av/av.go
@@ -292,11 +292,18 @@ func SaveAttributeView(av *AttributeView) (err error) {
 
 				// 校验日期 IsNotEmpty
 				if KeyTypeDate == kv.Key.Type {
-					if 0 != v.Date.Content && !v.Date.IsNotEmpty {
+					if nil != v.Date && 0 != v.Date.Content && !v.Date.IsNotEmpty {
 						v.Date.IsNotEmpty = true
 					}
 				}
 
+				// 校验数字 IsNotEmpty
+				if KeyTypeNumber == kv.Key.Type {
+					if nil != v.Number && 0 != v.Number.Content && !v.Number.IsNotEmpty {
+						v.Number.IsNotEmpty = true
+					}
+				}
+
 				for _, view := range av.Views {
 					switch view.LayoutType {
 					case LayoutTypeTable:
diff --git a/kernel/model/attribute_view.go b/kernel/model/attribute_view.go
index e8589f9c6..36f99d506 100644
--- a/kernel/model/attribute_view.go
+++ b/kernel/model/attribute_view.go
@@ -678,11 +678,18 @@ func renderAttributeView(attrView *av.AttributeView, viewID string, page, pageSi
 		for _, v := range kv.Values {
 			// 校验日期 IsNotEmpty
 			if av.KeyTypeDate == kv.Key.Type {
-				if 0 != v.Date.Content && !v.Date.IsNotEmpty {
+				if nil != v.Date && 0 != v.Date.Content && !v.Date.IsNotEmpty {
 					v.Date.IsNotEmpty = true
 				}
 			}
 
+			// 校验数字 IsNotEmpty
+			if av.KeyTypeNumber == kv.Key.Type {
+				if nil != v.Number && 0 != v.Number.Content && !v.Number.IsNotEmpty {
+					v.Number.IsNotEmpty = true
+				}
+			}
+
 			// 补全值的创建时间和更新时间
 			if "" == v.ID {
 				v.ID = ast.NewNodeID()