Commit 7bbee9a2 authored by 邓超's avatar 邓超

fix: 修改表管理类型为动态

parent 0044845e
Pipeline #65327 passed with stages
...@@ -282,7 +282,7 @@ const EditableCell = ({ ...@@ -282,7 +282,7 @@ const EditableCell = ({
return <td {...restProps}>{childNode}</td>; return <td {...restProps}>{childNode}</td>;
}; };
const TableView = props => { const TableView = props => {
const { callBackSubmit, onCancel, visible, type, formObj, tableType } = props; const { callBackSubmit, onCancel, visible, type, formObj, tableType, defaultFieldsList } = props;
const [dataSource, setDataSource] = useState([]); const [dataSource, setDataSource] = useState([]);
const [count, setCount] = useState(0); const [count, setCount] = useState(0);
const [loading, setLoading] = useState(false); const [loading, setLoading] = useState(false);
...@@ -339,22 +339,16 @@ const TableView = props => { ...@@ -339,22 +339,16 @@ const TableView = props => {
notification.error({ message: '提示', duration: 3, description: '网络异常' }); notification.error({ message: '提示', duration: 3, description: '网络异常' });
}); });
} else { } else {
let list = []; let list = defaultFieldsList
GetDefaultTableFields().then(res => { .find(item => item.value === tableType)
console.log(res.data); .list.map((item, i) => ({ ...item, keyIndex: i }));
res.data.forEach(item => { console.log(list);
if (item.value === tableType) { setDefaultData(list);
list = item.list.map((val, index) => ({ ...val, keyIndex: index })); setCount(list.length);
} setShowDefault(false);
}); let listitem = JSON.parse(JSON.stringify(list));
console.log(list); listitem = listitem.filter(item => !item.ReadOnly);
setDefaultData(list); setDataSource(listitem);
setCount(list.length);
setShowDefault(false);
let listitem = JSON.parse(JSON.stringify(list));
listitem = listitem.filter(item => !item.ReadOnly);
setDataSource(listitem);
});
} }
} else { } else {
setShowDefault(false); setShowDefault(false);
...@@ -543,7 +537,6 @@ const TableView = props => { ...@@ -543,7 +537,6 @@ const TableView = props => {
align: 'center', align: 'center',
render: (text, record) => ( render: (text, record) => (
<> <>
{console.log(record)}
<span>{text}</span> <span>{text}</span>
{record.IsIndex && ( {record.IsIndex && (
<img src={index} style={{ height: '25px', marginLeft: '5px' }} alt="" /> <img src={index} style={{ height: '25px', marginLeft: '5px' }} alt="" />
......
...@@ -18,6 +18,7 @@ import { ...@@ -18,6 +18,7 @@ import {
Dropdown, Dropdown,
Menu, Menu,
Modal, Modal,
message,
} from 'antd'; } from 'antd';
import { import {
EditOutlined, EditOutlined,
...@@ -43,6 +44,7 @@ import { ...@@ -43,6 +44,7 @@ import {
loadUnattachedTables, loadUnattachedTables,
checkTableType, checkTableType,
regroupTableType, regroupTableType,
GetDefaultTableFields,
} from '@/services/tablemanager/tablemanager'; } from '@/services/tablemanager/tablemanager';
import { useHistory } from 'react-router-dom'; import { useHistory } from 'react-router-dom';
import { Ellipse } from 'bizcharts/lib/g-components'; import { Ellipse } from 'bizcharts/lib/g-components';
...@@ -53,7 +55,7 @@ import AddTablelList from './components/TableView'; ...@@ -53,7 +55,7 @@ import AddTablelList from './components/TableView';
import AffiliateAdd from './components/Field/affiliateAdd'; import AffiliateAdd from './components/Field/affiliateAdd';
import LoadGroup from './components/Field/loadGroup'; import LoadGroup from './components/Field/loadGroup';
import LoadGroupNew from './components/Field/loadGroupNew'; import LoadGroupNew from './components/Field/loadGroupNew';
import { defaultFields } from './components/defaultFields'; // import { defaultFields } from './components/defaultFields';
import styles from './index.less'; import styles from './index.less';
const { Search } = Input; const { Search } = Input;
const { Option } = Select; const { Option } = Select;
...@@ -82,19 +84,27 @@ const TableManager = props => { ...@@ -82,19 +84,27 @@ const TableManager = props => {
const [treeVisible, setTreeVisible] = useState(true); // 是否显示左侧树 const [treeVisible, setTreeVisible] = useState(true); // 是否显示左侧树
const [hoverItemIndex, setHoverItemIndex] = useState(0); // hover流程索引 const [hoverItemIndex, setHoverItemIndex] = useState(0); // hover流程索引
const [pickIndex, setPickIndex] = useState(0); const [pickIndex, setPickIndex] = useState(0);
const [defaultFields1, setDefaultFields1] = useState([ const [defaultFields, setDefaultFields] = useState([]);
'事件表', const [defaultFieldsList, setDefaultFieldsList] = useState([]);
'事件工单表', const [tableType, setTableType] = useState(defaultFields[0]);
'工单表',
'台账表',
'设备表',
'反馈表',
]);
const [tableType, setTableType] = useState(defaultFields1[0]);
const [groupPopVisible, setgGroupPopVisible] = useState(false); const [groupPopVisible, setgGroupPopVisible] = useState(false);
const [checkMsg, setCheckMsg] = useState(); const [checkMsg, setCheckMsg] = useState();
const initNum = useRef(0); const initNum = useRef(0);
useEffect(() => {
GetDefaultTableFields().then(res => {
if (res.code === 0) {
let list = [];
setDefaultFieldsList(res.data);
res.data.forEach(item => {
list.push(item.value);
});
setDefaultFields(list);
} else {
message.error(res.msg);
}
});
}, []);
useEffect( useEffect(
record => { record => {
if (props.history.location.query && initNum.current == 0) { if (props.history.location.query && initNum.current == 0) {
...@@ -256,15 +266,7 @@ const TableManager = props => { ...@@ -256,15 +266,7 @@ const TableManager = props => {
let bb = []; let bb = [];
console.log(groupData, 'groupData'); console.log(groupData, 'groupData');
// 对分组进行排序 // 对分组进行排序
const sortNameArr = [ const sortNameArr = res.data.groupNames;
'事件表',
'事件工单表',
'工单表',
'台账表',
'设备表',
'反馈表',
'其他表',
];
const sortList = []; const sortList = [];
sortNameArr.forEach(ele => { sortNameArr.forEach(ele => {
Object.keys(groupData).map((item, index) => { Object.keys(groupData).map((item, index) => {
...@@ -526,7 +528,7 @@ const TableManager = props => { ...@@ -526,7 +528,7 @@ const TableManager = props => {
}); });
}; };
const menu = ( const menu = (
<Menu onClick={onMenuClick} items={defaultFields1.map(item => ({ key: item, label: item }))} /> <Menu onClick={onMenuClick} items={defaultFields.map(item => ({ key: item, label: item }))} />
); );
return ( return (
<Spin tip="loading..." spinning={treeLoading}> <Spin tip="loading..." spinning={treeLoading}>
...@@ -702,6 +704,7 @@ const TableManager = props => { ...@@ -702,6 +704,7 @@ const TableManager = props => {
onCancel={() => setVisible(false)} onCancel={() => setVisible(false)}
formObj={formObj} formObj={formObj}
callBackSubmit={onSubmit} callBackSubmit={onSubmit}
defaultFieldsList={defaultFieldsList}
tableType={tableType} tableType={tableType}
/> />
{visible && type === 'affiliateAdd' && ( {visible && type === 'affiliateAdd' && (
......
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