Commit db66e95a authored by 李纪文's avatar 李纪文

fix: 修改

parent e97926fe
...@@ -24,7 +24,7 @@ const treeDataGenerator = (origin, currentType, ref) => { ...@@ -24,7 +24,7 @@ const treeDataGenerator = (origin, currentType, ref) => {
<div <div
title={title} title={title}
style={{ style={{
width: _width, // width: _width,
overflow: 'hidden', overflow: 'hidden',
whiteSpace: 'nowrap', whiteSpace: 'nowrap',
textOverflow: 'ellipsis', textOverflow: 'ellipsis',
......
...@@ -10,11 +10,21 @@ ...@@ -10,11 +10,21 @@
&-tree-wrap { &-tree-wrap {
height: calc(100% - 48px); height: calc(100% - 48px);
overflow: auto; overflow: auto;
padding-right: 4px;
} }
:global {
.@{ant-prefix}-input-search { .@{ant-prefix}-input-search {
margin-bottom: 16px; margin-bottom: 16px;
} }
.@{ant-prefix}-tree {
&-treenode {
overflow: hidden;
width: 100%;
}
&-node-content-wrapper {
overflow: hidden;
}
} }
} }
\ No newline at end of file
...@@ -234,9 +234,16 @@ const QuotaSelect = ({ ...@@ -234,9 +234,16 @@ const QuotaSelect = ({
setSearch(e.target.value); setSearch(e.target.value);
if (e.target.value !== '') { if (e.target.value !== '') {
let newQuotaList = []; let newQuotaList = [];
quotaList.forEach((item) => { allQuotaList.forEach((item) => {
if (!item.sensorName) return; if (!item.sensorName) return;
if (item.sensorName.indexOf(e.target.value) > -1) newQuotaList.push(item); if (item.sensorName.indexOf(e.target.value) > -1) {
if (targetValue === 'all') {
newQuotaList.push(item);
} else {
if (item.isShow === 1 && item.sensorName.indexOf(search) >= 0)
newQuotaList.push(item);
}
}
}); });
setQuotaList(newQuotaList); setQuotaList(newQuotaList);
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment