Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
CivManage
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ReactWeb5
CivManage
Commits
9a815231
Commit
9a815231
authored
Dec 12, 2023
by
皮倩雯
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: '流程中心设计流程点击接口传参NAN,建表字段名称正则提示修改,管网配置表格增加loading
parent
14e12b93
Pipeline
#82969
waiting for manual action with stages
Changes
6
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
22 additions
and
12 deletions
+22
-12
EditTable.jsx
src/pages/bsmanager/base/standingBook/EditTable.jsx
+1
-1
TableView.jsx
...ages/bsmanager/base/tablemanager/components/TableView.jsx
+1
-1
ConfigNodeMsg.jsx
...flowChartComponents/nodeModalComponents/ConfigNodeMsg.jsx
+6
-2
SchemeConfig.less
src/pages/platformCenter/gis/schemeConfig/SchemeConfig.less
+9
-0
index.jsx
src/pages/platformCenter/gis/schemeConfig/ScopeMap/index.jsx
+0
-3
VectorData.jsx
...platformCenter/gis/schemeConfig/VectorData/VectorData.jsx
+5
-5
No files found.
src/pages/bsmanager/base/standingBook/EditTable.jsx
View file @
9a815231
...
...
@@ -280,7 +280,7 @@ const EditableCell = ({
},
{
pattern
:
/^
(?!(\d
+
)
$
)[\u
4e00-
\u
9fffa-zA-Z0-9_
]
+$/
,
message
:
'不能输入特殊符号或者
纯数字
'
,
message
:
'不能输入特殊符号或者
数字开头
'
,
},
];
}
...
...
src/pages/bsmanager/base/tablemanager/components/TableView.jsx
View file @
9a815231
...
...
@@ -261,7 +261,7 @@ const EditableCell = ({
},
{
pattern
:
/^
[^\d][\u
4e00-
\u
9fffA-Za-z0-9_
]
+$/
,
message
:
'不能输入特殊符号或者
纯数字
'
,
message
:
'不能输入特殊符号或者
数字开头
'
,
},
];
}
...
...
src/pages/bsmanager/workOrder/workflowEdit/workFlowComponents/flowChartComponents/nodeModalComponents/ConfigNodeMsg.jsx
View file @
9a815231
...
...
@@ -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
>
}
...
...
src/pages/platformCenter/gis/schemeConfig/SchemeConfig.less
View file @
9a815231
...
...
@@ -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%;
...
...
src/pages/platformCenter/gis/schemeConfig/ScopeMap/index.jsx
View file @
9a815231
...
...
@@ -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
;
});
...
...
src/pages/platformCenter/gis/schemeConfig/VectorData/VectorData.jsx
View file @
9a815231
...
...
@@ -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
);
setTree
Tile
Loading
(
true
);
GettMaplayer
({
terminalType
:
'base'
,
isBaseMap
:
true
,
})
.
then
(
res
=>
{
setTreeLoading
(
false
);
setTree
Tile
Loading
(
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
>
</>
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment