From e898462c4ac1f6ae7ea9a5642715cf8ad7cddec8 Mon Sep 17 00:00:00 2001
From: augushong <augushong@163.com>
Date: Wed, 23 Apr 2025 14:41:35 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E9=87=8D=E7=BD=AE=E5=AF=BC=E8=87=B4=E6=89=80?=
 =?UTF-8?q?=E6=9C=89=E9=A2=84=E8=AE=BE=E6=90=9C=E7=B4=A2=E5=80=BC=E5=A4=B1?=
 =?UTF-8?q?=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/plugs/ulthon-admin/ulthon-admin.js | 48 +++++++++++++------
 1 file changed, 33 insertions(+), 15 deletions(-)

diff --git a/public/static/plugs/ulthon-admin/ulthon-admin.js b/public/static/plugs/ulthon-admin/ulthon-admin.js
index b2c0b02..339b8fd 100644
--- a/public/static/plugs/ulthon-admin/ulthon-admin.js
+++ b/public/static/plugs/ulthon-admin/ulthon-admin.js
@@ -638,8 +638,7 @@
                     }
 
                     if (d.field !== false) {
-                        if(d.search !== false){
-
+                        if (d.search !== false) {
                             switch (d.search) {
                                 case true:
                                     formHtml += '\t<div class="layui-form-item layui-inline ' + formSearchHideClass + ' ">\n' +
@@ -652,7 +651,7 @@
                                 case 'select':
                                     d.searchOp = '=';
                                     var selectHtml = '';
-    
+
                                     $.each(d.selectList, function (sI, sV) {
                                         var selected = '';
                                         if (sI === d.searchValue) {
@@ -710,9 +709,9 @@
                                     break;
                             }
                             newCols.push(d);
-                        }else{
+                        } else {
                             // TODO：支持更多种类型的初始化，比如number_limit、time_limit
-                            formHtml += '<input type="hidden" name="' + d.fieldAlias + '" value="'+d.searchValue+'">'
+                            formHtml += '<input type="hidden" name="' + d.fieldAlias + '" value="' + d.searchValue + '">';
                         }
                     }
                 });
@@ -2073,16 +2072,35 @@
                 if (tableId === undefined || tableId === '' || tableId == null) {
                     tableId = init.tableRenderId;
                 }
-                var where = {
-                    filter: '{}',
-                    op: '{}'
-                };
-                table.reloadData(tableId, {
-                    page: {
-                        curr: 1
-                    }
-                    , where: where
-                }, 'data');
+
+                setTimeout(() => {
+                    var searchVals = form.val(tableId + '_filter_form');
+                    var dataField = searchVals;
+                    var formatFilter = {},
+                        formatOp = {};
+                    $.each(dataField, function (key, val) {
+                        if (val !== '') {
+                            formatFilter[key] = val;
+
+                            var elemId = admin.table.renderSearchFormItemElementId(key);
+
+                            var op = $('#c-' + elemId).attr('data-search-op');
+                            op = op || '%*%';
+                            formatOp[key] = op;
+                        }
+                    });
+
+                    var where = {
+                        filter: JSON.stringify(formatFilter),
+                        op: JSON.stringify(formatOp)
+                    };
+                    table.reloadData(tableId, {
+                        page: {
+                            curr: 1
+                        }
+                        , where: where
+                    }, 'data');
+                }, 100);
             });
 
             // 监听请求