Skip to content

Commit 10adcd7

Browse files
author
lanjiaxuan
committed
https://github.com/hhyo/Archery/issues/2410
修复页面实例选项空白问题
1 parent 527eb30 commit 10adcd7

File tree

3 files changed

+82
-76
lines changed

3 files changed

+82
-76
lines changed

‎sql/templates/archive.html

+33-31
Original file line numberDiff line numberDiff line change
@@ -2,39 +2,41 @@
22

33
{% block content %}
44
<!-- 自定义操作按钮-->
5-
<div id="toolbar" class="form-inline pull-left">
6-
<div class="form-group">
7-
<select id="filter_instance_id" class="form-control selectpicker"
8-
data-live-search="true">
9-
<option value="" selected="selected">全部实例</option>
10-
{% for ins in ins_list %}
11-
<option value="{{ ins.id }}">{{ ins.instance_name }}</option>
12-
{% endfor %}
13-
</select>
14-
</div>
15-
<div class="form-group">
16-
<select id="state" class="form-control selectpicker">
17-
<option value="" selected="selected">启用状态</option>
18-
<option value="true">启用</option>
19-
<option value="false">未启用</option>
20-
</select>
21-
</div>
22-
<div class="form-group">
23-
<button id="btn_add" type="button" class="btn btn-default"
24-
data-toggle="modal" data-target="#apply">
25-
<span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
26-
<span aria-hidden="true"></span>申请归档
27-
</button>
28-
</div>
29-
{% if perms.sql.archive_mgt %}
5+
<div style="position: relative">
6+
<div id="toolbar" class="form-inline pull-left" style="position: absolute;top: 10px">
7+
<div class="form-group">
8+
<select id="filter_instance_id" class="form-control selectpicker"
9+
data-live-search="true">
10+
<option value="" selected="selected">全部实例</option>
11+
{% for ins in ins_list %}
12+
<option value="{{ ins.id }}">{{ ins.instance_name }}</option>
13+
{% endfor %}
14+
</select>
15+
</div>
3016
<div class="form-group">
31-
<button id="btn_add_config" type="button" class="btn btn-info"
32-
onclick="window.open('/admin/sql/archiveconfig/add/')">
33-
<span class="glyphicon glyphicon-arrow-up" aria-hidden="true"></span>
34-
<span aria-hidden="true"></span>添加配置
17+
<select id="state" class="form-control selectpicker">
18+
<option value="" selected="selected">启用状态</option>
19+
<option value="true">启用</option>
20+
<option value="false">未启用</option>
21+
</select>
22+
</div>
23+
<div class="form-group">
24+
<button id="btn_add" type="button" class="btn btn-default"
25+
data-toggle="modal" data-target="#apply">
26+
<span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
27+
<span aria-hidden="true"></span>申请归档
3528
</button>
3629
</div>
37-
{% endif %}
30+
{% if perms.sql.archive_mgt %}
31+
<div class="form-group">
32+
<button id="btn_add_config" type="button" class="btn btn-info"
33+
onclick="window.open('/admin/sql/archiveconfig/add/')">
34+
<span class="glyphicon glyphicon-arrow-up" aria-hidden="true"></span>
35+
<span aria-hidden="true"></span>添加配置
36+
</button>
37+
</div>
38+
{% endif %}
39+
</div>
3840
</div>
3941
<!-- 申请列表的表格-->
4042
<div class="table-responsive">
@@ -282,7 +284,7 @@ <h4 class="modal-title text-danger">工单日志</h4>
282284
cardView: false, //是否显示详细视图
283285
detailView: false, //是否显示父子表
284286
locale: 'zh-CN', //本地化
285-
toolbar: "#toolbar", //指明自定义的toolbar
287+
// toolbar: "#toolbar", //指明自定义的toolbar
286288
queryParamsType: 'limit',
287289
//请求服务数据时所传参数
288290
queryParams:

‎sql/templates/database.html

+25-23
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,30 @@
22

