Commit ab09191f authored by 涂伟's avatar 涂伟

fix: '1.运维流程节点设计交互优化2.查询表名接口参数添加3.首节点配置提示优化'

parent 5e6c7688
Pipeline #68800 passed with stages
...@@ -9,7 +9,7 @@ const ParmarModal = props => { ...@@ -9,7 +9,7 @@ const ParmarModal = props => {
const [form] = Form.useForm(); const [form] = Form.useForm();
const [keepStandingBook, setKeepStandingBook] = useState([]); const [keepStandingBook, setKeepStandingBook] = useState([]);
const [visibleChecked, setVisibleChecked] = useState(true); const [visibleChecked, setVisibleChecked] = useState(true);
const [shineFieldsData, setShineFieldsData] = useState(['事件编号', '工单编号']); const [mappingData, setMappingData] = useState(['事件编号', '工单编号']);
const { Option } = Select; const { Option } = Select;
useEffect(() => { useEffect(() => {
if (visible) { if (visible) {
...@@ -28,15 +28,15 @@ const ParmarModal = props => { ...@@ -28,15 +28,15 @@ const ParmarModal = props => {
if (pageUrl.indexOf('[') !== -1) { if (pageUrl.indexOf('[') !== -1) {
let data = JSON.parse(pageUrl); let data = JSON.parse(pageUrl);
let list = []; let list = [];
if (data.shineFields.length > 0) { if (data.mapping.length > 0) {
data.shineFields.map(i => { data.mapping.map(i => {
list.push(i.formField); list.push(i.fromField);
}); });
} }
form.setFieldsValue({ form.setFieldsValue({
accountName: data.accountName, accountName: data.accountName,
editable: data.editable, editable: data.editable,
shineFields: list, mapping: list,
}); });
} }
} }
...@@ -54,14 +54,14 @@ const ParmarModal = props => { ...@@ -54,14 +54,14 @@ const ParmarModal = props => {
let data = {}; let data = {};
data.accountName = obj.accountName; data.accountName = obj.accountName;
data.editable = visibleChecked; data.editable = visibleChecked;
data.shineFields = []; data.mapping = [];
if (obj.shineFields) { if (obj.mapping) {
obj.shineFields.map(i => { obj.mapping.map(i => {
data.shineFields.push({ formField: i, toField: i }); data.mapping.push({ fromField: i, toField: i });
}); });
} }
// data.shineFields = [{ formField: obj.shineFields, toField: obj.shineFields }]; // data.mapping = [{ fromField: obj.mapping, toField: obj.mapping }];
// data.shineFields = parma; // data.mapping = parma;
parmarCallBack(JSON.stringify(data)); parmarCallBack(JSON.stringify(data));
} }
}); });
...@@ -106,9 +106,9 @@ const ParmarModal = props => { ...@@ -106,9 +106,9 @@ const ParmarModal = props => {
onChange={change} onChange={change}
/> />
</Form.Item> </Form.Item>
<Form.Item label="映射字段" name="shineFields"> <Form.Item label="映射字段" name="mapping">
<Select placeholder="请选择映射字段" showSearch mode="multiple"> <Select placeholder="请选择映射字段" showSearch mode="multiple">
{shineFieldsData.map((item, index) => ( {mappingData.map((item, index) => (
<Option key={index} value={item}> <Option key={index} value={item}>
{item} {item}
</Option> </Option>
...@@ -126,7 +126,7 @@ const ParmarModal = props => { ...@@ -126,7 +126,7 @@ const ParmarModal = props => {
<Form.Item <Form.Item
{...restField} {...restField}
style={{ marginBottom: '5px' }} style={{ marginBottom: '5px' }}
name={[name, 'formField']} name={[name, 'fromField']}
fieldKey={[fieldKey, 'key']} fieldKey={[fieldKey, 'key']}
validateTrigger={['onChange', 'onBlur']} validateTrigger={['onChange', 'onBlur']}
rules={[ rules={[
...@@ -136,7 +136,7 @@ const ParmarModal = props => { ...@@ -136,7 +136,7 @@ const ParmarModal = props => {
// 验证参数名不能重复 // 验证参数名不能重复
const allKey = form const allKey = form
.getFieldsValue() .getFieldsValue()
.parmars.map(item => (item ? item.formField : '')); .parmars.map(item => (item ? item.fromField : ''));
const repeatKey = new Set(allKey); const repeatKey = new Set(allKey);
if (repeatKey.size !== allKey.length) { if (repeatKey.size !== allKey.length) {
return Promise.reject(new Error('参数名重复')); return Promise.reject(new Error('参数名重复'));
......
...@@ -393,7 +393,21 @@ const ConfigNodeMsg = (props, ref) => { ...@@ -393,7 +393,21 @@ const ConfigNodeMsg = (props, ref) => {
</Radio> </Radio>
</Radio.Group> </Radio.Group>
</Form.Item> </Form.Item>
<Form.Item label="节点表名" name="TableName"> <Form.Item
label={
editMsg.NodeType === '1' ? (
<div style={{ display: 'flex', alignItems: 'center' }}>
<Tooltip title="首节点的表必须包含事件编号和工单编号">
<InfoCircleOutlined style={{ color: '#1890ff', marginLeft: '3px' }} />
</Tooltip>
节点表名
</div>
) : (
<div>节点表名</div>
)
}
name="TableName"
>
<Select placeholder="请选择节点表名" onChange={changTable} showSearch> <Select placeholder="请选择节点表名" onChange={changTable} showSearch>
{eventTable.map(item => ( {eventTable.map(item => (
<Option value={item.Name} key={item.Name}> <Option value={item.Name} key={item.Name}>
......
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