gitee
/
snowy
mirror of https://gitee.com/xiaonuobase/snowy
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

修复代码生成时间为非必填bug 

优化代码生成小驼峰规范
pull/55/head
albed 2021-09-15 08:59:36 +08:00
parent 12bd67cc34
commit 142f8271bc
3 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
snowy-base/snowy-gen/src/main/resources/template/addForm.vue.vm
View File

@ -96,9 +96,9 @@
#end #end
#if (${column.effectType} == "datepicker") #if (${column.effectType} == "datepicker")
#if (${column.whetherRequired} == "Y") #if (${column.whetherRequired} == "Y")
<a-date-picker style="width: 100%" placeholder="请选择${column.columnComment}" v-decorator="['${column.javaName}',{rules: [{ required: true, message: '请选择${column.columnComment}！' }]}]" @change="onChange${column.javaName}"/> <a-date-picker style="width: 100%" placeholder="请选择${column.columnComment}" v-decorator="['${column.javaName}',{rules: [{ required: true, message: '请选择${column.columnComment}！' }]}]" @change="${column.javaName}OnChange"/>
#else #else
<a-date-picker style="width: 100%" placeholder="请选择${column.columnComment}" v-decorator="['${column.javaName}']" @change="onChange${column.javaName}"/> <a-date-picker style="width: 100%" placeholder="请选择${column.columnComment}" v-decorator="['${column.javaName}']" @change="${column.javaName}OnChange"/>
#end #end
#end #end
</a-form-item> </a-form-item>
@ -162,14 +162,14 @@
validateFields((errors, values) => { validateFields((errors, values) => {
if (!errors) { if (!errors) {
for (const key in values) { for (const key in values) {
if (typeof (values[key]) === 'object') { if (typeof (values[key]) === 'object' && values[key] != null) {
values[key] = JSON.stringify(values[key]) values[key] = JSON.stringify(values[key])
} }
} }
#foreach ($column in $tableField) #foreach ($column in $tableField)
#if (${column.whetherAddUpdate} == "Y") #if (${column.whetherAddUpdate} == "Y")
#if (${column.effectType} == "datepicker") #if (${column.effectType} == "datepicker")
values.${column.javaName} = this.${column.javaName}DateString values.${column.javaName} = this.${column.javaName}DateString || null
#end #end
#end #end
#end #end
@ -193,13 +193,21 @@
#foreach ($column in $tableField) #foreach ($column in $tableField)
#if (${column.whetherAddUpdate} == "Y") #if (${column.whetherAddUpdate} == "Y")
#if (${column.effectType} == "datepicker") #if (${column.effectType} == "datepicker")
onChange${column.javaName}(date, dateString) { ${column.javaName}OnChange(date, dateString) {
this.${column.javaName}DateString = dateString this.${column.javaName}DateString = dateString
}, },
#end #end
#end #end
#end #end
handleCancel () { handleCancel () {
#foreach ($column in $tableField)
#if (${column.whetherAddUpdate} == "Y")
#if (${column.effectType} == "datepicker")
this.${column.javaName}DateString =''
this.form.getFieldDecorator('${column.javaName}', { initialValue: null })
#end
#end
#end
this.form.resetFields() this.form.resetFields()
this.visible = false this.visible = false
} }

22
snowy-base/snowy-gen/src/main/resources/template/editForm.vue.vm
View File

@ -98,9 +98,9 @@
#end #end
#if (${column.effectType} == "datepicker") #if (${column.effectType} == "datepicker")
#if (${column.whetherRequired} == "Y") #if (${column.whetherRequired} == "Y")
<a-date-picker style="width: 100%" placeholder="请选择${column.columnComment}" v-decorator="['${column.javaName}',{rules: [{ required: true, message: '请选择${column.columnComment}！' }]}]" @change="onChange${column.javaName}"/> <a-date-picker style="width: 100%" placeholder="请选择${column.columnComment}" v-decorator="['${column.javaName}',{rules: [{ required: true, message: '请选择${column.columnComment}！' }]}]" @change="${column.javaName}OnChange"/>
#else #else
<a-date-picker style="width: 100%" placeholder="请选择${column.columnComment}" v-decorator="['${column.javaName}']" @change="onChange${column.javaName}"/> <a-date-picker style="width: 100%" placeholder="请选择${column.columnComment}" v-decorator="['${column.javaName}']" @change="${column.javaName}OnChange"/>
#end #end
#end #end
</a-form-item> </a-form-item>
@ -206,10 +206,10 @@
#if (${column.whetherAddUpdate} == "Y") #if (${column.whetherAddUpdate} == "Y")
#if (${column.effectType} == "datepicker") #if (${column.effectType} == "datepicker")
// 时间单独处理 // 时间单独处理
if (record.${column.javaName} != null) { if (record.${column.javaName}) {
this.form.getFieldDecorator('${column.javaName}', { initialValue: moment(record.${column.javaName}, 'YYYY-MM-DD') }) this.form.getFieldDecorator('${column.javaName}', { initialValue: moment(record.${column.javaName}, 'YYYY-MM-DD') })
}
this.${column.javaName}DateString = moment(record.${column.javaName}).format('YYYY-MM-DD') this.${column.javaName}DateString = moment(record.${column.javaName}).format('YYYY-MM-DD')
}
#end #end
#end #end
#end #end
@ -220,14 +220,14 @@
validateFields((errors, values) => { validateFields((errors, values) => {
if (!errors) { if (!errors) {
for (const key in values) { for (const key in values) {
if (typeof (values[key]) === 'object') { if (typeof (values[key]) === 'object' && values[key] != null) {
values[key] = JSON.stringify(values[key]) values[key] = JSON.stringify(values[key])
} }
} }
#foreach ($column in $tableField) #foreach ($column in $tableField)
#if (${column.whetherAddUpdate} == "Y") #if (${column.whetherAddUpdate} == "Y")
#if (${column.effectType} == "datepicker") #if (${column.effectType} == "datepicker")
values.${column.javaName} = this.${column.javaName}DateString values.${column.javaName} = this.${column.javaName}DateString || null
#end #end
#end #end
#end #end
@ -251,13 +251,21 @@
#foreach ($column in $tableField) #foreach ($column in $tableField)
#if (${column.whetherAddUpdate} == "Y") #if (${column.whetherAddUpdate} == "Y")
#if (${column.effectType} == "datepicker") #if (${column.effectType} == "datepicker")
onChange${column.javaName}(date, dateString) { ${column.javaName}OnChange(date, dateString) {
this.${column.javaName}DateString = dateString this.${column.javaName}DateString = dateString
}, },
#end #end
#end #end
#end #end
handleCancel () { handleCancel () {
#foreach ($column in $tableField)
#if (${column.whetherAddUpdate} == "Y")
#if (${column.effectType} == "datepicker")
this.${column.javaName}DateString =''
this.form.getFieldDecorator('${column.javaName}', { initialValue: null })
#end
#end
#end
this.form.resetFields() this.form.resetFields()
this.visible = false this.visible = false
} }

4
snowy-base/snowy-gen/src/main/resources/template/index.vue.vm
View File

@ -124,7 +124,7 @@
#foreach ($column in $tableField) #foreach ($column in $tableField)
#if(${column.whetherTable} == "Y") #if(${column.whetherTable} == "Y")
#if(${column.whetherRetract} == "Y" || ${column.effectType} == 'select' || ${column.effectType} == 'radio' || ${column.effectType} == 'checkbox') #if(${column.whetherRetract} == "Y" || ${column.effectType} == 'select' || ${column.effectType} == 'radio' || ${column.effectType} == 'checkbox')
<span slot="${column.javaName}scopedSlots" slot-scope="text"> <span slot="${column.javaName}ScopedSlots" slot-scope="text">
#if(${column.whetherRetract} == "Y" && (${column.effectType} == 'select' || ${column.effectType} == 'radio' || ${column.effectType} == 'checkbox')) #if(${column.whetherRetract} == "Y" && (${column.effectType} == 'select' || ${column.effectType} == 'radio' || ${column.effectType} == 'checkbox'))
<ellipsis :length="10" tooltip>{{ '${column.dictTypeCode}' | dictType(text) }}</ellipsis> <ellipsis :length="10" tooltip>{{ '${column.dictTypeCode}' | dictType(text) }}</ellipsis>
#else #else
@ -210,7 +210,7 @@
align: 'center', align: 'center',
#if(${column.whetherRetract} == "Y" || ${column.effectType} == 'select' || ${column.effectType} == 'radio' || ${column.effectType} == 'checkbox') #if(${column.whetherRetract} == "Y" || ${column.effectType} == 'select' || ${column.effectType} == 'radio' || ${column.effectType} == 'checkbox')
dataIndex: '${column.javaName}', dataIndex: '${column.javaName}',
scopedSlots: { customRender: '${column.javaName}scopedSlots' } scopedSlots: { customRender: '${column.javaName}ScopedSlots' }
#else #else
dataIndex: '${column.javaName}' dataIndex: '${column.javaName}'
#end #end