33
{% block content %}
44
<!-- 自定义操作按钮-->
5-
<div id="toolbar" class="form-inline pull-left">
6-
<div class="form-group ">
7-
<select id=instance class="form-control selectpicker" name="instance_list"
8-
title="请选择实例"
9-
data-live-search="true">
10-
<optgroup id="optgroup-mysql" label="MySQL"></optgroup>
11-
<optgroup id="optgroup-mongo" label="Mongo"></optgroup>
12-
</select>
13-
</div>
14-
<div class="form-group">
15-
<select id="saved" class="form-control selectpicker"
16-
title="全部">
17-
<option value="" selected="selected">全部</option>
18-
<option value="true">已录入</option>
19-
</select>
20-
</div>
21-
<div class="form-group ">
22-
<button id="btn-create-database" type="button" class="btn btn-default" disabled="disabled"
23-
data-toggle="modal" data-target="#modal-create-database">
24-
<span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
25-
创建数据库
26-
</button>
5+
<div style="position: relative">
6+
<div id="toolbar" class="form-inline pull-left" style="position: absolute;top: 10px">
7+
<div class="form-group ">
8+
<select id=instance class="form-control selectpicker" name="instance_list"
9+
title="请选择实例"
10+
data-live-search="true">
11+
<optgroup id="optgroup-mysql" label="MySQL"></optgroup>
12+
<optgroup id="optgroup-mongo" label="Mongo"></optgroup>
13+
</select>
14+
</div>
15+
<div class="form-group">
16+
<select id="saved" class="form-control selectpicker"
17+
title="全部">
18+
<option value="" selected="selected">全部</option>
19+
<option value="true">已录入</option>
20+
</select>
21+
</div>
22+
<div class="form-group ">
23+
<button id="btn-create-database" type="button" class="btn btn-default" disabled="disabled"
24+
data-toggle="modal" data-target="#modal-create-database">
25+
<span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
26+
创建数据库
27+
</button>
28+
</div>
2729
</div>
2830
</div>
2931
<!-- 表格-->
@@ -248,7 +250,7 @@ <h4 class="modal-title">编辑/录入数据库信息</h4>
248250
cardView: false, //是否显示详细视图
249251
detailView: false, //是否显示父子表
250252
locale: 'zh-CN', //本地化
251-
toolbar: "#toolbar", //指明自定义的toolbar
253+
// toolbar: "#toolbar", //指明自定义的toolbar
252254
queryParamsType: 'limit',
253255
//请求服务数据时所传参数
254256
queryParams:

‎sql/templates/instanceaccount.html

+24-22
Original file line numberDiff line numberDiff line change
@@ -4,28 +4,30 @@
44

55
{% block content %}
66
<!-- 自定义操作按钮-->
7-
<div id="toolbar" class="form-inline pull-left">
8-
<div class="form-group ">
9-
<select id=instance class="form-control selectpicker" name="instance_list"
10-
title="请选择实例"
11-
data-live-search="true">
12-
<optgroup id="optgroup-mysql" label="MySQL"></optgroup>
13-
<optgroup id="optgroup-mongo" label="Mongo"></optgroup>
14-
</select>
15-
</div>
16-
<div class="form-group">
17-
<select id="saved" class="form-control selectpicker"
18-
title="全部">
19-
<option value="" selected="selected">全部</option>
20-
<option value="true">已录入</option>
21-
</select>
22-
</div>
23-
<div class="form-group ">
24-
<button id="btn-create-account" type="button" class="btn btn-default" disabled="disabled"
25-
data-toggle="modal" onclick="show_create_modal()">
26-
<span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
27-
创建账号
28-
</button>
7+
<div style="position: relative">
8+
<div id="toolbar" class="form-inline pull-left" style="position: absolute;top: 10px">
9+
<div class="form-group ">
10+
<select id=instance class="form-control selectpicker" name="instance_list"
11+
title="请选择实例"
12+
data-live-search="true">
13+
<optgroup id="optgroup-mysql" label="MySQL"></optgroup>
14+
<optgroup id="optgroup-mongo" label="Mongo"></optgroup>
15+
</select>
16+
</div>
17+
<div class="form-group">
18+
<select id="saved" class="form-control selectpicker"
19+
title="全部">
20+
<option value="" selected="selected">全部</option>
21+
<option value="true">已录入</option>
22+
</select>
23+
</div>
24+
<div class="form-group ">
25+
<button id="btn-create-account" type="button" class="btn btn-default" disabled="disabled"
26+
data-toggle="modal" onclick="show_create_modal()">
27+
<span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
28+
创建账号
29+
</button>
30+
</div>
2931
</div>
3032
</div>
3133
<!-- 表格-->

0 commit comments

Comments
 (0)