From 9b7b9993649bcf0046f6d6eb3e56c2cb77ed407a Mon Sep 17 00:00:00 2001
From: augushong <augushong@ulthon.com>
Date: Mon, 11 Dec 2023 15:50:21 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90timer=5Flimit=E7=9A=84?=
 =?UTF-8?q?=E9=A2=84=E6=90=9C=E7=B4=A2=E4=BC=A0=E5=80=BC=EF=BC=8C=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83=E6=96=B0=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 extend/base/admin/view/debug/log/index.js     |  2 +-
 extend/base/admin/view/index/welcome.html     |  6 ++
 .../base/common/command/admin/VersionBase.php |  5 +-
 .../static/plugs/ulthon-admin/ulthon-admin.js | 55 ++++++++++++-------
 4 files changed, 44 insertions(+), 24 deletions(-)

diff --git a/extend/base/admin/view/debug/log/index.js b/extend/base/admin/view/debug/log/index.js
index e4dac83..e0961b3 100644
--- a/extend/base/admin/view/debug/log/index.js
+++ b/extend/base/admin/view/debug/log/index.js
@@ -36,7 +36,7 @@ $(function () {
                     return '<div class="' + className + '">' + data.content + '</div>';
                 }
             },
-            { field: 'create_time', title: '记录时间', minWidth: 160, search: 'time_limit' },
+            { field: 'create_time', title: '记录时间', minWidth: 160, search: 'time_limit', defaultSearchValue: ua.getQueryVariable('create_time') },
             { field: 'app_name', title: 'app_name' },
             { field: 'controller_name', title: 'controller_name', },
             { field: 'action_name', title: 'action_name' },
diff --git a/extend/base/admin/view/index/welcome.html b/extend/base/admin/view/index/welcome.html
index 75441d9..325992e 100644
--- a/extend/base/admin/view/index/welcome.html
+++ b/extend/base/admin/view/index/welcome.html
@@ -156,6 +156,12 @@
                                     <td>PHP</td>
                                     <td>{:PHP_VERSION}</td>
                                 </tr>
+                                <tr>
+                                    <td>日志</td>
+                                    <td>
+                                        <div layuimini-content-href="{:url('admin/Debug.Log/index',['create_time'=>date('Y-m-d 00:00:00').','])}" data-title="日志管理" class="layui-btn layui-btn-xs layui-btn-primary">今日日志</div>
+                                    </td>
+                                </tr>
 
                             </tbody>
                         </table>
diff --git a/extend/base/common/command/admin/VersionBase.php b/extend/base/common/command/admin/VersionBase.php
index add1764..266e7f4 100644
--- a/extend/base/common/command/admin/VersionBase.php
+++ b/extend/base/common/command/admin/VersionBase.php
@@ -12,13 +12,12 @@ use think\console\Output;
 
 class VersionBase extends Command
 {
-    public const VERSION = 'v2.0.83';
+    public const VERSION = 'v2.0.84';
 
     public const LAYUI_VERSION = '2.8.17';
 
     public const COMMENT = [
-        '增加表格done的回调参数',
-        '增加require的扩展事件',
+        '完成timer_limit的预搜索传值',
         '发布新版本',
     ];
 
diff --git a/public/static/plugs/ulthon-admin/ulthon-admin.js b/public/static/plugs/ulthon-admin/ulthon-admin.js
index bd3652e..74a8ff1 100644
--- a/public/static/plugs/ulthon-admin/ulthon-admin.js
+++ b/public/static/plugs/ulthon-admin/ulthon-admin.js
@@ -509,31 +509,43 @@
                         d.elemIdName = d.elemIdName.replace('.', '-');
                     }
 
-
                     if (d.defaultSearchValue != undefined) {
                         if (d.searchValue.length == 0) {
                             d.searchValue = d.defaultSearchValue;
                         }
 
-                        if (d.search == 'number_limit') {
-                            if (d.searchValue) {
-                                var paramsArr = d.searchValue.split(',');
-                                a = paramsArr[0];
-                                b = paramsArr[1];
-                            }
-
-                            formatFilter['[' + d.field + ']min'] = a;
-                            formatOp['[' + d.field + ']min'] = 'min';
-
-                            formatFilter['[' + d.field + ']max'] = b;
-                            formatOp['[' + d.field + ']max'] = 'max';
-                        } else {
-                            formatFilter[d.field] = d.defaultSearchValue;
-                            formatOp[d.field] = d.searchOp;
-                        }
 
                     }
+                    console.log(d.defaultSearchValue);
 
+                    if (d.search == 'number_limit') {
+                        if (d.searchValue) {
+                            var paramsArr = d.searchValue.split(',');
+                            a = paramsArr[0];
+                            b = paramsArr[1];
+                        }
+
+                        formatFilter['[' + d.field + ']min'] = a;
+                        formatOp['[' + d.field + ']min'] = 'min';
+
+                        formatFilter['[' + d.field + ']max'] = b;
+                        formatOp['[' + d.field + ']max'] = 'max';
+                    } else if (d.search == 'time_limit') {
+                        if (d.searchValue) {
+                            var paramsArr = d.searchValue.split(',');
+                            a = paramsArr[0];
+                            b = paramsArr[1];
+                        }
+
+                        formatFilter['[' + d.field + ']min_date'] = a;
+                        formatOp['[' + d.field + ']min_date'] = 'min_date';
+
+                        formatFilter['[' + d.field + ']max_date'] = b;
+                        formatOp['[' + d.field + ']max_date'] = 'max_date';
+                    } else {
+                        formatFilter[d.field] = d.defaultSearchValue;
+                        formatOp[d.field] = d.searchOp;
+                    }
 
                     var formSearchHideClass = '';
 
@@ -595,8 +607,8 @@
                                 formHtml += '\t<div class="layui-form-item form-item-time-limit layui-inline ' + formSearchHideClass + ' ">\n' +
                                     '<label class="layui-form-label">' + d.title + '</label>\n' +
                                     '<div class="layui-input-inline">\n' +
-                                    '<input id="c-' + d.elemIdName + '-min_date" name="[' + d.fieldAlias + ']min_date"  data-search-op="min_date"  value="' + d.searchValue + '" placeholder="最小值" class="layui-input">\n' +
-                                    '<input id="c-' + d.elemIdName + '-max_date" name="[' + d.fieldAlias + ']max_date"  data-search-op="max_date"  value="' + d.searchValue + '" placeholder="最大值" class="layui-input">\n' +
+                                    '<input id="c-' + d.elemIdName + '-min_date" name="[' + d.fieldAlias + ']min_date"  data-search-op="min_date"  value="' + a + '" placeholder="最小值" class="layui-input">\n' +
+                                    '<input id="c-' + d.elemIdName + '-max_date" name="[' + d.fieldAlias + ']max_date"  data-search-op="max_date"  value="' + b + '" placeholder="最大值" class="layui-input">\n' +
                                     '</div>\n' +
                                     '</div>';
                                 break;
@@ -2389,10 +2401,13 @@
             }
 
             var query = window.location.search.substring(1);
+            query = query.replace(/\+/g, ' ');
             var vars = query.split("&");
             for (var i = 0; i < vars.length; i++) {
                 var pair = vars[i].split("=");
-                if (pair[0] == variable) { return decodeURIComponent(pair[1]); }
+                if (pair[0] == variable) {
+                    return decodeURIComponent(pair[1]);
+                }
             }
             return defaultValue;
         },