Commit 7ae644f2 authored by 皮倩雯's avatar 皮倩雯

fix: '事件编辑字段验证'

parent 324a8005
Pipeline #63655 passed with stages
...@@ -1117,7 +1117,7 @@ const AddModal = props => { ...@@ -1117,7 +1117,7 @@ const AddModal = props => {
let rueslt = keepStandingBook.find(i => i.name == e); let rueslt = keepStandingBook.find(i => i.name == e);
getMapFelidValue(rueslt.tableName); getMapFelidValue(rueslt.tableName);
formAdd.resetFields(); formAdd.resetFields();
form.setFieldsValue({ workOrder: '', eventOrder: '' }); form.setFieldsValue({ workOrder: undefined, eventOrder: undefined });
}; };
const handleChange = value => { const handleChange = value => {
...@@ -1251,7 +1251,7 @@ const AddModal = props => { ...@@ -1251,7 +1251,7 @@ const AddModal = props => {
fieldName: '', fieldName: '',
filterName: '', filterName: '',
filterValue: '', filterValue: '',
standingBook: '', standingBook: undefined,
check: 0, check: 0,
style: 0, style: 0,
AllID: '0', AllID: '0',
...@@ -1265,8 +1265,8 @@ const AddModal = props => { ...@@ -1265,8 +1265,8 @@ const AddModal = props => {
Association: '', Association: '',
farter: '', farter: '',
farterData: '', farterData: '',
workOrder: '', workOrder: undefined,
eventOrder: '', eventOrder: undefined,
configName: '', configName: '',
}); });
} }
......
...@@ -1580,8 +1580,8 @@ const AddModal = props => { ...@@ -1580,8 +1580,8 @@ const AddModal = props => {
if (aa == '') { if (aa == '') {
return Promise.reject('摘要字段必选'); return Promise.reject('摘要字段必选');
} }
if (bb.length < 3 || aa.split(',').length > 5) { if (bb.length < 1 || aa.split(',').length > 5) {
return Promise.reject('最少配置个字段,最多配置五个字段'); return Promise.reject('最少配置个字段,最多配置五个字段');
} }
return Promise.resolve(); return Promise.resolve();
}, },
......
...@@ -497,23 +497,26 @@ const Map = props => { ...@@ -497,23 +497,26 @@ const Map = props => {
obj[index].areaName = changedFields[0].value[changedFields[0].value.length - 1]; obj[index].areaName = changedFields[0].value[changedFields[0].value.length - 1];
setButState(false); setButState(false);
// 如果地区与范围初始值相等则范围已绘制 // 如果地区与范围初始值相等则范围已绘制
if (radio == 1) {
if (keepNameArea === changedFields[0].value[changedFields[0].value.length - 1]) { if (keepNameArea === changedFields[0].value[changedFields[0].value.length - 1]) {
if (keepNameArea !== '') { if (keepNameArea !== '') {
mapRef.current.changeAreaName(keepNameArea, keepDraw); mapRef.current.changeAreaName(keepNameArea, keepDraw);
setDraw(1); setDraw(1);
} else {
setDraw(0);
mapRef.current.changeAreaName(obj[index].areaName);
}
} else { } else {
setDraw(0); setDraw(0);
mapRef.current.changeAreaName(obj[index].areaName); mapRef.current.changeAreaName(obj[index].areaName);
} }
setAreaFlag(1);
setFlag(0);
Drawtool.deactivate(false);
setArea('');
} else { } else {
setDraw(0);
mapRef.current.changeAreaName(obj[index].areaName); mapRef.current.changeAreaName(obj[index].areaName);
} }
setAreaFlag(1);
setFlag(0);
Drawtool.deactivate(false);
setArea('');
setNewDraw(0); setNewDraw(0);
setResultData(null); setResultData(null);
......
...@@ -72,11 +72,11 @@ ...@@ -72,11 +72,11 @@
height: 100%; height: 100%;
} }
} }
.ant-cascader-menu {
} height: 530px;
.ant-cascader-menu { }
height: 530px;
} }
.borderColor{ .borderColor{
width: 22px; width: 22px;
height: 20px; height: 20px;
......
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