Commit 5f0c9a9c authored by 皮倩雯's avatar 皮倩雯

fix: '台账选择器映射字段'

parent 385cda55
Pipeline #65454 passed with stages
...@@ -202,11 +202,18 @@ const AddModal = props => { ...@@ -202,11 +202,18 @@ const AddModal = props => {
const [fieldList, setFieldList] = useState([]); const [fieldList, setFieldList] = useState([]);
const [fieldValue, setFeildValue] = useState([]); // 保存关联表单形态,字段名下拉框数据 const [fieldValue, setFeildValue] = useState([]); // 保存关联表单形态,字段名下拉框数据
const [mapFieldValue, setMapFeildValue] = useState([]); // 保存关联表单形态,映射字段名下拉框数据 const [mapFieldValue, setMapFeildValue] = useState([]); // 保存关联表单形态,映射字段名下拉框数据
const [standbookData, setStandbookData] = useState([]);
const [fieldshineChecked, setFieldshineChecked] = useState(false);
const [standFiledData, setStandFiledData] = useState([]);
const change = e => { const change = e => {
console.log(e); console.log(e);
setVisibleChecked(e); setVisibleChecked(e);
}; };
const fieldshineChange = e => {
console.log(e);
setFieldshineChecked(e);
};
const onChangeView = e => { const onChangeView = e => {
setView(e.target.checked); setView(e.target.checked);
}; };
...@@ -330,15 +337,23 @@ const AddModal = props => { ...@@ -330,15 +337,23 @@ const AddModal = props => {
} }
break; break;
case '台账选择器': case '台账选择器':
if (obj.fieldName.endsWith('.n')) { let arr = {};
arr.fromField = obj.workOrder;
arr.toField = obj.eventOrder;
let li = [];
if (formAdd.getFieldValue('parmars')) {
li = [...formAdd.getFieldValue('parmars')];
}
li.push(arr);
console.log(li);
let standData = fieldshineChecked ? JSON.stringify(li) : obj.fieldName;
if (obj.fieldName && obj.fieldName.endsWith('.n')) {
data[0].Config = `${obj.standingBook}.${obj.fieldName}`; data[0].Config = `${obj.standingBook}.${obj.fieldName}`;
} else if (obj.fieldName) { } else if (standData) {
data[0].Config = data[0].Config =
radio == 0 radio == 0
? `${obj.standingBook}.${obj.fieldName}` ? `${obj.standingBook}.${standData}`
: `${obj.standingBook}.${obj.fieldName}.n`; : `${obj.standingBook}.${standData}.n`;
} else {
data[0].Config = radio == 0 ? `${obj.standingBook}` : `${obj.standingBook}.n`;
} }
if (obj.filterName) { if (obj.filterName) {
data[0].Config = `${data[0].Config}?${obj.filterName}`; data[0].Config = `${data[0].Config}?${obj.filterName}`;
...@@ -346,14 +361,13 @@ const AddModal = props => { ...@@ -346,14 +361,13 @@ const AddModal = props => {
break; break;
case '关联表单': case '关联表单':
let aalist = {}; let aalist = {};
let arrlist = {};
aalist.台账名称 = obj.standingBook; aalist.台账名称 = obj.standingBook;
arrlist.fromField = obj.workOrder;
arrlist.toField = obj.eventOrder;
aalist.默认显示 = visibleChecked || false; aalist.默认显示 = visibleChecked || false;
aalist.控制规则 = obj.configName; aalist.控制规则 = obj.configName;
console.log(formAdd.getFieldValue('parmars'));
let arrlist = {};
arrlist.fromField = obj.workOrder;
arrlist.toField = obj.eventOrder;
let lii = []; let lii = [];
if (formAdd.getFieldValue('parmars')) { if (formAdd.getFieldValue('parmars')) {
lii = [...formAdd.getFieldValue('parmars')]; lii = [...formAdd.getFieldValue('parmars')];
...@@ -472,9 +486,10 @@ const AddModal = props => { ...@@ -472,9 +486,10 @@ const AddModal = props => {
}; };
const getData = () => { const getData = () => {
console.log(keepTree);
let last = []; let last = [];
let aa = ['工单编号','事件编号']; // 固定分组数据 let aa = ['工单编号', '事件编号']; // 固定分组数据
let kk = [] let kk = [];
keepTree.map((i, j) => { keepTree.map((i, j) => {
if (i != '工单编号' && i != '事件编号') { if (i != '工单编号' && i != '事件编号') {
// let kk = {}; // let kk = {};
...@@ -488,12 +503,13 @@ const AddModal = props => { ...@@ -488,12 +503,13 @@ const AddModal = props => {
bb.name = '内置字段'; bb.name = '内置字段';
bb.ID = 0; bb.ID = 0;
bb.children = aa; bb.children = aa;
last.push(bb) last.push(bb);
let dd ={}; // 附加字段对象 let dd = {}; // 附加字段对象
dd.name = '附加字段'; dd.name = '附加字段';
dd.ID = 1; dd.ID = 1;
dd.children = kk; dd.children = kk;
last.push(dd) last.push(dd);
console.log(last);
setFeildValue(last); setFeildValue(last);
// let cc = []; // let cc = [];
...@@ -509,6 +525,8 @@ const AddModal = props => { ...@@ -509,6 +525,8 @@ const AddModal = props => {
useEffect(() => { useEffect(() => {
if (isVisible) { if (isVisible) {
console.log(keepTree);
getStandData();
getData(); getData();
setFieldList(keepTreeData); setFieldList(keepTreeData);
// 用于判断分组名与字段名重复时提示当前未选中字段 // 用于判断分组名与字段名重复时提示当前未选中字段
...@@ -797,11 +815,41 @@ const AddModal = props => { ...@@ -797,11 +815,41 @@ const AddModal = props => {
break; break;
case '台账选择器': case '台账选择器':
let book = res[0].data.root.Config.split('.'); let book = res[0].data.root.Config.split('.');
let rueslt1 = keepStandingBook.find(i => i.name == book[0]);
getMapFelidValue(rueslt1.tableName);
let bb = book[1].split('?'); let bb = book[1].split('?');
if (bb[0].indexOf('[') !== -1) {
let filedname = JSON.parse(bb[0]);
form.setFieldsValue({ form.setFieldsValue({
standingBook: book[0] || '', standingBook: book[0] || '',
fieldName: bb[0] || '', fieldName: bb[0] || '',
workOrder: filedname[filedname.length - 1].fromField,
eventOrder: filedname[filedname.length - 1].toField,
fieldshine: true,
}); });
// 映射字段
if (Array.isArray(filedname)) {
let gg = [...filedname];
let a11 = [];
gg.length > 0 &&
gg.map((i, j) => {
if (j !== gg.length - 1) {
a11.push(i);
}
});
formAdd.setFieldsValue({ parmars: a11 });
setFieldshineChecked(true);
}
} else {
form.setFieldsValue({
standingBook: book[0] || '',
fieldName: bb[0] || '',
fieldshine: false,
});
setFieldshineChecked(false);
}
let book1 = res[0].data.root.Config.split('?'); let book1 = res[0].data.root.Config.split('?');
if (book1[1]) { if (book1[1]) {
// let aa = book1[1].split('='); // let aa = book1[1].split('=');
...@@ -1082,6 +1130,7 @@ const AddModal = props => { ...@@ -1082,6 +1130,7 @@ const AddModal = props => {
setCse(''); setCse('');
setPramData([]); setPramData([]);
form.resetFields(); form.resetFields();
formAdd.resetFields();
setChee(''); setChee('');
setCheestyle(''); setCheestyle('');
setRadio(''); setRadio('');
...@@ -1106,13 +1155,35 @@ const AddModal = props => { ...@@ -1106,13 +1155,35 @@ const AddModal = props => {
tableName: e, tableName: e,
}).then(res => { }).then(res => {
if (res.msg === 'Ok') { if (res.msg === 'Ok') {
console.log(res.data.root);
// 编辑时过滤下l拉框初始数据 // 编辑时过滤下l拉框初始数据
setMapFeildValue(res.data.root); setMapFeildValue(res.data.root);
let data = [];
let list = {};
let datalist = [];
list.ID = 0;
list.name = e;
res.data.root.map(i => {
datalist.push(i.name);
});
list.children = datalist;
data.push(list);
setStandbookData(data);
} }
}); });
}; };
const getStandData = () => {
let data = [];
let list = {};
let datalist = [];
datalist = [...keepTree];
list.ID = 0;
list.name = formObj1;
list.children = datalist;
data.push(list);
setStandFiledData(data);
};
const seach = e => { const seach = e => {
let rueslt = keepStandingBook.find(i => i.name == e); let rueslt = keepStandingBook.find(i => i.name == e);
getMapFelidValue(rueslt.tableName); getMapFelidValue(rueslt.tableName);
...@@ -1188,6 +1259,7 @@ const AddModal = props => { ...@@ -1188,6 +1259,7 @@ const AddModal = props => {
const getFieldData = value => { const getFieldData = value => {
LoadEventFields({ eventTableName: value, distinctFields: '' }).then(res => { LoadEventFields({ eventTableName: value, distinctFields: '' }).then(res => {
if (res.msg === 'Ok') { if (res.msg === 'Ok') {
console.log(res.data.root);
setFiled(formateArrDataA(res.data.root, 'group')); setFiled(formateArrDataA(res.data.root, 'group'));
setIsShow(true); setIsShow(true);
} }
...@@ -1290,6 +1362,8 @@ const AddModal = props => { ...@@ -1290,6 +1362,8 @@ const AddModal = props => {
setFlag(false); setFlag(false);
setPopeleShape('下拉框'); setPopeleShape('下拉框');
setHide(true); setHide(true);
setFieldshineChecked(false);
formAdd.resetFields();
console.log(value); console.log(value);
if (value == '文本') { if (value == '文本') {
setDetail('输入内容将显示在前端输入框提示信息中'); setDetail('输入内容将显示在前端输入框提示信息中');
...@@ -1792,12 +1866,43 @@ const AddModal = props => { ...@@ -1792,12 +1866,43 @@ const AddModal = props => {
setVisibleChecked(data11.默认显示); setVisibleChecked(data11.默认显示);
break; break;
case '台账选择器': case '台账选择器':
console.log(aa.Config);
let book = aa.Config.split('.'); let book = aa.Config.split('.');
let rueslt1 = keepStandingBook.find(j => j.name == book[0]);
getMapFelidValue(rueslt1.tableName);
let ad = book[1].split('?'); let ad = book[1].split('?');
if (ad[0].indexOf('[') !== -1) {
let filedname = JSON.parse(ad[0]);
form.setFieldsValue({ form.setFieldsValue({
standingBook: book[0] || '', standingBook: book[0] || '',
fieldName: ad[0] || '', fieldName: ad[0] || '',
workOrder: filedname[filedname.length - 1].fromField,
eventOrder: filedname[filedname.length - 1].toField,
fieldshine: true,
}); });
// 映射字段
if (Array.isArray(filedname)) {
let g = [...filedname];
let a1 = [];
g.length > 0 &&
g.map((i, j) => {
if (j !== g.length - 1) {
a1.push(i);
}
});
formAdd.setFieldsValue({ parmars: a1 });
setFieldshineChecked(true);
}
} else {
form.setFieldsValue({
standingBook: book[0] || '',
fieldName: ad[0] || '',
fieldshine: false,
});
setFieldshineChecked(false);
}
let book1 = aa.Config.split('?'); let book1 = aa.Config.split('?');
if (book1[1]) { if (book1[1]) {
// let cc = book1[1].split('='); // let cc = book1[1].split('=');
...@@ -1865,7 +1970,7 @@ const AddModal = props => { ...@@ -1865,7 +1970,7 @@ const AddModal = props => {
ConfigName: '', ConfigName: '',
}); });
} }
if (aa.Config.endsWith('.n')) { if (aa.endsWith('.n')) {
form.setFieldsValue({ choose: true }); form.setFieldsValue({ choose: true });
setCho(true); setCho(true);
} else { } else {
...@@ -2224,12 +2329,45 @@ const AddModal = props => { ...@@ -2224,12 +2329,45 @@ const AddModal = props => {
setVisibleChecked(data11.默认显示); setVisibleChecked(data11.默认显示);
break; break;
case '台账选择器': case '台账选择器':
console.log(res[0].data.root.Config);
let book = res[0].data.root.Config.split('.'); let book = res[0].data.root.Config.split('.');
let rueslt1 = keepStandingBook.find(i => i.name == book[0]);
console.log(rueslt1.tableName);
getMapFelidValue(rueslt1.tableName);
let ab = book[1].split('?'); let ab = book[1].split('?');
if (ab[0].indexOf('[') !== -1) {
let filedname = JSON.parse(ab[0]);
console.log(filedname);
form.setFieldsValue({ form.setFieldsValue({
standingBook: book[0] || '', standingBook: book[0] || '',
fieldName: ab[0] || '', fieldName: ab[0] || '',
workOrder: filedname[filedname.length - 1].fromField,
eventOrder: filedname[filedname.length - 1].toField,
fieldshine: true,
});
// 映射字段
if (Array.isArray(filedname)) {
let g = [...filedname];
let a1 = [];
g.length > 0 &&
g.map((i, j) => {
if (j !== g.length - 1) {
a1.push(i);
}
}); });
formAdd.setFieldsValue({ parmars: a1 });
setFieldshineChecked(true);
}
} else {
form.setFieldsValue({
standingBook: book[0] || '',
fieldName: ab[0] || '',
fieldshine: false,
});
setFieldshineChecked(false);
}
let book1 = res[0].data.root.Config.split('?'); let book1 = res[0].data.root.Config.split('?');
if (book1[1]) { if (book1[1]) {
// let aa = book1[1].split('='); // let aa = book1[1].split('=');
...@@ -2531,15 +2669,23 @@ const AddModal = props => { ...@@ -2531,15 +2669,23 @@ const AddModal = props => {
} }
break; break;
case '台账选择器': case '台账选择器':
if (obj.fieldName.endsWith('.n')) { let arr = {};
arr.fromField = obj.workOrder;
arr.toField = obj.eventOrder;
let li = [];
if (formAdd.getFieldValue('parmars')) {
li = [...formAdd.getFieldValue('parmars')];
}
li.push(arr);
console.log(li);
let standData = fieldshineChecked ? JSON.stringify(li) : obj.fieldName;
if (obj.fieldName && obj.fieldName.endsWith('.n')) {
data[0].Config = `${obj.standingBook}.${obj.fieldName}`; data[0].Config = `${obj.standingBook}.${obj.fieldName}`;
} else if (obj.fieldName) { } else if (standData) {
data[0].Config = data[0].Config =
radio == 0 radio == 0
? `${obj.standingBook}.${obj.fieldName}` ? `${obj.standingBook}.${standData}`
: `${obj.standingBook}.${obj.fieldName}.n`; : `${obj.standingBook}.${standData}.n`;
} else {
data[0].Config = radio == 0 ? `${obj.standingBook}` : `${obj.standingBook}.n`;
} }
if (obj.filterName) { if (obj.filterName) {
data[0].Config = `${data[0].Config}?${obj.filterName}`; data[0].Config = `${data[0].Config}?${obj.filterName}`;
...@@ -2694,9 +2840,11 @@ const AddModal = props => { ...@@ -2694,9 +2840,11 @@ const AddModal = props => {
setCheckboxAll1(''); setCheckboxAll1('');
setCheckboxAllID1(''); setCheckboxAllID1('');
setSynchronization(false); setSynchronization(false);
setFieldshineChecked(false);
setFlag(false); setFlag(false);
setPopeleShape(''); setPopeleShape('');
setHide(true); setHide(true);
formAdd.resetFields();
if (i == 1.14) { if (i == 1.14) {
console.log(valueData); console.log(valueData);
UpdateFields(valueData).then(res => { UpdateFields(valueData).then(res => {
...@@ -2738,6 +2886,19 @@ const AddModal = props => { ...@@ -2738,6 +2886,19 @@ const AddModal = props => {
return <TreeNode value={org} title={org} key={org} />; return <TreeNode value={org} title={org} key={org} />;
}; };
const mapTree2 = org => {
console.log(123);
console.log(org);
if (org.children) {
return (
<TreeNode value={org.name} title={org.name} key={org.ID} disabled>
{org.children.map(item => mapTreeSelect(item))}
</TreeNode>
);
}
return <TreeNode value={org} title={org} key={org} />;
};
const onChange2 = e => { const onChange2 = e => {
setRadio(e.target.value); setRadio(e.target.value);
setValue1(); setValue1();
...@@ -3021,15 +3182,35 @@ const AddModal = props => { ...@@ -3021,15 +3182,35 @@ const AddModal = props => {
> >
只读 只读
</Checkbox> </Checkbox>
{/* <Checkbox <Checkbox
checked={pramData.EditableLater} checked={pramData.EditableLater}
onChange={e => onChangeReady(e, 'EditableLater')} onChange={e => onChangeReady(e, 'EditableLater')}
> >
允许补正(事后修改) 允许补正(事后修改)
</Checkbox> */} </Checkbox>
</div> </div>
</Item> </Item>
<Item label="同步" name="SyncEvent" labelCol={{ span: 4 }}> <Item
label={
<Tooltip
title={
<>
<span>适合于分表办理,将信息由工单同步到事件</span>
</>
}
>
<InfoCircleOutlined
style={{
color: 'rgb(24 144 255)',
marginRight: '5px',
}}
/>
<span>同步</span>
</Tooltip>
}
name="SyncEvent"
labelCol={{ span: 4 }}
>
<Checkbox checked={synchronization} onChange={changeSy}> <Checkbox checked={synchronization} onChange={changeSy}>
工单 → 事件 工单 → 事件
</Checkbox> </Checkbox>
...@@ -3391,7 +3572,7 @@ const AddModal = props => { ...@@ -3391,7 +3572,7 @@ const AddModal = props => {
</Checkbox> </Checkbox>
</Item> </Item>
</div> </div>
<div style={{ display: 'inline-block' }}> {/* <div style={{ display: 'inline-block' }}>
<Item name="choose" style={{ marginBottom: '0' }}> <Item name="choose" style={{ marginBottom: '0' }}>
<Checkbox <Checkbox
checked={cho} checked={cho}
...@@ -3401,7 +3582,7 @@ const AddModal = props => { ...@@ -3401,7 +3582,7 @@ const AddModal = props => {
多选 多选
</Checkbox> </Checkbox>
</Item> </Item>
</div> </div> */}
</Item> </Item>
); );
case '关联表单': case '关联表单':
...@@ -3648,15 +3829,13 @@ const AddModal = props => { ...@@ -3648,15 +3829,13 @@ const AddModal = props => {
case '台账选择器': case '台账选择器':
return ( return (
<> <>
<Row>
<Col span={12}>
<Item <Item
label="台账名" label="台账名"
name="standingBook" name="standingBook"
labelCol={{ span: 8}} labelCol={{ span: 4 }}
rules={[{ required: true, message: '请选择台账名' }]} rules={[{ required: true, message: '请选择台账名' }]}
> >
<Select showSearch style={{ width: '110%' }}> <Select onChange={e => seach(e)} showSearch>
{keepStandingBook {keepStandingBook
? keepStandingBook.map((item, index) => ( ? keepStandingBook.map((item, index) => (
<Option key={index} value={item.name}> <Option key={index} value={item.name}>
...@@ -3666,21 +3845,281 @@ const AddModal = props => { ...@@ -3666,21 +3845,281 @@ const AddModal = props => {
: ''} : ''}
</Select> </Select>
</Item> </Item>
</Col> <Item label="字段映射" name="fieldshine" labelCol={{ span: 4 }}>
<Col span={12}> <Switch
checkedChildren="是"
unCheckedChildren="否"
checked={fieldshineChecked}
onChange={fieldshineChange}
/>
</Item>
{!fieldshineChecked && (
<Item colon={false} name="check" label="配置:" labelCol={{ span: 4 }}>
<Radio.Group onChange={onChange2} value={radio} defaultValue={chee}>
<Radio value={0}>单选</Radio>
<Radio value={1}>多选</Radio>
</Radio.Group>
</Item>
)}
{fieldshineChecked === false ? (
<Item <Item
label="字段名" label="字段名"
name="fieldName" name="fieldName"
labelCol={{ span: 8}} labelCol={{ span: 4 }}
rules={[{ required: true, message: '请输入字段名' }]} rules={[{ required: true, message: '请输入字段名' }]}
> >
<Input placeholder="台账表中字段用于数据回显" /> <Input placeholder="台账表中字段用于数据回显" />
</Item> </Item>
) : (
<>
<Item
style={{ marginBottom: '10px' }}
label={
<>
<span
style={{
color: 'red',
fontSize: '17px',
marginRight: '5px',
marginTop: '3px',
}}
>
*
</span>
<span>映射字段</span>
</>
}
labelCol={{ span: 4 }}
>
<Row>
<Col span={11}>
<Item
name="workOrder"
rules={[{ required: true, message: '请输入字段名' }]}
style={{ marginBottom: 0 }}
>
{/* <Select
placeholder="选择字段名"
showSearch
style={{ width: '208px' }}
>
{mapFieldValue.length > 0
? mapFieldValue.map((item, index) => (
<>
<Option key={item.name} value={item.name}>
{item.name}
</Option>
</>
))
: ''}
</Select> */}
<TreeSelect
showSearch
style={{ width: '208px' }}
dropdownStyle={{ maxHeight: 400, overflow: 'auto' }}
placeholder="请选择字段名 "
allowClear
treeDefaultExpandAll
>
{standbookData ? (
standbookData.map(i => mapTree2(i))
) : (
<Empty image={Empty.PRESENTED_IMAGE_SIMPLE} />
)}
</TreeSelect>
</Item>
</Col>
<Col span={1} style={{ paddingTop: '3px' }}>
{' '}
<img
src={logo}
style={{ height: '24px', marginLeft: '-10px' }}
alt=""
/>
</Col>
<Col span={11}>
<Item
name="eventOrder"
rules={[{ required: true, message: '请输入映射字段名' }]}
style={{ marginBottom: 0 }}
>
{/* <Select
placeholder="选择映射字段名"
showSearch
style={{ width: '208px' }}
>
{keepTree.length > 0
? keepTree.map((item, index) => (
<>
<Option key={item} value={item}>
{item}
</Option>
</>
))
: ''}
</Select> */}
<TreeSelect
showSearch
style={{ width: '208px' }}
dropdownStyle={{ maxHeight: 400, overflow: 'auto' }}
placeholder="请选择字段名 "
allowClear
treeDefaultExpandAll
>
{standFiledData ? (
standFiledData.map(i => mapTree2(i))
) : (
<Empty image={Empty.PRESENTED_IMAGE_SIMPLE} />
)}
</TreeSelect>
</Item>
</Col> </Col>
</Row> </Row>
</Item>
<Form name="form" form={formAdd} labelCol={{ span: 7 }}>
<Form.List name="parmars">
{(fields, { add, remove }) => (
<>
{fields.map(({ key, name, fieldKey, ...restField }) => (
<Space
key={key}
style={{
display: 'flex',
marginBottom: '5px',
justifyContent: 'center',
}}
align="baseline"
>
<Form.Item
{...restField}
style={{ marginBottom: '5px' }}
name={[name, 'fromField']}
fieldKey={[fieldKey, 'key']}
validateTrigger={['onChange', 'onBlur']}
rules={[{ required: true, message: '请填写字段名' }]}
>
{/* <Select
placeholder="选择字段名"
showSearch
style={{ width: '208px', marginLeft: '98px' }}
>
{mapFieldValue.length > 0
? mapFieldValue.map((item, index) => (
<>
<Option key={item.name} value={item.name}>
{item.name}
</Option>
</>
))
: ''}
</Select> */}
<TreeSelect
showSearch
style={{ width: '208px', marginLeft: '98px' }}
dropdownStyle={{ maxHeight: 400, overflow: 'auto' }}
placeholder="请选择字段名 "
allowClear
treeDefaultExpandAll
>
{standbookData ? (
standbookData.map(i => mapTree2(i))
) : (
<Empty image={Empty.PRESENTED_IMAGE_SIMPLE} />
)}
</TreeSelect>
</Form.Item>
{/* <SwapOutlined style={{marginLeft:'4px'}}/> */}
<img src={logo} style={{ height: '24px' }} alt="" />
<Form.Item
{...restField}
style={{ marginBottom: '5px' }}
name={[name, 'toField']}
fieldKey={[fieldKey, 'key']}
rules={[
{ required: true, message: '请填写映射字段名' },
{
validator: () => {
let aa = formAdd.getFieldsValue().parmars;
console.log(aa);
let data = [];
aa.length > 0 &&
aa.map(i => {
if (i) {
data.push(i.toField);
}
});
let list = new Set(data);
let ee = form.getFieldsValue().eventOrder;
if (
list.size !== data.length ||
data.indexOf(ee) != -1
) {
return Promise.reject(
new Error('映射字段名重复'),
);
}
return Promise.resolve();
},
},
]}
>
{/* <Select
placeholder="选择映射字段名"
showSearch
style={{ width: '208px' }}
>
{keepTree.length > 0
? keepTree.map((item, index) => (
<>
<Option key={item} value={item}>
{item}
</Option>
</>
))
: ''}
</Select> */}
<TreeSelect
showSearch
style={{ width: '208px' }}
dropdownStyle={{ maxHeight: 400, overflow: 'auto' }}
placeholder="请选择字段名 "
allowClear
treeDefaultExpandAll
>
{standFiledData ? (
standFiledData.map(i => mapTree2(i))
) : (
<Empty image={Empty.PRESENTED_IMAGE_SIMPLE} />
)}
</TreeSelect>
</Form.Item>
<MinusCircleOutlined
onClick={() => remove(name)}
style={{ marginLeft: '10px', fontSize: '20px' }}
/>
</Space>
))}
<Form.Item>
<Button
style={{ width: '456px', marginLeft: '100px' }}
type="dashed"
onClick={() => add()}
block
icon={<PlusOutlined />}
>
添加映射
</Button>
</Form.Item>
</>
)}
</Form.List>
</Form>
</>
)}
{/* <Col span={12}> */} {/* <Col span={12}> */}
<Item label="SQL过滤" name="filterName" labelCol={{ span: 4 }}> <Item label="SQL过滤" name="filterName" labelCol={{ span: 4 }}>
<TextArea placeholder="示例:部门='研发一部'" /> <TextArea placeholder="示例:部门='XX部门'" />
</Item> </Item>
{/* </Col> */} {/* </Col> */}
...@@ -3695,13 +4134,6 @@ const AddModal = props => { ...@@ -3695,13 +4134,6 @@ const AddModal = props => {
/> />
</Item> </Item>
</Col> */} </Col> */}
<Item colon={false} name="check" label="配置:" labelCol={{ span: 4 }}>
<Radio.Group onChange={onChange2} value={radio} defaultValue={chee}>
<Radio value={0}>单选</Radio>
<Radio value={1}>多选</Radio>
</Radio.Group>
</Item>
</> </>
); );
case '人员选择器': case '人员选择器':
......
...@@ -15,6 +15,7 @@ import { ...@@ -15,6 +15,7 @@ import {
Empty, Empty,
Checkbox, Checkbox,
Switch, Switch,
Tag,
} from 'antd'; } from 'antd';
import { import {
EditOutlined, EditOutlined,
...@@ -112,7 +113,7 @@ const AddModal = props => { ...@@ -112,7 +113,7 @@ const AddModal = props => {
title: '字段名', title: '字段名',
dataIndex: 'name', dataIndex: 'name',
key: 'name', key: 'name',
align: 'left', align: 'center',
width: 300, width: 300,
onCell: () => ({ onCell: () => ({
style: { style: {
...@@ -132,7 +133,7 @@ const AddModal = props => { ...@@ -132,7 +133,7 @@ const AddModal = props => {
</div> </div>
); );
let bb = ( let bb = (
<Tooltip placement="topLeft" title={text}> <Tooltip title={text}>
<div style={{ color: styleConfig(record) }}>{text}</div> <div style={{ color: styleConfig(record) }}>{text}</div>
</Tooltip> </Tooltip>
); );
...@@ -239,7 +240,11 @@ const AddModal = props => { ...@@ -239,7 +240,11 @@ const AddModal = props => {
width: 100, width: 100,
render: (text, record) => { render: (text, record) => {
const obj = { const obj = {
children: <span style={{ color: styleConfig(record) }}>{text} </span>, children: (
<span style={{ color: styleConfig(record) }}>
<Tag color={text === 1 ? 'success' : 'processing'}>{text === 1 ? '是' : '否'}</Tag>
</span>
),
props: {}, props: {},
}; };
obj.props.colSpan = record.children ? 0 : 1; obj.props.colSpan = record.children ? 0 : 1;
......
...@@ -513,7 +513,7 @@ const AddModal = props => { ...@@ -513,7 +513,7 @@ const AddModal = props => {
<TreeSelect <TreeSelect
showSearch showSearch
dropdownStyle={{ maxHeight: 400, overflow: 'auto' }} dropdownStyle={{ maxHeight: 400, overflow: 'auto' }}
placeholder="请选择表名 " placeholder="请选择执行周期"
allowClear allowClear
treeDefaultExpandAll treeDefaultExpandAll
showCheckedStrategy showCheckedStrategy
......
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