From 22eba8d4da223fec8463f163c3ea77398e68e630 Mon Sep 17 00:00:00 2001 From: maxbad <26058031@qq.com> Date: Thu, 11 Jan 2024 12:05:50 +0800 Subject: [PATCH 1/4] fix generate --- server/resource/generate/default/curd/controller.go.template | 1 + 1 file changed, 1 insertion(+) diff --git a/server/resource/generate/default/curd/controller.go.template b/server/resource/generate/default/curd/controller.go.template index de925c6..2fe8d47 100644 --- a/server/resource/generate/default/curd/controller.go.template +++ b/server/resource/generate/default/curd/controller.go.template @@ -11,6 +11,7 @@ import ( "context" "@{.importApi}" "hotgo/internal/model/input/form" + "hotgo/internal/model/input/@{.templateGroup}in" "@{.importService}" "hotgo/utility/validate" ) From fce75433fbaa753cee6079e3e0f8737c048d8924 Mon Sep 17 00:00:00 2001 From: maxbad <26058031@qq.com> Date: Sun, 14 Jan 2024 16:32:34 +0800 Subject: [PATCH 2/4] up generate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 表单组件是开关类型,默认值改为2(禁用状态) --- server/internal/library/hggen/views/curd_generate_web_model.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/server/internal/library/hggen/views/curd_generate_web_model.go b/server/internal/library/hggen/views/curd_generate_web_model.go index b635690..15594c3 100644 --- a/server/internal/library/hggen/views/curd_generate_web_model.go +++ b/server/internal/library/hggen/views/curd_generate_web_model.go @@ -44,6 +44,9 @@ func (l *gCurd) generateWebModelState(ctx context.Context, in *CurdPreviewInput) if field.Name == "status" { value = 1 } + if field.FormMode == "Switch" { + value = 2 + } buffer.WriteString(fmt.Sprintf(" public %s = %v; // %s\n", field.TsName, value, field.Dc)) } buffer.WriteString("\n constructor(state?: Partial) {\n if (state) {\n Object.assign(this, state);\n }\n }") From 528d985de534bfbe16ce55e079d8450933f8065a Mon Sep 17 00:00:00 2001 From: maxbad <26058031@qq.com> Date: Sun, 14 Jan 2024 16:43:19 +0800 Subject: [PATCH 3/4] up generate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 表单组件是动态键值对类型,默认值改为空数组 --- server/internal/library/hggen/views/curd_generate_web_model.go | 3 +++ 1 file changed, 3 insertions(+) diff --git a/server/internal/library/hggen/views/curd_generate_web_model.go b/server/internal/library/hggen/views/curd_generate_web_model.go index 15594c3..76df0fd 100644 --- a/server/internal/library/hggen/views/curd_generate_web_model.go +++ b/server/internal/library/hggen/views/curd_generate_web_model.go @@ -47,6 +47,9 @@ func (l *gCurd) generateWebModelState(ctx context.Context, in *CurdPreviewInput) if field.FormMode == "Switch" { value = 2 } + if field.FormMode == "InputDynamic" { + value = "[]" + } buffer.WriteString(fmt.Sprintf(" public %s = %v; // %s\n", field.TsName, value, field.Dc)) } buffer.WriteString("\n constructor(state?: Partial) {\n if (state) {\n Object.assign(this, state);\n }\n }") From 6566dd06441368289306b0d5a8a965a95c6ebc68 Mon Sep 17 00:00:00 2001 From: maxbad <26058031@qq.com> Date: Sun, 14 Jan 2024 18:40:58 +0800 Subject: [PATCH 4/4] up generate MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit model.ts中开关类型组件的key驼峰单词转下划线单词 --- server/internal/library/hggen/views/curd_generate_web_model.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/internal/library/hggen/views/curd_generate_web_model.go b/server/internal/library/hggen/views/curd_generate_web_model.go index 76df0fd..3a89df6 100644 --- a/server/internal/library/hggen/views/curd_generate_web_model.go +++ b/server/internal/library/hggen/views/curd_generate_web_model.go @@ -294,7 +294,7 @@ func (l *gCurd) generateWebModelColumnsEach(buffer *bytes.Buffer, in *CurdPrevie component = fmt.Sprintf(" {\n title: '%s',\n key: '%s',\n render(row) {\n if (isNullObject(row.%s)) {\n return ``;\n }\n return row.%s.map((attachfile) => {\n return h(\n %s,\n {\n size: 'small',\n style: {\n 'margin-left': '2px',\n },\n },\n {\n default: () => getFileExt(attachfile),\n }\n );\n });\n },\n },\n", field.Dc, field.TsName, field.TsName, field.TsName, "NAvatar") case FormModeSwitch: - component = fmt.Sprintf(" {\n title: '%s',\n key: '%s',\n width: 100,\n render(row) {\n return h(%s, {\n value: row.%s === 1,\n checked: '开启',\n unchecked: '关闭',\n disabled: !hasPermission(['%s']),\n onUpdateValue: function (e) {\n console.log('onUpdateValue e:' + JSON.stringify(e));\n row.%s = e ? 1 : 2;\n Switch({ %s: row.%s, key: '%s', value: row.%s }).then((_res) => {\n $message.success('操作成功');\n });\n },\n });\n },\n },\n", field.Dc, field.TsName, "NSwitch", field.TsName, "/"+in.options.ApiPrefix+"/switch", field.TsName, in.pk.TsName, in.pk.TsName, field.TsName, field.TsName) + component = fmt.Sprintf(" {\n title: '%s',\n key: '%s',\n width: 100,\n render(row) {\n return h(%s, {\n value: row.%s === 1,\n checked: '开启',\n unchecked: '关闭',\n disabled: !hasPermission(['%s']),\n onUpdateValue: function (e) {\n console.log('onUpdateValue e:' + JSON.stringify(e));\n row.%s = e ? 1 : 2;\n Switch({ %s: row.%s, key: '%s', value: row.%s }).then((_res) => {\n $message.success('操作成功');\n });\n },\n });\n },\n },\n", field.Dc, field.TsName, "NSwitch", field.TsName, "/"+in.options.ApiPrefix+"/switch", field.TsName, in.pk.TsName, in.pk.TsName, convert.CamelCaseToUnderline(field.TsName), field.TsName) case FormModeRate: component = fmt.Sprintf(" {\n title: '%s',\n key: '%s',\n render(row) {\n return h(%s, {\n allowHalf: true,\n readonly: true,\n defaultValue: row.%s,\n });\n },\n },\n", field.Dc, field.TsName, "NRate", field.TsName)