Skip to content

Commit

Permalink
修复页面实例选项空白问题 (hhyo#2411)
Browse files Browse the repository at this point in the history 
* hhyo#2410
修复页面实例选项空白问题

* hhyo#2410
修复页面实例选项空白问题

* hhyo#2410
修复页面实例选项空白问题

---------

Co-authored-by: lanjiaxuan <lanjiaxuan@e6yun.com>
  • Loading branch information
@lanheader @finovy
2 people authored and finovy committed Dec 1, 2023
1 parent 2863d5f commit 54ea2cf
Show file tree
Hide file tree
Showing 3 changed files with 80 additions and 77 deletions.
63 changes: 32 additions & 31 deletions sql/templates/archive.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,39 +2,41 @@

{% block content %}
<!-- 自定义操作按钮-->
<div id="toolbar" class="form-inline pull-left">
<div class="form-group">
<select id="filter_instance_id" class="form-control selectpicker"
data-live-search="true">
<option value="" selected="selected">全部实例</option>
{% for ins in ins_list %}
<option value="{{ ins.id }}">{{ ins.instance_name }}</option>
{% endfor %}
</select>
</div>
<div class="form-group">
<select id="state" class="form-control selectpicker">
<option value="" selected="selected">启用状态</option>
<option value="true">启用</option>
<option value="false">未启用</option>
</select>
</div>
<div class="form-group">
<button id="btn_add" type="button" class="btn btn-default"
data-toggle="modal" data-target="#apply">
<span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
<span aria-hidden="true"></span>申请归档
</button>
</div>
{% if perms.sql.archive_mgt %}
<div style="position: relative">
<div id="toolbar" class="form-inline pull-left" style="position: absolute;top: 10px">
<div class="form-group">
<select id="filter_instance_id" class="form-control selectpicker"
data-live-search="true">
<option value="" selected="selected">全部实例</option>
{% for ins in ins_list %}
<option value="{{ ins.id }}">{{ ins.instance_name }}</option>
{% endfor %}
</select>
</div>
<div class="form-group">
<button id="btn_add_config" type="button" class="btn btn-info"
onclick="window.open('/admin/sql/archiveconfig/add/')">
<span class="glyphicon glyphicon-arrow-up" aria-hidden="true"></span>
<span aria-hidden="true"></span>添加配置
<select id="state" class="form-control selectpicker">
<option value="" selected="selected">启用状态</option>
<option value="true">启用</option>
<option value="false">未启用</option>
</select>
</div>
<div class="form-group">
<button id="btn_add" type="button" class="btn btn-default"
data-toggle="modal" data-target="#apply">
<span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
<span aria-hidden="true"></span>申请归档
</button>
</div>
{% endif %}
{% if perms.sql.archive_mgt %}
<div class="form-group">
<button id="btn_add_config" type="button" class="btn btn-info"
onclick="window.open('/admin/sql/archiveconfig/add/')">
<span class="glyphicon glyphicon-arrow-up" aria-hidden="true"></span>
<span aria-hidden="true"></span>添加配置
</button>
</div>
{% endif %}
</div>
</div>
<!-- 申请列表的表格-->
<div class="table-responsive">
Expand Down Expand Up @@ -282,7 +284,6 @@ <h4 class="modal-title text-danger">工单日志</h4>
cardView: false, //是否显示详细视图
detailView: false, //是否显示父子表
locale: 'zh-CN', //本地化
toolbar: "#toolbar", //指明自定义的toolbar
queryParamsType: 'limit',
//请求服务数据时所传参数
queryParams:
Expand Down
47 changes: 24 additions & 23 deletions sql/templates/database.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,28 +2,30 @@

{% block content %}
<!-- 自定义操作按钮-->
<div id="toolbar" class="form-inline pull-left">
<div class="form-group ">
<select id=instance class="form-control selectpicker" name="instance_list"
title="请选择实例"
data-live-search="true">
<optgroup id="optgroup-mysql" label="MySQL"></optgroup>
<optgroup id="optgroup-mongo" label="Mongo"></optgroup>
</select>
</div>
<div class="form-group">
<select id="saved" class="form-control selectpicker"
title="全部">
<option value="" selected="selected">全部</option>
<option value="true">已录入</option>
</select>
</div>
<div class="form-group ">
<button id="btn-create-database" type="button" class="btn btn-default" disabled="disabled"
data-toggle="modal" data-target="#modal-create-database">
<span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
创建数据库
</button>
<div style="position: relative">
<div id="toolbar" class="form-inline pull-left" style="position: absolute;top: 10px">
<div class="form-group ">
<select id=instance class="form-control selectpicker" name="instance_list"
title="请选择实例"
data-live-search="true">
<optgroup id="optgroup-mysql" label="MySQL"></optgroup>
<optgroup id="optgroup-mongo" label="Mongo"></optgroup>
</select>
</div>
<div class="form-group">
<select id="saved" class="form-control selectpicker"
title="全部">
<option value="" selected="selected">全部</option>
<option value="true">已录入</option>
</select>
</div>
<div class="form-group ">
<button id="btn-create-database" type="button" class="btn btn-default" disabled="disabled"
data-toggle="modal" data-target="#modal-create-database">
<span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
创建数据库
</button>
</div>
</div>
</div>
<!-- 表格-->
Expand Down Expand Up @@ -248,7 +250,6 @@ <h4 class="modal-title">编辑/录入数据库信息</h4>
cardView: false, //是否显示详细视图
detailView: false, //是否显示父子表
locale: 'zh-CN', //本地化
toolbar: "#toolbar", //指明自定义的toolbar
queryParamsType: 'limit',
//请求服务数据时所传参数
queryParams:
Expand Down
47 changes: 24 additions & 23 deletions sql/templates/instanceaccount.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,28 +4,30 @@

{% block content %}
<!-- 自定义操作按钮-->
<div id="toolbar" class="form-inline pull-left">
<div class="form-group ">
<select id=instance class="form-control selectpicker" name="instance_list"
title="请选择实例"
data-live-search="true">
<optgroup id="optgroup-mysql" label="MySQL"></optgroup>
<optgroup id="optgroup-mongo" label="Mongo"></optgroup>
</select>
</div>
<div class="form-group">
<select id="saved" class="form-control selectpicker"
title="全部">
<option value="" selected="selected">全部</option>
<option value="true">已录入</option>
</select>
</div>
<div class="form-group ">
<button id="btn-create-account" type="button" class="btn btn-default" disabled="disabled"
data-toggle="modal" onclick="show_create_modal()">
<span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
创建账号
</button>
<div style="position: relative">
<div id="toolbar" class="form-inline pull-left" style="position: absolute;top: 10px">
<div class="form-group ">
<select id=instance class="form-control selectpicker" name="instance_list"
title="请选择实例"
data-live-search="true">
<optgroup id="optgroup-mysql" label="MySQL"></optgroup>
<optgroup id="optgroup-mongo" label="Mongo"></optgroup>
</select>
</div>
<div class="form-group">
<select id="saved" class="form-control selectpicker"
title="全部">
<option value="" selected="selected">全部</option>
<option value="true">已录入</option>
</select>
</div>
<div class="form-group ">
<button id="btn-create-account" type="button" class="btn btn-default" disabled="disabled"
data-toggle="modal" onclick="show_create_modal()">
<span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
创建账号
</button>
</div>
</div>
</div>
<!-- 表格-->
Expand Down Expand Up @@ -1282,7 +1284,6 @@ <h4 class="modal-title">删除账号
cardView: false, //是否显示详细视图
detailView: false, //是否显示父子表
locale: 'zh-CN', //本地化
toolbar: "#toolbar", //指明自定义的toolbar
queryParamsType: 'limit',
//请求服务数据时所传参数
queryParams:
Expand Down

0 comments on commit 54ea2cf

Please sign in to comment.