From 8b9e533567befa6e9e689c114cd4a68bb75e0bb0 Mon Sep 17 00:00:00 2001
From: newpanjing <newpanjing@163.com>
Date: Fri, 1 Mar 2019 18:28:20 +0800
Subject: [PATCH] =?UTF-8?q?##=20version=201.4.7=20-=20[x]=20=E6=A0=87?=
 =?UTF-8?q?=E9=A2=98=E9=A1=B5=E7=82=B9=E5=87=BB=E5=88=B7=E6=96=B0=E8=8F=9C?=
 =?UTF-8?q?=E5=8D=95=E6=97=A0=E6=95=88=20-=20[x]=20=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E9=A1=B5=E7=9A=84=E8=BF=87=E6=BB=A4=E6=9D=A1=E4=BB=B6=E4=B8=8B?=
 =?UTF-8?q?=E6=8B=89=E6=A1=86=EF=BC=8C=E5=A6=82=E6=9E=9C=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E4=B8=BA=E6=99=AE=E9=80=9A=E5=AD=97=E6=AE=B5=EF=BC=8C=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E4=B8=8D=E8=83=BD=E8=A2=AB=E6=AD=A3=E7=A1=AE=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=20-=20[x]=20=E6=89=80=E6=9C=89=E7=9A=84=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=EF=BC=8C=E5=9C=A8=E7=AC=AC=E4=B8=80=E9=A1=B5=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=AD=A3=E5=B8=B8=EF=BC=8C=E4=BD=86=E6=98=AF=E5=9C=A8?=
 =?UTF-8?q?=E7=AC=AC=E4=BA=8C=E9=A1=B5=E7=9A=84=E6=97=B6=E5=80=99=E5=B0=B1?=
 =?UTF-8?q?=E4=B8=A2=E5=A4=B1=E4=BA=86=E6=90=9C=E7=B4=A2=E5=85=B3=E9=94=AE?=
 =?UTF-8?q?=E5=AD=97=EF=BC=8C=E4=B9=9F=E5=B0=B1=E6=98=AF=E8=AF=B4=E8=BF=99?=
 =?UTF-8?q?=E4=B8=AA=E7=AC=AC=E4=BA=8C=E9=A1=B5=E5=B0=B1=E6=98=AF=E5=BD=93?=
 =?UTF-8?q?=E5=89=8D=E9=A1=B5=E9=9D=A2=E6=89=80=E6=9C=89=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5=E4=B9=8B=E5=90=8E=E7=9A=84=E7=AC=AC=E4=BA=8C?=
 =?UTF-8?q?=E9=A1=B5=20-=20[X]=20=E5=9C=A8list=5Ffilter=E4=B8=AD=EF=BC=8C?=
 =?UTF-8?q?=E4=B8=8D=E8=83=BD=E6=8C=89=E6=97=B6=E9=97=B4=E8=BF=87=E6=BB=A4?=
 =?UTF-8?q?(=E5=A2=9E=E5=8A=A0=E4=BA=86=E6=97=B6=E9=97=B4=E5=8C=BA?=
 =?UTF-8?q?=E5=9F=9F=E9=80=89=E6=8B=A9=EF=BC=8C=E7=94=B1=E4=BA=8Edjango?=
 =?UTF-8?q?=E7=9A=84=E9=99=90=E5=88=B6=EF=BC=8C=E6=9A=82=E6=97=B6=E4=B8=8D?=
 =?UTF-8?q?=E8=83=BD=E5=BE=88=E5=A5=BD=E7=9A=84=E5=8F=91=E6=8C=A5=E4=BD=9C?=
 =?UTF-8?q?=E7=94=A8)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md                                     |  7 +++
 setup.py                                      |  2 +-
 .../admin/simpleui/static/js/vip_comm.js      | 12 +++-
 simpleui/templates/admin/pagination.html      | 24 ++++++--
 simpleui/templates/admin/search_form.html     | 55 +++++++++++++++++--
 simpleui/templatetags/simpletags.py           |  6 ++
 6 files changed, 93 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 77683d28..70720407 100644
--- a/README.md
+++ b/README.md
@@ -90,6 +90,13 @@ SIMPLEUI_HOME_ICON = 'layui-icon-rate'
 ## version 1.4.6
 + 加入 `# -*- coding: utf-8 -*-` 以支持python2
 
