From 1fdcd74956f95d6260f47ccf6bd41e83f38fb37a Mon Sep 17 00:00:00 2001
From: augushong <augushong@163.com>
Date: Wed, 23 Apr 2025 14:33:29 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=94=AF=E6=8C=81=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E4=B8=BAsearch=EF=BC=9Afalse=E6=97=B6=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E5=8C=96=E6=97=B6=E4=BC=A0=E5=85=A5=E7=9A=84=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=8C=81=E4=B9=85=E7=9A=84=E4=BF=9D=E7=95=99?=
 =?UTF-8?q?=E5=9C=A8=E8=A1=A8=E5=8D=95=E4=B8=AD=EF=BC=8C=E5=90=A6=E5=88=99?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E4=B9=8B=E5=90=8E=E5=88=9D=E5=A7=8B=E5=8C=96?=
 =?UTF-8?q?=E7=9A=84=E6=90=9C=E7=B4=A2=E9=A1=B9=E4=BC=9A=E4=B8=A2=E5=A4=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../static/plugs/ulthon-admin/ulthon-admin.js | 144 +++++++++---------
 1 file changed, 75 insertions(+), 69 deletions(-)

diff --git a/public/static/plugs/ulthon-admin/ulthon-admin.js b/public/static/plugs/ulthon-admin/ulthon-admin.js
index 1bef735..b2c0b02 100644
--- a/public/static/plugs/ulthon-admin/ulthon-admin.js
+++ b/public/static/plugs/ulthon-admin/ulthon-admin.js
@@ -637,77 +637,83 @@
                         d.searchValue = '';
                     }
 
