hxd/zky_mandate
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix 代码生成表单样式、日期搜索、管理用户表报错修复

Browse Source
This commit is contained in:
yxh 2023-02-03 17:51:59 +08:00
parent 45f5eaffa7
commit faa6fb448d
6 changed files with 108 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
resource/template/vm/go/logic.template
View File

@ -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}} != "" {

2
resource/template/vm/go/router.template
View File

@ -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拦截器

1
resource/template/vm/ts/model.template
View File

@ -62,6 +62,7 @@ export interface {{.table.ClassName}}TableDataState {
{{else}}
{{$column.HtmlField}}: {{$column.TsType}}|undefined;
{{end}}{{end}}
dateRange: string[];
};
};
}

6
resource/template/vm/vue/edit-vue.template
View File

@ -10,7 +10,7 @@
<template #header>
<div v-drag="['.{{.table.ModuleName}}-{{.table.BusinessName|CaseCamelLower}}-edit .el-dialog', '.{{.table.ModuleName}}-{{.table.BusinessName|CaseCamelLower}}-edit .el-dialog__header']">{{"{{"}}(!formData.{{.table.PkColumn.HtmlField}} || formData.{{.table.PkColumn.HtmlField}}==0?'添加':'修改')+'{{.table.FunctionName}}'{{"}}"}}</div>
</template>
<el-form ref="formRef" :model="formData" :rules="rules" size="default" label-width="90px">
<el-form ref="formRef" :model="formData" :rules="rules" label-width="90px">
{{if .table.IsPkInsertable}}
<el-form-item label="{{.table.PkColumn.ColumnComment}}" prop="{{.table.PkColumn.HtmlField}}">
<el-input v-model="formData.{{.table.PkColumn.HtmlField}}" placeholder="请输入{{.table.PkColumn.ColumnComment}}" v-bind:disabled="this.currentOp === 'edit'" />
@ -90,7 +90,7 @@
{{end}}
{{else if eq $column.HtmlType "date"}}
<el-form-item label="{{$column.ColumnComment}}" prop="{{$column.HtmlField}}">
<el-date-picker clearable size="small" style="width: 200px"
<el-date-picker clearable style="width: 200px"
v-model="formData.{{$column.HtmlField}}"
type="date"
placeholder="选择{{$column.ColumnComment}}">
@ -98,7 +98,7 @@
</el-form-item>
{{else if eq $column.HtmlType "datetime"}}
<el-form-item label="{{$column.ColumnComment}}" prop="{{$column.HtmlField}}">
<el-date-picker clearable size="small" style="width: 200px"
<el-date-picker clearable style="width: 200px"
v-model="formData.{{$column.HtmlField}}"
type="datetime"
placeholder="选择{{$column.ColumnComment}}">

54
resource/template/vm/vue/list-vue.template
View File

