Commit 9a815231 authored by 皮倩雯's avatar 皮倩雯

fix: '流程中心设计流程点击接口传参NAN,建表字段名称正则提示修改,管网配置表格增加loading

parent 14e12b93
Pipeline #82969 waiting for manual action with stages
...@@ -280,7 +280,7 @@ const EditableCell = ({ ...@@ -280,7 +280,7 @@ const EditableCell = ({
}, },
{ {
pattern: /^(?!(\d+)$)[\u4e00-\u9fffa-zA-Z0-9_]+$/, pattern: /^(?!(\d+)$)[\u4e00-\u9fffa-zA-Z0-9_]+$/,
message: '不能输入特殊符号或者纯数字', message: '不能输入特殊符号或者数字开头',
}, },
]; ];
} }
......
...@@ -261,7 +261,7 @@ const EditableCell = ({ ...@@ -261,7 +261,7 @@ const EditableCell = ({
}, },
{ {
pattern: /^[^\d][\u4e00-\u9fffA-Za-z0-9_]+$/, pattern: /^[^\d][\u4e00-\u9fffA-Za-z0-9_]+$/,
message: '不能输入特殊符号或者纯数字', message: '不能输入特殊符号或者数字开头',
}, },
]; ];
} }
......
...@@ -33,7 +33,10 @@ const ConfigNodeMsg = (props, ref) => { ...@@ -33,7 +33,10 @@ const ConfigNodeMsg = (props, ref) => {
})); }));
useEffect(() => { useEffect(() => {
form.resetFields(); form.resetFields();
if (editMsg.NodeType) {
getTableName(); getTableName();
}
// 获取反馈类型 // 获取反馈类型
// getFeedbackName(); // getFeedbackName();
getFormData(); getFormData();
...@@ -435,8 +438,9 @@ const ConfigNodeMsg = (props, ref) => { ...@@ -435,8 +438,9 @@ const ConfigNodeMsg = (props, ref) => {
) : ( ) : (
'' ''
)} )}
<span style={{ marginRight: '4px', color: 'red' }}>{ <span style={{ marginRight: '4px', color: 'red' }}>
editMsg.NodeType === '1'?'*':''}</span> {editMsg.NodeType === '1' ? '*' : ''}
</span>
<span>字段编辑</span> <span>字段编辑</span>
</div> </div>
} }
......
...@@ -246,6 +246,15 @@ ...@@ -246,6 +246,15 @@
.tileContainer { .tileContainer {
height: 100%; height: 100%;
overflow-y: scroll; overflow-y: scroll;
.tableTile {
height: 400px;
.ant-table-content {
height: 341px;
.ant-table-row {
height: 57px;
}
}
}
.ant-table-wrapper { .ant-table-wrapper {
height: 100%; height: 100%;
......
...@@ -565,9 +565,6 @@ const Map = props => { ...@@ -565,9 +565,6 @@ const Map = props => {
// setFirstList({ ...aa }); // setFirstList({ ...aa });
break; break;
case 'schemename': case 'schemename':
// let asd = mapInfo.current?.map.layers;
// console.log(asd);
// debugger;
const filterLyrs = mapInfo.current?.map.layers.filter(item => { const filterLyrs = mapInfo.current?.map.layers.filter(item => {
return item.pipenetImark; return item.pipenetImark;
}); });
......
...@@ -32,6 +32,7 @@ const VectorData = props => { ...@@ -32,6 +32,7 @@ const VectorData = props => {
const [searchValue, setSearchValue] = useState(''); const [searchValue, setSearchValue] = useState('');
const [radioType, setRadioType] = useState('1'); const [radioType, setRadioType] = useState('1');
const [addVisible, setAddVisible] = useState(false); // 弹窗 const [addVisible, setAddVisible] = useState(false); // 弹窗
const [treeTileLoading, setTreeTileLoading] = useState(false);
const [name, setName] = useState([]); const [name, setName] = useState([]);
const { Search } = Input; const { Search } = Input;
const columns = [ const columns = [
...@@ -327,13 +328,13 @@ const VectorData = props => { ...@@ -327,13 +328,13 @@ const VectorData = props => {
}; };
const renderTileSliced = () => { const renderTileSliced = () => {
setTreeLoading(true); setTreeTileLoading(true);
GettMaplayer({ GettMaplayer({
terminalType: 'base', terminalType: 'base',
isBaseMap: true, isBaseMap: true,
}) })
.then(res => { .then(res => {
setTreeLoading(false); setTreeTileLoading(false);
if (res.code == '0') { if (res.code == '0') {
let newdata = res.data.general.baseMap.layers?.filter(i => i.type === 'google-user'); let newdata = res.data.general.baseMap.layers?.filter(i => i.type === 'google-user');
setTileSlicedData(newdata); setTileSlicedData(newdata);
...@@ -350,6 +351,7 @@ const VectorData = props => { ...@@ -350,6 +351,7 @@ const VectorData = props => {
} }
}) })
.catch(err => { .catch(err => {
setTreeTileLoading(false);
if (err.message.indexOf('timeout') !== -1) { if (err.message.indexOf('timeout') !== -1) {
notification.error({ notification.error({
message: '提示', message: '提示',
...@@ -363,7 +365,6 @@ const VectorData = props => { ...@@ -363,7 +365,6 @@ const VectorData = props => {
description: err.message, description: err.message,
}); });
} }
setTreeLoading(false);
}); });
}; };
// 搜索 // 搜索
...@@ -420,7 +421,6 @@ const VectorData = props => { ...@@ -420,7 +421,6 @@ const VectorData = props => {
return ( return (
<> <>
<div className={styles.pipeNetwork}> <div className={styles.pipeNetwork}>
<Spin tip="loading..." spinning={treeLoading}>
<div className={styles.tileBtnVe}> <div className={styles.tileBtnVe}>
<div className={styles.tileBtnLeft}> <div className={styles.tileBtnLeft}>
<span>管网类型:</span> <span>管网类型:</span>
...@@ -470,6 +470,7 @@ const VectorData = props => { ...@@ -470,6 +470,7 @@ const VectorData = props => {
</div> </div>
<div style={{ height: 'calc(100% - 51px)', width: '100%' }}> <div style={{ height: 'calc(100% - 51px)', width: '100%' }}>
<Table <Table
loading={radioType == 1 ? treeLoading : treeTileLoading}
columns={radioType == 1 ? columns : columnsPart} columns={radioType == 1 ? columns : columnsPart}
dataSource={radioType == 1 ? tileData : tileSlicedData} dataSource={radioType == 1 ? tileData : tileSlicedData}
bordered bordered
...@@ -506,7 +507,6 @@ const VectorData = props => { ...@@ -506,7 +507,6 @@ const VectorData = props => {
formObj={record} formObj={record}
name={name} name={name}
/> />
</Spin>
</div> </div>
</> </>
); );
......
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