Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

修复页面实例选项空白问题 #2411

Merged
merged 3 commits into from
Nov 24, 2023
Merged

修复页面实例选项空白问题 #2411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
10adcd7
https://github.com/hhyo/Archery/issues/2410
Nov 24, 2023
c75f88c
https://github.com/hhyo/Archery/issues/2410
Nov 24, 2023
cf077a2
https://github.com/hhyo/Archery/issues/2410
Nov 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 32 additions & 31 deletions sql/templates/archive.html
View file
Open in desktop
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
Open in desktop
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
Open in desktop
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
Loading