@ -16,9 +16,9 @@
{{if eq $colIndex 2}}
<el-col :span="8" :class="!showAll ? 'colBlock' : 'colNone'">
<el-form-item>
<el-button type="primary" size="small" @click="{{$businessName}}List"><el-icon><ele-Search /></el-icon>搜索</el-button>
<el-button size="small" @click="resetQuery(queryRef)"><el-icon><ele-Refresh /></el-icon>重置</el-button>
<el-button type="primary" link size="small" @click="toggleSearch">
<el-button type="primary" @click="{{$businessName}}List"><el-icon><ele-Search /></el-icon>搜索</el-button>
<el-button @click="resetQuery(queryRef)"><el-icon><ele-Refresh /></el-icon>重置</el-button>
<el-button type="primary" link @click="toggleSearch">
{{"{{"}} word {{"}}"}}
<el-icon v-show="showAll"><ele-ArrowUp/></el-icon>
<el-icon v-show="!showAll"><ele-ArrowDown /></el-icon>
@ -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 "") }}
<el-col :span="8" {{if lt $colIndex 2}}class="colBlock"{{else}}:class="showAll ? 'colBlock' : 'colNone'"{{end}}>
<el-form-item label="{{$column.ColumnComment}}" prop="{{$column.HtmlField}}">
<el-select v-model="tableData.param.{{$column.HtmlField}}" placeholder="请选择{{$column.ColumnComment}}" clearable size="small">
<el-select v-model="tableData.param.{{$column.HtmlField}}" placeholder="请选择{{$column.ColumnComment}}" clearable >
<el-option
v-for="dict in {{$column.DictType}}"
:key="dict.value"
@ -68,7 +66,7 @@
<el-col :span="8" {{if lt $colIndex 2}}class="colBlock"{{else}}:class="showAll ? 'colBlock' : 'colNone'"{{end}}>
<el-form-item label="{{$column.ColumnComment}}" prop="{{$column.HtmlField}}">
<el-date-picker
clearable size="small" style="width: 200px"
clearable style="width: 200px"
v-model="tableData.param.{{$column.HtmlField}}"
{{if eq $column.QueryType "BETWEEN"}}
type="daterange"
@ -87,7 +85,7 @@
<el-col :span="8" {{if lt $colIndex 2}}class="colBlock"{{else}}:class="showAll ? 'colBlock' : 'colNone'"{{end}}>
<el-form-item label="{{$column.ColumnComment}}" prop="{{$column.HtmlField}}">
<el-date-picker
clearable size="small" style="width: 200px"
clearable style="width: 200px"
v-model="tableData.param.{{$column.HtmlField}}"
{{if eq $column.QueryType "BETWEEN"}}
type="datetimerange"
@ -105,7 +103,7 @@
{{else if and (eq $column.HtmlType "select" "radio" "checkbox") (ne $column.LinkTableName "")}}
<el-col :span="8" {{if lt $colIndex 2}}class="colBlock"{{else}}:class="showAll ? 'colBlock' : 'colNone'"{{end}}>
<el-form-item label="{{$column.ColumnComment}}" prop="{{$column.HtmlField}}">
<el-select v-model="tableData.param.{{$column.HtmlField}}" placeholder="请选择{{$column.ColumnComment}}" clearable size="small" {{if $column.IsCascadeParent}}@change="query{{$column.ColumnName | CaseCamel}}Changed"{{end}} {{if not $column.IsCascade}}@click.native="get{{$column.LinkTableClass}}{{if $column.IsCascade}}Query{{end}}Items{{$column.GoField}}"{{end}}>
<el-select v-model="tableData.param.{{$column.HtmlField}}" placeholder="请选择{{$column.ColumnComment}}" clearable {{if $column.IsCascadeParent}}@change="query{{$column.ColumnName | CaseCamel}}Changed"{{end}} {{if not $column.IsCascade}}@click.native="get{{$column.LinkTableClass}}{{if $column.IsCascade}}Query{{end}}Items{{$column.GoField}}"{{end}}>
<el-option
{{if $column.IsCascade}}
v-for="item in {{$column.HtmlField}}QueryOptions"
@ -123,7 +121,7 @@
{{else}}
<el-col :span="8" {{if lt $colIndex 2}}class="colBlock"{{else}}:class="showAll ? 'colBlock' : 'colNone'"{{end}}>
<el-form-item label="{{$column.ColumnComment}}" prop="{{$column.HtmlField}}">
<el-select v-model="tableData.param.{{$column.HtmlField}}" placeholder="请选择{{$column.ColumnComment}}" clearable size="small">
<el-select v-model="tableData.param.{{$column.HtmlField}}" placeholder="请选择{{$column.ColumnComment}}" clearable >
<el-option label="请选择字典生成" value="" />
</el-select>
</el-form-item>
@ -131,13 +129,28 @@
{{$colIndex = ($colIndex | plus 1)}}
{{end}}
{{end}}
{{if eq $column.ColumnName "created_at"}}
<el-col :span="8" {{if lt $colIndex 2}}class="colBlock"{{else}}:class="showAll ? 'colBlock' : 'colNone'"{{end}}>
<el-form-item label="创建日期" prop="dateRange">
<el-date-picker
clearable style="width: 200px"
v-model="tableData.param.dateRange"
type="daterange"
range-separator="-"
value-format="YYYY-MM-DD"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
</el-col>
{{end}}
{{end}}
{{if gt $colIndex 2}}
<el-col :span="8" :class="showAll ? 'colBlock' : 'colNone'">
<el-form-item>
<el-button type="primary" size="small" @click="{{$businessName}}List"><el-icon><ele-Search /></el-icon>搜索</el-button>
<el-button size="small" @click="resetQuery(queryRef)"><el-icon><ele-Refresh /></el-icon>重置</el-button>
<el-button type="primary" link size="small" @click="toggleSearch">
<el-button type="primary" @click="{{$businessName}}List"><el-icon><ele-Search /></el-icon>搜索</el-button>
<el-button @click="resetQuery(queryRef)"><el-icon><ele-Refresh /></el-icon>重置</el-button>
<el-button type="primary" link @click="toggleSearch">
{{"{{"}} word {{"}}"}}
<el-icon v-show="showAll"><ele-ArrowUp/></el-icon>
<el-icon v-show="!showAll"><ele-ArrowDown /></el-icon>
@ -147,8 +160,8 @@
{{else}}
<el-col :span="8" class="colBlock">
<el-form-item>
<el-button type="primary" size="small" @click="{{$businessName}}List"><el-icon><ele-Search /></el-icon>搜索</el-button>
<el-button size="small" @click="resetQuery(queryRef)"><el-icon><ele-Refresh /></el-icon>重置</el-button>
<el-button type="primary" @click="{{$businessName}}List"><el-icon><ele-Search /></el-icon>搜索</el-button>
<el-button @click="resetQuery(queryRef)"><el-icon><ele-Refresh /></el-icon>重置</el-button>
</el-form-item>
</el-col>
{{end}}
@ -159,7 +172,6 @@
<el-col :span="1.5">
<el-button
type="primary"
size="small"
@click="handleAdd"
v-auth="'{{.apiVersion}}/{{.table.ModuleName}}/{{$businessName}}/add'"
><el-icon><ele-Plus /></el-icon>新增</el-button>
@ -167,7 +179,6 @@
<el-col :span="1.5">
<el-button
type="success"
size="small"
:disabled="single"
@click="handleUpdate(null)"
v-auth="'{{.apiVersion}}/{{.table.ModuleName}}/{{$businessName}}/edit'"
@ -176,7 +187,6 @@
<el-col :span="1.5">
<el-button
type="danger"
size="small"
:disabled="multiple"
@click="handleDelete(null)"
v-auth="'{{.apiVersion}}/{{.table.ModuleName}}/{{$businessName}}/delete'"
@ -268,7 +278,6 @@
<template #default="scope">
{{if eq .table.ShowDetail "true"}}
<el-button
size="small"
type="primary"
link
@click="handleView(scope.row)"
@ -276,14 +285,12 @@
><el-icon><ele-View /></el-icon>详情</el-button>
{{end}}
<el-button
size="small"
type="primary"
link
@click="handleUpdate(scope.row)"
v-auth="'{{.apiVersion}}/{{.table.ModuleName}}/{{$businessName}}/edit'"
><el-icon><ele-EditPen /></el-icon>修改</el-button>
<el-button
size="small"
type="primary"
link
@click="handleDelete(scope.row)"
@ -464,6 +471,7 @@ export default defineComponent({
{{else}}
{{$column.HtmlField}}: undefined,
{{end}}{{end}}
dateRange: []
},
},
});
@ -513,6 +521,7 @@ export default defineComponent({
});
{{end}}
{{if or $hasCreatedBy $hasUpdatedBy}}
if(listUid.length>0){
getUserList(listUid).then((response:any) =>{
let users = response.data.list||[]
list.map((item:any)=>{
@ -531,6 +540,9 @@ export default defineComponent({
})
state.tableData.data = list;
})
}else{
state.tableData.data = list;
}
{{else}}
state.tableData.data = list;
{{end}}

59
resource/template/vm/vue/tree-vue.template
View File

@ -19,9 +19,9 @@
{{if eq $colIndex 2}}
<el-col :span="8" :class="!showAll ? 'colBlock' : 'colNone'">
<el-form-item>
<el-button type="primary" size="small" @click="{{$businessName}}List"><el-icon><ele-Search /></el-icon>搜索</el-button>
<el-button size="small" @click="resetQuery(queryRef)"><el-icon><ele-Refresh /></el-icon>重置</el-button>
<el-button type="primary" link size="small" @click="toggleSearch">
<el-button type="primary" @click="{{$businessName}}List"><el-icon><ele-Search /></el-icon>搜索</el-button>
<el-button @click="resetQuery(queryRef)"><el-icon><ele-Refresh /></el-icon>重置</el-button>
<el-button type="primary" link @click="toggleSearch">
{{"{{"}} word {{"}}"}}
<el-icon v-show="showAll"><ele-ArrowUp/></el-icon>
<el-icon v-show="!showAll"><ele-ArrowDown /></el-icon>
@ -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 "") }}
<el-col :span="8" {{if lt $colIndex 2}}class="colBlock"{{else}}:class="showAll ? 'colBlock' : 'colNone'"{{end}}>
<el-form-item label="{{$column.ColumnComment}}" prop="{{$column.HtmlField}}">
<el-select v-model="tableData.param.{{$column.HtmlField}}" placeholder="请选择{{$column.ColumnComment}}" clearable size="small">
<el-select v-model="tableData.param.{{$column.HtmlField}}" placeholder="请选择{{$column.ColumnComment}}" clearable >
<el-option
v-for="dict in {{$column.DictType}}"
:key="dict.value"
@ -71,7 +69,7 @@
<el-col :span="8" {{if lt $colIndex 2}}class="colBlock"{{else}}:class="showAll ? 'colBlock' : 'colNone'"{{end}}>
<el-form-item label="{{$column.ColumnComment}}" prop="{{$column.HtmlField}}">
<el-date-picker
clearable size="small" style="width: 200px"
clearable style="width: 200px"
v-model="tableData.param.{{$column.HtmlField}}"
{{if eq $column.QueryType "BETWEEN"}}
type="daterange"
@ -90,7 +88,7 @@
<el-col :span="8" {{if lt $colIndex 2}}class="colBlock"{{else}}:class="showAll ? 'colBlock' : 'colNone'"{{end}}>
<el-form-item label="{{$column.ColumnComment}}" prop="{{$column.HtmlField}}">
<el-date-picker
clearable size="small" style="width: 200px"
clearable style="width: 200px"
v-model="tableData.param.{{$column.HtmlField}}"
{{if eq $column.QueryType "BETWEEN"}}
type="datetimerange"
@ -108,7 +106,7 @@
{{else if and (eq $column.HtmlType "select" "radio" "checkbox") (ne $column.LinkTableName "")}}
<el-col :span="8" {{if lt $colIndex 2}}class="colBlock"{{else}}:class="showAll ? 'colBlock' : 'colNone'"{{end}}>
<el-form-item label="{{$column.ColumnComment}}" prop="{{$column.HtmlField}}">
<el-select v-model="tableData.param.{{$column.HtmlField}}" placeholder="请选择{{$column.ColumnComment}}" clearable size="small" {{if $column.IsCascadeParent}}@change="query{{$column.ColumnName | CaseCamel}}Changed"{{end}} {{if not $column.IsCascade}}@click.native="get{{$column.LinkTableClass}}{{if $column.IsCascade}}Query{{end}}Items{{$column.GoField}}"{{end}}>
<el-select v-model="tableData.param.{{$column.HtmlField}}" placeholder="请选择{{$column.ColumnComment}}" clearable {{if $column.IsCascadeParent}}@change="query{{$column.ColumnName | CaseCamel}}Changed"{{end}} {{if not $column.IsCascade}}@click.native="get{{$column.LinkTableClass}}{{if $column.IsCascade}}Query{{end}}Items{{$column.GoField}}"{{end}}>
<el-option
{{if $column.IsCascade}}
v-for="item in {{$column.HtmlField}}QueryOptions"
@ -126,7 +124,7 @@
{{else}}
<el-col :span="8" {{if lt $colIndex 2}}class="colBlock"{{else}}:class="showAll ? 'colBlock' : 'colNone'"{{end}}>
<el-form-item label="{{$column.ColumnComment}}" prop="{{$column.HtmlField}}">
<el-select v-model="tableData.param.{{$column.HtmlField}}" placeholder="请选择{{$column.ColumnComment}}" clearable size="small">
<el-select v-model="tableData.param.{{$column.HtmlField}}" placeholder="请选择{{$column.ColumnComment}}" clearable >
<el-option label="请选择字典生成" value="" />
</el-select>
</el-form-item>
@ -134,13 +132,28 @@
{{$colIndex = ($colIndex | plus 1)}}
{{end}}
{{end}}
{{if eq $column.ColumnName "created_at"}}
<el-col :span="8" {{if lt $colIndex 2}}class="colBlock"{{else}}:class="showAll ? 'colBlock' : 'colNone'"{{end}}>
<el-form-item label="创建日期" prop="dateRange">
<el-date-picker
clearable style="width: 200px"
v-model="tableData.param.dateRange"
type="daterange"
range-separator="-"
value-format="YYYY-MM-DD"
start-placeholder="开始日期"
end-placeholder="结束日期"
></el-date-picker>
</el-form-item>
</el-col>
{{end}}
{{end}}
{{if gt $colIndex 2}}
<el-col :span="8" :class="showAll ? 'colBlock' : 'colNone'">
<el-form-item>
<el-button type="primary" size="small" @click="{{$businessName}}List"><el-icon><ele-Search /></el-icon>搜索</el-button>
<el-button size="small" @click="resetQuery(queryRef)"><el-icon><ele-Refresh /></el-icon>重置</el-button>
<el-button type="primary" link size="small" @click="toggleSearch">
<el-button type="primary" @click="{{$businessName}}List"><el-icon><ele-Search /></el-icon>搜索</el-button>
<el-button @click="resetQuery(queryRef)"><el-icon><ele-Refresh /></el-icon>重置</el-button>
<el-button type="primary" link @click="toggleSearch">
{{"{{"}} word {{"}}"}}
<el-icon v-show="showAll"><ele-ArrowUp/></el-icon>
<el-icon v-show="!showAll"><ele-ArrowDown /></el-icon>
@ -150,8 +163,8 @@
{{else}}
<el-col :span="8" class="colBlock">
<el-form-item>
<el-button type="primary" size="small" @click="{{$businessName}}List"><el-icon><ele-Search /></el-icon>搜索</el-button>
<el-button size="small" @click="resetQuery(queryRef)"><el-icon><ele-Refresh /></el-icon>重置</el-button>
<el-button type="primary" @click="{{$businessName}}List"><el-icon><ele-Search /></el-icon>搜索</el-button>
<el-button @click="resetQuery(queryRef)"><el-icon><ele-Refresh /></el-icon>重置</el-button>
</el-form-item>
</el-col>
{{end}}
@ -162,7 +175,7 @@
<el-col :span="1.5">
<el-button
type="primary"
size="small"
@click="handleAdd"
v-auth="'{{.apiVersion}}/{{.table.ModuleName}}/{{$businessName}}/add'"
><el-icon><ele-Plus /></el-icon>新增</el-button>
@ -170,7 +183,7 @@
<el-col :span="1.5">
<el-button
type="success"
size="small"
:disabled="single"
@click="handleUpdate(null)"
v-auth="'{{.apiVersion}}/{{.table.ModuleName}}/{{$businessName}}/edit'"
@ -179,7 +192,7 @@
<el-col :span="1.5">
<el-button
type="danger"
size="small"
:disabled="multiple"
@click="handleDelete(null)"
v-auth="'{{.apiVersion}}/{{.table.ModuleName}}/{{$businessName}}/delete'"
@ -277,7 +290,6 @@
<template #default="scope">
{{if eq .table.ShowDetail "true"}}
<el-button
size="small"
type="primary"
link
@click="handleView(scope.row)"
@ -285,14 +297,12 @@
><el-icon><ele-View /></el-icon>详情</el-button>
{{end}}
<el-button
size="small"
type="primary"
link
@click="handleUpdate(scope.row)"
v-auth="'{{.apiVersion}}/{{.table.ModuleName}}/{{$businessName}}/edit'"
><el-icon><ele-EditPen /></el-icon>修改</el-button>
<el-button
size="small"
type="primary"
link
@click="handleDelete(scope.row)"
@ -469,6 +479,7 @@ export default defineComponent({
{{else}}
{{$column.HtmlField}}: undefined,
{{end}}{{end}}
dateRange: []
},
},
});
@ -518,6 +529,7 @@ export default defineComponent({
});
{{end}}
{{if or $hasCreatedBy $hasUpdatedBy}}
if(listUid.length>0){
getUserList(listUid).then((response:any) =>{
let users = response.data.list||[]
list.map((item:any)=>{
@ -538,6 +550,11 @@ export default defineComponent({
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}}");