diff --git a/public/static/plugs/lay-module/switchSelect/switchSelect.css b/public/static/plugs/lay-module/switchSelect/switchSelect.css index 1e859a3..2c72187 100644 --- a/public/static/plugs/lay-module/switchSelect/switchSelect.css +++ b/public/static/plugs/lay-module/switchSelect/switchSelect.css @@ -4,6 +4,7 @@ .layui-switch-select .radio-container { border: 1px solid #eee; + padding: 0 5px; } .layui-switch-select .toggle-dots { @@ -36,4 +37,8 @@ .layui-switch-select .toggle-hidden { display: none !important; +} + +.layui-form-pane .layui-switch-select .radio-container { + padding: 0; } \ No newline at end of file diff --git a/public/static/plugs/lay-module/switchSelect/switchSelect.js b/public/static/plugs/lay-module/switchSelect/switchSelect.js index f093340..55d5dcb 100644 --- a/public/static/plugs/lay-module/switchSelect/switchSelect.js +++ b/public/static/plugs/lay-module/switchSelect/switchSelect.js @@ -52,7 +52,7 @@ layui.define(['form'], function (exports) {
${this.generateRadioHtml()}
- ${this.generateSelectHtml()}
@@ -69,7 +69,7 @@ layui.define(['form'], function (exports) { let html = ''; $.map(this.config.data, (item, index) => { let checked = index == this.config.default ? 'checked' : ''; - html += `\n\n`; + html += `\n\n`; }); return html; }, @@ -117,16 +117,21 @@ layui.define(['form'], function (exports) { }); // 监听单选按钮变化 - form.on('radio(switchSelectFilter)', function (data) { - let value = data.value; - elem.find(`select[name="${that.config.name}"]`).val(value); + form.on('radio', function (data) { + let that = $(this); + let name = $(data.elem).attr('name') + if (that.attr('lay-filter') !== `switchSelectFilter_${name}`) return; + let value = $(data.elem).val() + elem.find(`select[name="${name}"]`).val(value); form.render('select'); }); // 监听下拉框变化 - form.on('select(selectFilter)', function (data) { - let value = data.value; - elem.find(`input[name="${that.config.name}"][value="${value}"]`).prop('checked', true); + form.on('select', function (data) { + let name = $(data.elem).attr('name') + if ($(data.elem).attr('lay-filter') !== `switchSelectFilter_${name}`) return; + let value = $(data.elem).val() + elem.find(`input[name="${name}"][value="${value}"]`).prop('checked', true); form.render('radio'); }); },