Commit f77e7ce0 by 放生的三文鱼

修复未挂载的数据问题

parent 667a8890
......@@ -69,7 +69,7 @@ const FC = (props) => {
const [columns, tableData, total] = React.useMemo(() => {
let [newColumns, newTableData] = [[], []]
for (const element of filterElements??[]) {
const name = element.name
const column = {
......@@ -113,18 +113,17 @@ const FC = (props) => {
}
if (!loadingFilterElements) {
console.log(data?.data);
for (const item of (data?.data??[])) {
let index = 0
let newItem = {}
for (const elementValue of (item.elementValues??[])) {
for (const value of elementValue.values) {
for (const elementValue of (item.elementValuesWithoutTypeAttribute??[])) {
if ((newColumns??[]).length > index) {
const name = newColumns[index].dataIndex
newItem[name] = value
newItem[name] = elementValue
}
index++
}
}
newTableData.push({...item, ...newItem})
......
......@@ -203,7 +203,7 @@ const FilterElementModal = (props) => {
return (
<Col className='mb-3' key={_index} md={6}>
<div className='d-flex'>
<Checkbox checked={ selectedKeys.indexOf(element.id||'')!==-1 } value={element.id||''} onChange={onCheckChange} disabled={element.selectAble==='否'} >
<Checkbox checked={ selectedKeys.indexOf(element.id||'')!==-1 } value={element.id||''} onChange={onCheckChange} disabled={element.selectAble==='否'||element.defaultSelected==='是'} >
</Checkbox>
<Typography.Paragraph className='ml-1' title={element.name||''} ellipsis>
{element.name||''}
......
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