From 280f28de4a787578e3473b6ff9883623d80f92e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=85=B0=E5=98=89=E8=BD=A9?=
 <52522047+lanheader@users.noreply.github.com>
Date: Fri, 24 Nov 2023 18:04:07 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A1=B5=E9=9D=A2=E5=AE=9E?=
 =?UTF-8?q?=E4=BE=8B=E9=80=89=E9=A1=B9=E7=A9=BA=E7=99=BD=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=20(#2411)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* https://github.com/hhyo/Archery/issues/2410
修复页面实例选项空白问题

* https://github.com/hhyo/Archery/issues/2410
修复页面实例选项空白问题

* https://github.com/hhyo/Archery/issues/2410
修复页面实例选项空白问题

---------

Co-authored-by: lanjiaxuan <lanjiaxuan@e6yun.com>
---
 sql/templates/archive.html         | 63 +++++++++++++++---------------
 sql/templates/database.html        | 47 +++++++++++-----------
 sql/templates/instanceaccount.html | 47 +++++++++++-----------
 3 files changed, 80 insertions(+), 77 deletions(-)

diff --git a/sql/templates/archive.html b/sql/templates/archive.html
index a16e7a9301..88c73c0722 100644
--- a/sql/templates/archive.html
+++ b/sql/templates/archive.html
@@ -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">
@@ -282,7 +284,6 @@ <h4 class="modal-title text-danger">工单日志</h4>
                 cardView: false,                    //是否显示详细视图
                 detailView: false,                  //是否显示父子表
                 locale: 'zh-CN',                    //本地化
-                toolbar: "#toolbar",               //指明自定义的toolbar
                 queryParamsType: 'limit',
                 //请求服务数据时所传参数
                 queryParams:
diff --git a/sql/templates/database.html b/sql/templates/database.html
index e60bccbef6..498cd60ffa 100755
--- a/sql/templates/database.html
+++ b/sql/templates/database.html
@@ -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>
     <!-- 表格-->
@@ -248,7 +250,6 @@ <h4 class="modal-title">编辑/录入数据库信息</h4>
                 cardView: false,                    //是否显示详细视图
                 detailView: false,                  //是否显示父子表
                 locale: 'zh-CN',                    //本地化
-                toolbar: "#toolbar",               //指明自定义的toolbar
                 queryParamsType: 'limit',
                 //请求服务数据时所传参数
                 queryParams:
diff --git a/sql/templates/instanceaccount.html b/sql/templates/instanceaccount.html
index 2c53ec397f..9a0585e527 100644
--- a/sql/templates/instanceaccount.html
+++ b/sql/templates/instanceaccount.html
@@ -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>
     <!-- 表格-->
@@ -1282,7 +1284,6 @@ <h4 class="modal-title">删除账号
                 cardView: false,                    //是否显示详细视图
                 detailView: false,                  //是否显示父子表
                 locale: 'zh-CN',                    //本地化
-                toolbar: "#toolbar",               //指明自定义的toolbar
                 queryParamsType: 'limit',
                 //请求服务数据时所传参数
                 queryParams: