fix(makecode): 达梦列注释按 OWNER 对齐,并兼容选项解析边界

同时修复新增默认 state、导出 sheet 名长度与目录权限。

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
2026-07-24 05:36:37 +08:00
parent c8382200a0
commit 3e08b20698
2 changed files with 54 additions and 15 deletions
+25 -10
View File
@@ -209,6 +209,17 @@ var TptProject = Proj{
}
}
columns := that.MakeCodeRouter[hotimeName].TableConfig.GetMap(tableName).GetSlice("columns")
for k := range columns {
if columns.GetMap(k).GetString("name") == "state" {
stateVal := inData["state"]
if stateVal == nil || ObjToStr(stateVal) == "" {
inData["state"] = 0
}
break
}
}
re := that.Db.Insert(tableName, inData)
if re == 0 {
@@ -604,9 +615,13 @@ var TptProject = Proj{
if download == 1 {
tableNameLabel := that.MakeCodeRouter[hotimeName].TableConfig.GetMap(tableName).GetString("label")
sheetName := tableNameLabel
if sheetName == "" || len(sheetName) > 31 {
sheetName = tableName
}
f := excelize.NewFile()
// 创建一个工作表
f.NewSheet(tableNameLabel)
f.NewSheet(sheetName)
f.DeleteSheet("Sheet1")
columns := that.MakeCodeRouter[hotimeName].TableConfig.GetMap(tableName).GetSlice("columns")
@@ -622,21 +637,21 @@ var TptProject = Proj{
//单行
for k1, v1 := range reData {
if k1 == 0 {
f.SetCellValue(tableNameLabel, convertToTitle(n)+"1", v.GetString("label"))
f.SetCellValue(sheetName, convertToTitle(n)+"1", v.GetString("label"))
}
if v.GetString("link") != "" {
f.SetCellValue(tableNameLabel, convertToTitle(n)+ObjToStr(k1+2), v1.GetString(v.GetString("link")+"_"+v.GetString("name")+"_"+v.GetString("value")))
f.SetCellValue(sheetName, convertToTitle(n)+ObjToStr(k1+2), v1.GetString(v.GetString("link")+"_"+v.GetString("name")+"_"+v.GetString("value")))
continue
}
if v.GetString("name") == "table" {
f.SetCellValue(tableNameLabel, convertToTitle(n)+ObjToStr(k1+2), v1.GetString("table_"+v.GetString("name")+"_name"))
f.SetCellValue(sheetName, convertToTitle(n)+ObjToStr(k1+2), v1.GetString("table_"+v.GetString("name")+"_name"))
continue
}
if v.GetString("name") == "table_id" {
f.SetCellValue(tableNameLabel, convertToTitle(n)+ObjToStr(k1+2), v1.GetString("table_"+v.GetString("name")+"_name"))
f.SetCellValue(sheetName, convertToTitle(n)+ObjToStr(k1+2), v1.GetString("table_"+v.GetString("name")+"_name"))
continue
}
@@ -647,7 +662,7 @@ var TptProject = Proj{
for ok, _ := range options {
ov := options.GetMap(ok)
if ov.GetString("value") == v1.GetString(v.GetString("name")) {
f.SetCellValue(tableNameLabel, convertToTitle(n)+ObjToStr(k1+2), ov.GetString("name"))
f.SetCellValue(sheetName, convertToTitle(n)+ObjToStr(k1+2), ov.GetString("name"))
isEnd = true
break
}
@@ -659,7 +674,7 @@ var TptProject = Proj{
}
f.SetCellValue(tableNameLabel, convertToTitle(n)+ObjToStr(k1+2), v1.GetString(v.GetString("name")))
f.SetCellValue(sheetName, convertToTitle(n)+ObjToStr(k1+2), v1.GetString(v.GetString("name")))
}
}
filePath := that.Config.GetString("filePath")
@@ -668,7 +683,7 @@ var TptProject = Proj{
}
//path := time.Now().Format(filePath)
e := os.MkdirAll(that.Config.GetString("tpt")+filePath, os.ModeDir)
e := os.MkdirAll(that.Config.GetString("tpt")+filePath, 0755)
if e != nil {
that.Display(3, e)
return
@@ -677,7 +692,7 @@ var TptProject = Proj{
// 根据指定路径保存文件
if err := f.SaveAs(that.Config.GetString("tpt") + filePath); err != nil {
fmt.Println(err)
fmt.Printf("SaveAs failed: %v\n", err)
that.Display(4, "输出异常")
return
}
@@ -875,7 +890,7 @@ var TptProject = Proj{
}
path := time.Now().Format(filePath)
e := os.MkdirAll(that.Config.GetString("tpt")+path, os.ModeDir)
e := os.MkdirAll(that.Config.GetString("tpt")+path, 0755)
if e != nil {
that.Display(3, e)
return