feat: 甘特图页面产品类型筛选改多选(MultiSelect + 后端 MultiCsvContains)
- delivery_dashboard.html: filterProductType 从单选改多选
复用已验证的 MultiSelect 组件(方案B:下拉+checkbox)
CSS + initMultiSelect 函数从 material_delivery.html 搬入
loadGantt / 卡片跳转 / loadProductTypes 全部适配多值 getMultiValues()
- 后端零改动:GetBoardGantt/GetGanttData 已支持 MultiCsvContains
- deploy_v8.js 补 Step 5.5:复制 View/*.html 到 E:\WebApi\View\
(之前只复制 DLL,HTML 变更不会被部署)
E2E 验证(生产):
productType 空 = 全部(15711 条)
productType=M4 → 5183 条
productType=S1.3 → 3080 条
productType=M4,S1.3 → 8263 条(= 5183+3080,OR 语义 ✅)
This commit is contained in:
1 parent
519b6cf470
commit
6dab7ce1b0
1 file changed
+203
-5
@@ -94,6 +94,35 @@ body { font-family: 'Microsoft YaHei','PingFang SC',sans-serif; background: #f3f
|
|||||||
.gantt-summary { margin-top: 10px; padding: 8px 12px; background: #f7f9fc; border-radius: 6px; font-size: 12px; color: #909399; line-height: 1.7; }
|
.gantt-summary { margin-top: 10px; padding: 8px 12px; background: #f7f9fc; border-radius: 6px; font-size: 12px; color: #909399; line-height: 1.7; }
|
||||||
|
|
||||||
.loading, .empty { text-align: center; padding: 50px 0; color: #909399; font-size: 14px; }
|
.loading, .empty { text-align: center; padding: 50px 0; color: #909399; font-size: 14px; }
|
||||||
|
|
||||||
|
/* ===== MultiSelect 多选下拉组件(方案B:下拉+checkbox)===== */
|
||||||
|
.ms-wrap{position:relative;display:inline-block;vertical-align:middle}
|
||||||
|
.ms-native{display:none}/* 隐藏原生select,保留id供JS取值 */
|
||||||
|
.ms-trigger{display:flex;align-items:center;justify-content:space-between;min-width:160px;padding:0 28px 0 10px;height:30px;background:#fff;border:1px solid #d9d9d9;border-radius:4px;font-size:13px;color:#333;cursor:pointer;user-select:none;transition:border-color .2s}
|
||||||
|
.ms-trigger:hover{border-color:#1890ff}
|
||||||
|
.ms-trigger.active{border-color:#1890ff;box-shadow:0 0 0 2px rgba(24,144,255,.15)}
|
||||||
|
.ms-trigger .ms-arrow{position:absolute;right:8px;top:50%;transform:translateY(-50%);width:0;height:0;border-left:4px solid transparent;border-right:4px solid transparent;border-top:5px solid #999;pointer-events:none}
|
||||||
|
.ms-trigger .ms-placeholder{color:#999}
|
||||||
|
.ms-trigger .ms-tags{display:flex;flex-wrap:wrap;gap:4px;margin-right:12px;max-width:260px}
|
||||||
|
.ms-trigger .ms-tag{display:inline-flex;align-items:center;gap:3px;background:#e6f4ff;color:#1890ff;padding:0 6px;height:20px;border-radius:3px;font-size:12px;line-height:1}
|
||||||
|
.ms-trigger .ms-tag .ms-tag-close{cursor:pointer;font-size:14px;line-height:1;margin-top:-1px}
|
||||||
|
.ms-trigger .ms-tag .ms-tag-close:hover{color:#096dd9}
|
||||||
|
.ms-trigger .ms-more{color:#999;font-size:12px;padding:0 4px}
|
||||||
|
.ms-dropdown{display:none;position:absolute;top:calc(100% + 4px);left:0;min-width:200px;max-height:280px;background:#fff;border:1px solid #e8e8e8;border-radius:6px;box-shadow:0 6px 16px rgba(0,0,0,.12);z-index:100;overflow:hidden}
|
||||||
|
.ms-dropdown.active{display:block}
|
||||||
|
.ms-search{padding:8px;border-bottom:1px solid #f0f0f0}
|
||||||
|
.ms-search input{width:100%;height:26px;padding:0 8px;border:1px solid #d9d9d9;border-radius:3px;font-size:12px;outline:none}
|
||||||
|
.ms-search input:focus{border-color:#1890ff}
|
||||||
|
.ms-options{max-height:220px;overflow-y:auto;padding:4px 0}
|
||||||
|
.ms-options label{display:flex;align-items:center;gap:8px;padding:5px 10px;cursor:pointer;font-size:13px;color:#333;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}
|
||||||
|
.ms-options label:hover{background:#f5f5f5}
|
||||||
|
.ms-options input[type=checkbox]{cursor:pointer}
|
||||||
|
.ms-footer{display:flex;justify-content:space-between;padding:6px 10px;border-top:1px solid #f0f0f0;font-size:12px}
|
||||||
|
.ms-footer .ms-btn{padding:2px 10px;border:1px solid #d9d9d9;border-radius:3px;background:#fff;cursor:pointer;color:#555}
|
||||||
|
.ms-footer .ms-btn:hover{border-color:#1890ff;color:#1890ff}
|
||||||
|
.ms-footer .ms-btn.primary{background:#1890ff;border-color:#1890ff;color:#fff}
|
||||||
|
.ms-footer .ms-btn.primary:hover{background:#096dd9}
|
||||||
|
/* ===== MultiSelect 结束 ===== */
|
||||||
</style>
|
</style>
|
||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
@@ -125,7 +154,7 @@ body { font-family: 'Microsoft YaHei','PingFang SC',sans-serif; background: #f3f
|
|||||||
|
|
||||||
<div class="toolbar">
|
<div class="toolbar">
|
||||||
<span>产品类型:</span>
|
<span>产品类型:</span>
|
||||||
<select id="filterProductType"><option value="">全部</option></select>
|
<select id="filterProductType" class="ms-native"><option value="">全部</option></select>
|
||||||
<span>风险:</span>
|
<span>风险:</span>
|
||||||
<select id="filterRisk">
|
<select id="filterRisk">
|
||||||
<option value="">全部</option>
|
<option value="">全部</option>
|
||||||
@@ -163,7 +192,6 @@ const DAY_WIDTH = 56; // 每天宽度(按截图样式,约56px/列)
|
|||||||
const ROW_HEIGHT = 50; // 每行高度
|
const ROW_HEIGHT = 50; // 每行高度
|
||||||
const HEAD_HEIGHT = 36; // 表头高度
|
const HEAD_HEIGHT = 36; // 表头高度
|
||||||
let autoRefreshTimer = null;
|
let autoRefreshTimer = null;
|
||||||
let currentProductType = '';
|
|
||||||
let currentRisk = '';
|
let currentRisk = '';
|
||||||
|
|
||||||
function parseDate(s) {
|
function parseDate(s) {
|
||||||
@@ -202,6 +230,8 @@ function loadProductTypes() {
|
|||||||
opt.value = t; opt.textContent = t;
|
opt.value = t; opt.textContent = t;
|
||||||
sel.appendChild(opt);
|
sel.appendChild(opt);
|
||||||
});
|
});
|
||||||
|
// MultiSelect 组件:options 注入后重建 checkbox DOM
|
||||||
|
if (sel.refreshMulti) sel.refreshMulti();
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -209,7 +239,10 @@ function loadProductTypes() {
|
|||||||
function loadGantt() {
|
function loadGantt() {
|
||||||
document.getElementById('ganttContainer').innerHTML = '<div class="loading">加载中...</div>';
|
document.getElementById('ganttContainer').innerHTML = '<div class="loading">加载中...</div>';
|
||||||
const params = new URLSearchParams();
|
const params = new URLSearchParams();
|
||||||
if (currentProductType) params.append('productType', currentProductType);
|
// 优先从 MultiSelect 组件读多值,fallback 原生 .value
|
||||||
|
const ptEl = document.getElementById('filterProductType');
|
||||||
|
const ptCsv = ptEl.getMultiValues ? ptEl.getMultiValues().join(',') : (ptEl.value || '');
|
||||||
|
if (ptCsv) params.append('productType', ptCsv);
|
||||||
if (currentRisk) params.append('risk', currentRisk);
|
if (currentRisk) params.append('risk', currentRisk);
|
||||||
fetch(API_BASE + '/GetBoardGantt?' + params).then(r => r.json()).then(res => {
|
fetch(API_BASE + '/GetBoardGantt?' + params).then(r => r.json()).then(res => {
|
||||||
if (!res.success) {
|
if (!res.success) {
|
||||||
@@ -418,12 +451,14 @@ document.querySelectorAll('.card').forEach(card => {
|
|||||||
const risk = card.dataset.risk;
|
const risk = card.dataset.risk;
|
||||||
const params = new URLSearchParams();
|
const params = new URLSearchParams();
|
||||||
if (risk) params.append('risk', risk);
|
if (risk) params.append('risk', risk);
|
||||||
if (currentProductType) params.append('productType', currentProductType);
|
// MultiSelect 多值 join 成逗号串
|
||||||
|
const ptEl = document.getElementById('filterProductType');
|
||||||
|
const ptCsv = ptEl.getMultiValues ? ptEl.getMultiValues().join(',') : (ptEl.value || '');
|
||||||
|
if (ptCsv) params.append('productType', ptCsv);
|
||||||
window.location.href = 'delivery_dashboard_risk.html?' + params.toString();
|
window.location.href = 'delivery_dashboard_risk.html?' + params.toString();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
document.getElementById('filterProductType').addEventListener('change', e => { currentProductType = e.target.value; loadGantt(); });
|
|
||||||
document.getElementById('filterRisk').addEventListener('change', e => { currentRisk = e.target.value; loadGantt(); });
|
document.getElementById('filterRisk').addEventListener('change', e => { currentRisk = e.target.value; loadGantt(); });
|
||||||
document.getElementById('btnRefresh').addEventListener('click', () => { loadSummary(); loadGantt(); });
|
document.getElementById('btnRefresh').addEventListener('click', () => { loadSummary(); loadGantt(); });
|
||||||
let autoOn = true;
|
let autoOn = true;
|
||||||
@@ -435,6 +470,169 @@ document.getElementById('btnAutoRefresh').addEventListener('click', e => {
|
|||||||
function startAuto() { stopAuto(); autoRefreshTimer = setInterval(() => { loadSummary(); loadGantt(); }, 600000); }
|
function startAuto() { stopAuto(); autoRefreshTimer = setInterval(() => { loadSummary(); loadGantt(); }, 600000); }
|
||||||
function stopAuto() { if (autoRefreshTimer) { clearInterval(autoRefreshTimer); autoRefreshTimer = null; } }
|
function stopAuto() { if (autoRefreshTimer) { clearInterval(autoRefreshTimer); autoRefreshTimer = null; } }
|
||||||
|
|
||||||
|
/* ===== MultiSelect 组件初始化(方案B:下拉+checkbox)===== */
|
||||||
|
function initMultiSelect(selectEl, placeholder){
|
||||||
|
var wrap=document.createElement('div');
|
||||||
|
wrap.className='ms-wrap';
|
||||||
|
var trigger=document.createElement('div');
|
||||||
|
trigger.className='ms-trigger';
|
||||||
|
trigger.innerHTML='<span class="ms-tags"></span><span class="ms-placeholder">'+placeholder+'</span><span class="ms-arrow"></span>';
|
||||||
|
var dropdown=document.createElement('div');
|
||||||
|
dropdown.className='ms-dropdown';
|
||||||
|
var searchWrap=document.createElement('div');searchWrap.className='ms-search';
|
||||||
|
var searchInput=document.createElement('input');searchInput.type='text';searchInput.placeholder='搜索...';
|
||||||
|
searchWrap.appendChild(searchInput);
|
||||||
|
var optionsWrap=document.createElement('div');optionsWrap.className='ms-options';
|
||||||
|
var footer=document.createElement('div');footer.className='ms-footer';
|
||||||
|
footer.innerHTML='<button class="ms-btn" data-action="clear">清空</button><button class="ms-btn primary" data-action="ok">确定</button>';
|
||||||
|
dropdown.appendChild(searchWrap);dropdown.appendChild(optionsWrap);dropdown.appendChild(footer);
|
||||||
|
|
||||||
|
wrap.appendChild(trigger);wrap.appendChild(dropdown);
|
||||||
|
selectEl.parentNode.insertBefore(wrap, selectEl);
|
||||||
|
|
||||||
|
// 读原生 options 构建 checkbox 列表
|
||||||
|
var origOptions=selectEl.querySelectorAll('option');
|
||||||
|
var listItems=[];
|
||||||
|
origOptions.forEach(function(opt){
|
||||||
|
if(!opt.value)return;// 跳过"全部"空值
|
||||||
|
var lbl=document.createElement('label');
|
||||||
|
var cb=document.createElement('input');cb.type='checkbox';cb.value=opt.value;
|
||||||
|
var txt=document.createElement('span');txt.textContent=opt.textContent;
|
||||||
|
lbl.appendChild(cb);lbl.appendChild(txt);
|
||||||
|
optionsWrap.appendChild(lbl);
|
||||||
|
listItems.push({cb:cb,txt:txt,label:lbl});
|
||||||
|
});
|
||||||
|
|
||||||
|
function getSelectedValues(){
|
||||||
|
return listItems.filter(i=>i.cb.checked).map(i=>i.cb.value);
|
||||||
|
}
|
||||||
|
var _msDebounce=null;
|
||||||
|
function triggerAutoSearch(){
|
||||||
|
if(_msDebounce)clearTimeout(_msDebounce);
|
||||||
|
_msDebounce=setTimeout(function(){loadGantt();},300);
|
||||||
|
}
|
||||||
|
function renderTags(){
|
||||||
|
var vals=getSelectedValues();
|
||||||
|
var tagsSpan=trigger.querySelector('.ms-tags');
|
||||||
|
var ph=trigger.querySelector('.ms-placeholder');
|
||||||
|
if(vals.length===0){
|
||||||
|
tagsSpan.innerHTML='';ph.style.display='inline';ph.textContent=placeholder;
|
||||||
|
trigger.style.minWidth='160px';
|
||||||
|
}else{
|
||||||
|
ph.style.display='none';
|
||||||
|
if(vals.length<=2){
|
||||||
|
tagsSpan.innerHTML=vals.map(function(v){
|
||||||
|
var label=selectEl.querySelector('option[value="'+v+'"]');
|
||||||
|
var txt=label?label.textContent:v;
|
||||||
|
return '<span class="ms-tag">'+txt+'<span class="ms-tag-close" data-val="'+v+'">×</span></span>';
|
||||||
|
}).join('');
|
||||||
|
}else{
|
||||||
|
var shown=vals.slice(0,1);
|
||||||
|
var hidden=vals.length-1;
|
||||||
|
tagsSpan.innerHTML='<span class="ms-tag">'+(selectEl.querySelector('option[value="'+shown[0]+'"]')?.textContent||shown[0])+'<span class="ms-tag-close" data-val="'+shown[0]+'">×</span></span><span class="ms-more">+'+hidden+'</span>';
|
||||||
|
}
|
||||||
|
}
|
||||||
|
trigger.style.minWidth='';
|
||||||
|
}
|
||||||
|
|
||||||
|
// 点 trigger 打开
|
||||||
|
trigger.addEventListener('click',function(e){
|
||||||
|
e.stopPropagation();
|
||||||
|
// 关闭其他
|
||||||
|
document.querySelectorAll('.ms-dropdown.active').forEach(function(d){if(d!==dropdown)d.classList.remove('active');document.querySelectorAll('.ms-trigger.active').forEach(function(t){t.classList.remove('active')});});
|
||||||
|
dropdown.classList.toggle('active');
|
||||||
|
trigger.classList.toggle('active');
|
||||||
|
if(dropdown.classList.contains('active')){
|
||||||
|
searchInput.focus();searchInput.value='';
|
||||||
|
listItems.forEach(function(i){i.label.style.display=''});
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// 搜索
|
||||||
|
searchInput.addEventListener('input',function(){
|
||||||
|
var q=searchInput.value.toLowerCase();
|
||||||
|
listItems.forEach(function(i){
|
||||||
|
if(!q||i.txt.textContent.toLowerCase().indexOf(q)>=0)i.label.style.display='';
|
||||||
|
else i.label.style.display='none';
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
// checkbox 变更 → 防抖自动筛选
|
||||||
|
listItems.forEach(function(i){
|
||||||
|
i.cb.addEventListener('change',function(){renderTags();triggerAutoSearch();});
|
||||||
|
});
|
||||||
|
|
||||||
|
// tag 里的 × 关闭
|
||||||
|
wrap.addEventListener('click',function(e){
|
||||||
|
var close=e.target.closest('.ms-tag-close');
|
||||||
|
if(close){
|
||||||
|
e.stopPropagation();
|
||||||
|
var v=close.getAttribute('data-val');
|
||||||
|
var item=listItems.find(function(x){return x.cb.value===v});
|
||||||
|
if(item){item.cb.checked=false;renderTags();triggerAutoSearch();}
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// footer 按钮
|
||||||
|
footer.addEventListener('click',function(e){
|
||||||
|
var btn=e.target.closest('.ms-btn');if(!btn)return;
|
||||||
|
if(btn.getAttribute('data-action')==='clear'){
|
||||||
|
listItems.forEach(function(i){i.cb.checked=false;});
|
||||||
|
renderTags();triggerAutoSearch();
|
||||||
|
dropdown.classList.remove('active');trigger.classList.remove('active');
|
||||||
|
}else if(btn.getAttribute('data-action')==='ok'){
|
||||||
|
dropdown.classList.remove('active');trigger.classList.remove('active');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// 点外面关闭
|
||||||
|
document.addEventListener('click',function(e){
|
||||||
|
if(!wrap.contains(e.target)){
|
||||||
|
dropdown.classList.remove('active');trigger.classList.remove('active');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// 提供 reset 方法供外部调用
|
||||||
|
selectEl.resetMulti=function(){listItems.forEach(function(i){i.cb.checked=false;});renderTags();triggerAutoSearch();};
|
||||||
|
// 提供 setValues 供 loadOptions 后回填
|
||||||
|
selectEl.setValuesMulti=function(csv){
|
||||||
|
var arr=(csv||'').split(',').filter(Boolean);
|
||||||
|
listItems.forEach(function(i){i.cb.checked=arr.indexOf(i.cb.value)>=0;});
|
||||||
|
renderTags();
|
||||||
|
};
|
||||||
|
// loadGantt 优先调用这个(数组),绕过原生 select .value
|
||||||
|
selectEl.getMultiValues=function(){return getSelectedValues();};
|
||||||
|
|
||||||
|
// 刷新 options(当原生 select innerHTML 被动态更新后调用,如 loadProductTypes 回调)
|
||||||
|
selectEl.refreshMulti=function(){
|
||||||
|
var saved=getSelectedValues();// 先保存当前选中值
|
||||||
|
optionsWrap.innerHTML='';
|
||||||
|
listItems=[];
|
||||||
|
origOptions=selectEl.querySelectorAll('option');
|
||||||
|
origOptions.forEach(function(opt){
|
||||||
|
if(!opt.value)return;
|
||||||
|
var lbl=document.createElement('label');
|
||||||
|
var cb=document.createElement('input');cb.type='checkbox';cb.value=opt.value;
|
||||||
|
var txt=document.createElement('span');txt.textContent=opt.textContent;
|
||||||
|
lbl.appendChild(cb);lbl.appendChild(txt);
|
||||||
|
optionsWrap.appendChild(lbl);
|
||||||
|
listItems.push({cb:cb,txt:txt,label:lbl});
|
||||||
|
});
|
||||||
|
listItems.forEach(function(i){
|
||||||
|
i.cb.addEventListener('change',function(){renderTags();triggerAutoSearch();});
|
||||||
|
});
|
||||||
|
// 恢复之前的选中值
|
||||||
|
listItems.forEach(function(i){i.cb.checked=saved.indexOf(i.cb.value)>=0;});
|
||||||
|
renderTags();
|
||||||
|
};
|
||||||
|
|
||||||
|
renderTags();
|
||||||
|
return selectEl;
|
||||||
|
}
|
||||||
|
|
||||||
|
// 初始化 MultiSelect(在原生 options 注入前先搭好组件骨架)
|
||||||
|
initMultiSelect(document.getElementById('filterProductType'),'产品类型:全部');
|
||||||
|
|
||||||
loadSummary();
|
loadSummary();
|
||||||
loadProductTypes();
|
loadProductTypes();
|
||||||
loadGantt();
|
loadGantt();
|
||||||
|
|||||||
Reference in new issue
Block a user