From d61f94cd3b113ab7d7d48acce138ab8e5300f45f Mon Sep 17 00:00:00 2001 From: maxbad <26058031@qq.com> Date: Sun, 14 May 2023 17:13:46 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=20?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 表单组件是下拉框,但是没有选择字段前端就会报错 status默认值置为1,不然表单添加的时候没有默认值 单选按钮组件在table也使用tag渲染 选择了字典类型后可清空 删除代码生成的时间 --- .../internal/library/hggen/views/curd_generate_web_edit.go | 6 +++++- .../internal/library/hggen/views/curd_generate_web_model.go | 5 +++++ server/resource/generate/default/curd/api.go.template | 1 - .../resource/generate/default/curd/controller.go.template | 1 - server/resource/generate/default/curd/input.go.template | 1 - server/resource/generate/default/curd/logic.go.template | 1 - server/resource/generate/default/curd/router.go.template | 1 - web/src/views/develop/code/components/EditMasterCell.vue | 1 + 8 files changed, 11 insertions(+), 6 deletions(-) diff --git a/server/internal/library/hggen/views/curd_generate_web_edit.go b/server/internal/library/hggen/views/curd_generate_web_edit.go index 3696f6f..98327ab 100644 --- a/server/internal/library/hggen/views/curd_generate_web_edit.go +++ b/server/internal/library/hggen/views/curd_generate_web_edit.go @@ -70,7 +70,11 @@ func (l *gCurd) generateWebEditFormItem(ctx context.Context, in *CurdPreviewInpu component = fmt.Sprintf("\n \n \n \n \n \n ", field.Dc, field.TsName, field.TsName, in.options.dictMap[field.TsName]) case FormModeSelect: - component = fmt.Sprintf("\n \n ", field.Dc, field.TsName, field.TsName, in.options.dictMap[field.TsName]) + if in.options.dictMap[field.TsName] != nil { + component = fmt.Sprintf("\n \n ", field.Dc, field.TsName, field.TsName, in.options.dictMap[field.TsName]) + } else { + component = fmt.Sprintf("\n \n ", field.Dc, field.TsName, field.TsName) + } case FormModeSelectMultiple: component = fmt.Sprintf("\n \n ", field.Dc, field.TsName, field.TsName, in.options.dictMap[field.TsName]) 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 0f5e158..ca80d17 100644 --- a/server/internal/library/hggen/views/curd_generate_web_model.go +++ b/server/internal/library/hggen/views/curd_generate_web_model.go @@ -53,6 +53,9 @@ func (l *gCurd) generateWebModelDefaultState(ctx context.Context, in *CurdPrevie if value == "" { value = "''" } + if field.Name == "status" { + value = 1 + } buffer.WriteString(fmt.Sprintf(" %s: %v,\n", field.TsName, value)) } buffer.WriteString("};") @@ -261,6 +264,8 @@ func (l *gCurd) generateWebModelColumnsEach(buffer *bytes.Buffer, in *CurdPrevie case FormModeDate: component = fmt.Sprintf(" {\n title: '%s',\n key: '%s',\n render(row) {\n return formatToDate(row.%s);\n },\n },\n", field.Dc, field.TsName, field.TsName) + case FormModeRadio: + fallthrough case FormModeSelect: if g.IsEmpty(in.options.dictMap[field.TsName]) { err = gerror.Newf("设置单选下拉框选项时，必须选择字典类型，字段名称:%v", field.Name) diff --git a/server/resource/generate/default/curd/api.go.template b/server/resource/generate/default/curd/api.go.template index e92c8ff..66d705d 100644 --- a/server/resource/generate/default/curd/api.go.template +++ b/server/resource/generate/default/curd/api.go.template @@ -4,7 +4,6 @@ // @Author Ms <133814250@qq.com> // @License https://github.com/bufanyun/hotgo/blob/master/LICENSE // @AutoGenerate Version @{.hgVersion} -// @AutoGenerate Date @{.nowTime} // package @{.varName | ToLower} diff --git a/server/resource/generate/default/curd/controller.go.template b/server/resource/generate/default/curd/controller.go.template index 37c8746..f4967e2 100644 --- a/server/resource/generate/default/curd/controller.go.template +++ b/server/resource/generate/default/curd/controller.go.template @@ -4,7 +4,6 @@ // @Author Ms <133814250@qq.com> // @License https://github.com/bufanyun/hotgo/blob/master/LICENSE // @AutoGenerate Version @{.hgVersion} -// @AutoGenerate Date @{.nowTime} // package @{.templateGroup} diff --git a/server/resource/generate/default/curd/input.go.template b/server/resource/generate/default/curd/input.go.template index 79b526f..191a1e3 100644 --- a/server/resource/generate/default/curd/input.go.template +++ b/server/resource/generate/default/curd/input.go.template @@ -4,7 +4,6 @@ // @Author Ms <133814250@qq.com> // @License https://github.com/bufanyun/hotgo/blob/master/LICENSE // @AutoGenerate Version @{.hgVersion} -// @AutoGenerate Date @{.nowTime} // package @{.templateGroup}in diff --git a/server/resource/generate/default/curd/logic.go.template b/server/resource/generate/default/curd/logic.go.template index 67da6d5..ad109d7 100644 --- a/server/resource/generate/default/curd/logic.go.template +++ b/server/resource/generate/default/curd/logic.go.template @@ -4,7 +4,6 @@ // @Author Ms <133814250@qq.com> // @License https://github.com/bufanyun/hotgo/blob/master/LICENSE // @AutoGenerate Version @{.hgVersion} -// @AutoGenerate Date @{.nowTime} // package @{.templateGroup} diff --git a/server/resource/generate/default/curd/router.go.template b/server/resource/generate/default/curd/router.go.template index 72f6bd9..4aeb9aa 100644 --- a/server/resource/generate/default/curd/router.go.template +++ b/server/resource/generate/default/curd/router.go.template @@ -4,7 +4,6 @@ // @Author Ms <133814250@qq.com> // @License https://github.com/bufanyun/hotgo/blob/master/LICENSE // @AutoGenerate Version @{.hgVersion} -// @AutoGenerate Date @{.nowTime} // package genrouter diff --git a/web/src/views/develop/code/components/EditMasterCell.vue b/web/src/views/develop/code/components/EditMasterCell.vue index 7de4277..11f5a7e 100644 --- a/web/src/views/develop/code/components/EditMasterCell.vue +++ b/web/src/views/develop/code/components/EditMasterCell.vue @@ -284,6 +284,7 @@ return h(NTreeSelect, { value: row.dictType, disabled: row.name === 'id', + clearable: true, options: props.selectList?.dictMode ?? [], onUpdateValue: function (e) { row.dictType = e;