Skip to content

C
CivManage
Commit 0e9bfe4b authored by 邓超's avatar 邓超
Browse files
Options

fix: 添加外部字段模块，修改表返回位置问题

parent 5946c5ef
Hide whitespace changes
Inline Side-by-side
Showing with 594 additions and 454 deletions
src/pages/platformCenter/bsmanager/tablemanager/index.jsx
View file @ 0e9bfe4b
import React, { useEffect, useState } from 'react'
import React, { useEffect, useState } from 'react';
import classnames from 'classnames';
import {
// Tree,
Table,
Space,
Input,
Button,
Select,
Popconfirm,
notification,
Spin,
Tooltip,
Badge, Spac
// Tree,
Table,
Space,
Input,
Button,
Select,
Popconfirm,
notification,
Spin,
Tooltip,
Badge,
Spac,
} from 'antd';
import { EditOutlined, DeleteOutlined, FontColorsOutlined, PlusSquareOutlined, SortDescendingOutlined ,PlusOutlined,BorderInnerOutlined } from '@ant-design/icons';
import {
EditOutlined,
DeleteOutlined,
FontColorsOutlined,
PlusSquareOutlined,
SortDescendingOutlined,
PlusOutlined,
BorderInnerOutlined,
} from '@ant-design/icons';
import PageContainer from '@/components/BasePageContainer';
import { CM_Table_LoadTable, removeTable, loadUnattachedTables } from '@/services/platform/bs'
import styles from './index.less'
import Editor from './components/Field/editor'
import AddTablelList from './components/Field/addTable'
import AffiliateAdd from './components/Field/affiliateAdd'
import LoadGroup from './components/Field/loadGroup'
import {
CM_Table_LoadTable,
removeTable,
loadUnattachedTables,
} from '@/services/platform/bs';
import styles from './index.less';
import Editor from './components/Field/editor';
import AddTablelList from './components/Field/addTable';
import AffiliateAdd from './components/Field/affiliateAdd';
import LoadGroup from './components/Field/loadGroup';
import { useHistory } from 'react-router-dom';
const { Search } = Input;
const { Option } = Select;
const placeholder = "请输入表名"
const TableManager = (props) => {
const history = useHistory();
const [visible, setVisible] = useState(false); // 弹窗
const [type, setType] = useState(''); // 弹窗类型
const [formObj, setFormObj] = useState({});
const [flag, setFlag] = useState(0); // 弹窗类型
const [searchValue, setSearchValue] = useState('')
const [treeLoading, setTreeLoading] = useState(true)
const [tableList, setTableList] = useState([])
const [groupArr, setGroupArr] = useState([])
const [allData, setAllData] = useState([])
const [tableData, setTableData] = useState([])
const [select, setSelect] = useState([])
const [selectTableName, setSelectTableName] = useState({})
useEffect((record) => {
loadTable(searchValue)
getField()
if (props.history.location.state) {
let template = props.history.location.state.template
setSelectTableName(template)
}
}, [flag])
const placeholder = '请输入表名';
//附加
const add = (record) => {
setFormObj(record);
setType('affiliateAdd');
setVisible(true);
}
//修改表名
const changeDesc = (record) => {
setType('edit');
setVisible(true);
setFormObj(record);
}
//删除表
const deleteChart = (record) => {
removeTable({ tableID: record.tableID, removeFields: true }).then(res => {
if (res.msg === 'Ok' || res.msg === '') {
notification.success({
message: '提示',
duration: 3,
description: '删除成功',
});
setFlag(flag + 1)
}
else {
notification.error({
message: '提示',
duration: 3,
description: res.msg,
});
}
})
const TableManager = props => {
const history = useHistory();
const [visible, setVisible] = useState(false); // 弹窗
const [type, setType] = useState(''); // 弹窗类型
const [formObj, setFormObj] = useState({});
const [flag, setFlag] = useState(0); // 弹窗类型
const [searchValue, setSearchValue] = useState('');
const [treeLoading, setTreeLoading] = useState(true);
const [tableList, setTableList] = useState([]);
const [groupArr, setGroupArr] = useState([]);
const [allData, setAllData] = useState([]);
const [tableData, setTableData] = useState([]);
const [select, setSelect] = useState([]);
const [selectTableName, setSelectTableName] = useState('');
useEffect(
record => {
loadTable(searchValue);
getField();
// if (props.history.location.query && selectTableName !== {}) {
// let { template } = props.history.location.query;
// setSelectTableName(template);
// }
},
[flag],
);
// 重字段配置返回后需要返回到原来的位置
useEffect(() => {
let arr = Object.keys(allData);
console.log(selectTableName, 'selectTableName');
console.log(arr, 'arr');
console.log(props.history.location.query, 'props.history.location.query');
if (
arr.length > 0 &&
props.history.location.query &&
selectTableName == ''
) {
console.log(234534256342);
let { tableScroll, template } = props.history.location.query;
setSelectTableName(template);
setTimeout(() => {
document.querySelector('.ant-table-body').scrollTop = tableScroll;
}, 0);
}
}, [allData]);
// 附加
const add = record => {
setFormObj(record);
setType('affiliateAdd');
setVisible(true);
};
// 修改表名
const changeDesc = record => {
setType('edit');
setVisible(true);
setFormObj(record);
};
// 删除表
const deleteChart = record => {
removeTable({ tableID: record.tableID, removeFields: true }).then(res => {
if (res.msg === 'Ok' || res.msg === '') {
notification.success({
message: '提示',
duration: 3,
description: '删除成功',
});
setFlag(flag + 1);
} else {
notification.error({
message: '提示',
duration: 3,
description: res.msg,
});
}
});
};
const onSubmit = prop => {
setVisible(false);
setFlag(flag + 1)
};
//建表
const AddTable = () => {
setType('add');
setVisible(true);
}
//附加表
const AffiliateAddTable = () => {
setType('affiliateAdd');
setFormObj({});
setVisible(true);
}
//字段配置
const fieldsConfig = (record, e) => {
e.stopPropagation()
setFormObj(record);
history.push({ pathname: `/platformCenter/bsmanger/filedConfig/${record.tableName}`, state: { template: record } })
// setType('config');
// setVisible(true);
}
//分组与排序
const sort = (record) => {
setFormObj(record);
setType('sort');
setVisible(true);
}
//搜索框改变时存储输入的值
const handleChange = (e) => {
setSearchValue(e.target.value)
}
//搜索
const handleSearch = (text) => {
loadTable(text)
setSearchValue(text)
}
const getField = () => {
loadUnattachedTables().then(res => {
if (res.data.root && res.data.root.length) {
setTableList(res.data.root)
}
const onSubmit = prop => {
setVisible(false);
setFlag(flag + 1);
};
// 建表
const AddTable = () => {
setType('add');
setVisible(true);
};
// 附加表
const AffiliateAddTable = () => {
setType('affiliateAdd');
setFormObj({});
setVisible(true);
};
// 字段配置
const fieldsConfig = (record, e) => {
e.stopPropagation();
setFormObj(record);
history.push({
pathname: `/platformCenter/bsmanger/filedConfig/${record.tableName}`,
state: {
template: record,
tableScroll: document.querySelector('.ant-table-body').scrollTop,
},
});
// setType('config');
// setVisible(true);
};
// 分组与排序
const sort = record => {
setFormObj(record);
setType('sort');
setVisible(true);
};
// 搜索框改变时存储输入的值
const handleChange = e => {
setSearchValue(e.target.value);
};
// 搜索
const handleSearch = text => {
loadTable(text);
setSearchValue(text);
};
const getField = () => {
loadUnattachedTables().then(res => {
if (res.data.root && res.data.root.length) {
setTableList(res.data.root);
}
});
};
// 加载表
const loadTable = keyword => {
setTreeLoading(true);
CM_Table_LoadTable({
_version: 9999,
filter: keyword || '',
})
.then(res => {
setTreeLoading(false);
if (res.msg === 'Ok') {
setTableData(res.data.root);
let groupData = formateArrDataA(res.data.root, 'groupName');
let newArr = [];
Object.keys(groupData).map((item, index) => {
newArr.push({ type: item, key: index });
});
})
setAllData(groupData);
setGroupArr(newArr);
setSelect(newArr);
}
})
.catch(e => {
setTreeLoading(true);
});
};
const formateArrDataA = (initialArr, name) => {
// 判定传参是否符合规则
if (!(initialArr instanceof Array)) {
return '请传入正确格式的数组';
}
//加载表
const loadTable = (keyword) => {
setTreeLoading(true)
CM_Table_LoadTable({
_version: 9999,
filter: keyword || ''
}).then(
res => {
setTreeLoading(false)
if (res.msg === 'Ok') {
setTableData(res.data.root)
let groupData = formateArrDataA(res.data.root, 'groupName')
let newArr = []
Object.keys(groupData).map((item, index) => {
newArr.push({ type: item, key: index })
})
setAllData(groupData)
setGroupArr(newArr)
setSelect(newArr)
}
}
).catch(e => {
setTreeLoading(true)
})
if (!name) {
return '请传入对象属性';
}
const formateArrDataA = (initialArr, name) => {
// 判定传参是否符合规则
if (!(initialArr instanceof Array)) {
return '请传入正确格式的数组'
}
if (!name) {
return '请传入对象属性'
}
//先获取一下这个数组中有多少个"name"
let nameArr = []
for (let i in initialArr) {
if (nameArr.indexOf(initialArr[i][`${name}`]) === -1) {
nameArr.push(initialArr[i][`${name}`])
}
}
//新建一个包含多个list的结果对象
let tempObj = {}
// 根据不同的"name"生成多个数组
for (let k in nameArr) {
for (let j in initialArr) {
if (initialArr[j][`${name}`] == nameArr[k]) {
// 每次外循环时新建一个对应"name"的数组, 内循环时当前数组不变
tempObj[nameArr[k]] = tempObj[nameArr[k]] || []
tempObj[nameArr[k]].push(initialArr[j])
}
}
}
for (let keys in tempObj) {
let arr = []
tempObj[keys].map((item, index) => {
tempObj[keys] = arr;
item.key = index
arr.push(item)
})
// 先获取一下这个数组中有多少个"name"
let nameArr = [];
for (let i in initialArr) {
if (nameArr.indexOf(initialArr[i][`${name}`]) === -1) {
nameArr.push(initialArr[i][`${name}`]);
}
}
// 新建一个包含多个list的结果对象
let tempObj = {};
// 根据不同的"name"生成多个数组
for (let k in nameArr) {
for (let j in initialArr) {
if (initialArr[j][`${name}`] == nameArr[k]) {
// 每次外循环时新建一个对应"name"的数组, 内循环时当前数组不变
tempObj[nameArr[k]] = tempObj[nameArr[k]] || [];
tempObj[nameArr[k]].push(initialArr[j]);
}
return tempObj
}
}
const setRowClassName = record =>
Object.entries(record).toString() === Object.entries(selectTableName).toString() ? styles.clickRowStyle : '';
const expandedRowRender = (item) => {
const columns1 = [
{
title: '名称',
dataIndex: 'tableName',
key: 'tableName',
width: 300,
render: (text, record) => <div onClick={e => fieldsConfig(record, e)}>{text}</div>,
},
{
title: '别名',
dataIndex: 'tableAlias',
key: 'tableAlias',
align: 'center',
},
{
title: '表格样式',
dataIndex: 'tableStyle',
key: 'tableStyle',
align: 'center'
},
{
title: '附加字段',
dataIndex: 'fieldCount',
key: 'fieldCount',
align: 'center',
},
{
title: '缺少字段',
dataIndex: 'missingFieldCount',
key: 'missingFieldCount',
align: 'center',
render: text => {
return (<div className={classnames({
[styles.lack]:text!=='(无)' ,
})} >{text}</div>)
}
},
{
title: '未附加',
dataIndex: 'extraFieldCount',
key: 'extraFieldCount',
align: 'center',
},
{
title: '分组数量',
dataIndex: 'groupCount',
key: 'groupCount',
align: 'center',
},
{
title: '操作',
ellipsis: true,
key: 'tableID',
align: 'center',
render: (text, record) => (
<Space>
<Tooltip title="修改">
<EditOutlined
onClick={() => changeDesc(record)}
style={{ fontSize: '20px', color: '#1890FF' }}
/>
</Tooltip>
<Tooltip title="字段配置">
<FontColorsOutlined
onClick={e => fieldsConfig(record, e)}
style={{ fontSize: '16px', color: '#1890FF' }}
/>
</Tooltip>
<Tooltip title="附加">
<PlusSquareOutlined
onClick={() => add(record)}
style={{ fontSize: '16px', color: '#1890FF' }}
/>
</Tooltip>
<Tooltip title="分组与排序">
<SortDescendingOutlined
onClick={() => sort(record)}
style={{ fontSize: '16px', color: '#1890FF' }}
/>
</Tooltip>
<div onClick={e => e.stopPropagation()}>
<Popconfirm
title="是否删除该表？"
okText="确认"
cancelText="取消"
onConfirm={() => {
deleteChart(record);
}}
>
<Tooltip title="删除">
<DeleteOutlined
style={{ fontSize: '16px', color: '#e86060' }}
/>
</Tooltip>
</Popconfirm>
</div>
</Space>
),
},
];
for (let keys in tempObj) {
let arr = [];
tempObj[keys].map((item, index) => {
tempObj[keys] = arr;
item.key = index;
arr.push(item);
});
}
return tempObj;
};
const setRowClassName = record =>
Object.entries(record).toString() ===
Object.entries(selectTableName).toString()
? styles.clickRowStyle
: '';
const expandedRowRender = item => {
const columns1 = [
{
title: '名称',
dataIndex: 'tableName',
key: 'tableName',
width: 300,
render: (text, record) => (
<div onClick={e => fieldsConfig(record, e)}>{text}</div>
),
},
{
title: '别名',
dataIndex: 'tableAlias',
key: 'tableAlias',
align: 'center',
},
{
title: '表格样式',
dataIndex: 'tableStyle',
key: 'tableStyle',
align: 'center',
},
{
title: '附加字段',
dataIndex: 'fieldCount',
key: 'fieldCount',
align: 'center',
},
{
title: '缺少字段',
dataIndex: 'missingFieldCount',
key: 'missingFieldCount',
align: 'center',
render: text => {
return (
<div
className={classnames({
[styles.lack]: text !== '(无)',
})}
>
{text}
</div>
);
},
},
{
title: '未附加',
dataIndex: 'extraFieldCount',
key: 'extraFieldCount',
align: 'center',
},
{
title: '分组数量',
dataIndex: 'groupCount',
key: 'groupCount',
align: 'center',
},
{
title: '操作',
ellipsis: true,
key: 'tableID',
align: 'center',
render: (text, record) => (
<Space>
<Tooltip title="修改">
<EditOutlined
onClick={() => changeDesc(record)}
style={{ fontSize: '20px', color: '#1890FF' }}
/>
</Tooltip>
<Tooltip title="字段配置">
<FontColorsOutlined
onClick={e => fieldsConfig(record, e)}
style={{ fontSize: '16px', color: '#1890FF' }}
/>
</Tooltip>
<Tooltip title="附加">
<PlusSquareOutlined
onClick={() => add(record)}
style={{ fontSize: '16px', color: '#1890FF' }}
/>
</Tooltip>
<Tooltip title="分组与排序">
<SortDescendingOutlined
onClick={() => sort(record)}
style={{ fontSize: '16px', color: '#1890FF' }}
/>
</Tooltip>
<div onClick={e => e.stopPropagation()}>
<Popconfirm
title="是否删除该表？"
okText="确认"
cancelText="取消"
onConfirm={() => {
deleteChart(record);
}}
>
<Tooltip title="删除">
<DeleteOutlined
style={{ fontSize: '16px', color: '#e86060' }}
/>
</Tooltip>
</Popconfirm>
</div>
</Space>
),
},
];
return <Table columns={columns1} bordered size="small" onRow={record => {
return {
onDoubleClick: event => {
event.stopPropagation()
history.push({ pathname: `/platformCenter/bsmanger/filedConfig/${record.tableName}`, state: { template: record } })
return (
<Table
columns={columns1}
bordered
size="small"
onRow={record => {
return {
onDoubleClick: event => {
event.stopPropagation();
history.push({
pathname: `/platformCenter/bsmanger/filedConfig/${
record.tableName
}`,
state: {
template: record,
tableScroll: document.querySelector('.ant-table-body')
.scrollTop,
},
onClick: event => {
event.stopPropagation()
setSelectTableName(record)
}, // 点击行
}
}}
rowClassName={setRowClassName}
showHeader={false} dataSource={allData[item.type]} pagination={false} />;
};
const columns = [
{
title: '名称', dataIndex: 'type', key: 'type',
render: text => {
return (<a style={{ fontWeight:'bold' }}>{text}({allData && allData[text] ? allData[text].length : 0}个)</a>)
});
},
width: 260,
},
{
title: '别名',
dataIndex: 'tableAlias',
key: 'tableAlias',
align: 'center',
},
{
title: '表格样式',
dataIndex: 'tableStyle',
key: 'tableStyle',
align: 'center',
},
{
title: '附加字段',
dataIndex: 'fieldCount',
key: 'fieldCount',
align: 'center',
},
{
title: '缺少字段',
dataIndex: 'missingFieldCount',
key: 'missingFieldCount',
align: 'center',
render: text => {
return (<div>{text}</div>)
}
},
{
title: '未附加',
dataIndex: 'extraFieldCount',
key: 'extraFieldCount',
align: 'center',
},
{
title: '分组数量',
dataIndex: 'groupCount',
key: 'groupCount',
align: 'center',
},
{
title: '操作',
dataIndex: 'title',
key: 'title',
align: 'center',
},
onClick: event => {
event.stopPropagation();
setSelectTableName(record);
}, // 点击行
};
}}
rowClassName={setRowClassName}
showHeader={false}
dataSource={allData[item.type]}
pagination={false}
/>
);
};
];
const onUnfold = (expanded, record) => {
const data = [...select]
let index = data.indexOf(record)
if (expanded) {
data.push(record)
} else {
data.splice(index, 1)
}
setSelect(data)
const columns = [
{
title: '名称',
dataIndex: 'type',
key: 'type',
render: text => {
return (
<a style={{ fontWeight: 'bold' }}>
{text}({allData && allData[text] ? allData[text].length : 0}个)
</a>
);
},
width: 260,
},
{
title: '别名',
dataIndex: 'tableAlias',
key: 'tableAlias',
align: 'center',
},
{
title: '表格样式',
dataIndex: 'tableStyle',
key: 'tableStyle',
align: 'center',
},
{
title: '附加字段',
dataIndex: 'fieldCount',
key: 'fieldCount',
align: 'center',
},
{
title: '缺少字段',
dataIndex: 'missingFieldCount',
key: 'missingFieldCount',
align: 'center',
render: text => {
return <div>{text}</div>;
},
},
{
title: '未附加',
dataIndex: 'extraFieldCount',
key: 'extraFieldCount',
align: 'center',
},
{
title: '分组数量',
dataIndex: 'groupCount',
key: 'groupCount',
align: 'center',
},
{
title: '操作',
dataIndex: 'title',
key: 'title',
align: 'center',
},
];
const onUnfold = (expanded, record) => {
const data = [...select];
let index = data.indexOf(record);
if (expanded) {
data.push(record);
} else {
data.splice(index, 1);
}
return (
<Spin tip="loading..." spinning={treeLoading}>
<PageContainer>
<div className={styles.tablemanager_container}>
<div className={styles.operate_bar}>
<div className={styles.fast_search}>
<div className={styles.title}>快速检索</div>
<Search
allowClear
placeholder={placeholder}
onSearch={handleSearch}
onChange={handleChange}
value={searchValue}
enterButton
style={{ width: "300px" }}
/>
</div>
<Button type="primary" style={{ marginLeft: "10px" }} icon={<BorderInnerOutlined />} onClick={AddTable}>建表</Button>
<Button type="primary" style={{ marginLeft: "10px" }} icon={<PlusOutlined />} onClick={AffiliateAddTable}>附加表</Button>
setSelect(data);
};
return (
<Spin tip="loading..." spinning={treeLoading}>
<PageContainer>
<div className={styles.tablemanager_container}>
<div className={styles.operate_bar}>
<div className={styles.fast_search}>
<div className={styles.title}>快速检索</div>
<Search
allowClear
placeholder={placeholder}
onSearch={handleSearch}
onChange={handleChange}
value={searchValue}
enterButton
style={{ width: '300px' }}
/>
</div>
</div>
<div style={{ width: '100vm', height: 'calc(100vh - 150px) ', background: '#ffffff' }}>
{/* <Table
<Button
type="primary"
style={{ marginLeft: '10px' }}
icon={<BorderInnerOutlined />}
onClick={AddTable}
>
建表
</Button>
<Button
type="primary"
style={{ marginLeft: '10px' }}
icon={<PlusOutlined />}
onClick={AffiliateAddTable}
>
附加表
</Button>
</div>
<div
style={{
width: '100vm',
height: 'calc(100vh - 150px) ',
background: '#ffffff',
}}
>
{/* <Table
columns={columns}
dataSource={tableData}
//pagination={{ pageSize: 10 }}
......@@ -420,61 +507,61 @@ const TableManager = (props) => {
showSizeChanger: true,
}}
/> */}
<Table
className="components-table-demo-nested"
columns={columns}
expandable={{ expandedRowRender }}
expandedRowKeys={select.map(item => item.key)} //展开的行
expandRowByClick={true}
defaultExpandAllRows={true}
dataSource={groupArr}
scroll={{ y: 'calc(100vh - 190px)' }}
size="small"
pagination={false}
onExpand={onUnfold}
style={{ height: '8rem' }}
/>
</div>
</div>
{visible && type == 'edit' && (
<Editor
visible={visible}
onCancel={() => setVisible(false)}
callBackSubmit={onSubmit}
type={type}
formObj={formObj} />
)}
{visible && type === 'add' && (
<AddTablelList
type={type}
onCancel={() => setVisible(false)}
callBackSubmit={onSubmit}
/>
)}
{visible && type === 'affiliateAdd' && (
<AffiliateAdd
visible={visible}
tableList={tableList}
type={type}
onCancel={() => setVisible(false)}
callBackSubmit={onSubmit}
formObj={formObj}
/>
)}
<Table
className="components-table-demo-nested"
columns={columns}
expandable={{ expandedRowRender }}
expandedRowKeys={select.map(item => item.key)} // 展开的行
expandRowByClick={true}
defaultExpandAllRows={true}
dataSource={groupArr}
scroll={{ y: 'calc(100vh - 190px)' }}
size="small"
pagination={false}
onExpand={onUnfold}
style={{ height: '8rem' }}
/>
</div>
</div>
{visible && type === 'sort' && (
<LoadGroup
visible={visible}
type={type}
formObj={formObj}
onCancel={() => setVisible(false)}
callBackSubmit={onSubmit}
/>
)}
</PageContainer>
</Spin>
)
{visible && type == 'edit' && (
<Editor
visible={visible}
onCancel={() => setVisible(false)}
callBackSubmit={onSubmit}
type={type}
formObj={formObj}
/>
)}
{visible && type === 'add' && (
<AddTablelList
type={type}
onCancel={() => setVisible(false)}
callBackSubmit={onSubmit}
/>
)}
{visible && type === 'affiliateAdd' && (
<AffiliateAdd
visible={visible}
tableList={tableList}
type={type}
onCancel={() => setVisible(false)}
callBackSubmit={onSubmit}
formObj={formObj}
/>
)}
}
export default TableManager;
\ No newline at end of file
{visible && type === 'sort' && (
<LoadGroup
visible={visible}
type={type}
formObj={formObj}
onCancel={() => setVisible(false)}
callBackSubmit={onSubmit}
/>
)}
</PageContainer>
</Spin>
);
};
export default TableManager;
src/pages/platformCenter/bsmanager/workFlow/flowNode/flowNode.jsx
View file @ 0e9bfe4b
......@@ -85,7 +85,7 @@ const FlowNode = () => {
// 控制表格的展开跟收起
const onUnfold = (expanded, record) => {
const data = [...expandedRowKeys];
let index = data.indexOf(record);
let index = data.indexOf(record.GroupName);
if (expanded) {
data.push(record.GroupName);
} else {
......
src/pages/platformCenter/bsmanager/workFlow/flowNode/flowNode.less
View file @ 0e9bfe4b
......@@ -113,7 +113,16 @@
margin-bottom: 10px;
font-weight: 700;
color: #15428b;
line-height: 100%;
border-top-color: #99bbe8;
.groupName {
display: inline-block;
margin-right: 10px;
max-width: 200px;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
}
}
......
src/pages/platformCenter/bsmanager/workFlow/flowNode/flowNodeComponents/NodeEdit.jsx
View file @ 0e9bfe4b
......@@ -100,19 +100,36 @@ const NodeEdit = props => {
loadEventFields({ eventTableName: value.TableName }).then(res => {
if (res.code === 0) {
let defaultCheckedList = value[val] ? value[val].split(',') : [];
let allFields = []; // 所有得字段用来判断是否为外部字段
// 处理树形结构
let checkList = res.data.map(item => {
let plainOptions = [];
// 存入没个组得字段
item.root.forEach(ele => {
plainOptions = [...plainOptions, ele.fieldName];
});
// 存所有得字段
allFields = [...allFields, ...plainOptions];
return {
groupName: item.groupName,
plainOptions,
defaultCheckedList: [],
};
});
let externalFields = {
groupName: '外部字段',
indeterminate: false,
checkAll: true,
plainOptions: [],
defaultCheckedList: [],
}; // 外部字段
defaultCheckedList.forEach(item => {
// 添加外部字段
let isExternal = allFields.some(checkName => checkName === item);
if (!isExternal) {
externalFields.plainOptions.push(item);
externalFields.defaultCheckedList.push(item);
}
checkList.forEach(element => {
// 当前得模块是否有当前字段
let indeterminate = element.plainOptions.some(
......@@ -140,7 +157,10 @@ const NodeEdit = props => {
}
});
});
console.log(checkList, 'checkList');
// 添加外部字段
if (externalFields.plainOptions.length > 0) {
checkList.push(externalFields);
}
setFieldList(checkList);
setTimeout(() => {
setShowField(true);
......
src/pages/platformCenter/bsmanager/workFlow/flowNode/flowNodeComponents/nodeEditComponents/Fieldselection.jsx
View file @ 0e9bfe4b
......@@ -98,9 +98,7 @@ const Fieldselection = props => {
<div className={styles.cardBox} key={index}>
<div className={styles.title}>
<Divider orientation="left" className={styles.cardDivider}>
<span style={{ marginRight: '10px' }}>
{item.groupName}
</span>
<span className={styles.groupName}>{item.groupName}</span>
<Checkbox
indeterminate={item.indeterminate}
onChange={e => onCheckAllChange(e, index)}
......
src/pages/platformCenter/filedConfig/filedConfig.jsx
View file @ 0e9bfe4b
......@@ -358,11 +358,13 @@ const AddModal = props => {
};
// 返回上一级
const back = () => {
console.log(props)
let template = props.location.state.template;
let { template, tableScroll } = props.location.state;
history.push({
pathname: '/platformCenter/bsmanger/tablemanger',
state: { template },
query: {
template,
tableScroll,
},
});
};
const onUnfold = (expanded, record) => {
......
src/pages/platformCenter/standingBook/editorModal.jsx
View file @ 0e9bfe4b
/* eslint-disable guard-for-in */
/* eslint-disable no-restricted-syntax */
import React, { useState, useEffect } from 'react';
import {
Form,
......@@ -64,6 +66,7 @@ const AddModal = props => {
const [Type, setType] = useState('');
const [characterValue, setCharacterValue] = useState('');
const [standingType, setStandingType] = useState(['台账', '反馈', '设备']);
const [allFileds, setAllFileds] = useState([]); // 当前表所有的字段
const [form] = Form.useForm();
const { Item } = Form;
// 提交
......@@ -166,14 +169,18 @@ const AddModal = props => {
if (!name) {
return '请传入对象属性';
}
//先获取一下这个数组中有多少个"name"
// 先获取一下这个数组中有多少个"name"
let nameArr = [];
let allFile = [];
for (let i in initialArr) {
allFile.push(initialArr[i].fieldName);
if (nameArr.indexOf(initialArr[i][`${name}`]) === -1) {
nameArr.push(initialArr[i][`${name}`]);
}
}
//新建一个包含多个list的结果对象
// 保存所有的字段用来比较是否有外部字段
setAllFileds(allFile);
// 新建一个包含多个list的结果对象
let tempObj = {};
// 根据不同的"name"生成多个数组
console.log(initialArr);
......@@ -204,9 +211,26 @@ const AddModal = props => {
setInputVaule(inputText);
};
const pickFiled = fileds => {
// 添加外部字段
let fil = { ...filed };
fil['外部字段'] = [];
let isExternal;
inputValue[fileds].split(',').forEach(item => {
isExternal = allFileds.some(val => val === item);
if (!isExternal && item !== '') {
fil['外部字段'].push(item);
}
});
if (fil['外部字段'].length === 0) {
delete fil['外部字段'];
}
setFiled(fil);
setTypes('add');
setCharacterValue(inputValue[fileds]);
setCheckedList(inputValue[fileds].split(','));
setPickItem(fileds);
setIsVisible(true);
};
......
src/pages/webConfig/utils.js
View file @ 0e9bfe4b
......@@ -69,6 +69,7 @@ export const defaultWebConfigObj = {
mapPlan: '',
qrcode: '',
loginTemplate: 'Default.html',
alarmWays: notificationTypes.MQTT,
};
export const getDefaultGetWebconfig = ({
......
src/services/platform/bs.jsx
View file @ 0e9bfe4b
......@@ -25,11 +25,11 @@ export const loadUnattachedTables = () =>
//7.附加表
export const addTables = (param) =>
get(`${PUBLISH_SERVICE}/CaseManage/AddTables`, param);
post(`${PUBLISH_SERVICE}/CaseManage/AddTables`, param);
//8.添加表字段
export const addFields = (param) =>
get(`${PUBLISH_SERVICE}/CaseManage/AddFields`, param);
post(`${PUBLISH_SERVICE}/CaseManage/AddFields`, param);
//9.获取表信息
......
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