diff --git a/code/allapp/allapp-go-v3/pkg/db/insert.go b/code/allapp/allapp-go-v3/pkg/db/insert.go
index b59ab098..4f63769b 100644
--- a/code/allapp/allapp-go-v3/pkg/db/insert.go
+++ b/code/allapp/allapp-go-v3/pkg/db/insert.go
@@ -31,11 +31,12 @@ func buildInsertSQL(table string, data map[string]any) (string, []any) {
}
func (c *Client) Insert(ctx context.Context, table, keyField string, data map[string]any) error {
-
- if _, err := validateData(table, keyField, data); err != nil {
+ if _, err := validateInsertData(table, keyField, data); err != nil {
return err
}
+ ensureID(data, keyField)
+
data = applyMetaFields(ctx, table, data, true)
sql, args := buildInsertSQL(table, data)
@@ -51,7 +52,7 @@ func (c *Client) BatchInsert(ctx context.Context, table, keyField string, list [
}
first := list[0]
- if _, err := validateData(table, keyField, first); err != nil {
+ if _, err := validateInsertData(table, keyField, first); err != nil {
return err
}
@@ -71,6 +72,7 @@ func (c *Client) BatchInsert(ctx context.Context, table, keyField string, list [
)
for _, row := range list {
+ ensureID(row, keyField)
row = applyMetaFields(ctx, table, row, true)
diff --git a/code/allapp/allapp-go-v3/pkg/db/validate.go b/code/allapp/allapp-go-v3/pkg/db/validate.go
index 41d04d3e..65829534 100644
--- a/code/allapp/allapp-go-v3/pkg/db/validate.go
+++ b/code/allapp/allapp-go-v3/pkg/db/validate.go
@@ -1,6 +1,7 @@
package db
import (
+ "allapp-go/pkg/uniqueid"
"fmt"
"regexp"
"strings"
@@ -58,3 +59,30 @@ func validateData(table string, keyField string, data map[string]any) (any, erro
return val, nil
}
+
+// 校验数据
+func validateInsertData(table string, keyField string, data map[string]any) (any, error) {
+ if table == "" {
+ return nil, fmt.Errorf("表名不能为空")
+ }
+
+ if len(data) == 0 {
+ return nil, fmt.Errorf("数据不能为空")
+ }
+
+ if keyField == "" {
+ return nil, fmt.Errorf("主键字段不能为空")
+ }
+
+ val, _ := data[keyField]
+
+ return val, nil
+}
+
+func ensureID(data map[string]any, keyField string) {
+ v, ok := data[keyField]
+
+ if !ok || v == nil || v == "" {
+ data[keyField] = uniqueid.NextId()
+ }
+}
diff --git a/code/allapp/allapp-rn/src/store/finance.ts b/code/allapp/allapp-rn/src/store/finance.ts
index 5b9ccf21..16a3d0bf 100644
--- a/code/allapp/allapp-rn/src/store/finance.ts
+++ b/code/allapp/allapp-rn/src/store/finance.ts
@@ -25,7 +25,7 @@ interface FinanceState {
records: FinanceRecordGroup[]
getTotalIncome: () => string
getTotalExpense: () => string
- getTotalBalance: () => string
+ getTotalBalance: () => string
setRecords: (records: FinanceRecord[]) => void
getRecordById: (id: number) => FinanceRecord | null
diff --git a/code/allapp/allapp-rn/test.html b/code/allapp/allapp-rn/test.html
index 7496c677..23d3bcd3 100644
--- a/code/allapp/allapp-rn/test.html
+++ b/code/allapp/allapp-rn/test.html
@@ -1,165 +1,118 @@
-
-
-
+
-
-
- 个人中心
+
+
+ 金额输入 Demo
-
+ /* 点击反馈 */
+ .amount-wrapper:active {
+ opacity: 0.6;
+ }
+ /* 隐藏输入 */
+ .hidden-input {
+ position: absolute;
+ opacity: 0;
+ pointer-events: none;
+ }
+
-
- ```
-
-
+
-
-
-
- 我的工具
- ›
-
-
- 数据管理
- ›
-
-
- 云同步
- ›
-
-
+
+
-
-
-
- 深色模式
- ›
-
-
- 通知设置
- ›
-
-
- 关于应用
- ›
-
-
- 退出登录
-
-
- ```
+
+
+
+
+
+
-