+## version 1.4.7
+- [x] 标题页点击刷新菜单无效
+- [x] 列表页的过滤条件下拉框，如果类型为普通字段，内容不能被正确显示
+- [x] 所有的搜索，在第一页显示正常，但是在第二页的时候就丢失了搜索关键字，也就是说这个第二页就是当前页面所有数据分页之后的第二页
+- [X] 在list_filter中，不能按时间过滤(增加了时间区域选择，由于django的限制，暂时不能很好的发挥作用)
+      
+
 
 ## v1.4版预览图
 
diff --git a/setup.py b/setup.py
index af754747..1cf4f53e 100644
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
 
 setup(
     name='django-simpleui',
-    version='1.4.6',
+    version='1.4.7',
     packages=['simpleui'],
     zip_safe=False,
     include_package_data=True,
diff --git a/simpleui/static/admin/simpleui/static/js/vip_comm.js b/simpleui/static/admin/simpleui/static/js/vip_comm.js
index 9a738a56..ee143cf7 100755
--- a/simpleui/static/admin/simpleui/static/js/vip_comm.js
+++ b/simpleui/static/admin/simpleui/static/js/vip_comm.js
@@ -192,7 +192,7 @@ layui.use(['layer', 'element', 'util'], function () {
     // 右键提示框菜单操作-刷新页面
     $(document).on('click', '.card-refresh', function () {
         // 窗体对象
-        var ifr = $(document).find('.my-body .layui-tab-content .layui-tab-item iframe').eq(cardIdx);
+        var ifr = $(document).find('.my-body .layui-tab-content .layui-tab-item iframe').eq(cardIdx-1);
         // 刷新当前页
         ifr.attr('src', ifr.attr('src'));
         // 切换到当前选项卡
@@ -312,4 +312,14 @@ layui.use(['layer', 'element', 'util'], function () {
 
     // 初始化
     init();
+
+    window.processForm=function (obj) {
+        $(obj).find("*[name]").each(function () {
+            var val = $(this).val();
+            if(val==""){
+                $(this).removeAttr('name');
+            }
+        });
+        return false;
+    }
 });
\ No newline at end of file
diff --git a/simpleui/templates/admin/pagination.html b/simpleui/templates/admin/pagination.html
index fab9607d..ef7587be 100644
--- a/simpleui/templates/admin/pagination.html
+++ b/simpleui/templates/admin/pagination.html
@@ -13,12 +13,18 @@
                     <a href="javascript:;" data-page="{{ i }}">{{ i }}</a>
                 {% endif %}
             {% endfor %}
-            <a href="javascript:;" class="layui-laypage-next">下一页</a>
+            <a href="javascript:;" class="layui-laypage-next">下一页{{ request.GET.p }}</a>
         {% endif %}
     </div>
 </div>
 <script type="text/javascript">
     $(function () {
+
+        function page_go(p) {
+            $("#changelist-search input[name='p']").val(p);
+            $("#changelist-search").submit();
+        }
+
         var _cl ={{ cl.page_num }};
         $("#pagination *[data-page!='']").each(function () {
             var page = $(this).attr("data-page")
@@ -34,23 +40,29 @@
                     '<em>' + (page + 1) + '</em>');
             } else {
                 $(this).text(page + 1);
-                $(this).attr("href", "?p=" + page);
+                $(this).data('page', page);
+                $(this).click(function () {
+                    page_go($(this).data().page);
+                });
             }
         });
         //处理上一页和下一页
         if (_cl == 0) {
             $(".layui-laypage-prev").addClass("layui-disabled");
         } else {
-            $(".layui-laypage-prev").attr("href", "?p=" + (_cl - 1));
+            $(".layui-laypage-prev").click(function () {
+                page_go(_cl - 1)
+            });
         }
-        {#var total = $(".layui-laypage-next").prev().text();#}
-        {#total = parseInt(total);#}
+
         var total ={{cl.paginator.count}};
 
         if (_cl == (total - 1)) {
             $(".layui-laypage-next").addClass("layui-disabled");
         } else {
-            $(".layui-laypage-next").attr("href", "?p=" + (_cl + 1));
+            $(".layui-laypage-next").click(function () {
+                page_go(_cl+1)
+            });
         }
     });
 </script>
\ No newline at end of file
diff --git a/simpleui/templates/admin/search_form.html b/simpleui/templates/admin/search_form.html
index d11a0b3f..46af4f84 100644
--- a/simpleui/templates/admin/search_form.html
+++ b/simpleui/templates/admin/search_form.html
@@ -2,7 +2,8 @@
 {% load simpletags %}
 {% if cl.search_fields or cl.has_filters %}
     <div id="toolbar">
-        <form id="changelist-search" method="get">
+        <form id="changelist-search" method="get" onsubmit="processForm(this)">
+            <input type="hidden" name="p" value=""/>
             <div class="layui-form"><!-- DIV needed for valid HTML -->
                 <label for="searchbar"><img src="{% static "admin/img/search.svg" %}" alt="Search"/></label>
                 {% if cl.search_fields %}
@@ -14,13 +15,24 @@
                     {% for spec in cl.filter_specs %}
 
                         <div class="layui-inline">
+
+                            {% if spec.links %}
+                                <input type="input" class="date_field" data-name="{{spec.field_path}}" data-json="{{spec|date_to_json}}" placeholder="{{spec.title}}"/>
+                                <input type="hidden" name="{{spec.field_generic}}gte"/>
+                                <input type="hidden" name="{{spec.field_generic}}lt"/>
+                            {% else %}
                             <select data-name="{{ spec.lookup_kwarg }}" lay-search>
                                 <option value="">全部{{ spec.title }}</option>
-
                                 {% if spec.lookup_choices %}
-                                    {% for option in spec.lookup_choices %}
-                                        <option value="{{ option.0 }}">{{ option.1 }}</option>
-                                    {% endfor %}
+                                    {% if spec.lookup_choices.query %}
+                                        {% for option in spec.lookup_choices %}
+                                            <option value="{{ option }}">{{ option }}</option>
+                                        {% endfor %}
+                                    {% else %}
+                                        {% for option in spec.lookup_choices %}
+                                            <option value="{{ option.0 }}">{{ option.1 }}</option>
+                                        {% endfor %}
+                                    {% endif %}
                                 {% elif spec.field.choices %}
                                     {% for option in spec.field.choices %}
                                         <option value="{{ option.0 }}">{{ option.1 }}</option>
@@ -30,6 +42,7 @@
                                     <option value="False">False</option>
                                 {% endif %}
                             </select>
+                            {% endif %}
                         </div>
                     {% endfor %}
                 {% endif %}
@@ -77,6 +90,38 @@
                     }
                 })
             });
