From c1d1ace36dc537109538777fef510573a609a137 Mon Sep 17 00:00:00 2001 From: fungleo Date: Sun, 26 Jul 2020 17:29:40 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96index.vue.vm=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=EF=BC=8C!=3D1=E4=BF=AE=E6=94=B9=E4=B8=BA=E4=B8=A5?= =?UTF-8?q?=E6=A0=BC=E4=B8=8D=E7=AD=89=EF=BC=9Bundefined=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=BAnull?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/vm/vue/index.vue.vm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm index df2890eb8..4616a16e0 100644 --- a/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm +++ b/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm @@ -286,7 +286,7 @@ export default { pageSize: 10, #foreach ($column in $columns) #if($column.query) - $column.javaField: undefined#if($velocityCount != $columns.size()),#end + $column.javaField: null#if($velocityCount != $columns.size()),#end #end #end @@ -363,7 +363,7 @@ export default { $column.javaField: []#if($velocityCount != $columns.size()),#end #else - $column.javaField: undefined#if($velocityCount != $columns.size()),#end + $column.javaField: null#if($velocityCount != $columns.size()),#end #end #end @@ -383,7 +383,7 @@ export default { // 多选框选中数据 handleSelectionChange(selection) { this.ids = selection.map(item => item.${pkColumn.javaField}) - this.single = selection.length!=1 + this.single = selection.length!==1 this.multiple = !selection.length }, /** 新增按钮操作 */ @@ -408,7 +408,7 @@ export default { }); }, /** 提交按钮 */ - submitForm: function() { + submitForm() { this.#[[$]]#refs["form"].validate(valid => { if (valid) { #foreach ($column in $columns) @@ -416,7 +416,7 @@ export default { this.form.$column.javaField = this.form.${column.javaField}.join(","); #end #end - if (this.form.${pkColumn.javaField} != undefined) { + if (this.form.${pkColumn.javaField} != null) { update${BusinessName}(this.form).then(response => { if (response.code === 200) { this.msgSuccess("修改成功"); @@ -465,4 +465,4 @@ export default { } } }; - \ No newline at end of file + From ca657b048275fbac4fd13e3c26808ad20e8ea128 Mon Sep 17 00:00:00 2001 From: fungleo Date: Sun, 26 Jul 2020 17:33:42 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=20index-tree.vue.vm=20?= =?UTF-8?q?=E6=96=87=E4=BB=B6=EF=BC=8Cundefined=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=20null?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/vm/vue/index-tree.vue.vm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm index 7435ae77b..80b469aaf 100644 --- a/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm +++ b/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm @@ -253,7 +253,7 @@ export default { queryParams: { #foreach ($column in $columns) #if($column.query) - $column.javaField: undefined#if($velocityCount != $columns.size()),#end + $column.javaField: null#if($velocityCount != $columns.size()),#end #end #end @@ -349,7 +349,7 @@ export default { $column.javaField: []#if($velocityCount != $columns.size()),#end #else - $column.javaField: undefined#if($velocityCount != $columns.size()),#end + $column.javaField: null#if($velocityCount != $columns.size()),#end #end #end @@ -376,7 +376,7 @@ export default { handleUpdate(row) { this.reset(); this.getTreeselect(); - if (row != undefined) { + if (row != null) { this.form.${treeParentCode} = row.${treeCode}; } get${BusinessName}(row.${pkColumn.javaField}).then(response => { @@ -391,7 +391,7 @@ export default { }); }, /** 提交按钮 */ - submitForm: function() { + submitForm() { this.#[[$]]#refs["form"].validate(valid => { if (valid) { #foreach ($column in $columns) @@ -399,7 +399,7 @@ export default { this.form.$column.javaField = this.form.${column.javaField}.join(","); #end #end - if (this.form.${pkColumn.javaField} != undefined) { + if (this.form.${pkColumn.javaField} != null) { update${BusinessName}(this.form).then(response => { if (response.code === 200) { this.msgSuccess("修改成功"); @@ -434,4 +434,4 @@ export default { } } }; - \ No newline at end of file +