liwei/crops
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新增通用方法简化模态/缓存使用

Browse Source
This commit is contained in:
RuoYi
2021-09-23 09:38:16 +08:00
parent 3b42abef44
commit 258335cc65
32 changed files with 447 additions and 466 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ruoyi-ui/src/views/tool/gen/editTable.vue
View File

@ -192,13 +192,13 @@ export default {
parentMenuId: genTable.parentMenuId
};
updateGenTable(genTable).then(res => {
this.msgSuccess(res.msg);
this.$modal.msgSuccess(res.msg);
if (res.code === 200) {
this.close();
}
});
} else {
this.msgError("表单校验未通过，请重新检查提交内容");
this.$modal.msgError("表单校验未通过，请重新检查提交内容");
}
});
},

9
ruoyi-ui/src/views/tool/gen/importTable.vue
View File

@ -104,8 +104,13 @@ export default {
},
/** 导入按钮操作 */
handleImportTable() {
importTable({ tables: this.tables.join(",") }).then(res => {
this.msgSuccess(res.msg);
const tableNames = this.tables.join(",");
if (tableNames == "") {
this.$modal.msgError("请选择要导入的表");
return;
}
importTable({ tables: tableNames }).then(res => {
this.$modal.msgSuccess(res.msg);
if (res.code === 200) {
this.visible = false;
this.$emit("ok");

26
ruoyi-ui/src/views/tool/gen/index.vue
View File

@ -262,12 +262,12 @@ export default {
handleGenTable(row) {
const tableNames = row.tableName || this.tableNames;
if (tableNames == "") {
this.msgError("请选择要生成的数据");
this.$modal.msgError("请选择要生成的数据");
return;
}
if(row.genType === "1") {
genCode(row.tableName).then(response => {
this.msgSuccess("成功生成到自定义路径：" + row.genPath);
this.$modal.msgSuccess("成功生成到自定义路径：" + row.genPath);
});
} else {
downLoadZip("/tool/gen/batchGenCode?tables=" + tableNames, "ruoyi");
@ -276,14 +276,10 @@ export default {
/** 同步数据库操作 */
handleSynchDb(row) {
const tableName = row.tableName;
this.$confirm('确认要强制同步"' + tableName + '"表结构吗？', "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(function() {
return synchDb(tableName);
this.$modal.confirm('确认要强制同步"' + tableName + '"表结构吗？').then(function() {
return synchDb(tableName);
}).then(() => {
this.msgSuccess("同步成功");
this.$modal.msgSuccess("同步成功");
}).catch(() => {});
},
/** 打开导入表弹窗 */
@ -326,15 +322,11 @@ export default {
/** 删除按钮操作 */
handleDelete(row) {
const tableIds = row.tableId || this.ids;
this.$confirm('是否确认删除表编号为"' + tableIds + '"的数据项?', "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(function() {
return delTable(tableIds);
this.$modal.confirm('是否确认删除表编号为"' + tableIds + '"的数据项？').then(function() {
return delTable(tableIds);
}).then(() => {
this.getList();
this.msgSuccess("删除成功");
this.getList();
this.$modal.msgSuccess("删除成功");
}).catch(() => {});
}
}