From 9349e3cdbedfdc7d9a4e3a68294afce8ca63da1d Mon Sep 17 00:00:00 2001 From: kercylan98 Date: Mon, 17 Jul 2023 16:11:29 +0800 Subject: [PATCH] =?UTF-8?q?other:=20=E9=85=8D=E7=BD=AE=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=20Golang=20=E7=BB=93=E6=9E=84=E4=BD=93=E6=B3=A8=E9=87=8A?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- planner/pce/cs/xlsx.go | 6 +++--- planner/pce/tmpls/golang.go | 12 +++++++----- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/planner/pce/cs/xlsx.go b/planner/pce/cs/xlsx.go index a62ec0b..b81c6a5 100644 --- a/planner/pce/cs/xlsx.go +++ b/planner/pce/cs/xlsx.go @@ -38,7 +38,7 @@ func (slf *Xlsx) GetDisplayName() string { } func (slf *Xlsx) GetDescription() string { - return "暂无描述" + return slf.GetDisplayName() } func (slf *Xlsx) GetIndexCount() int { @@ -57,10 +57,10 @@ func (slf *Xlsx) GetFields() []pce.DataField { } field = pce.DataField{ Index: index, - Name: strings.ReplaceAll(strings.ReplaceAll(str.FirstUpper(name.String()), "\r", ""), "\n", ""), + Name: strings.ReplaceAll(strings.ReplaceAll(str.FirstUpper(name.String()), "\r", " "), "\n", " "), Type: fieldType.String(), ExportType: exportType.String(), - Desc: strings.ReplaceAll(strings.ReplaceAll(desc.String(), "\r", ""), "\n", ""), + Desc: strings.ReplaceAll(strings.ReplaceAll(desc.String(), "\r", " "), "\n", " "), } if len(field.Name) == 0 || len(field.Type) == 0 || len(field.ExportType) == 0 { return field, false diff --git a/planner/pce/tmpls/golang.go b/planner/pce/tmpls/golang.go index be01d50..f7afb2b 100644 --- a/planner/pce/tmpls/golang.go +++ b/planner/pce/tmpls/golang.go @@ -34,7 +34,7 @@ func (slf *Golang) Render(templates ...*pce.TmplStruct) (string, error) { const ( {{- range .Templates}} - {{.Name}}Sign Sign = "{{.Name}}" + {{.Name}}Sign Sign = "{{.Name}}" // {{.Desc}} {{- end}} ) @@ -52,7 +52,7 @@ func (slf *Golang) Render(templates ...*pce.TmplStruct) (string, error) { var ( {{- range .Templates}} {{- if $.HasIndex .}} - {{.Name}} {{$.GetVariable .}} + {{.Name}} {{$.GetVariable .}} // {{.Desc}} {{- end}} {{- end}} ) @@ -60,7 +60,7 @@ func (slf *Golang) Render(templates ...*pce.TmplStruct) (string, error) { var ( {{- range .Templates}} {{- if $.HasIndex .}}{{- else}} - {{.Name}} *{{$.GetConfigName .}} + {{.Name}} *{{$.GetConfigName .}} // {{.Desc}} {{- end}} {{- end}} ) @@ -68,7 +68,7 @@ func (slf *Golang) Render(templates ...*pce.TmplStruct) (string, error) { var ( {{- range .Templates}} {{- if $.HasIndex .}} - _{{.Name}} {{$.GetVariable .}} + _{{.Name}} {{$.GetVariable .}} // {{.Desc}} {{- end}} {{- end}} ) @@ -76,12 +76,13 @@ func (slf *Golang) Render(templates ...*pce.TmplStruct) (string, error) { var ( {{- range .Templates}} {{- if $.HasIndex .}}{{- else}} - _{{.Name}} *{{$.GetConfigName .}} + _{{.Name}} *{{$.GetConfigName .}} // {{.Desc}} {{- end}} {{- end}} ) {{- range .Templates}} + // {{$.GetConfigName .}} {{.Desc}} type {{$.GetConfigName .}} struct { {{- range .Fields}} {{- if .IsSlice}} @@ -110,6 +111,7 @@ func (slf *Golang) Render(templates ...*pce.TmplStruct) (string, error) { {{- range .Templates}} {{- range .AllChildren}} + // {{.Name}} {{.Desc}} type {{.Name}} struct { {{- range .Fields}} {{- if .IsSlice}}