Merge pull request #186 from newpanjing/dev

Dev
newpanjing · Nov 25, 2019 · daffb9b · daffb9b
2 parents 778d642 + e7212c4
commit daffb9b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/simpleui/__init__.py b/simpleui/__init__.py
@@ -1,2 +1,2 @@
 def get_version():
-    return '3.4'
+    return '3.5'
diff --git a/simpleui/templates/admin/actions.html b/simpleui/templates/admin/actions.html
@@ -71,8 +71,10 @@
     {% endblock %}
 
     <el-button-group class="btn-group">
+        {% if cl.search_fields or cl.has_filters %}
         <a href="javascript:;" @click="searchDisplay()" class="el-button el-button--default"><span
                 class="el-icon-search"></span></a>
+        {% endif %}
         <a href="javascript:;" @click="reload()" class="el-button el-button--default"><span
                 class="el-icon-refresh"></span></a>
         <a href="javascript:;" @click="openNewPage()" class="el-button el-button--default"><span
@@ -244,10 +246,10 @@
                     confirmButtonText: '确定',
                     cancelButtonText: '取消',
                     type: 'warning'
-                }).then(() => done());
+                }).then(() => done.call(this));
 
             } else {
-                done();
+                done.call(this)
             }
 
             function done() {
@@ -291,11 +293,12 @@
                         }
                     }
                 }
-                console.log('执行了')
                 if (url) {
                     window.location.href = url;
                     return;
-                } else if ($(this).attr('data-name')) {
+                }
+
+                if ($(this).attr('data-name')) {
                     var name = $(this).attr("data-name");
                     $("#changelist-form input[name='action']").val(name);
 
@@ -307,10 +310,8 @@
                             obj.removeAttr('name');
                         }
                     });
-                    $("#changelist-form").submit();
-                } else {
-                    $("#changelist-form").submit();
                 }
+                $("#changelist-form").submit();
             }
         });
     });