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

Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

Browse Source 
 Conflicts:
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataScopeAspect.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/DataSourceAspect.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/LogAspect.java
	ruoyi-framework/src/main/java/com/ruoyi/framework/aspectj/RateLimiterAspect.java
This commit is contained in:
疯狂的狮子Li 2021-09-20 17:53:25 +08:00
commit 5306a45093
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-ui/src/views/monitor/job/index.vue
View File

@ -240,7 +240,7 @@
</div> </div>
</el-dialog> </el-dialog>
<el-dialog title="Cron表达式生成器" :visible.sync="openCron" append-to-body class="scrollbar"> <el-dialog title="Cron表达式生成器" :visible.sync="openCron" append-to-body class="scrollbar" destroy-on-close >
<crontab @hide="openCron=false" @fill="crontabFill" :expression="expression"></crontab> <crontab @hide="openCron=false" @fill="crontabFill" :expression="expression"></crontab>
</el-dialog> </el-dialog>

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

@ -301,6 +301,7 @@ export default {
previewTable(row.tableId).then(response => { previewTable(row.tableId).then(response => {
this.preview.data = response.data; this.preview.data = response.data;
this.preview.open = true; this.preview.open = true;
this.preview.activeName = "domain.java";
}); });
}, },
/** 高亮显示 */ /** 高亮显示 */