jiangyc/RuoYi-Vue-Plus
1
0
Fork 0
mirror of https://github.com/dromara/RuoYi-Vue-Plus.git synced 2025-09-24 07:19:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

发布 2.3.1

Browse Source
This commit is contained in:
疯狂的狮子li
2021-06-04 16:20:12 +08:00
parent d87eb34352
commit 801f7cd8f7
25 changed files with 331 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi/src/main/resources/application-dev.yml
View File

@ -81,7 +81,7 @@ redisson:
# 单节点配置
singleServerConfig:
# 客户端名称
clientName: ${ruoyi-vue-plus.name}
clientName: ${ruoyi.name}
# 最小空闲连接数
connectionMinimumIdleSize: 32
# 连接池大小

2
ruoyi/src/main/resources/application-prod.yml
View File

@ -81,7 +81,7 @@ redisson:
# 单节点配置
singleServerConfig:
# 客户端名称
clientName: ${ruoyi-vue-plus.name}
clientName: ${ruoyi.name}
# 最小空闲连接数
connectionMinimumIdleSize: 32
# 连接池大小

4
ruoyi/src/main/resources/application.yml
View File

@ -8,8 +8,8 @@ ruoyi:
copyrightYear: 2021
# 实例演示开关
demoEnabled: true
# 文件路径,使用jvm系统变量,兼容windows和linux;
profile: ${user.dir}/ruoyi/uploadPath
# 文件路径
profile: ./ruoyi/uploadPath
# 获取ip地址开关
addressEnabled: false

2
ruoyi/src/main/resources/vm/java/vo.java.vm
View File

@ -29,7 +29,7 @@ public class ${ClassName}Vo {
private ${pkColumn.javaType} ${pkColumn.javaField};
#foreach ($column in $columns)
#if($column.isList)
#if($column.isList && $column.isPk!=1)
/** $column.columnComment */
#set($parentheseIndex=$column.columnComment.indexOf("（"))
#if($parentheseIndex != -1)

13
ruoyi/src/main/resources/vm/vue/index-tree.vue.vm
View File

@ -247,7 +247,7 @@
#end
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
@ -302,6 +302,8 @@ export default {
},
data() {
return {
//按钮loading
buttonLoading: false,
// 遮罩层
loading: true,
// 显示搜索条件
@ -480,12 +482,14 @@ export default {
},
/** 修改按钮操作 */
handleUpdate(row) {
this.loading = true;
this.reset();
this.getTreeselect();
if (row != null) {
this.form.${treeParentCode} = row.${treeCode};
}
get${BusinessName}(row.${pkColumn.javaField}).then(response => {
this.loading = false;
this.form = response.data;
#foreach ($column in $columns)
#if($column.htmlType == "checkbox")
@ -500,6 +504,7 @@ export default {
submitForm() {
this.#[[$]]#refs["form"].validate(valid => {
if (valid) {
this.buttonLoading = true;
#foreach ($column in $columns)
#if($column.htmlType == "checkbox")
this.form.$column.javaField = this.form.${column.javaField}.join(",");
@ -507,12 +512,14 @@ export default {
#end
if (this.form.${pkColumn.javaField} != null) {
update${BusinessName}(this.form).then(response => {
this.buttonLoading = false;
this.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
add${BusinessName}(this.form).then(response => {
this.buttonLoading = false;
this.msgSuccess("新增成功");
this.open = false;
this.getList();
@ -527,9 +534,11 @@ export default {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(function() {
}).then(() => {
this.loading = true;
return del${BusinessName}(row.${pkColumn.javaField});
}).then(() => {
this.loading = false;
this.getList();
this.msgSuccess("删除成功");
})

13
ruoyi/src/main/resources/vm/vue/index.vue.vm
View File

@ -301,7 +301,7 @@
#end
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
<el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
@ -353,6 +353,8 @@ export default {
},
data() {
return {
//按钮loading
buttonLoading: false,
// 遮罩层
loading: true,
// 导出遮罩层
@ -534,9 +536,11 @@ export default {
},
/** 修改按钮操作 */
handleUpdate(row) {
this.loading = true;
this.reset();
const ${pkColumn.javaField} = row.${pkColumn.javaField} || this.ids
get${BusinessName}(${pkColumn.javaField}).then(response => {
this.loading = false;
this.form = response.data;
#foreach ($column in $columns)
#if($column.htmlType == "checkbox")
@ -554,6 +558,7 @@ export default {
submitForm() {
this.#[[$]]#refs["form"].validate(valid => {
if (valid) {
this.buttonLoading = true;
#foreach ($column in $columns)
#if($column.htmlType == "checkbox")
this.form.$column.javaField = this.form.${column.javaField}.join(",");
@ -564,12 +569,14 @@ export default {
#end
if (this.form.${pkColumn.javaField} != null) {
update${BusinessName}(this.form).then(response => {
this.buttonLoading = false;
this.msgSuccess("修改成功");
this.open = false;
this.getList();
});
} else {
add${BusinessName}(this.form).then(response => {
this.buttonLoading = false;
this.msgSuccess("新增成功");
this.open = false;
this.getList();
@ -585,9 +592,11 @@ export default {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(function() {
}).then(() => {
this.loading = true;
return del${BusinessName}(${pkColumn.javaField}s);
}).then(() => {
this.loading = false;
this.getList();
this.msgSuccess("删除成功");
})