diff --git a/resource/template/vm/go/logic.template b/resource/template/vm/go/logic.template index dbb17c6..f22b3fb 100644 --- a/resource/template/vm/go/logic.template +++ b/resource/template/vm/go/logic.template @@ -90,11 +90,8 @@ func (s *s{{.table.ClassName}})List(ctx context.Context, req *{{.table.ModuleNam } {{else if eq $column.GoType "Time"}} {{if eq $column.ColumnName "created_at"}} - if req.BeginTime != "" { - m = m.Where(dao.{{$.table.ClassName}}.Columns().{{$column.GoField}}+" >=", req.BeginTime) - } - if req.EndTime != "" { - m = m.Where(dao.{{$.table.ClassName}}.Columns().{{$column.GoField}}+" <", req.EndTime) + if len(req.DateRange) != 0 { + m = m.Where(dao.{{$.table.ClassName}}.Columns().{{$column.GoField}}+" >=? AND "+dao.{{$.table.ClassName}}.Columns().{{$column.GoField}}+" <=?", req.DateRange[0], req.DateRange[1]) } {{else}} if req.{{$column.GoField}} != "" { diff --git a/resource/template/vm/go/router.template b/resource/template/vm/go/router.template index ce15b28..232b66e 100644 --- a/resource/template/vm/go/router.template +++ b/resource/template/vm/go/router.template @@ -23,7 +23,7 @@ var R = new(Router) type Router struct{} //// func (router *Router) BindController(ctx context.Context, group *ghttp.RouterGroup) { - group.Group("/demo", func(group *ghttp.RouterGroup) { + group.Group("/{{.table.ModuleName}}", func(group *ghttp.RouterGroup) { //登录验证拦截 service.GfToken().Middleware(group) //context拦截器 diff --git a/resource/template/vm/ts/model.template b/resource/template/vm/ts/model.template index 22f2b91..7025194 100644 --- a/resource/template/vm/ts/model.template +++ b/resource/template/vm/ts/model.template @@ -62,6 +62,7 @@ export interface {{.table.ClassName}}TableDataState { {{else}} {{$column.HtmlField}}: {{$column.TsType}}|undefined; {{end}}{{end}} + dateRange: string[]; }; }; } diff --git a/resource/template/vm/vue/edit-vue.template b/resource/template/vm/vue/edit-vue.template index e3b1dd9..fbd9754 100644 --- a/resource/template/vm/vue/edit-vue.template +++ b/resource/template/vm/vue/edit-vue.template @@ -10,7 +10,7 @@ - + {{if .table.IsPkInsertable}} @@ -90,7 +90,7 @@ {{end}} {{else if eq $column.HtmlType "date"}} - @@ -98,7 +98,7 @@ {{else if eq $column.HtmlType "datetime"}} - diff --git a/resource/template/vm/vue/list-vue.template b/resource/template/vm/vue/list-vue.template index cbf9414..6eb975f 100644 --- a/resource/template/vm/vue/list-vue.template +++ b/resource/template/vm/vue/list-vue.template @@ -16,9 +16,9 @@ {{if eq $colIndex 2}} - 搜索 - 重置 - + 搜索 + 重置 + {{"{{"}} word {{"}}"}} @@ -33,7 +33,6 @@ v-model="tableData.param.{{$column.HtmlField}}{{if eq $column.QueryType "BETWEEN"}}[0]{{end}}" placeholder="请输入{{$column.ColumnComment}}" clearable - size="small" {{if eq $column.QueryType "BETWEEN"}}style="width:100px"{{end}} @keyup.enter.native="{{$businessName}}List" /> @@ -42,7 +41,6 @@ v-model="tableData.param.{{$column.HtmlField}}[1]" placeholder="请输入{{$column.ColumnComment}}" clearable - size="small" style="width:100px" @keyup.enter.native="{{$businessName}}List" /> @@ -53,7 +51,7 @@ {{else if and (eq $column.HtmlType "select" "radio" "checkbox") (ne $column.DictType "") }} - + - + - + @@ -131,13 +129,28 @@ {{$colIndex = ($colIndex | plus 1)}} {{end}} {{end}} + {{if eq $column.ColumnName "created_at"}} + + + + + + {{end}} {{end}} {{if gt $colIndex 2}} - 搜索 - 重置 - + 搜索 + 重置 + {{"{{"}} word {{"}}"}} @@ -147,8 +160,8 @@ {{else}} - 搜索 - 重置 + 搜索 + 重置 {{end}} @@ -159,7 +172,6 @@ 新增 @@ -167,7 +179,6 @@ {{if eq .table.ShowDetail "true"}} 详情 {{end}} 修改 { - let users = response.data.list||[] - list.map((item:any)=>{ - users.forEach((user:any)=>{ - {{if $hasCreatedBy}} - if(item.createdBy==user.id){ - item.createdBy = user.userNickname - } - {{end}} - {{if $hasUpdatedBy}} - if(item.updatedBy==user.id){ - item.updatedBy = user.userNickname - } - {{end}} + if(listUid.length>0){ + getUserList(listUid).then((response:any) =>{ + let users = response.data.list||[] + list.map((item:any)=>{ + users.forEach((user:any)=>{ + {{if $hasCreatedBy}} + if(item.createdBy==user.id){ + item.createdBy = user.userNickname + } + {{end}} + {{if $hasUpdatedBy}} + if(item.updatedBy==user.id){ + item.updatedBy = user.userNickname + } + {{end}} + }) }) + state.tableData.data = list; }) + }else{ state.tableData.data = list; - }) + } {{else}} state.tableData.data = list; {{end}} diff --git a/resource/template/vm/vue/tree-vue.template b/resource/template/vm/vue/tree-vue.template index 4277990..455fc76 100644 --- a/resource/template/vm/vue/tree-vue.template +++ b/resource/template/vm/vue/tree-vue.template @@ -19,9 +19,9 @@ {{if eq $colIndex 2}} - 搜索 - 重置 - + 搜索 + 重置 + {{"{{"}} word {{"}}"}} @@ -36,7 +36,6 @@ v-model="tableData.param.{{$column.HtmlField}}{{if eq $column.QueryType "BETWEEN"}}[0]{{end}}" placeholder="请输入{{$column.ColumnComment}}" clearable - size="small" {{if eq $column.QueryType "BETWEEN"}}style="width:100px"{{end}} @keyup.enter.native="{{$businessName}}List" /> @@ -45,7 +44,6 @@ v-model="tableData.param.{{$column.HtmlField}}[1]" placeholder="请输入{{$column.ColumnComment}}" clearable - size="small" style="width:100px" @keyup.enter.native="{{$businessName}}List" /> @@ -56,7 +54,7 @@ {{else if and (eq $column.HtmlType "select" "radio" "checkbox") (ne $column.DictType "") }} - + - + - + @@ -134,13 +132,28 @@ {{$colIndex = ($colIndex | plus 1)}} {{end}} {{end}} + {{if eq $column.ColumnName "created_at"}} + + + + + + {{end}} {{end}} {{if gt $colIndex 2}} - 搜索 - 重置 - + 搜索 + 重置 + {{"{{"}} word {{"}}"}} @@ -150,8 +163,8 @@ {{else}} - 搜索 - 重置 + 搜索 + 重置 {{end}} @@ -162,7 +175,7 @@ 新增 @@ -170,7 +183,7 @@ {{if eq .table.ShowDetail "true"}} 详情 {{end}} 修改 { - let users = response.data.list||[] - list.map((item:any)=>{ - users.forEach((user:any)=>{ - {{if $hasCreatedBy}} - if(item.createdBy==user.id){ - item.createdBy = user.userNickname - } - {{end}} - {{if $hasUpdatedBy}} - if(item.updatedBy==user.id){ - item.updatedBy = user.userNickname - } - {{end}} + if(listUid.length>0){ + getUserList(listUid).then((response:any) =>{ + let users = response.data.list||[] + list.map((item:any)=>{ + users.forEach((user:any)=>{ + {{if $hasCreatedBy}} + if(item.createdBy==user.id){ + item.createdBy = user.userNickname + } + {{end}} + {{if $hasUpdatedBy}} + if(item.updatedBy==user.id){ + item.updatedBy = user.userNickname + } + {{end}} + }) }) + dataList.value = _.clone(res.data.list) + list = proxy.handleTree(res.data.list||[], "{{$treeCode}}", "{{$treeParentCode}}"); + state.tableData.data = list; }) + }else{ dataList.value = _.clone(res.data.list) list = proxy.handleTree(res.data.list||[], "{{$treeCode}}", "{{$treeParentCode}}"); state.tableData.data = list; - }) + } {{else}} dataList.value = _.clone(res.data.list) list = proxy.handleTree(res.data.list||[], "{{$treeCode}}", "{{$treeParentCode}}");