From a337900077a0f19261f8a33eba9692d08403cd7e Mon Sep 17 00:00:00 2001
From: augushong <augushong@ulthon.com>
Date: Fri, 8 Dec 2023 16:26:17 +0800
Subject: [PATCH] =?UTF-8?q?number=5Flimit=E5=A2=9E=E5=8A=A0=E9=BB=98?=
 =?UTF-8?q?=E8=AE=A4=E5=8F=82=E6=95=B0=EF=BC=9B=E5=8F=91=E5=B8=83=E6=96=B0?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/common/command/admin/VersionBase.php |  4 +--
 .../static/plugs/ulthon-admin/ulthon-admin.js | 25 ++++++++++++++++---
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/extend/base/common/command/admin/VersionBase.php b/extend/base/common/command/admin/VersionBase.php
index c156754..478aaf8 100644
--- a/extend/base/common/command/admin/VersionBase.php
+++ b/extend/base/common/command/admin/VersionBase.php
@@ -12,12 +12,12 @@ use think\console\Output;
 
 class VersionBase extends Command
 {
-    public const VERSION = 'v2.0.77';
+    public const VERSION = 'v2.0.78';
 
     public const LAYUI_VERSION = '2.8.17';
 
     public const COMMENT = [
-        '修复更新逻辑创建目录',
+        'number_limit增加默认参数',
         '发布新版本',
     ];
 
diff --git a/public/static/plugs/ulthon-admin/ulthon-admin.js b/public/static/plugs/ulthon-admin/ulthon-admin.js
index 12e8e0e..cc520e5 100644
--- a/public/static/plugs/ulthon-admin/ulthon-admin.js
+++ b/public/static/plugs/ulthon-admin/ulthon-admin.js
@@ -34,7 +34,7 @@
         tableRenderId: 'currentTableRenderId',
         uploadUrl: 'ajax/upload',
         uploadExts: '',
-        extGroup:{}
+        extGroup: {}
     };
 
     var table;
@@ -79,7 +79,7 @@
 
         }
     }
-    
+
     extGroup['office'] = [].concat(extGroup['word'], extGroup['excel'], extGroup['ppt'], extGroup['pdf']);
     extGroup['media'] = [].concat(extGroup['image'], extGroup['music'], extGroup['video']);
 
@@ -512,8 +512,25 @@
                             d.searchValue = d.defaultSearchValue;
                         }
 
-                        formatFilter[d.field] = d.defaultSearchValue;
-                        formatOp[d.field] = d.searchOp;
+                        if (d.search == 'number_limit') {
+                            var a = '';
+                            var b = '';
+                            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;
+                        }
+
                     }