From 6d7f1adea87fd31788893b0cdbc0c60755b969bd Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 20 七月 2023 22:37:51 +0800
Subject: [PATCH] !398 修改代码生成模板，调整打开对话框和接口请求顺序 Merge pull request !398 from 小驴/5.X
---
ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm | 26 +++++++++++---------------
1 files changed, 11 insertions(+), 15 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..4bc1e6b 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
@@ -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