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