+
+            function format_datetime(d) {
+                for(i in d){
+                    if (d[i] < 10) {
+                        d[i] = '0' + d[i];
+                    }
+                }
+                //2019-03-01 00:00:00+08:00
+                return d.year + '-' + d.month + '-' + d.date + ' ' + d.hours + ":" + d.minutes + ':' + d.seconds+'+08:00';
+            }
+
+            layui.use('laydate', function () {
+                var date = new Date();
+                var laydate = layui.laydate;
+                laydate.render({
+                    elem: '.date_field'
+                    // , type: 'datetime'
+                    , type: 'date'
+                    , range: true
+                    // max:date.getFullYear()+"-"+date.getMonth()+"-"+date.getDate()
+                    ,done:function (value,begin,end) {
+
+                        var obj = $(this.elem);
+                        var name = obj.attr('data-name');
+                        //2019-03-01 00:00:00+08:00
+                        var d = begin;
+                        obj.parent().find('input[name="' + name + '__gte"]').val(format_datetime(begin));
+                        obj.parent().find('input[name="' + name + '__lt"]').val(format_datetime(end));
+
+                    }
+                });
+            });
         }
     </script>
 {% endif %}
diff --git a/simpleui/templatetags/simpletags.py b/simpleui/templatetags/simpletags.py
index 898eadbe..7e12fcdd 100644
--- a/simpleui/templatetags/simpletags.py
+++ b/simpleui/templatetags/simpletags.py
@@ -5,6 +5,7 @@
 from django.utils.html import format_html
 from django.conf import settings
 import os
+import json
 
 register = template.Library()
 
@@ -466,7 +467,12 @@ def get_icon(name):
 @register.filter
 def test(obj):
     print(obj)
+    # pass
+    return ''
 
+@register.filter
+def date_to_json(obj):
+    return json.dumps(obj.date_params)
 
 @register.simple_tag(takes_context=True)
 def home_page(context):