admin/lx-admin-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!398 修改代码生成模板，调整打开对话框和接口请求顺序

Browse Source 
Merge pull request !398 from 小驴/5.X
This commit is contained in:
疯狂的狮子Li 2023-07-20 14:37:51 +00:00 committed by Gitee
commit 6d7f1adea8
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 31 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
View File

@ -421,17 +421,15 @@ const resetQuery = () => {
/** 新增按钮操作 */ /** 新增按钮操作 */
const handleAdd = (row?: ${BusinessName}VO) => { 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.visible = true;
dialog.title = "添加${functionName}"; 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 toggleExpandAll = (data: ${BusinessName}VO[], status: boolean) => {
} }
/** 修改按钮操作 */ /** 修改按钮操作 */
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.visible = true;
dialog.title = "修改${functionName}"; 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
});
} }
/** 提交按钮 */ /** 提交按钮 */

26
ruoyi-modules/ruoyi-generator/src/main/resources/vm/vue/index.vue.vm
View File

@ -404,28 +404,24 @@ const handleSelectionChange = (selection: ${BusinessName}VO[]) => {
/** 新增按钮操作 */ /** 新增按钮操作 */
const handleAdd = () => { const handleAdd = () => {
reset();
dialog.visible = true; dialog.visible = true;
dialog.title = "添加${functionName}"; 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.visible = true;
dialog.title = "修改${functionName}"; 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
});
} }
/** 提交按钮 */ /** 提交按钮 */