From 3480e36dcd527e8bd8bb97ac8d2e4bc3d56de4d2 Mon Sep 17 00:00:00 2001 From: lvwshuai <lvwshuai@icloud.com> Date: 星期四, 20 七月 2023 14:10:21 +0800 Subject: [PATCH] update 修改代码生成模板,调整列表打开对话框和接口请求顺序 --- ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm | 44 ++++++++++++++++++++------------------------ 1 files changed, 20 insertions(+), 24 deletions(-) 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 9c57e2c..ee3800f 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 @@ -421,17 +421,15 @@ /** 鏂板鎸夐挳鎿嶄綔 */ const handleAdd = (row?: ${BusinessName}VO) => { + reset(); + getTreeselect(); + if (row != null && row.${treeCode}) { + form.value.${treeParentCode} = row.${treeCode}; + } else { + form.value.${treeParentCode} = 0; + } dialog.visible = true; dialog.title = "娣诲姞${functionName}"; - nextTick(() => { - reset(); - getTreeselect(); - if (row != null && row.${treeCode}) { - form.value.${treeParentCode} = row.${treeCode}; - } else { - form.value.${treeParentCode} = 0; - } - }); } /** 灞曞紑/鎶樺彔鎿嶄綔 */ @@ -449,23 +447,21 @@ } /** 淇敼鎸夐挳鎿嶄綔 */ -const handleUpdate = (row: ${BusinessName}VO) => { +const handleUpdate = async (row: ${BusinessName}VO) => { + reset(); + await getTreeselect(); + if (row != null) { + form.value.${treeParentCode} = row.${treeCode}; + } + const res = await get${BusinessName}(row.${treeCode}); + 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(); - await getTreeselect(); - if (row != null) { - form.value.${treeParentCode} = row.${treeCode}; - } - const res = await get${BusinessName}(row.${treeCode}); - 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