Skip to content

Commit 8b43226

Browse files
author
gaoyanguo
committed
修改动态数据源
1 parent 723dc9a commit 8b43226

File tree

5 files changed

+34
-12
lines changed

5 files changed

+34
-12
lines changed

src/main/resources/application.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ mybatis-plus.global-config.db-config.logic-delete-value=1
2222
mybatis-plus.global-config.db-config.logic-not-delete-value=0
2323

2424
#redis配置
25-
spring.redis.host=monkeyzi-redis
25+
spring.redis.host=node04
2626
spring.redis.port=6379
27-
spring.redis.password=1223gao
27+
spring.redis.password=
2828
spring.redis.database=0
2929
spring.redis.jedis.pool.max-active=8
3030
spring.redis.jedis.pool.max-wait=-1ms

src/main/resources/static/febs/lay/modules/view.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,6 @@ layui
386386
if (existsTab) {
387387
var menu = $(this.menu);
388388
var currentMenu = menu.find(lay);
389-
390389
if (existsTab.href !== route.href) {
391390
tab.del(existsTab.fileurl, true);
392391
tab.change(route);

src/main/resources/templates/febs/views/ds/dataSource.html

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="layui-fluid layui-anim febs-anim" id="monx-datasource" lay-title="数据源管理">
1+
<div class="layui-fluid layui-anim febs-anim" id="monx-datasource" lay-title="数据源管理44444">
22
<div class="layui-row febs-container">
33
<div class="layui-col-md12">
44
<div class="layui-card">
@@ -142,11 +142,6 @@
142142
}
143143
});
144144

145-
table.on('sort(datasourceTable)', function (obj) {
146-
tableIns.reload({
147-
where: $.extend(getQueryParams(), {})
148-
});
149-
});
150145

151146
$query.on('click', function () {
152147
var params = $.extend(getQueryParams(), {});

src/main/resources/templates/febs/views/gen/gen.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<div class="layui-fluid layui-anim febs-anim" id="monx-gen" lay-title="代码生成">
1+
<div class="layui-fluid layui-anim febs-anim" id="monx-gen" lay-title="代码生成xxxxxx">
22
<div class="layui-row febs-container">
33
<div class="layui-col-md12">
44
<div class="layui-card">

src/main/resources/templates/febs/views/layout.html

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@
1212
<span class="febs-breadcrumb"></span>
1313
</ul>
1414
<ul class="layui-nav layui-layout-right" lay-filter="febs-header">
15-
<li class="layui-nav-item layui-hide-xs" lay-unselect="">
16-
<a ew-event="fullScreen" title="全屏"><i class="layui-icon layui-icon-screen-full"></i></a>
15+
<li class="layui-nav-item layui-hide-xs" id="fullscreen" lay-unselect>
16+
<a title="切换全屏">
17+
<i class="layui-icon layui-icon-screen-full"></i>
18+
</a>
1719
</li>
1820
<li class="layui-nav-item layui-user" lay-unselect>
1921
<a>
@@ -115,7 +117,33 @@
115117
var element = layui.element;
116118

117119
initTheme();
120+
//全屏
121+
$view.on('click', '#fullscreen', function () {
122+
var $this = $(this);
123+
var normalCls = 'layui-icon-screen-full';
124+
var activeCls = 'layui-icon-screen-restore';
125+
var ico = $this.find('.layui-icon');
118126

127+
if (ico.hasClass(normalCls)) {
128+
var a = document.body;
129+
a.webkitRequestFullScreen
130+
? a.webkitRequestFullScreen()
131+
: a.mozRequestFullScreen
132+
? a.mozRequestFullScreen()
133+
: a.requestFullScreen && a.requestFullscreen();
134+
ico.removeClass(normalCls).addClass(activeCls)
135+
} else {
136+
var b = document;
137+
b.webkitCancelFullScreen
138+
? b.webkitCancelFullScreen()
139+
: b.mozCancelFullScreen
140+
? b.mozCancelFullScreen()
141+
: b.cancelFullScreen
142+
? b.cancelFullScreen()
143+
: b.exitFullscreen && b.exitFullscreen();
144+
ico.removeClass(activeCls).addClass(normalCls)
145+
}
146+
});
119147
$view.find('#user-avatar').attr('src', ctx + "febs/images/avatar/" + currentUser.avatar);
120148

121149
$view.on('click', '.layui-logo', function () {

0 commit comments

Comments
 (0)