diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm index 2bc699a20..1dcf0b915 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm +++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm @@ -333,6 +333,7 @@ export default { // 表单校验 rules: { #foreach ($column in $columns) +#if($column.isInsert || $column.isEdit) #if($column.required) #set($parentheseIndex=$column.columnComment.indexOf("(")) #if($parentheseIndex != -1) @@ -344,6 +345,7 @@ export default { { required: true, message: "$comment不能为空", trigger: #if($column.htmlType == "select" || $column.htmlType == "radio")"change"#else"blur"#end } ]#if($foreach.count != $columns.size()),#end #end +#end #end } }; @@ -404,11 +406,13 @@ export default { reset() { this.form = { #foreach ($column in $columns) +#if($column.isInsert || $column.isEdit) #if($column.htmlType == "checkbox") $column.javaField: []#if($foreach.count != $columns.size()),#end #else $column.javaField: null#if($foreach.count != $columns.size()),#end #end +#end #end }; this.resetForm("form"); diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm index 9f0131b71..3e7628e29 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm +++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm @@ -343,6 +343,7 @@ export default { // 表单校验 rules: { #foreach ($column in $columns) +#if($column.isInsert || $column.isEdit) #if($column.required) #set($parentheseIndex=$column.columnComment.indexOf("(")) #if($parentheseIndex != -1) @@ -354,6 +355,7 @@ export default { { required: true, message: "$comment不能为空", trigger: #if($column.htmlType == "select" || $column.htmlType == "radio")"change"#else"blur"#end } ]#if($foreach.count != $columns.size()),#end #end +#end #end } }; @@ -395,11 +397,13 @@ export default { reset() { this.form = { #foreach ($column in $columns) +#if($column.isInsert || $column.isEdit) #if($column.htmlType == "checkbox") $column.javaField: []#if($foreach.count != $columns.size()),#end #else $column.javaField: undefined#if($foreach.count != $columns.size()),#end #end +#end #end }; this.resetForm("form"); diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm index 663893a2c..31091a3b1 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm +++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/v3/index-tree.vue.vm @@ -304,6 +304,7 @@ const data = reactive({ }, rules: { #foreach ($column in $columns) +#if($column.isInsert || $column.isEdit) #if($column.required) #set($parentheseIndex=$column.columnComment.indexOf("(")) #if($parentheseIndex != -1) @@ -315,6 +316,7 @@ const data = reactive({ { required: true, message: "$comment不能为空", trigger: #if($column.htmlType == "select" || $column.htmlType == "radio")"change"#else"blur"#end } ]#if($foreach.count != $columns.size()),#end #end +#end #end } }); @@ -365,11 +367,13 @@ function cancel() { function reset() { form.value = { #foreach ($column in $columns) +#if($column.isInsert || $column.isEdit) #if($column.htmlType == "checkbox") $column.javaField: []#if($foreach.count != $columns.size()),#end #else $column.javaField: null#if($foreach.count != $columns.size()),#end #end +#end #end }; proxy.resetForm("${businessName}Ref"); diff --git a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm index e623295c1..2a2deb49b 100644 --- a/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm +++ b/ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/v3/index.vue.vm @@ -315,6 +315,7 @@ const data = reactive({ }, rules: { #foreach ($column in $columns) +#if($column.isInsert || $column.isEdit) #if($column.required) #set($parentheseIndex=$column.columnComment.indexOf("(")) #if($parentheseIndex != -1) @@ -326,6 +327,7 @@ const data = reactive({ { required: true, message: "$comment不能为空", trigger: #if($column.htmlType == "select" || $column.htmlType == "radio")"change"#else"blur"#end } ]#if($foreach.count != $columns.size()),#end #end +#end #end } }); @@ -367,11 +369,13 @@ function cancel() { function reset() { form.value = { #foreach ($column in $columns) +#if($column.isInsert || $column.isEdit) #if($column.htmlType == "checkbox") $column.javaField: []#if($foreach.count != $columns.size()),#end #else $column.javaField: null#if($foreach.count != $columns.size()),#end #end +#end #end }; proxy.resetForm("${businessName}Ref");