From 142f8271bc0db1d035cb9c06f940ffb503dac7e9 Mon Sep 17 00:00:00 2001
From: albed <877617829@qq.com>
Date: Wed, 15 Sep 2021 08:59:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BB=A3=E7=A0=81=E7=94=9F?=
=?UTF-8?q?=E6=88=90=E6=97=B6=E9=97=B4=E4=B8=BA=E9=9D=9E=E5=BF=85=E5=A1=AB?=
=?UTF-8?q?bug=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90?=
=?UTF-8?q?=E5=B0=8F=E9=A9=BC=E5=B3=B0=E8=A7=84=E8=8C=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../main/resources/template/addForm.vue.vm | 18 ++++++++++-----
.../main/resources/template/editForm.vue.vm | 22 +++++++++++++------
.../src/main/resources/template/index.vue.vm | 4 ++--
3 files changed, 30 insertions(+), 14 deletions(-)
diff --git a/snowy-base/snowy-gen/src/main/resources/template/addForm.vue.vm b/snowy-base/snowy-gen/src/main/resources/template/addForm.vue.vm
index dc437d04..bed6ce00 100644
--- a/snowy-base/snowy-gen/src/main/resources/template/addForm.vue.vm
+++ b/snowy-base/snowy-gen/src/main/resources/template/addForm.vue.vm
@@ -96,9 +96,9 @@
#end
#if (${column.effectType} == "datepicker")
#if (${column.whetherRequired} == "Y")
-
+
#else
-
+
#end
#end
@@ -162,14 +162,14 @@
validateFields((errors, values) => {
if (!errors) {
for (const key in values) {
- if (typeof (values[key]) === 'object') {
+ if (typeof (values[key]) === 'object' && values[key] != null) {
values[key] = JSON.stringify(values[key])
}
}
#foreach ($column in $tableField)
#if (${column.whetherAddUpdate} == "Y")
#if (${column.effectType} == "datepicker")
- values.${column.javaName} = this.${column.javaName}DateString
+ values.${column.javaName} = this.${column.javaName}DateString || null
#end
#end
#end
@@ -193,13 +193,21 @@
#foreach ($column in $tableField)
#if (${column.whetherAddUpdate} == "Y")
#if (${column.effectType} == "datepicker")
- onChange${column.javaName}(date, dateString) {
+ ${column.javaName}OnChange(date, dateString) {
this.${column.javaName}DateString = dateString
},
#end
#end
#end
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.visible = false
}
diff --git a/snowy-base/snowy-gen/src/main/resources/template/editForm.vue.vm b/snowy-base/snowy-gen/src/main/resources/template/editForm.vue.vm
index 6a36c328..0a5ff505 100644
--- a/snowy-base/snowy-gen/src/main/resources/template/editForm.vue.vm
+++ b/snowy-base/snowy-gen/src/main/resources/template/editForm.vue.vm
@@ -98,9 +98,9 @@
#end
#if (${column.effectType} == "datepicker")
#if (${column.whetherRequired} == "Y")
-
+
#else
-
+
#end
#end
@@ -206,10 +206,10 @@
#if (${column.whetherAddUpdate} == "Y")
#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.${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
@@ -220,14 +220,14 @@
validateFields((errors, values) => {
if (!errors) {
for (const key in values) {
- if (typeof (values[key]) === 'object') {
+ if (typeof (values[key]) === 'object' && values[key] != null) {
values[key] = JSON.stringify(values[key])
}
}
#foreach ($column in $tableField)
#if (${column.whetherAddUpdate} == "Y")
#if (${column.effectType} == "datepicker")
- values.${column.javaName} = this.${column.javaName}DateString
+ values.${column.javaName} = this.${column.javaName}DateString || null
#end
#end
#end
@@ -251,13 +251,21 @@
#foreach ($column in $tableField)
#if (${column.whetherAddUpdate} == "Y")
#if (${column.effectType} == "datepicker")
- onChange${column.javaName}(date, dateString) {
+ ${column.javaName}OnChange(date, dateString) {
this.${column.javaName}DateString = dateString
},
#end
#end
#end
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.visible = false
}
diff --git a/snowy-base/snowy-gen/src/main/resources/template/index.vue.vm b/snowy-base/snowy-gen/src/main/resources/template/index.vue.vm
index bcc85b2a..a030b896 100644
--- a/snowy-base/snowy-gen/src/main/resources/template/index.vue.vm
+++ b/snowy-base/snowy-gen/src/main/resources/template/index.vue.vm
@@ -124,7 +124,7 @@
#foreach ($column in $tableField)
#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'))
{{ '${column.dictTypeCode}' | dictType(text) }}
#else
@@ -210,7 +210,7 @@
align: 'center',
#if(${column.whetherRetract} == "Y" || ${column.effectType} == 'select' || ${column.effectType} == 'radio' || ${column.effectType} == 'checkbox')
dataIndex: '${column.javaName}',
- scopedSlots: { customRender: '${column.javaName}scopedSlots' }
+ scopedSlots: { customRender: '${column.javaName}ScopedSlots' }
#else
dataIndex: '${column.javaName}'
#end