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
7ae644f2
Commit
7ae644f2
authored
2 years ago
by
皮倩雯
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: '事件编辑字段验证'
parent
324a8005
Pipeline
#63655
passed with stages
Changes
4
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
10 deletions
+13
-10
fieldEditor.jsx
...s/bsmanager/base/tablemanager/filedConfig/fieldEditor.jsx
+4
-4
AddModal.jsx
src/pages/bsmanager/workOrder/incident/AddModal.jsx
+2
-2
index.jsx
src/pages/platformCenter/gis/schemeConfig/ScopeMap/index.jsx
+4
-1
index.less
...pages/platformCenter/gis/schemeConfig/ScopeMap/index.less
+3
-3
No files found.
src/pages/bsmanager/base/tablemanager/filedConfig/fieldEditor.jsx
View file @
7ae644f2
...
...
@@ -1117,7 +1117,7 @@ const AddModal = props => {
let
rueslt
=
keepStandingBook
.
find
(
i
=>
i
.
name
==
e
);
getMapFelidValue
(
rueslt
.
tableName
);
formAdd
.
resetFields
();
form
.
setFieldsValue
({
workOrder
:
''
,
eventOrder
:
''
});
form
.
setFieldsValue
({
workOrder
:
undefined
,
eventOrder
:
undefined
});
};
const
handleChange
=
value
=>
{
...
...
@@ -1251,7 +1251,7 @@ const AddModal = props => {
fieldName
:
''
,
filterName
:
''
,
filterValue
:
''
,
standingBook
:
''
,
standingBook
:
undefined
,
check
:
0
,
style
:
0
,
AllID
:
'0'
,
...
...
@@ -1265,8 +1265,8 @@ const AddModal = props => {
Association
:
''
,
farter
:
''
,
farterData
:
''
,
workOrder
:
''
,
eventOrder
:
''
,
workOrder
:
undefined
,
eventOrder
:
undefined
,
configName
:
''
,
});
}
...
...
This diff is collapsed.
Click to expand it.
src/pages/bsmanager/workOrder/incident/AddModal.jsx
View file @
7ae644f2
...
...
@@ -1580,8 +1580,8 @@ const AddModal = props => {
if
(
aa
==
''
)
{
return
Promise
.
reject
(
'摘要字段必选'
);
}
if
(
bb
.
length
<
3
||
aa
.
split
(
','
).
length
>
5
)
{
return
Promise
.
reject
(
'最少配置
三
个字段,最多配置五个字段'
);
if
(
bb
.
length
<
1
||
aa
.
split
(
','
).
length
>
5
)
{
return
Promise
.
reject
(
'最少配置
一
个字段,最多配置五个字段'
);
}
return
Promise
.
resolve
();
},
...
...
This diff is collapsed.
Click to expand it.
src/pages/platformCenter/gis/schemeConfig/ScopeMap/index.jsx
View file @
7ae644f2
...
...
@@ -497,7 +497,7 @@ const Map = props => {
obj
[
index
].
areaName
=
changedFields
[
0
].
value
[
changedFields
[
0
].
value
.
length
-
1
];
setButState
(
false
);
// 如果地区与范围初始值相等则范围已绘制
if
(
radio
==
1
)
{
if
(
keepNameArea
===
changedFields
[
0
].
value
[
changedFields
[
0
].
value
.
length
-
1
])
{
if
(
keepNameArea
!==
''
)
{
mapRef
.
current
.
changeAreaName
(
keepNameArea
,
keepDraw
);
...
...
@@ -514,6 +514,9 @@ const Map = props => {
setFlag
(
0
);
Drawtool
.
deactivate
(
false
);
setArea
(
''
);
}
else
{
mapRef
.
current
.
changeAreaName
(
obj
[
index
].
areaName
);
}
setNewDraw
(
0
);
setResultData
(
null
);
...
...
This diff is collapsed.
Click to expand it.
src/pages/platformCenter/gis/schemeConfig/ScopeMap/index.less
View file @
7ae644f2
...
...
@@ -72,11 +72,11 @@
height: 100%;
}
}
}
.ant-cascader-menu {
.ant-cascader-menu {
height: 530px;
}
}
.borderColor{
width: 22px;
height: 20px;
...
...
This diff is collapsed.
Click to expand it.
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