-                    if (d.field !== false && d.search !== false) {
-                        switch (d.search) {
-                            case true:
-                                formHtml += '\t<div class="layui-form-item layui-inline ' + formSearchHideClass + ' ">\n' +
-                                    '<label class="layui-form-label">' + d.title + '</label>\n' +
-                                    '<div class="layui-input-inline">\n' +
-                                    '<input id="c-' + d.elemIdName + '" name="' + d.fieldAlias + '" data-search-op="' + d.searchOp + '" value="' + d.searchValue + '" placeholder="' + d.searchTip + '" class="layui-input">\n' +
-                                    '</div>\n' +
-                                    '</div>';
-                                break;
-                            case 'select':
-                                d.searchOp = '=';
-                                var selectHtml = '';
+                    if (d.field !== false) {
+                        if(d.search !== false){
 
-                                $.each(d.selectList, function (sI, sV) {
-                                    var selected = '';
-                                    if (sI === d.searchValue) {
-                                        selected = 'selected=""';
-                                    }
-                                    selectHtml += '<option value="' + sI + '" ' + selected + '>' + sV + '</option>/n';
-                                });
-                                formHtml += '\t<div class="layui-form-item layui-inline ' + formSearchHideClass + ' ">\n' +
-                                    '<label class="layui-form-label">' + d.title + '</label>\n' +
-                                    '<div class="layui-input-inline">\n' +
-                                    '<select class="layui-select" id="c-' + d.elemIdName + '" name="' + d.fieldAlias + '"  data-search-op="' + d.searchOp + '" >\n' +
-                                    '<option value="">- 全部 -</option> \n' +
-                                    selectHtml +
-                                    '</select>\n' +
-                                    '</div>\n' +
-                                    '</div>';
-                                break;
-                            case 'range':
-                                d.searchOp = 'range';
-                                formHtml += '\t<div class="layui-form-item layui-inline ' + formSearchHideClass + ' ">\n' +
-                                    '<label class="layui-form-label">' + d.title + '</label>\n' +
-                                    '<div class="layui-input-inline">\n' +
-                                    '<input id="c-' + d.elemIdName + '" name="' + d.fieldAlias + '"  data-search-op="' + d.searchOp + '"  value="' + d.searchValue + '" placeholder="' + d.searchTip + '" class="layui-input">\n' +
-                                    '</div>\n' +
-                                    '</div>';
-                                break;
-                            case 'time':
-                                d.searchOp = '=';
-                                formHtml += '\t<div class="layui-form-item layui-inline ' + formSearchHideClass + ' ">\n' +
-                                    '<label class="layui-form-label">' + d.title + '</label>\n' +
-                                    '<div class="layui-input-inline">\n' +
-                                    '<input id="c-' + d.elemIdName + '" name="' + d.fieldAlias + '"  data-search-op="' + d.searchOp + '"  value="' + d.searchValue + '" placeholder="' + d.searchTip + '" class="layui-input">\n' +
-                                    '</div>\n' +
-                                    '</div>';
-                                break;
-                            case 'time_limit':
-                                d.searchOp = '=';
-                                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="' + 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;
-                            case 'number_limit':
-                                d.searchOp = '=';
-                                formHtml += '\t<div class="layui-form-item form-item-number-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" name="[' + d.fieldAlias + ']min"  data-search-op="min" type="text" value="' + a + '" placeholder="最小值" class="layui-input">\n' +
-                                    '<input id="c-' + d.elemIdName + '-max" name="[' + d.fieldAlias + ']max"  data-search-op="max" type="text" value="' + b + '" placeholder="最大值" class="layui-input">\n' +
-                                    '</div>\n' +
-                                    '</div>';
-                                break;
+                            switch (d.search) {
+                                case true:
+                                    formHtml += '\t<div class="layui-form-item layui-inline ' + formSearchHideClass + ' ">\n' +
+                                        '<label class="layui-form-label">' + d.title + '</label>\n' +
+                                        '<div class="layui-input-inline">\n' +
+                                        '<input id="c-' + d.elemIdName + '" name="' + d.fieldAlias + '" data-search-op="' + d.searchOp + '" value="' + d.searchValue + '" placeholder="' + d.searchTip + '" class="layui-input">\n' +
+                                        '</div>\n' +
+                                        '</div>';
+                                    break;
+                                case 'select':
+                                    d.searchOp = '=';
+                                    var selectHtml = '';
+    
+                                    $.each(d.selectList, function (sI, sV) {
+                                        var selected = '';
+                                        if (sI === d.searchValue) {
+                                            selected = 'selected=""';
+                                        }
+                                        selectHtml += '<option value="' + sI + '" ' + selected + '>' + sV + '</option>/n';
+                                    });
+                                    formHtml += '\t<div class="layui-form-item layui-inline ' + formSearchHideClass + ' ">\n' +
+                                        '<label class="layui-form-label">' + d.title + '</label>\n' +
+                                        '<div class="layui-input-inline">\n' +
+                                        '<select class="layui-select" id="c-' + d.elemIdName + '" name="' + d.fieldAlias + '"  data-search-op="' + d.searchOp + '" >\n' +
+                                        '<option value="">- 全部 -</option> \n' +
+                                        selectHtml +
+                                        '</select>\n' +
+                                        '</div>\n' +
+                                        '</div>';
+                                    break;
+                                case 'range':
+                                    d.searchOp = 'range';
+                                    formHtml += '\t<div class="layui-form-item layui-inline ' + formSearchHideClass + ' ">\n' +
+                                        '<label class="layui-form-label">' + d.title + '</label>\n' +
+                                        '<div class="layui-input-inline">\n' +
+                                        '<input id="c-' + d.elemIdName + '" name="' + d.fieldAlias + '"  data-search-op="' + d.searchOp + '"  value="' + d.searchValue + '" placeholder="' + d.searchTip + '" class="layui-input">\n' +
+                                        '</div>\n' +
+                                        '</div>';
+                                    break;
+                                case 'time':
+                                    d.searchOp = '=';
+                                    formHtml += '\t<div class="layui-form-item layui-inline ' + formSearchHideClass + ' ">\n' +
+                                        '<label class="layui-form-label">' + d.title + '</label>\n' +
+                                        '<div class="layui-input-inline">\n' +
+                                        '<input id="c-' + d.elemIdName + '" name="' + d.fieldAlias + '"  data-search-op="' + d.searchOp + '"  value="' + d.searchValue + '" placeholder="' + d.searchTip + '" class="layui-input">\n' +
+                                        '</div>\n' +
+                                        '</div>';
+                                    break;
+                                case 'time_limit':
+                                    d.searchOp = '=';
+                                    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="' + 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;
+                                case 'number_limit':
+                                    d.searchOp = '=';
+                                    formHtml += '\t<div class="layui-form-item form-item-number-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" name="[' + d.fieldAlias + ']min"  data-search-op="min" type="text" value="' + a + '" placeholder="最小值" class="layui-input">\n' +
+                                        '<input id="c-' + d.elemIdName + '-max" name="[' + d.fieldAlias + ']max"  data-search-op="max" type="text" value="' + b + '" placeholder="最大值" class="layui-input">\n' +
+                                        '</div>\n' +
+                                        '</div>';
+                                    break;
+                            }
+                            newCols.push(d);
+                        }else{
+                            // TODO：支持更多种类型的初始化，比如number_limit、time_limit
+                            formHtml += '<input type="hidden" name="' + d.fieldAlias + '" value="'+d.searchValue+'">'
                         }
-                        newCols.push(d);
                     }
                 });