From e07acf3e3f8beda6eefd4fb4490807d961595d6c Mon Sep 17 00:00:00 2001 From: weizhiqiang <598748873@qq.com> Date: Thu, 14 Jul 2022 23:04:43 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E9=AB=98=E7=BA=A7=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E3=80=91=E9=9D=99=E6=80=81=E9=A1=B5=E9=9D=A2=E7=89=88=E5=AE=8C?= =?UTF-8?q?=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../template/js/syseverole/syseverolelist.js | 14 ++- .../customer/tableUtil/initTableSearchUtil.js | 108 +++++++++++++++--- .../lib/winui/css/customer/search-table.css | 18 +++ 3 files changed, 117 insertions(+), 23 deletions(-) diff --git a/userauth/src/main/resources/template/js/syseverole/syseverolelist.js b/userauth/src/main/resources/template/js/syseverole/syseverolelist.js index 38c2e1ff2..0ea411107 100644 --- a/userauth/src/main/resources/template/js/syseverole/syseverolelist.js +++ b/userauth/src/main/resources/template/js/syseverole/syseverolelist.js @@ -36,14 +36,16 @@ layui.config({ matchingLanguage(); var searchParams = { "roleName": { - "type": "input", + "dataType": "input", "searchCondition": [{ - "value": "<", - "title": "小于" + "operator": "<", + "operatorName": "小于" }] } }; - initTableSearchUtil.initAdvancedSearch(this, searchParams, form); + initTableSearchUtil.initAdvancedSearch(this, searchParams, form, function () { + table.reload("messageTable", {page: {curr: 1}, where: getTableParams()}); + }); } }); @@ -139,9 +141,9 @@ layui.config({ } function getTableParams() { - return { + return $.extend(true, { roleName: $("#roleName").val() - }; + }, initTableSearchUtil.getSearchValue("messageTable")); } exports('syseverolelist', {}); diff --git a/web/src/main/resources/template/assets/lib/layui/customer/tableUtil/initTableSearchUtil.js b/web/src/main/resources/template/assets/lib/layui/customer/tableUtil/initTableSearchUtil.js index 9f1993d0a..c3b3576ac 100644 --- a/web/src/main/resources/template/assets/lib/layui/customer/tableUtil/initTableSearchUtil.js +++ b/web/src/main/resources/template/assets/lib/layui/customer/tableUtil/initTableSearchUtil.js @@ -17,16 +17,23 @@ var initTableSearchUtil = { * @param $table 表格对象 * @param searchParams 高级查询的参数 * @param form form表单对象 + * @param callback 搜索条件点击确定时的回调，用来刷新表格 */ - initAdvancedSearch: function ($table, searchParams, form) { + initAdvancedSearch: function ($table, searchParams, form, callback) { + var tableId = $table.id; // 同一个表格只加载一次 - if(isNull(initTableSearchUtil.tableMap[$table.id])){ - initTableSearchUtil.tableMap[$table.id] = { + if(isNull(initTableSearchUtil.tableMap[tableId])){ + initTableSearchUtil.tableMap[tableId] = { table: $table, - searchParams: searchParams + searchParams: searchParams, + callback: callback }; + // 加载筛选条件展示框 + $("div[lay-id='" + tableId + "']").parent().prepend(''); + // 初始化监听事件 + initTableSearchUtil.initEvent(form); } - initTableSearchUtil.loadSearchSign($table.id, searchParams, form); + initTableSearchUtil.loadSearchSign(tableId, searchParams, form); }, /** @@ -48,10 +55,6 @@ var initTableSearchUtil = { } }); }); - // 初始化监听事件 - initTableSearchUtil.initEvent(form); - // 加载筛选条件展示框 - $("div[lay-id='" + tableId + "']").parent().prepend(''); }, /** @@ -109,7 +112,7 @@ var initTableSearchUtil = { var searchCondition = searchParam.searchCondition; var options = ""; $.each(searchCondition, function (i, item) { - options += ''; + options += ''; }); return options; }, @@ -121,7 +124,7 @@ var initTableSearchUtil = { * @param searchParam 高级查询的参数 */ getFormUnit: function (fieldId, searchParam) { - var type = searchParam.type; + var type = searchParam.dataType; if (type === 'input') { return ''; } @@ -134,12 +137,33 @@ var initTableSearchUtil = { * @param searchParam 高级查询的参数 */ getFormUnitValue: function (fieldId, searchParam) { - var type = searchParam.type; + var type = searchParam.dataType; if (type === 'input') { return $("#" + fieldId).val(); } }, + /** + * 回显筛选值 + * + * @param tableId 表格id + * @param fieldId 字段列id + * @param searchParam 高级查询的参数 + */ + resetFormDefaultValue: function (tableId, fieldId, searchParam) { + // 判断是否有筛选历史，如果有，则回显 + var tableChooseMap = isNull(initTableSearchUtil.chooseMap[tableId]) ? {} : initTableSearchUtil.chooseMap[tableId]; + var confimValue = tableChooseMap[fieldId]; + if (!isNull(confimValue)) { + $("#sel" + fieldId).val(confimValue.operator); + + var type = searchParam.dataType; + if (type === 'input') { + return $("#" + fieldId).val(confimValue.value); + } + } + }, + /** * 初始化监听事件 * @@ -161,6 +185,9 @@ var initTableSearchUtil = { // 设置位置 $("#searchBox").css("left", $(this).offset().left - 5); $("#searchBox").css("top", $(this).offset().top + $(this).outerHeight()); + + // 设置默认值 + initTableSearchUtil.resetFormDefaultValue(tableId, fieldId, paramConfig); form.render(); // 点击空白处，下拉框隐藏-------开始 @@ -187,12 +214,19 @@ var initTableSearchUtil = { var tableId = $(this).attr("table-id"); var fieldId = $(this).attr("field-id"); var paramConfig = initTableSearchUtil.getPointSearchParams(tableId, fieldId); + + var chooseValue = initTableSearchUtil.getFormUnitValue(fieldId, paramConfig); + if (isNull(chooseValue)) { + winui.window.msg('请输入筛选值.', {icon: 2, time: 2000}); + return false; + } + // 点击确定获取值 var confimValue = { "fieldName": $(this).attr("field-name"), "operator": $("#sel" + fieldId).val(), "operatorName": $("#sel" + fieldId).find("option:selected").text(), - "value": initTableSearchUtil.getFormUnitValue(fieldId, paramConfig) + "value": chooseValue }; var tableChooseMap = isNull(initTableSearchUtil.chooseMap[tableId]) ? {} : initTableSearchUtil.chooseMap[tableId]; @@ -202,7 +236,24 @@ var initTableSearchUtil = { // 移除选择框 $("#searchBox").remove(); // 展示筛选内容 - initTableSearchUtil.loadChooseHtml(tableId); + initTableSearchUtil.loadChooseHtml(tableId, fieldId); + // 加载回调函数 + var mation = initTableSearchUtil.tableMap[tableId]; + if (typeof (mation.callback) == "function") { + mation.callback(); + } + }); + + // 删除筛选条件 + $("body").on("click", ".search-del", function (e) { + var tableId = $(this).attr("table-id"); + var fieldId = $(this).attr("field-id"); + + var tableChooseMap = isNull(initTableSearchUtil.chooseMap[tableId]) ? {} : initTableSearchUtil.chooseMap[tableId]; + delete tableChooseMap[fieldId]; + initTableSearchUtil.chooseMap[tableId] = tableChooseMap; + + $(this).parent().remove(); }); }, @@ -211,18 +262,21 @@ var initTableSearchUtil = { * 加载选中列筛选条件的内容 * * @param tableId 表格id + * @param fieldId 字段列id */ - loadChooseHtml: function (tableId) { + loadChooseHtml: function (tableId, fieldId) { var tableChooseMap = isNull(initTableSearchUtil.chooseMap[tableId]) ? {} : initTableSearchUtil.chooseMap[tableId]; var str = ""; $.each(tableChooseMap, function (key, value) { - str += '' + value.fieldName + ' ' + value.operatorName + ' ' + value.value + ''; + str += '' + value.fieldName + ' ' + value.operatorName + ' ' + value.value + '' + + 'ဆ' + + ''; }); $("#filter" + tableId).html(str); }, /** - * 获取指定表格，指定列的筛选条件信息 + * 获取指定表格以及指定列的筛选条件信息 * * @param tableId 表格id * @param fieldId 字段列id @@ -239,6 +293,26 @@ var initTableSearchUtil = { } }); return result; + }, + + /** + * 获取搜索内容进行表格刷新 + * + * @param tableId 表格id + */ + getSearchValue: function (tableId) { + var tableChooseMap = isNull(initTableSearchUtil.chooseMap[tableId]) ? {} : initTableSearchUtil.chooseMap[tableId]; + var searchCondition = []; + $.each(tableChooseMap, function (key, confimValue) { + searchCondition.push({ + "attributeKey": key, + "operator": confimValue.operator, + "attributeValue": confimValue.value + }); + }); + return { + "dynamicCondition": JSON.stringify(searchCondition) + }; } } diff --git a/web/src/main/resources/template/assets/lib/winui/css/customer/search-table.css b/web/src/main/resources/template/assets/lib/winui/css/customer/search-table.css index da0a32da6..7cef531ea 100644 --- a/web/src/main/resources/template/assets/lib/winui/css/customer/search-table.css +++ b/web/src/main/resources/template/assets/lib/winui/css/customer/search-table.css @@ -10,6 +10,24 @@ .filter-search-box{ width: 100%; + padding-top: 7px; +} + +.filter-search-box .skyeye-badge { + margin-bottom: 0px; + background-color: #d9e7f9 !important; + border: 1px solid rgba(0,0,0,.07); + color: #2f73c8 !important; + padding: 5px 5px; + font-size: 12px; + margin-top: 5px; + margin-left: 5px; +} + +.filter-search-box .skyeye-badge .layui-tab-close { + margin-left: 5px; + font-size: 14px; + cursor: pointer; } .search-form { -- GitLab