修复高级查询的UI和交互bug

gopeak · Jul 14, 2020 · 128bf6b · 128bf6b
1 parent 5b089fe
commit 128bf6b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/app/public/dev/js/issue/adv_query.js b/app/public/dev/js/issue/adv_query.js
@@ -153,6 +153,7 @@ var IssueAdvQuery = (function () {
                 auth_check(resp);
                 if (resp.ret == '200') {
                     notify_success('保存成功');
+                    window.location.reload();
                     $('#modal-adv_query').modal('hide');
                     window.qtipApi.hide();
                     $('#btn-save_adv_filter').qtip('api').toggle(false);

diff --git a/app/view/twig/issue/list.twig b/app/view/twig/issue/list.twig
@@ -1259,6 +1259,11 @@
                         $('#tips_panel').modal('hide');
                     });
 
+                    // 点击高级查询按钮
+                    $('#modal-adv_query').on('shown.bs.modal', function () {
+                        IssueAdvQuery.prototype.renderAdvQuery(adv_details);
+                        clearAdvSearchQuery();
+                    });
 
                     // 添加bottom的textare的focus事件
                     $('.bottom-part textarea').on('focus', function () {

diff --git a/app/view/twig/issue/list_handbars_tpl.twig b/app/view/twig/issue/list_handbars_tpl.twig
@@ -531,22 +531,22 @@
                 <script type="text/html" id="content_table_adv_tpl">
                     {{#tableList}}
                         <tr data-index="{{@index}}">
-                            <td scope="row">
+                            <td scope="row" title="可上下拖拽移动条件的顺序">
                                 <i class="fa fa-arrows"></i>
                             </td>
-                            <td>
+                            <td title="双击可修改">
                                 <span class="table-text" data-type="select" data-source="logic" data-filed="logic" data-title="关系" data-content="{{logic}}">{{logic}}</span>
                                 <div class="table-form hidden"></div>
                             </td>
-                            <td>
+                            <td title="双击可修改起始括号">
                                 <span class="table-text" data-type="select" data-source="brace" data-filed="start_braces" data-title="请选择" data-content="{{start_braces}}">{{start_braces}}</span>
                                 <div class="table-form hidden"></div>
                             </td>
                             <td>
                                 <span class="table-text" data-type="select" data-source="field" data-filed="field" data-title="字段" data-content="{{field_title}}">{{field_title}}</span>
                                 <div class="table-form hidden"></div>
                             </td>
-                            <td>
+                            <td  title="双击可修改运算符">
                                 <span class="table-text" data-type="select" data-source="opt" data-filed="opt" data-title="运算符" data-content="{{opt}}">{{opt}}</span>
                                 <div class="table-form hidden"></div>
                             </td>
@@ -556,14 +556,14 @@
                                 </span>
                                 <div class="table-form hidden"></div>
                             </td>
-                            <td>
+                            <td  title="双击可修改结束括号">
                                 <span class="table-text" data-type="select" data-source="brace" data-title="请选择" data-filed="end_braces" data-content="{{end_braces}}">
                                 {{end_braces}}
                                 </span>
                                 <div class="table-form hidden"></div>
                             </td>
                             <td>
-                                <a href="javascript:;" onclick="deleteAdvQuery('{{@index}}')">删除</a>
+                                <a title="移除此条件" href="javascript:;" onclick="deleteAdvQuery('{{@index}}')">移除</a>
                             </td>
                         </tr>
                 {{/tableList}}