From 5306a45093bd7549dcd864c58bebd8f53b5fe279 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 20 九月 2021 17:53:25 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
---
ruoyi-ui/src/views/tool/gen/index.vue | 1 +
ruoyi-ui/src/views/monitor/job/index.vue | 2 +-
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/ruoyi-ui/src/views/monitor/job/index.vue b/ruoyi-ui/src/views/monitor/job/index.vue
index f19a597..a3738d6 100644
--- a/ruoyi-ui/src/views/monitor/job/index.vue
+++ b/ruoyi-ui/src/views/monitor/job/index.vue
@@ -240,7 +240,7 @@
</div>
</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>
</el-dialog>
diff --git a/ruoyi-ui/src/views/tool/gen/index.vue b/ruoyi-ui/src/views/tool/gen/index.vue
index 87fc796..0c9f0c2 100644
--- a/ruoyi-ui/src/views/tool/gen/index.vue
+++ b/ruoyi-ui/src/views/tool/gen/index.vue
@@ -301,6 +301,7 @@
previewTable(row.tableId).then(response => {
this.preview.data = response.data;
this.preview.open = true;
+ this.preview.activeName = "domain.java";
});
},
/** 楂樹寒鏄剧ず */
--
Gitblit v1.9.3