From d0aa35e47ee48325cd43d0729e4ec82bdea23f7b Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期一, 04 九月 2023 09:43:47 +0800 Subject: [PATCH] fix 修复 代码生成页面参数缺少逗号问题 --- ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm | 44 ++++++++++++++++++++------------------------ 1 files changed, 20 insertions(+), 24 deletions(-) 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 23715ec..f872149 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 @@ -308,19 +308,19 @@ pageSize: 10, #foreach ($column in $columns) #if($column.query) - #if($column.htmlType != "datetime" || $column.queryType != "BETWEEN") - $column.javaField: undefined#if($foreach.count != $columns.size()),#end - #end +#if($column.htmlType != "datetime" || $column.queryType != "BETWEEN") + $column.javaField: undefined, +#end #end #end params: { - #foreach ($column in $columns) - #if($column.query) - #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN") +#foreach ($column in $columns) +#if($column.query) +#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN") $column.javaField: undefined#if($foreach.count != $columns.size()),#end - #end - #end - #end +#end +#end +#end } }, rules: { @@ -404,28 +404,24 @@ /** 鏂板鎸夐挳鎿嶄綔 */ const handleAdd = () => { + reset(); dialog.visible = true; dialog.title = "娣诲姞${functionName}"; - nextTick(() => { - reset(); - }); } /** 淇敼鎸夐挳鎿嶄綔 */ -const handleUpdate = (row?: ${BusinessName}VO) => { +const handleUpdate = async (row?: ${BusinessName}VO) => { + reset(); + const _${pkColumn.javaField} = row?.${pkColumn.javaField} || ids.value[0] + const res = await get${BusinessName}(_${pkColumn.javaField}); + Object.assign(form.value, res.data); +#foreach ($column in $columns) + #if($column.htmlType == "checkbox") + form.value.$column.javaField = form.value.${column.javaField}.split(","); + #end +#end dialog.visible = true; dialog.title = "淇敼${functionName}"; - nextTick(async () => { - reset(); - const _${pkColumn.javaField} = row?.${pkColumn.javaField} || ids.value[0] - const res = await get${BusinessName}(_${pkColumn.javaField}); - Object.assign(form.value, res.data); -#foreach ($column in $columns) -#if($column.htmlType == "checkbox") - form.value.$column.javaField = form.value.${column.javaField}.split(","); -#end -#end - }); } /** 鎻愪氦鎸夐挳 */ -- Gitblit v1.9.3